Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: adding --no-status to resolve to match status
authortimeless <timeless@gmail.com>
Sun, 25 Oct 2009 13:27:54 +0100
changeset 9646 5b001f534452
parent 9645 02f40b2ece3f
child 9647 f69fd20d788d
commands: adding --no-status to resolve to match status
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-debugcomplete.out file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Oct 21 12:41:28 2009 +0300
+++ b/mercurial/commands.py	Sun Oct 25 13:27:54 2009 +0100
@@ -2445,7 +2445,7 @@
 def resolve(ui, repo, *pats, **opts):
     """retry file merges from a merge or update
 
-    This command will cleanly retry unresolved file merges using file
+    This command can cleanly retry unresolved file merges using file
     revisions preserved from the last update or merge. To attempt to
     resolve all unresolved files, use the -a/--all switch.
 
@@ -2463,7 +2463,8 @@
       R = resolved
     """
 
-    all, mark, unmark, show = [opts.get(o) for o in 'all mark unmark list'.split()]
+    all, mark, unmark, show, nostatus = \
+        [opts.get(o) for o in 'all mark unmark list no_status'.split()]
 
     if (show and (mark or unmark)) or (mark and unmark):
         raise util.Abort(_("too many options specified"))
@@ -2479,7 +2480,10 @@
     for f in ms:
         if m(f):
             if show:
-                ui.write("%s %s\n" % (ms[f].upper(), f))
+                if nostatus:
+                    ui.write("%s\n" % f)
+                else:
+                    ui.write("%s %s\n" % (ms[f].upper(), f))
             elif mark:
                 ms.mark(f, "r")
             elif unmark:
@@ -3586,7 +3590,8 @@
          [('a', 'all', None, _('remerge all unresolved files')),
           ('l', 'list', None, _('list state of files needing merge')),
           ('m', 'mark', None, _('mark files as resolved')),
-          ('u', 'unmark', None, _('unmark files as resolved'))]
+          ('u', 'unmark', None, _('unmark files as resolved')),
+          ('n', 'no-status', None, _('hide status prefix'))]
           + walkopts,
           _('[OPTION]... [FILE]...')),
     "revert":
--- a/tests/test-debugcomplete.out	Wed Oct 21 12:41:28 2009 +0300
+++ b/tests/test-debugcomplete.out	Sun Oct 25 13:27:54 2009 +0100
@@ -218,7 +218,7 @@
 paths: 
 recover: 
 rename: after, force, include, exclude, dry-run
-resolve: all, list, mark, unmark, include, exclude
+resolve: all, list, mark, unmark, no-status, include, exclude
 revert: all, date, rev, no-backup, include, exclude, dry-run
 rollback: 
 root:
mercurial