mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
histedit: avoid converting nodeid to context and back again
It looks like this became unnecessary in 8166e7073157 (histedit: fix preventing strips during histedit, 2015-04-04).
This commit is contained in:
parent
8843ab4c98
commit
cb58483f81
@ -1572,8 +1572,7 @@ def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
|
|||||||
state.read()
|
state.read()
|
||||||
histedit_nodes = set([action.node for action
|
histedit_nodes = set([action.node for action
|
||||||
in state.actions if action.node])
|
in state.actions if action.node])
|
||||||
strip_nodes = set([repo[n].node() for n in nodelist])
|
common_nodes = histedit_nodes & set(nodelist)
|
||||||
common_nodes = histedit_nodes & strip_nodes
|
|
||||||
if common_nodes:
|
if common_nodes:
|
||||||
raise error.Abort(_("histedit in progress, can't strip %s")
|
raise error.Abort(_("histedit in progress, can't strip %s")
|
||||||
% ', '.join(node.short(x) for x in common_nodes))
|
% ', '.join(node.short(x) for x in common_nodes))
|
||||||
|
Loading…
Reference in New Issue
Block a user