# HG changeset patch # User Ryan McElroy # Date 1491585973 25200 # Node ID ad366d57d57431a13f1b620be9c707bd8b19772c # Parent 08fbc97d1364b08b53d538efc33b3ed41cea51a0 show: tweak plain abort language for clarity diff -r 08fbc97d1364 -r ad366d57d574 hgext/show.py --- 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 diff -r 08fbc97d1364 -r ad366d57d574 tests/test-show.t --- 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