# HG changeset patch # User timeless # Date 2015-12-02 07:41:35 # Node ID 1ec23f3e62f3552ec091f7450a051e4737304c93 # Parent 8117e2cd959e49f30a189208b807ad3d622ae312 histedit: improve missing rule suggestion include actual suggested text diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1214,7 +1214,7 @@ def verifyactions(actions, state, ctxs): 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 diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t --- a/tests/test-histedit-arguments.t +++ b/tests/test-histedit-arguments.t @@ -164,7 +164,7 @@ Test that missing revisions are detected > 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