diff --git a/hgext/histedit.py b/hgext/histedit.py index 9960b6369e7f500211e44febda9c16bf66fde06a_aGdleHQvaGlzdGVkaXQucHk=..b721c9543a4f64d19f6c0cd26ae04111ec5a4ce2_aGdleHQvaGlzdGVkaXQucHk= 100644 --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1315,8 +1315,8 @@ 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') @@ -1319,8 +1319,8 @@ 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(_( diff --git a/tests/test-histedit-arguments.t b/tests/test-histedit-arguments.t index 9960b6369e7f500211e44febda9c16bf66fde06a_dGVzdHMvdGVzdC1oaXN0ZWRpdC1hcmd1bWVudHMudA==..b721c9543a4f64d19f6c0cd26ae04111ec5a4ce2_dGVzdHMvdGVzdC1oaXN0ZWRpdC1hcmd1bWVudHMudA== 100644 --- a/tests/test-histedit-arguments.t +++ b/tests/test-histedit-arguments.t @@ -171,7 +171,7 @@ > pick c8e68270e35a 3 four > pick 08d98a8350f3 4 five > EOF - hg: parse error: pick "363035386362" changeset was not a candidate + hg: parse error: pick "6058cbb6cfd7" changeset was not a candidate (only use listed changesets) [255] diff --git a/tests/test-histedit-base.t b/tests/test-histedit-base.t index 9960b6369e7f500211e44febda9c16bf66fde06a_dGVzdHMvdGVzdC1oaXN0ZWRpdC1iYXNlLnQ=..b721c9543a4f64d19f6c0cd26ae04111ec5a4ce2_dGVzdHMvdGVzdC1oaXN0ZWRpdC1iYXNlLnQ= 100644 --- a/tests/test-histedit-base.t +++ b/tests/test-histedit-base.t @@ -232,7 +232,7 @@ > base d273e35dcdf2 B > pick b2f90fd8aa85 I > EOF - hg: parse error: base "643237336533" changeset was not an edited list candidate + hg: parse error: base "d273e35dcdf2" changeset was not an edited list candidate (only use listed changesets) $ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle diff --git a/tests/test-histedit-commute.t b/tests/test-histedit-commute.t index 9960b6369e7f500211e44febda9c16bf66fde06a_dGVzdHMvdGVzdC1oaXN0ZWRpdC1jb21tdXRlLnQ=..b721c9543a4f64d19f6c0cd26ae04111ec5a4ce2_dGVzdHMvdGVzdC1oaXN0ZWRpdC1jb21tdXRlLnQ= 100644 --- a/tests/test-histedit-commute.t +++ b/tests/test-histedit-commute.t @@ -282,7 +282,7 @@ > pick de71b079d9ce e > pick 38b92f448761 c > EOF - hg: parse error: pick "646537316230" changeset was not a candidate + hg: parse error: pick "de71b079d9ce" changeset was not a candidate (only use listed changesets) $ hg log --graph @ changeset: 7:803ef1c6fcfd