From patchwork Thu Jul 24 21:41:43 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: resolve: report no argument warning using a hint
From: Nathan Goldbaum <nathan12343@gmail.com>
X-Patchwork-Id: 5198
Message-Id: <bba64b611762854c2da2.1406238103@ROUS>
To: mercurial-devel@selenic.com
Date: Thu, 24 Jul 2014 14:41:43 -0700

# HG changeset patch
# User Nathan Goldbaum <ngoldbau@ucsc.edu>
# Date 1406237348 25200
#      Thu Jul 24 14:29:08 2014 -0700
# Node ID bba64b611762854c2da2a08d5a343fd0378b8a4b
# Parent  7142e04b438eab39685e63085503b8af0e42b31e
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)

diff -r 7142e04b438e -r bba64b611762 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 18 19:46:56 2014 -0400
+++ 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:
diff -r 7142e04b438e -r bba64b611762 tests/test-merge9.t
--- a/tests/test-merge9.t	Fri Jul 18 19:46:56 2014 -0400
+++ 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