mercurial-scm/hg: comparison mercurial/changegroup.py

equal deleted inserted replaced

-:ec367f203cb5
+:6ea1f858efd9
 for c in self.revchunk(revlog, curr, prev, linknode):
 yield c
 yield self.close()
+# filter any nodes that claim to be part of the known set
+def prune(self, revlog, missing, commonrevs, source):
+rr, rl = revlog.rev, revlog.linkrev
+return [n for n in missing if rl(rr(n)) not in commonrevs]
 def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
 '''yield a sequence of changegroup chunks (strings)'''
 repo = self._repo
 cl = self._changelog
 mf = self._manifest
 msgbundling = _('bundling')
 mfs = {} # needed manifests
 fnodes = {} # needed file nodes
 changedfiles = set()
-# filter any nodes that claim to be part of the known set
-def prune(revlog, missing):
-rr, rl = revlog.rev, revlog.linkrev
-return [n for n in missing if rl(rr(n)) not in commonrevs]
 # Callback for the changelog, used to collect changed files and manifest
 # nodes.
 # Returns the linkrev node (identity in the changelog case).
 def lookupcl(x):
 yield chunk
 progress(msgbundling, None)
 for f in changedfiles:
 fnodes[f] = {}
-mfnodes = prune(mf, mfs)
+mfnodes = self.prune(mf, mfs, commonrevs, source)
 for chunk in self.group(mfnodes, mf, lookupmf, units=_('manifests'),
 reorder=reorder):
 yield chunk
 progress(msgbundling, None)
 # Lookup for filenodes, we collected the linkrev nodes above in the
 # fastpath case and with lookupmf in the slowpath case.
 def lookupfilelog(x):
 return linkrevnodes[x]
-filenodes = prune(filerevlog, linkrevnodes)
+filenodes = self.prune(filerevlog, linkrevnodes, commonrevs, source)
 if filenodes:
 progress(msgbundling, i + 1, item=fname, unit=msgfiles,
 total=total)
 yield self.fileheader(fname)
 for chunk in self.group(filenodes, filerevlog, lookupfilelog,

changeset 19289	6ea1f858efd9
parent 19208	0b564cf359a7
child 19293	446ab88d3f1c