| ryanmce |
| Restricted Project |
Upstream added the source keyword to the generatemanifest api. We need to add it
as well.
| Lint Skipped |
| Unit Tests Skipped |
| return super(shallowcg1packer, self).generate(commonrevs, clnodes, | return super(shallowcg1packer, self).generate(commonrevs, clnodes, | ||||
| fastpathlinkrev, source) | fastpathlinkrev, source) | ||||
| def group(self, nodelist, rlog, lookup, units=None, reorder=None): | def group(self, nodelist, rlog, lookup, units=None, reorder=None): | ||||
| return shallowgroup(shallowcg1packer, self, nodelist, rlog, lookup, | return shallowgroup(shallowcg1packer, self, nodelist, rlog, lookup, | ||||
| units=units) | units=units) | ||||
| def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, | def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, | ||||
| mfs, fnodes): | mfs, fnodes, source): | ||||
| """ | """ | ||||
| - `commonrevs` is the set of known commits on both sides | - `commonrevs` is the set of known commits on both sides | ||||
| - `clrevorder` is a mapping from cl node to rev number, used for | - `clrevorder` is a mapping from cl node to rev number, used for | ||||
| determining which commit is newer. | determining which commit is newer. | ||||
| - `mfs` is the potential manifest nodes to send, | - `mfs` is the potential manifest nodes to send, | ||||
| with maps to their linknodes | with maps to their linknodes | ||||
| { manifest root node -> link node } | { manifest root node -> link node } | ||||
| - `fnodes` is a mapping of { filepath -> { node -> clnode } } | - `fnodes` is a mapping of { filepath -> { node -> clnode } } | ||||
| If fastpathlinkrev is false, we are responsible for populating | If fastpathlinkrev is false, we are responsible for populating | ||||
| fnodes. | fnodes. | ||||
| """ | """ | ||||
| sendflat = self._repo.ui.configbool('treemanifest', 'sendflat', | sendflat = self._repo.ui.configbool('treemanifest', 'sendflat', | ||||
| True) | True) | ||||
| if sendflat: | if sendflat: | ||||
| # In this code path, generating the manifests populates fnodes for | # In this code path, generating the manifests populates fnodes for | ||||
| # us. | # us. | ||||
| chunks = super(shallowcg1packer, self).generatemanifests( | chunks = super(shallowcg1packer, self).generatemanifests( | ||||
| commonrevs, | commonrevs, | ||||
| clrevorder, | clrevorder, | ||||
| fastpathlinkrev, | fastpathlinkrev, | ||||
| mfs, | mfs, | ||||
| fnodes, | fnodes, | ||||
| source, | |||||
| ) | ) | ||||
| for chunk in chunks: | for chunk in chunks: | ||||
| yield chunk | yield chunk | ||||
| else: | else: | ||||
| # If not using the fast path, we need to discover what files to send | # If not using the fast path, we need to discover what files to send | ||||
| if not fastpathlinkrev: | if not fastpathlinkrev: | ||||
| mflog = self._repo.manifestlog | mflog = self._repo.manifestlog | ||||
| for mfnode, clnode in mfs.iteritems(): | for mfnode, clnode in mfs.iteritems(): | ||||