12 > # changegroup part we are being requested. Use the parent of each head |
12 > # changegroup part we are being requested. Use the parent of each head |
13 > # in 'heads' as intermediate heads for the first changegroup. |
13 > # in 'heads' as intermediate heads for the first changegroup. |
14 > intermediates = [repo[r].p1().node() for r in heads] |
14 > intermediates = [repo[r].p1().node() for r in heads] |
15 > cg = changegroup.getchangegroup(repo, source, heads=intermediates, |
15 > cg = changegroup.getchangegroup(repo, source, heads=intermediates, |
16 > common=common, bundlecaps=bundlecaps) |
16 > common=common, bundlecaps=bundlecaps) |
17 > bundler.newpart('b2x:output', data='changegroup1') |
17 > bundler.newpart('output', data='changegroup1') |
18 > bundler.newpart('b2x:changegroup', data=cg.getchunks()) |
18 > bundler.newpart('changegroup', data=cg.getchunks()) |
19 > cg = changegroup.getchangegroup(repo, source, heads=heads, |
19 > cg = changegroup.getchangegroup(repo, source, heads=heads, |
20 > common=common + intermediates, |
20 > common=common + intermediates, |
21 > bundlecaps=bundlecaps) |
21 > bundlecaps=bundlecaps) |
22 > bundler.newpart('b2x:output', data='changegroup2') |
22 > bundler.newpart('output', data='changegroup2') |
23 > bundler.newpart('b2x:changegroup', data=cg.getchunks()) |
23 > bundler.newpart('changegroup', data=cg.getchunks()) |
24 > |
24 > |
25 > def _pull(repo, *args, **kwargs): |
25 > def _pull(repo, *args, **kwargs): |
26 > pullop = _orig_pull(repo, *args, **kwargs) |
26 > pullop = _orig_pull(repo, *args, **kwargs) |
27 > repo.ui.write('pullop.cgresult is %d\n' % pullop.cgresult) |
27 > repo.ui.write('pullop.cgresult is %d\n' % pullop.cgresult) |
28 > return pullop |
28 > return pullop |