Mercurial > hg-stable
diff hgext/histedit.py @ 27955:b721c9543a4f stable
histedit: show correct hash ID at verification error
node.short() on 'ha' in verifyactions() causes broken hash ID, because
it is initialized with node.hex()-ed node value.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Mon, 01 Feb 2016 20:29:20 +0900 |
parents | 76ecf0227ea5 |
children | f3eb98b8fe12 |
line wrap: on
line diff
--- a/hgext/histedit.py Sat Jan 30 18:00:11 2016 +0900 +++ b/hgext/histedit.py Mon Feb 01 20:29:20 2016 +0900 @@ -1315,12 +1315,12 @@ if _constraints.noother in constraints and ha not in expected: raise error.ParseError( _('%s "%s" changeset was not a candidate') - % (action.verb, node.short(ha)), + % (action.verb, ha[:12]), hint=_('only use listed changesets')) if _constraints.forceother in constraints and ha in expected: raise error.ParseError( _('%s "%s" changeset was not an edited list candidate') - % (action.verb, node.short(ha)), + % (action.verb, ha[:12]), hint=_('only use listed changesets')) if _constraints.noduplicates in constraints and ha in seen: raise error.ParseError(_(