Mercurial > hg-stable

changeset 30027:4d9999e43ff7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: avoid converting nodeid to context and back again It looks like this became unnecessary in e767f5aba810 (histedit: fix preventing strips during histedit, 2015-04-04).
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 27 Sep 2016 22:09:28 -0700
parents f3c4edfd35e1
children ba06562a06a2
files hgext/histedit.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/histedit.py	Tue Sep 13 22:58:12 2016 -0400
+++ b/hgext/histedit.py	Tue Sep 27 22:09:28 2016 -0700
@@ -1572,8 +1572,7 @@
         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))