Mercurial > hg

changeset 31858:ad366d57d574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
show: tweak plain abort language for clarity
author Ryan McElroy <rmcelroy@fb.com>
date Fri, 07 Apr 2017 10:26:13 -0700
parents 08fbc97d1364
children 8e282aa3c3ff
files hgext/show.py tests/test-show.t
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/show.py	Sun Apr 09 22:19:27 2017 -0400
+++ b/hgext/show.py	Fri Apr 07 10:26:13 2017 -0700
@@ -73,10 +73,8 @@
 
     """
     if ui.plain() and not template:
-        raise error.Abort(_('"hg show" cannot be used in plain mode because '
-                            'output is not stable'),
-                          hint=_('unset HGPLAIN and invoke with -T/--template '
-                                 'to control output'))
+        hint = _('invoke with -T/--template to control output format')
+        raise error.Abort(_('must specify a template in plain mode'), hint=hint)
 
     views = showview._table
 
--- a/tests/test-show.t	Sun Apr 09 22:19:27 2017 -0400
+++ b/tests/test-show.t	Fri Apr 07 10:26:13 2017 -0700
@@ -55,8 +55,8 @@
 HGPLAIN results in abort
 
   $ HGPLAIN=1 hg show bookmarks
-  abort: "hg show" cannot be used in plain mode because output is not stable
-  (unset HGPLAIN and invoke with -T/--template to control output)
+  abort: must specify a template in plain mode
+  (invoke with -T/--template to control output format)
   [255]
 
 But not if a template is specified