This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4187

changegroup: move part of _revisiondeltanarrow into group()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGed25722da873: changegroup: move part of _revisiondeltanarrow into group()
Summary

Now all the logic for determining which delta generation code
is called lives in a single 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 rHGed25722da873: changegroup: move part of _revisiondeltanarrow into group() (authored by indygreg). · Explain WhyAug 9 2018, 4:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (31 lines)

Diff 10176

mercurial/changegroup.py

total=(len(revs) - 1)) total=(len(revs) - 1))
for r in pycompat.xrange(len(revs) - 1): for r in pycompat.xrange(len(revs) - 1):
if progress: if progress:
progress.update(r + 1) progress.update(r + 1)
prev, curr = revs[r], revs[r + 1] prev, curr = revs[r], revs[r + 1]
linknode = lookup(store.node(curr)) linknode = lookup(store.node(curr))
if self._ellipses: if self._ellipses:
linkrev = self._clnodetorev[linknode]
self._clrevtolocalrev[linkrev] = curr
# This is a node to send in full, because the changeset it
# corresponds to was a full changeset.
if linknode in self._fullnodes:
delta = _revisiondeltanormal(store, curr, prev, linknode,
self._deltaparentfn)
elif linkrev not in self._precomputedellipsis:
delta = None
else:
delta = self._revisiondeltanarrow(store, ischangelog, delta = self._revisiondeltanarrow(store, ischangelog,
curr, prev, linknode) curr, linkrev, linknode)
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)
size = len(h) size = len(h)
yield h yield h
for chunk in self.group(revs, filerevlog, False, lookupfilelog): for chunk in self.group(revs, filerevlog, False, lookupfilelog):
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, prev, linknode): def _revisiondeltanarrow(self, store, ischangelog, rev, linkrev, linknode):
linkrev = self._clnodetorev[linknode]
self._clrevtolocalrev[linkrev] = rev
# This is a node to send in full, because the changeset it
# corresponds to was a full changeset.
if linknode in self._fullnodes:
return _revisiondeltanormal(store, rev, prev, linknode,
self._deltaparentfn)
# At this point, a node can either be one we should skip or an
# ellipsis. If it's not an ellipsis, bail immediately.
if linkrev not in self._precomputedellipsis:
return
linkparents = self._precomputedellipsis[linkrev] linkparents = self._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