This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4186

changegroup: populate _clnodetorev as part of changelog linknode lookup
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6076053589b9: changegroup: populate _clnodetorev as part of changelog linknode lookup
Summary

The thing that matters is that self._clnodetorev is populated with
changesets that are being sent. Back when this code was in an
extension, it wasn't possible to monkeypatch the changelog lookup
function. Now that the code is in core, we can move this code to
where it logically belongs.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (13 lines)

Diff 10175

mercurial/changegroup.py

# Callback for the changelog, used to collect changed files and # Callback for the changelog, used to collect changed files and
# manifest nodes. # manifest nodes.
# Returns the linkrev node (identity in the changelog case). # Returns the linkrev node (identity in the changelog case).
def lookupcl(x): def lookupcl(x):
c = cl.read(x) c = cl.read(x)
clrevorder[x] = len(clrevorder) clrevorder[x] = len(clrevorder)
if self._ellipses: if self._ellipses:
self._clnodetorev[x] = cl.rev(x)
# Only update mfs if x is going to be sent. Otherwise we # Only update mfs if x is going to be sent. Otherwise we
# end up with bogus linkrevs specified for manifests and # end up with bogus linkrevs specified for manifests and
# we skip some manifest nodes that we should otherwise # we skip some manifest nodes that we should otherwise
# have sent. # have sent.
if (x in self._fullnodes if (x in self._fullnodes
or cl.rev(x) in self._precomputedellipsis): or cl.rev(x) in self._precomputedellipsis):
n = c[0] n = c[0]
# Record the first changeset introducing this manifest # Record the first changeset introducing this manifest
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, prev, linknode):
# build up some mapping information that's useful later. See
# the local() nested function below.
if ischangelog:
self._clnodetorev[linknode] = rev
linkrev = rev
self._clrevtolocalrev[linkrev] = rev
else:
linkrev = self._clnodetorev[linknode] linkrev = self._clnodetorev[linknode]
self._clrevtolocalrev[linkrev] = rev self._clrevtolocalrev[linkrev] = rev
# 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._fullnodes: if linknode in self._fullnodes:
return _revisiondeltanormal(store, rev, prev, linknode, return _revisiondeltanormal(store, rev, prev, linknode,
self._deltaparentfn) self._deltaparentfn)
# At this point, a node can either be one we should skip or an # At this point, a node can either be one we should skip or an