facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

histedit: avoid converting nodeid to context and back again

Browse Source 
It looks like this became unnecessary in 8166e7073157 (histedit: fix
preventing strips during histedit, 2015-04-04).
This commit is contained in:
Martin von Zweigbergk 2016-09-27 22:09:28 -07:00
parent 8843ab4c98
commit cb58483f81
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hgext/histedit.py
View File

@ -1572,8 +1572,7 @@ def stripwrapper(orig, ui, repo, nodelist, *args, **kwargs):
state.read()
histedit_nodes = set([action.node for action
in state.actions if action.node])
strip_nodes = set([repo[n].node() for n in nodelist])
common_nodes = histedit_nodes & strip_nodes
common_nodes = histedit_nodes & set(nodelist)
if common_nodes:
raise error.Abort(_("histedit in progress, can't strip %s")
% ', '.join(node.short(x) for x in common_nodes))