Patchwork D4102: resolve: support confirm config option with --unmark flag

login
register
mail settings
Submitter phabricator
Date Aug. 6, 2018, 2:40 a.m.
Message ID <50e4a39b4fc002295e9176d02a2a7fd9@localhost.localdomain>
Download mbox | patch
Permalink /patch/33283/
State Not Applicable
Headers show

Comments

phabricator - Aug. 6, 2018, 2:40 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGf35f6791595f: resolve: support confirm config option with --unmark flag (authored by khanchi97, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D4102?vs=9905&id=9938

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

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

CHANGE DETAILS




To: khanchi97, #hg-reviewers, pulkit
Cc: pulkit, 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
@@ -557,6 +557,35 @@ 
   R emp2
   R emp3
 
+Test that commands.resolve.confirm respect --unmark option (only when no patterns args are given):
+===============================================================================================
+
+  $ hg resolve -u emp1
+
+  $ hg resolve -l
+  U emp1
+  R emp2
+  R emp3
+
+  $ hg resolve -u << EOF
+  > n
+  > EOF
+  mark all resolved files as unresolved (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,10 +4546,15 @@ 
     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 unmark and confirm and not pats:
+        if ui.promptchoice(_(b'mark all resolved files as unresolved (yn)?'
+                             b'$$ &Yes $$ &No')):
+            raise error.Abort(_('user quit'))
 
     if show:
         ui.pager('resolve')