This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3942

rebase: use revnums (not nodes) for set of extinct revisions
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG20a30bb8f276: rebase: use revnums (not nodes) for set of extinct revisions
Summary

There is no need to convert extinct revisions to nodeids.

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.

Event Timeline

martinvonz created this revision.Jul 12 2018, 3:34 PM
Closed by commit rHG20a30bb8f276: rebase: use revnums (not nodes) for set of extinct revisions (authored by martinvonz). · Explain WhyJul 13 2018, 8:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9585

hgext/rebase.py

""" """
obsoletenotrebased = {} obsoletenotrebased = {}
obsoletewithoutsuccessorindestination = set([]) obsoletewithoutsuccessorindestination = set([])
obsoleteextinctsuccessors = set([]) obsoleteextinctsuccessors = set([])
assert repo.filtername is None assert repo.filtername is None
cl = repo.changelog cl = repo.changelog
nodemap = cl.nodemap nodemap = cl.nodemap
extinctnodes = set(cl.node(r) for r in repo.revs('extinct()')) extinctrevs = set(repo.revs('extinct()'))
for srcrev in rebaseobsrevs: for srcrev in rebaseobsrevs:
srcnode = cl.node(srcrev) srcnode = cl.node(srcrev)
# XXX: more advanced APIs are required to handle split correctly # XXX: more advanced APIs are required to handle split correctly
successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode])) successors = set(obsutil.allsuccessors(repo.obsstore, [srcnode]))
# obsutil.allsuccessors includes node itself # obsutil.allsuccessors includes node itself
successors.remove(srcnode) successors.remove(srcnode)
if successors.issubset(extinctnodes): succrevs = {nodemap[s] for s in successors if s in nodemap}
if succrevs.issubset(extinctrevs):
# 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:
dstrev = destmap[srcrev] dstrev = destmap[srcrev]
succrevs = [nodemap[s] for s in successors if s in nodemap]
for succrev in succrevs: for succrev in succrevs:
if cl.isancestorrev(succrev, dstrev): if cl.isancestorrev(succrev, dstrev):
obsoletenotrebased[srcrev] = succrev obsoletenotrebased[srcrev] = succrev
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.