--- a/hgext/histedit.py Wed Feb 04 15:17:13 2015 -0500
+++ b/hgext/histedit.py Tue Mar 03 17:28:05 2015 -0600
@@ -1026,9 +1026,8 @@
strip_nodes = set([repo[n].hex() for n in nodelist])
common_nodes = histedit_nodes & strip_nodes
if common_nodes:
- raise util.Abort(_('unable to strip %s. Nodes are '
- 'used by history edit in progress.')
- % ', '.join(common_nodes))
+ raise util.Abort(_("histedit in progress, can't strip %s")
+ % ', '.join(node.short(x) for x in common_nodes))
return orig(ui, repo, nodelist, *args, **kwargs)
extensions.wrapfunction(repair, 'strip', stripwrapper)