Mercurial > hg

diff hgext/histedit.py @ 27712:bb810c8b3eca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: report the unacceptable changeset
author timeless <timeless@mozdev.org>
date Wed, 23 Dec 2015 07:37:45 +0000
parents d073f4c70575
children fb2c77ba577a
line wrap: on
line diff
--- a/hgext/histedit.py	Mon Jan 11 22:00:07 2016 -0500
+++ b/hgext/histedit.py	Wed Dec 23 07:37:45 2015 +0000
@@ -1302,12 +1302,14 @@
             ha = node.hex(nodetoverify)
             if _constraints.noother in constraints and ha not in expected:
                 raise error.ParseError(
-                    _('may not use "%s" with changesets '
-                      'other than the ones listed') % action.verb)
+                    _('%s "%s" changeset was not a candidate')
+                     % (action.verb, node.short(ha)),
+                    hint=_('only use listed changesets'))
             if _constraints.forceother in constraints and ha in expected:
                 raise error.ParseError(
-                    _('may not use "%s" with changesets '
-                      'within the edited list') % action.verb)
+                    _('%s "%s" changeset was not an edited list candidate')
+                     % (action.verb, node.short(ha)),
+                    hint=_('only use listed changesets'))
             if _constraints.noduplicates in constraints and ha in seen:
                 raise error.ParseError(_(
                         'duplicated command for changeset %s') %