Patchwork D4101: resolve: support commands.resolve.confirm option with --mark flag

login
register
mail settings
Submitter phabricator
Date Aug. 4, 2018, 5:39 p.m.
Message ID <74556b81c4a0c0d371ff5974a08ae317@localhost.localdomain>
Download mbox | patch
Permalink /patch/33241/
State Not Applicable
Headers show

Comments

phabricator - Aug. 4, 2018, 5:39 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdb03e5cefc82: resolve: support commands.resolve.confirm option with --mark flag (authored by khanchi97, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D4101?vs=9898&id=9903#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4101?vs=9898&id=9903

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

AFFECTED FILES
  mercurial/commands.py
  tests/test-resolve.t

CHANGE DETAILS




To: khanchi97, #hg-reviewers, pulkit
Cc: mercurial-devel

Patch

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -509,6 +509,33 @@ 
   warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
   [1]
 
+Test that commands.resolve.confirm respect --mark option (only when no patterns args are given):
+===============================================================================================
+
+  $ hg resolve -m emp1
+  $ hg resolve -l
+  R emp1
+  U emp2
+  U emp3
+
+  $ hg resolve -m << EOF
+  > n
+  > EOF
+  mark all unresolved files as resolved (yn)? n
+  abort: user quit
+  [255]
+
+  $ hg resolve -m << EOF
+  > y
+  > EOF
+  mark all unresolved files as resolved (yn)? y
+  (no more unresolved files)
+  continue: hg rebase --continue
+  $ hg resolve -l
+  R emp1
+  R emp2
+  R emp3
+
   $ hg rebase --abort
   rebase aborted
   $ cd ..
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4546,6 +4546,10 @@ 
     if not (all or pats or show or mark or unmark):
         raise error.Abort(_('no files or directories specified'),
                          hint=('use --all to re-merge all unresolved files'))
+    if mark and confirm and not pats:
+        if ui.promptchoice(_(b'mark all unresolved files as resolved (yn)?'
+                             b'$$ &Yes $$ &No')):
+            raise error.Abort(_('user quit'))
 
     if show:
         ui.pager('resolve')