Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: improve missing rule suggestion
authortimeless <timeless@mozdev.org>
Wed, 02 Dec 2015 07:41:35 +0000
changeset 27217 1ec23f3e62f3
parent 27216 8117e2cd959e
child 27218 de3335b4c8ef
histedit: improve missing rule suggestion include actual suggested text
hgext/histedit.py file | annotate | diff | comparison | revisions
tests/test-histedit-arguments.t file | annotate | diff | comparison | revisions 
--- a/hgext/histedit.py	Sat Nov 14 17:25:43 2015 +0900
+++ b/hgext/histedit.py	Wed Dec 02 07:41:35 2015 +0000
@@ -1214,7 +1214,7 @@
     if missing:
         raise error.Abort(_('missing rules for changeset %s') %
                 missing[0][:12],
-                hint=_('do you want to use the drop action?'))
+                hint=_('use "drop %s" to discard the change') % missing[0][:12])
 
 def newnodestoabort(state):
     """process the list of replacements to return
--- a/tests/test-histedit-arguments.t	Sat Nov 14 17:25:43 2015 +0900
+++ b/tests/test-histedit-arguments.t	Wed Dec 02 07:41:35 2015 +0000
@@ -164,7 +164,7 @@
   > pick 08d98a8350f3 4 five
   > EOF
   abort: missing rules for changeset c8e68270e35a
-  (do you want to use the drop action?)
+  (use "drop c8e68270e35a" to discard the change)
   [255]
 
 Test that extra revisions are detected
Mercurial