facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

shallowbundle: make the generatemanifests method compatible with older Hg

Browse Source
This commit is contained in:
Matt DeVore 2017-09-23 16:58:58 -07:00
parent a6a9d48bfa
commit 928a902f2a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
remotefilelog/shallowbundle.py
View File

@ -58,7 +58,7 @@ class shallowcg1packer(changegroup.cg1packer):
units=units)
def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev,
mfs, fnodes, source):
mfs, fnodes, *args, **kwargs):
"""
- `commonrevs` is the set of known commits on both sides
- `clrevorder` is a mapping from cl node to rev number, used for
@ -69,6 +69,9 @@ class shallowcg1packer(changegroup.cg1packer):
- `fnodes` is a mapping of { filepath -> { node -> clnode } }
If fastpathlinkrev is false, we are responsible for populating
fnodes.
- `args` and `kwargs` are extra arguments that will be passed to the
core generatemanifests method, whose length depends on the
version of core Hg.
"""
sendflat = self._repo.ui.configbool('treemanifest', 'sendflat',
True)
@ -83,8 +86,7 @@ class shallowcg1packer(changegroup.cg1packer):
fastpathlinkrev,
mfs,
fnodes,
source,
)
*args, **kwargs)
for chunk in chunks:
yield chunk
else:
@ -230,15 +232,14 @@ if util.safehasattr(changegroup, 'cg3packer'):
@shallowutil.interposeclass(changegroup, 'cg3packer')
class shallowcg3packer(changegroup.cg3packer):
def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev,
mfs, fnodes, source):
mfs, fnodes, *args, **kwargs):
chunks = super(shallowcg3packer, self).generatemanifests(
commonrevs,
clrevorder,
fastpathlinkrev,
mfs,
fnodes,
source,
)
*args, **kwargs)
for chunk in chunks:
yield chunk