# HG changeset patch # User Pierre-Yves David # Date 1438607317 25200 # Node ID 5e53d214415d2ccb7e43bdaf6865ea676c827e8c # Parent 4b92d11e48fe308926fd000fd22e05d48ae0b0ed histedit: use revset to check if we need to update during abort The for loop is already quite more complicated than necessary and we are about to add some logic. Instead, we use a simple revset. Revset laziness should provide us with similar performance. diff -r 4b92d11e48fe -r 5e53d214415d hgext/histedit.py --- a/hgext/histedit.py Mon Aug 03 05:57:45 2015 -0700 +++ b/hgext/histedit.py Mon Aug 03 06:08:37 2015 -0700 @@ -791,11 +791,9 @@ os.remove(backupfile) # check whether we should update away - parentnodes = [c.node() for c in repo[None].parents()] - for n in leafs | set([state.parentctxnode]): - if n in parentnodes: - hg.clean(repo, state.topmost) - break + if repo.unfiltered().revs('parents() and (%n or %ln)', + state.parentctxnode, leafs): + hg.clean(repo, state.topmost) cleanupnode(ui, repo, 'created', tmpnodes) cleanupnode(ui, repo, 'temp', leafs) state.clear()