This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3941

rebase: avoid converting from nodes to revnums twice
ClosedPublic

Authored by martinvonz on Jul 12 2018, 3:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0f8599afb92f: rebase: avoid converting from nodes to revnums twice
Summary

In the case where the node has successors, but none of them is an
ancestor of the destination, we would iterate over the successor nodes
twice, check if they're in the repo and convert them to revnums. I
doubt it's a measureable cost, but it gets simpler this way too.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 9584

hgext/rebase.py

successors.remove(srcnode) successors.remove(srcnode)
if successors.issubset(extinctnodes): if successors.issubset(extinctnodes):
# all successors are extinct # all successors are extinct
obsoleteextinctsuccessors.add(srcrev) obsoleteextinctsuccessors.add(srcrev)
if not successors: if not successors:
# no successor # no successor
obsoletenotrebased[srcrev] = None obsoletenotrebased[srcrev] = None
else: else:
destnode = cl.node(destmap[srcrev]) dstrev = destmap[srcrev]
for succnode in successors: succrevs = [nodemap[s] for s in successors if s in nodemap]
if succnode not in nodemap: for succrev in succrevs:
continue if cl.isancestorrev(succrev, dstrev):
if cl.isancestor(succnode, destnode): obsoletenotrebased[srcrev] = succrev
obsoletenotrebased[srcrev] = nodemap[succnode]
break break
else: else:
# If 'srcrev' has a successor in rebase set but none in # If 'srcrev' has a successor in rebase set but none in
# destination (which would be catched above), we shall skip it # destination (which would be catched above), we shall skip it
# and its descendants to avoid divergence. # and its descendants to avoid divergence.
if any(nodemap[s] in destmap for s in successors if any(s in destmap for s in succrevs):
if s in nodemap):
obsoletewithoutsuccessorindestination.add(srcrev) obsoletewithoutsuccessorindestination.add(srcrev)
return ( return (
obsoletenotrebased, obsoletenotrebased,
obsoletewithoutsuccessorindestination, obsoletewithoutsuccessorindestination,
obsoleteextinctsuccessors, obsoleteextinctsuccessors,
) )