This is an archive of the discontinued Mercurial Phabricator instance.

Differential D686

changegroup: add source parameter to generatemanifests
ClosedPublic

Authored by durham on Sep 11 2017, 7:18 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG75cc1f1e11f2: changegroup: add source parameter to generatemanifests
Summary

Extensions, like remotefilelog, will want to look at the source of a pull when
determining what manifests to add to a changegroup. For instance, on push they
will include everything, while on pull they won't.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durham created this revision.Sep 11 2017, 7:18 PM
indygreg accepted this revision.Sep 13 2017, 11:14 PM
This revision is now accepted and ready to land.Sep 13 2017, 11:14 PM
Closed by commit rHG75cc1f1e11f2: changegroup: add source parameter to generatemanifests (authored by durham). · Explain WhySep 13 2017, 11:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (9 lines)

Diff 1742

mercurial/changegroup.py

fastpathlinkrev = fastpathlinkrev and not self._reorder fastpathlinkrev = fastpathlinkrev and not self._reorder
# Treemanifests don't work correctly with fastpathlinkrev # Treemanifests don't work correctly with fastpathlinkrev
# either, because we don't discover which directory nodes to # either, because we don't discover which directory nodes to
# send along with files. This could probably be fixed. # send along with files. This could probably be fixed.
fastpathlinkrev = fastpathlinkrev and ( fastpathlinkrev = fastpathlinkrev and (
'treemanifest' not in repo.requirements) 'treemanifest' not in repo.requirements)
for chunk in self.generatemanifests(commonrevs, clrevorder, for chunk in self.generatemanifests(commonrevs, clrevorder,
fastpathlinkrev, mfs, fnodes): fastpathlinkrev, mfs, fnodes, source):
yield chunk yield chunk
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:
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 generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs, def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs,
fnodes): fnodes, source):
"""Returns an iterator of changegroup chunks containing manifests.
`source` is unused here, but is used by extensions like remotefilelog to
change what is sent based in pulls vs pushes, etc.
"""
repo = self._repo repo = self._repo
mfl = repo.manifestlog mfl = repo.manifestlog
dirlog = mfl._revlog.dirlog dirlog = mfl._revlog.dirlog
tmfnodes = {'': mfs} tmfnodes = {'': mfs}
# Callback for the manifest, used to collect linkrevs for filelog # Callback for the manifest, used to collect linkrevs for filelog
# revisions. # revisions.
# Returns the linkrev node (collected in lookupcl). # Returns the linkrev node (collected in lookupcl).