This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4303

exchange: don't use dagutil
ClosedPublic

Authored by indygreg on Aug 16 2018, 4:43 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb0c73866c9fb: exchange: don't use dagutil
Summary

We were only using it for simple node -> rev and parent revision
lookups. These are exposed via the storage interface and we don't
need to go through dagutil.

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

indygreg created this revision.Aug 16 2018, 4:43 PM
Closed by commit rHGb0c73866c9fb: exchange: don't use dagutil (authored by indygreg). · Explain WhyAug 18 2018, 4:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (12 lines)

Diff 10427

mercurial/exchange.py

) )
from .thirdparty import ( from .thirdparty import (
attr, attr,
) )
from . import ( from . import (
bookmarks as bookmod, bookmarks as bookmod,
bundle2, bundle2,
changegroup, changegroup,
dagutil,
discovery, discovery,
error, error,
lock as lockmod, lock as lockmod,
logexchange, logexchange,
narrowspec, narrowspec,
obsolete, obsolete,
phases, phases,
pushkey, pushkey,
the narrowspec. The client needs these as non-ellipsis nodes. the narrowspec. The client needs these as non-ellipsis nodes.
ellipsisroots: A dict of {rev: parents} that is used in ellipsisroots: A dict of {rev: parents} that is used in
narrowchangegroup to produce ellipsis nodes with the narrowchangegroup to produce ellipsis nodes with the
correct parents. correct parents.
""" """
cl = repo.changelog cl = repo.changelog
mfl = repo.manifestlog mfl = repo.manifestlog
cldag = dagutil.revlogdag(cl) clrev = cl.rev
# dagutil does not like nullid/nullrev
commonrevs = cldag.internalizeall(common - set([nullid])) | set([nullrev]) commonrevs = {clrev(n) for n in common} | {nullrev}
headsrevs = cldag.internalizeall(heads) headsrevs = {clrev(n) for n in heads}
if depth: if depth:
revdepth = {h: 0 for h in headsrevs} revdepth = {h: 0 for h in headsrevs}
ellipsisheads = collections.defaultdict(set) ellipsisheads = collections.defaultdict(set)
ellipsisroots = collections.defaultdict(set) ellipsisroots = collections.defaultdict(set)
def addroot(head, curchange): def addroot(head, curchange):
"""Add a root to an ellipsis head, splitting heads with 3 roots.""" """Add a root to an ellipsis head, splitting heads with 3 roots."""
missing = list(cl.findmissingrevs(common=commonrevs, heads=headsrevs)) missing = list(cl.findmissingrevs(common=commonrevs, heads=headsrevs))
visit = reversed(missing) visit = reversed(missing)
relevant_nodes = set() relevant_nodes = set()
visitnodes = [cl.node(m) for m in missing] visitnodes = [cl.node(m) for m in missing]
required = set(headsrevs) | known required = set(headsrevs) | known
for rev in visit: for rev in visit:
clrev = cl.changelogrevision(rev) clrev = cl.changelogrevision(rev)
ps = cldag.parents(rev) ps = [prev for prev in cl.parentrevs(rev) if prev != nullrev]
if depth is not None: if depth is not None:
curdepth = revdepth[rev] curdepth = revdepth[rev]
for p in ps: for p in ps:
revdepth[p] = min(curdepth + 1, revdepth.get(p, depth + 1)) revdepth[p] = min(curdepth + 1, revdepth.get(p, depth + 1))
needed = False needed = False
shallow_enough = depth is None or revdepth[rev] <= depth shallow_enough = depth is None or revdepth[rev] <= depth
if shallow_enough: if shallow_enough:
curmf = mfl[clrev.manifest].read() curmf = mfl[clrev.manifest].read()