This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3940

rebase: reduce scope of a variable
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG99ed6e2f6606: rebase: reduce scope of a variable
Summary

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 rHG99ed6e2f6606: rebase: reduce scope of a variable (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 9583

hgext/rebase.py

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()')) extinctnodes = set(cl.node(r) for r in repo.revs('extinct()'))
for srcrev in rebaseobsrevs: for srcrev in rebaseobsrevs:
srcnode = cl.node(srcrev) srcnode = cl.node(srcrev)
destnode = cl.node(destmap[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): 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])
for succnode in successors: for succnode in successors:
if succnode not in nodemap: if succnode not in nodemap:
continue continue
if cl.isancestor(succnode, destnode): if cl.isancestor(succnode, destnode):
obsoletenotrebased[srcrev] = nodemap[succnode] 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