| Restricted Project |
This should have been in my previous patch, but I messed it up a little. Oops.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | remotefilelog/shallowbundle.py (84 lines) |
| l = len(meta) + len(delta) | l = len(meta) + len(delta) | ||||
| yield changegroup.chunkheader(l) | yield changegroup.chunkheader(l) | ||||
| yield meta | yield meta | ||||
| yield delta | yield delta | ||||
| if util.safehasattr(changegroup, 'cg1packer'): | if util.safehasattr(changegroup, 'cg1packer'): | ||||
| shallowutil.interposeclass(changegroup, cgpacker.__name__)(shallowcg1packer) | shallowutil.interposeclass(changegroup, cgpacker.__name__)(shallowcg1packer) | ||||
| if util.safehasattr(changegroup, 'cg2packer'): | if util.safehasattr(changegroup, 'cg2packer'): | ||||
| # Mercurial >= 3.3 | # Mercurial >= 3.3 | ||||
| cg2packer = changegroup.cg2packer | cg2packer = changegroup.cg2packer | ||||
| elif util.safehasattr(changegroup, 'cgpacker'): | elif util.safehasattr(changegroup, 'cgpacker'): | ||||
| # Since Mercurial 4c99c6d1ef95 | # Since Mercurial 4c99c6d1ef95 | ||||
| cg2packer = changegroup.cgpacker | cg2packer = changegroup.cgpacker | ||||
| if cg2packer: | if cg2packer: | ||||
| @shallowutil.interposeclass(changegroup, cg2packer.__name__) | @shallowutil.interposeclass(changegroup, cg2packer.__name__) | ||||
| class shallowcg2packer(cg2packer): | class shallowcg2packer(cg2packer): | ||||
| def group(self, nodelist, rlog, lookup, units=None, reorder=None): | def group(self, nodelist, rlog, lookup, units=None, reorder=None): | ||||
| # for revlogs, shallowgroup will be called twice in the same stack | # for revlogs, shallowgroup will be called twice in the same stack | ||||
| # -- once here, once up the inheritance hierarchy in | # -- once here, once up the inheritance hierarchy in | ||||
| # shallowcg1packer. That's fine though because for revlogs, | # shallowcg1packer. That's fine though because for revlogs, | ||||
| # shallowgroup doesn't do anything on top of the usual group | # shallowgroup doesn't do anything on top of the usual group | ||||
| # function. If that assumption changes this will have to be | # function. If that assumption changes this will have to be | ||||
| # revisited. | # revisited. | ||||
| return shallowgroup(shallowcg2packer, self, nodelist, rlog, lookup, | return shallowgroup(shallowcg2packer, self, nodelist, rlog, lookup, | ||||
| units=units) | units=units) | ||||
| if util.safehasattr(changegroup, 'cg3packer'): | if util.safehasattr(changegroup, 'cg3packer'): | ||||
| cg3packer = changegroup.cg3packer | cg3packer = changegroup.cg3packer | ||||
| elif util.safehasattr(changegroup, 'cgpacker'): | elif util.safehasattr(changegroup, 'cgpacker'): | ||||
| # Since Mercurial 4c99c6d1ef95 | # Since Mercurial 4c99c6d1ef95 | ||||
| cg3packer = changegroup.cgpacker | cg3packer = changegroup.cgpacker | ||||
| if cgpacker: | if cgpacker: | ||||
| @shallowutil.interposeclass(changegroup, cg3packer.__name__) | @shallowutil.interposeclass(changegroup, cg3packer.__name__) | ||||
| class shallowcg3packer(cg3packer): | class shallowcg3packer(cg3packer): | ||||
| def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, | def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, | ||||
| mfs, fnodes, *args, **kwargs): | mfs, fnodes, *args, **kwargs): | ||||
| chunks = super(shallowcg3packer, self).generatemanifests( | chunks = super(shallowcg3packer, self).generatemanifests( | ||||
| commonrevs, | commonrevs, | ||||
| clrevorder, | clrevorder, | ||||
| fastpathlinkrev, | fastpathlinkrev, | ||||
| mfs, | mfs, | ||||
| fnodes, | fnodes, | ||||
| *args, **kwargs) | *args, **kwargs) | ||||
| for chunk in chunks: | for chunk in chunks: | ||||
| yield chunk | yield chunk | ||||
| # If we're not sending flat manifests, then the subclass | # If we're not sending flat manifests, then the subclass | ||||
| # generatemanifests call did not add the appropriate closing chunk | # generatemanifests call did not add the appropriate closing chunk | ||||
| # for a changegroup3. | # for a changegroup3. | ||||
| if not _cansendflat(self._repo, mfs.keys()): | if not _cansendflat(self._repo, mfs.keys()): | ||||
| yield self._manifestsdone() | yield self._manifestsdone() | ||||
| # Unused except in older versions of Mercurial | # Unused except in older versions of Mercurial | ||||
| def getchangegroup(orig, repo, source, outgoing, bundlecaps=None, version='01'): | def getchangegroup(orig, repo, source, outgoing, bundlecaps=None, version='01'): | ||||
| def origmakechangegroup(repo, outgoing, version, source): | def origmakechangegroup(repo, outgoing, version, source): | ||||
| return orig(repo, source, outgoing, bundlecaps=bundlecaps, | return orig(repo, source, outgoing, bundlecaps=bundlecaps, | ||||
| version=version) | version=version) | ||||
| return makechangegroup(origmakechangegroup, repo, outgoing, version, source) | return makechangegroup(origmakechangegroup, repo, outgoing, version, source) | ||||