This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12135

branchmap: don't add branch entries if there are no heads
ClosedPublic

Authored by av6 on Feb 7 2022, 1:41 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8b393f40a5e6: branchmap: don't add branch entries if there are no heads
Summary

We definitely don't want any empty entries to be present in repo.branchmap()
just for the sake of not breaking test-notify.t.

No test changes required because the previous patch made notify extension to
not raise any tracebacks in case of RepoLookupErrors.

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

av6 created this revision.Feb 7 2022, 1:41 AM
Alphare accepted this revision.Feb 7 2022, 8:40 AM
This revision is now accepted and ready to land.Feb 7 2022, 8:40 AM
av6 added a commit: rHG8b393f40a5e6: branchmap: don't add branch entries if there are no heads.Feb 7 2022, 9:05 AM
Closed by commit rHG8b393f40a5e6: branchmap: don't add branch entries if there are no heads (authored by av6). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/branchmap.py (6 lines)

Diff 32084

mercurial/branchmap.py

# a branchhead as ancestor. # a branchhead as ancestor.
# - In all other cases, the parents on different branches # - In all other cases, the parents on different branches
# could have a branchhead as ancestor. Those parents are # could have a branchhead as ancestor. Those parents are
# kept in the "uncertain" set. If all branchheads are also # kept in the "uncertain" set. If all branchheads are also
# topological heads, they can't have descendants and further # topological heads, they can't have descendants and further
# checks can be skipped. Otherwise, the ancestors of the # checks can be skipped. Otherwise, the ancestors of the
# "uncertain" set are removed from branchheads. # "uncertain" set are removed from branchheads.
# This computation is heavy and avoided if at all possible. # This computation is heavy and avoided if at all possible.
bheads = self._entries.setdefault(branch, []) bheads = self._entries.get(branch, [])
bheadset = {cl.rev(node) for node in bheads} bheadset = {cl.rev(node) for node in bheads}
uncertain = set() uncertain = set()
for newrev in sorted(newheadrevs): for newrev in sorted(newheadrevs):
if newrev in obsrevs: if newrev in obsrevs:
# We ignore obsolete changesets as they shouldn't be # We ignore obsolete changesets as they shouldn't be
# considered heads. # considered heads.
continue continue
if uncertain: if uncertain:
if topoheads is None: if topoheads is None:
topoheads = set(cl.headrevs()) topoheads = set(cl.headrevs())
if bheadset - topoheads: if bheadset - topoheads:
floorrev = min(bheadset) floorrev = min(bheadset)
if floorrev <= max(uncertain): if floorrev <= max(uncertain):
ancestors = set(cl.ancestors(uncertain, floorrev)) ancestors = set(cl.ancestors(uncertain, floorrev))
bheadset -= ancestors bheadset -= ancestors
bheadrevs = sorted(bheadset) if bheadset:
self[branch] = [cl.node(rev) for rev in bheadrevs] self[branch] = [cl.node(rev) for rev in sorted(bheadset)]
tiprev = max(newheadrevs) tiprev = max(newheadrevs)
if tiprev > ntiprev: if tiprev > ntiprev:
ntiprev = tiprev ntiprev = tiprev
if ntiprev > self.tiprev: if ntiprev > self.tiprev:
self.tiprev = ntiprev self.tiprev = ntiprev
self.tipnode = cl.node(ntiprev) self.tipnode = cl.node(ntiprev)