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.
resolve: report no argument warning using a hint stable
authorNathan Goldbaum <ngoldbau@ucsc.edu>
Thu, 24 Jul 2014 14:29:08 -0700
branchstable
changeset 21940 9209c02f1f25
parent 21939 f486001f9d6f
child 21941 dab31290c7eb
resolve: report no argument warning using a hint With this change resolve and revert produce consistent output when run with no arguments: $ hg resolve abort: no files or directories specified (use --all to remerge all files) $ hg revert abort: no files or directories specified (use --all to revert all files)
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-merge9.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Jul 24 12:12:12 2014 -0700
+++ b/mercurial/commands.py	Thu Jul 24 14:29:08 2014 -0700
@@ -4994,8 +4994,8 @@
     if pats and all:
         raise util.Abort(_("can't specify --all and patterns"))
     if not (all or pats or show or mark or unmark):
-        raise util.Abort(_('no files or directories specified; '
-                           'use --all to remerge all files'))
+        raise util.Abort(_('no files or directories specified'),
+                         hint=('use --all to remerge all files'))
 
     wlock = repo.wlock()
     try:
--- a/tests/test-merge9.t	Thu Jul 24 12:12:12 2014 -0700
+++ b/tests/test-merge9.t	Thu Jul 24 14:29:08 2014 -0700
@@ -76,7 +76,8 @@
 
 resolve all warning
   $ hg resolve
-  abort: no files or directories specified; use --all to remerge all files
+  abort: no files or directories specified
+  (use --all to remerge all files)
   [255]
 
 resolve all
mercurial