This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4195

changegroup: pass state into _revisiondeltanarrow
ClosedPublic

Authored by indygreg on Aug 9 2018, 2:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG58377518201c: changegroup: pass state into _revisiondeltanarrow
Summary

After this, the method no longer accesses self and be split
into a standalone function.

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 9 2018, 2:51 PM
Closed by commit rHG58377518201c: changegroup: pass state into _revisiondeltanarrow (authored by indygreg). · Explain WhyAug 9 2018, 4:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (22 lines)

Diff 10184

mercurial/changegroup.py

# This is a node to send in full, because the changeset it # This is a node to send in full, because the changeset it
# corresponds to was a full changeset. # corresponds to was a full changeset.
if linknode in self._fullclnodes: if linknode in self._fullclnodes:
delta = _revisiondeltanormal(store, curr, prev, linknode, delta = _revisiondeltanormal(store, curr, prev, linknode,
self._deltaparentfn) self._deltaparentfn)
elif linkrev not in self._precomputedellipsis: elif linkrev not in self._precomputedellipsis:
delta = None delta = None
else: else:
delta = self._revisiondeltanarrow(store, ischangelog, delta = self._revisiondeltanarrow(
curr, linkrev, linknode, cl, store, ischangelog, curr, linkrev, linknode,
clrevtolocalrev) clrevtolocalrev, self._fullclnodes,
self._precomputedellipsis)
else: else:
delta = _revisiondeltanormal(store, curr, prev, linknode, delta = _revisiondeltanormal(store, curr, prev, linknode,
self._deltaparentfn) self._deltaparentfn)
if not delta: if not delta:
continue continue
meta = self._builddeltaheader(delta) meta = self._builddeltaheader(delta)
yield h yield h
for chunk in self.group(revs, filerevlog, False, lookupfilelog, for chunk in self.group(revs, filerevlog, False, lookupfilelog,
clrevtolocalrev=clrevtolocalrev): clrevtolocalrev=clrevtolocalrev):
size += len(chunk) size += len(chunk)
yield chunk yield chunk
self._verbosenote(_('%8.i %s\n') % (size, fname)) self._verbosenote(_('%8.i %s\n') % (size, fname))
progress.complete() progress.complete()
def _revisiondeltanarrow(self, store, ischangelog, rev, linkrev, linknode, def _revisiondeltanarrow(self, cl, store, ischangelog, rev, linkrev,
clrevtolocalrev): linknode, clrevtolocalrev, fullclnodes,
linkparents = self._precomputedellipsis[linkrev] precomputedellipsis):
linkparents = precomputedellipsis[linkrev]
def local(clrev): def local(clrev):
"""Turn a changelog revnum into a local revnum. """Turn a changelog revnum into a local revnum.
The ellipsis dag is stored as revnums on the changelog, The ellipsis dag is stored as revnums on the changelog,
but when we're producing ellipsis entries for but when we're producing ellipsis entries for
non-changelog revlogs, we need to turn those numbers into non-changelog revlogs, we need to turn those numbers into
something local. This does that for us, and during the something local. This does that for us, and during the
changelog sending phase will also expand the stored changelog sending phase will also expand the stored
# entry will have been relevant, so we need to skip some changelog # entry will have been relevant, so we need to skip some changelog
# nodes even after ellipsis-izing. # nodes even after ellipsis-izing.
walk = [clrev] walk = [clrev]
while walk: while walk:
p = walk[0] p = walk[0]
walk = walk[1:] walk = walk[1:]
if p in clrevtolocalrev: if p in clrevtolocalrev:
return clrevtolocalrev[p] return clrevtolocalrev[p]
elif p in self._fullclnodes: elif p in fullclnodes:
walk.extend([pp for pp in self._repo.changelog.parentrevs(p) walk.extend([pp for pp in cl.parentrevs(p)
if pp != nullrev]) if pp != nullrev])
elif p in self._precomputedellipsis: elif p in precomputedellipsis:
walk.extend([pp for pp in self._precomputedellipsis[p] walk.extend([pp for pp in precomputedellipsis[p]
if pp != nullrev]) if pp != nullrev])
else: else:
# In this case, we've got an ellipsis with parents # In this case, we've got an ellipsis with parents
# outside the current bundle (likely an # outside the current bundle (likely an
# incremental pull). We "know" that we can use the # incremental pull). We "know" that we can use the
# value of this same revlog at whatever revision # value of this same revlog at whatever revision
# is pointed to by linknode. "Know" is in scare # is pointed to by linknode. "Know" is in scare
# quotes because I haven't done enough examination # quotes because I haven't done enough examination