##// END OF EJS Templates
histedit: avoid converting nodeid to context and back again...
Martin von Zweigbergk -
r30025:4d9999e4 default
parent child Browse files
Show More
@@ -1572,8 +1572,7 b' def stripwrapper(orig, ui, repo, nodelis'
1572 state.read()
1572 state.read()
1573 histedit_nodes = set([action.node for action
1573 histedit_nodes = set([action.node for action
1574 in state.actions if action.node])
1574 in state.actions if action.node])
1575 strip_nodes = set([repo[n].node() for n in nodelist])
1575 common_nodes = histedit_nodes & set(nodelist)
1576 common_nodes = histedit_nodes & strip_nodes
1577 if common_nodes:
1576 if common_nodes:
1578 raise error.Abort(_("histedit in progress, can't strip %s")
1577 raise error.Abort(_("histedit in progress, can't strip %s")
1579 % ', '.join(node.short(x) for x in common_nodes))
1578 % ', '.join(node.short(x) for x in common_nodes))
General Comments 0
You need to be logged in to leave comments. Login now