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

Import correct changegroup fix from upstream

Browse Source 
Our hack for preventing overbundling was incorrect. Upstream has 22c0e29cfb77
which is the right fix.

We're also seeing missing manifest revisions in bundles for some users, so this
change (or the one upstream), might be exposing a deeper bug in the general
delta bundle creation.
This commit is contained in:
Durham Goode 2015-07-13 11:21:33 -07:00
parent e6c0c52e2f
commit d63b523d53
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
writecg2.py
View File

@ -45,12 +45,13 @@ def overridechangegroupsubset(orig, repo, roots, heads, source, version = '01'):
cl = repo.changelog
if not roots:
roots = [nullid]
# TODO: remove call to nodesbetween.
csets, roots, stripped_heads = cl.nodesbetween(roots, heads)
unaffected_heads = set(heads) - set(stripped_heads)
discbases = list(unaffected_heads)
discbases = []
for n in roots:
discbases.extend([p for p in cl.parents(n) if p != nullid])
# TODO: remove call to nodesbetween.
csets, roots, heads = cl.nodesbetween(roots, heads)
included = set(csets)
discbases = [n for n in discbases if n not in included]
outgoing = discovery.outgoing(cl, discbases, heads)
# use packermap because other extensions might override it
bundler = changegroup.packermap['02'][0](repo)