##// END OF EJS Templates
histedit: fix style of new error message...
Matt Mackall -
r24196:c3d13202 default
parent child Browse files
Show More
@@ -1026,9 +1026,8 b' def stripwrapper(orig, ui, repo, nodelis'
1026 strip_nodes = set([repo[n].hex() for n in nodelist])
1026 strip_nodes = set([repo[n].hex() for n in nodelist])
1027 common_nodes = histedit_nodes & strip_nodes
1027 common_nodes = histedit_nodes & strip_nodes
1028 if common_nodes:
1028 if common_nodes:
1029 raise util.Abort(_('unable to strip %s. Nodes are '
1029 raise util.Abort(_("histedit in progress, can't strip %s")
1030 'used by history edit in progress.')
1030 % ', '.join(node.short(x) for x in common_nodes))
1031 % ', '.join(common_nodes))
1032 return orig(ui, repo, nodelist, *args, **kwargs)
1031 return orig(ui, repo, nodelist, *args, **kwargs)
1033
1032
1034 extensions.wrapfunction(repair, 'strip', stripwrapper)
1033 extensions.wrapfunction(repair, 'strip', stripwrapper)
@@ -88,7 +88,7 b' Go at a random point and try to continue'
88
88
89 Try to delete necessary commit
89 Try to delete necessary commit
90 $ hg strip -r 652413bf663e
90 $ hg strip -r 652413bf663e
91 abort: unable to strip 652413bf663ef2a641cab26574e46d5f5a64a55a. Nodes are used by history edit in progress.
91 abort: histedit in progress, can't strip 363532343133
92 [255]
92 [255]
93
93
94 commit, then edit the revision
94 commit, then edit the revision
General Comments 0
You need to be logged in to leave comments. Login now