histedit: report the unacceptable changeset

hgext/histedit.py

@@ -1302,12 +1302,14 b' def verifyactions(actions, state, ctxs):'
             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') %

tests/test-histedit-arguments.t

@@ -171,7 +171,8 b' Test that extra revisions are detected'
   > pick c8e68270e35a 3 four
   > pick 08d98a8350f3 4 five
   > EOF
-  hg: parse error: may not use "pick" with changesets other than the ones listed
+  hg: parse error: pick "363035386362" changeset was not a candidate
+  (only use listed changesets)
   [255]
 
 Test malformed line

tests/test-histedit-base.t

@@ -232,7 +232,8 b' base on a previously picked changeset'
   > base d273e35dcdf2 B
   > pick b2f90fd8aa85 I
   > EOF
-  hg: parse error: may not use "base" with changesets within the edited list
+  hg: parse error: base "643237336533" changeset was not an edited list candidate
+  (only use listed changesets)
 
   $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
   > base cd010b8cd998 A

tests/test-histedit-commute.t

@@ -282,7 +282,8 b' try with --rev'
   > pick de71b079d9ce e
   > pick 38b92f448761 c
   > EOF
-  hg: parse error: may not use "pick" with changesets other than the ones listed
+  hg: parse error: pick "646537316230" changeset was not a candidate
+  (only use listed changesets)
   $ hg log --graph
   @  changeset:   7:803ef1c6fcfd
   |  tag:         tip