11 > # Create two changegroups given the common changesets and heads for the |
11 > # Create two changegroups given the common changesets and heads for the |
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 > outgoing = discovery.outgoing(repo, common, intermediates) |
15 > outgoing = discovery.outgoing(repo, common, intermediates) |
16 > cg = changegroup.getchangegroup(repo, source, outgoing, |
16 > cg = changegroup.getchangegroup(repo, source, outgoing) |
17 > bundlecaps=bundlecaps) |
|
18 > bundler.newpart('output', data='changegroup1') |
17 > bundler.newpart('output', data='changegroup1') |
19 > bundler.newpart('changegroup', data=cg.getchunks()) |
18 > bundler.newpart('changegroup', data=cg.getchunks()) |
20 > outgoing = discovery.outgoing(repo, common + intermediates, heads) |
19 > outgoing = discovery.outgoing(repo, common + intermediates, heads) |
21 > cg = changegroup.getchangegroup(repo, source, outgoing, |
20 > cg = changegroup.getchangegroup(repo, source, outgoing) |
22 > bundlecaps=bundlecaps) |
|
23 > bundler.newpart('output', data='changegroup2') |
21 > bundler.newpart('output', data='changegroup2') |
24 > bundler.newpart('changegroup', data=cg.getchunks()) |
22 > bundler.newpart('changegroup', data=cg.getchunks()) |
25 > |
23 > |
26 > def _pull(repo, *args, **kwargs): |
24 > def _pull(repo, *args, **kwargs): |
27 > pullop = _orig_pull(repo, *args, **kwargs) |
25 > pullop = _orig_pull(repo, *args, **kwargs) |