Patchwork D12416: revert: ask user to confirm before tracking new file when interactive

login
register
mail settings
Submitter phabricator
Date March 28, 2022, 5:57 p.m.
Message ID <differential-rev-PHID-DREV-a6aqgvtr5awygymp3jjm-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50761/
State New
Headers show

Comments

phabricator - March 28, 2022, 5:57 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  If interactively reverting from a commit with `hg revert -i -r`, we
  would unconditionally add files from that commit that are not already
  tracked in the working copy. We have prompts for adding back files
  removed in the working copy, but that's specific to such files and
  does not apply to adding files from another revision.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12416

AFFECTED FILES
  mercurial/cmdutil.py
  tests/test-revert-interactive.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-revert-interactive.t b/tests/test-revert-interactive.t
--- a/tests/test-revert-interactive.t
+++ b/tests/test-revert-interactive.t
@@ -420,6 +420,19 @@ 
   forgetting newfile
   $ hg status
   ? newfile
+  $ rm newfile
+  $ hg co 0
+  1 files updated, 0 files merged, 4 files removed, 0 files unresolved
+  $ hg status
+  $ hg revert -r 2 -i <<EOF
+  > y
+  > n
+  > EOF
+  add new file folder1/g (Yn)? y
+  adding folder1/g
+  add new file folder2/h (Yn)? n
+  $ hg status
+  A folder1/g
 
 When a line without EOL is selected during "revert -i" (issue5651)
 
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3752,6 +3752,12 @@ 
         if f in newlyaddedandmodifiedfiles:
             continue
 
+        if interactive:
+            choice = repo.ui.promptchoice(
+                _(b"add new file %s (Yn)?$$ &Yes $$ &No") % uipathfn(f)
+            )
+            if choice != 0:
+                continue
         prntstatusmsg(b'add', f)
         checkout(f)
         repo.dirstate.set_tracked(f)