This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4140

changegroup: pass mfdicts properly
ClosedPublic

Authored by indygreg on Aug 6 2018, 3:51 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGfbbda9ff3deb: changegroup: pass mfdicts properly
Summary

With the narrow code part of core, the hacky pass-argument-via-
attribute-on-self can be accomplished with a regular function
argument.

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 6 2018, 3:51 PM
durin42 accepted this revision.Aug 9 2018, 2:08 PM
durin42 added a subscriber: durin42.

❤️

This revision is now accepted and ready to land.Aug 9 2018, 2:08 PM
Closed by commit rHGfbbda9ff3deb: changegroup: pass mfdicts properly (authored by indygreg). · Explain WhyAug 9 2018, 2:16 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (25 lines)

Diff 10147

mercurial/changegroup.py

'treemanifest' not in repo.requirements) 'treemanifest' not in repo.requirements)
fnodes = {} # needed file nodes fnodes = {} # needed file nodes
for chunk in self.generatemanifests(commonrevs, clrevorder, for chunk in self.generatemanifests(commonrevs, clrevorder,
fastpathlinkrev, mfs, fnodes, source): fastpathlinkrev, mfs, fnodes, source):
yield chunk yield chunk
if self._ellipses:
mfdicts = None mfdicts = None
if self._isshallow: if self._ellipses and self._isshallow:
mfdicts = [(self._repo.manifestlog[n].read(), lr) mfdicts = [(self._repo.manifestlog[n].read(), lr)
for (n, lr) in mfs.iteritems()] for (n, lr) in mfs.iteritems()]
mfs.clear() mfs.clear()
clrevs = set(cl.rev(x) for x in clnodes) clrevs = set(cl.rev(x) for x in clnodes)
if not fastpathlinkrev: if not fastpathlinkrev:
def linknodes(unused, fname): def linknodes(unused, fname):
return fnodes.get(fname, {}) return fnodes.get(fname, {})
else: else:
cln = cl.node cln = cl.node
def linknodes(filerevlog, fname): def linknodes(filerevlog, fname):
llr = filerevlog.linkrev llr = filerevlog.linkrev
fln = filerevlog.node fln = filerevlog.node
revs = ((r, llr(r)) for r in filerevlog) revs = ((r, llr(r)) for r in filerevlog)
return dict((fln(r), cln(lr)) for r, lr in revs if lr in clrevs) return dict((fln(r), cln(lr)) for r, lr in revs if lr in clrevs)
if self._ellipses:
# We need to pass the mfdicts variable down into
# generatefiles(), but more than one command might have
# wrapped generatefiles so we can't modify the function
# signature. Instead, we pass the data to ourselves using an
# instance attribute. I'm sorry.
self._mfdicts = mfdicts
for chunk in self.generatefiles(changedfiles, linknodes, commonrevs, for chunk in self.generatefiles(changedfiles, linknodes, commonrevs,
source): source, mfdicts):
yield chunk yield chunk
yield self._close() yield self._close()
if clnodes: if clnodes:
repo.hook('outgoing', node=hex(clnodes[0]), source=source) repo.hook('outgoing', node=hex(clnodes[0]), source=source)
def _generatechangelog(self, cl, nodes): def _generatechangelog(self, cl, nodes):
for x in self._packmanifests(dir, store, revs, lookupfn): for x in self._packmanifests(dir, store, revs, lookupfn):
size += len(x) size += len(x)
yield x yield x
self._verbosenote(_('%8.i (manifests)\n') % size) self._verbosenote(_('%8.i (manifests)\n') % size)
yield self._manifestsend yield self._manifestsend
# The 'source' parameter is useful for extensions # The 'source' parameter is useful for extensions
def generatefiles(self, changedfiles, linknodes, commonrevs, source): def generatefiles(self, changedfiles, linknodes, commonrevs, source,
mfdicts):
changedfiles = list(filter(self._filematcher, changedfiles)) changedfiles = list(filter(self._filematcher, changedfiles))
if self._isshallow: if self._isshallow:
# See comment in generate() for why this sadness is a thing.
mfdicts = self._mfdicts
del self._mfdicts
# In a shallow clone, the linknodes callback needs to also include # In a shallow clone, the linknodes callback needs to also include
# those file nodes that are in the manifests we sent but weren't # those file nodes that are in the manifests we sent but weren't
# introduced by those manifests. # introduced by those manifests.
commonctxs = [self._repo[c] for c in commonrevs] commonctxs = [self._repo[c] for c in commonrevs]
oldlinknodes = linknodes oldlinknodes = linknodes
clrev = self._repo.changelog.rev clrev = self._repo.changelog.rev
# Defining this function has a side-effect of overriding the # Defining this function has a side-effect of overriding the