Show More
@@ -104,14 +104,14 b' class outgoing:' | |||||
104 | if ancestorsof is None: |
|
104 | if ancestorsof is None: | |
105 | ancestorsof = cl.heads() |
|
105 | ancestorsof = cl.heads() | |
106 | if missingroots: |
|
106 | if missingroots: | |
107 | discbases = [] |
|
|||
108 | for n in missingroots: |
|
|||
109 | discbases.extend([p for p in cl.parents(n) if p != repo.nullid]) |
|
|||
110 | # TODO remove call to nodesbetween. |
|
107 | # TODO remove call to nodesbetween. | |
111 | # TODO populate attributes on outgoing instance instead of setting |
|
108 | # TODO populate attributes on outgoing instance instead of setting | |
112 | # discbases. |
|
109 | # discbases. | |
113 | csets, roots, heads = cl.nodesbetween(missingroots, ancestorsof) |
|
110 | csets, roots, heads = cl.nodesbetween(missingroots, ancestorsof) | |
114 | included = set(csets) |
|
111 | included = set(csets) | |
|
112 | discbases = [] | |||
|
113 | for n in csets: | |||
|
114 | discbases.extend([p for p in cl.parents(n) if p != repo.nullid]) | |||
115 | ancestorsof = heads |
|
115 | ancestorsof = heads | |
116 | commonheads = [n for n in discbases if n not in included] |
|
116 | commonheads = [n for n in discbases if n not in included] | |
117 | elif not commonheads: |
|
117 | elif not commonheads: |
@@ -296,9 +296,8 b' Check that the right ancestors is used w' | |||||
296 | bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload |
|
296 | bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload | |
297 | bundle2-output-part: "phase-heads" 24 bytes payload |
|
297 | bundle2-output-part: "phase-heads" 24 bytes payload | |
298 | saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg |
|
298 | saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg | |
299 |
|
|
299 | 2 changesets found | |
300 | list of changesets: |
|
300 | list of changesets: | |
301 | 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
|
|||
302 | 19c888675e133ab5dff84516926a65672eaf04d9 |
|
301 | 19c888675e133ab5dff84516926a65672eaf04d9 | |
303 | c1ffa3b5274e92a9388fe782854e295d2e8d0443 |
|
302 | c1ffa3b5274e92a9388fe782854e295d2e8d0443 | |
304 | bundle2-output-bundle: "HG20", 3 parts total |
|
303 | bundle2-output-bundle: "HG20", 3 parts total | |
@@ -309,15 +308,14 b' Check that the right ancestors is used w' | |||||
309 | bundle2-input-bundle: with-transaction |
|
308 | bundle2-input-bundle: with-transaction | |
310 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
|
309 | bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported | |
311 | adding changesets |
|
310 | adding changesets | |
312 | add changeset 4c9fbe56a16f |
|
|||
313 | add changeset 19c888675e13 |
|
311 | add changeset 19c888675e13 | |
314 | add changeset c1ffa3b5274e |
|
312 | add changeset c1ffa3b5274e | |
315 | adding manifests |
|
313 | adding manifests | |
316 | adding file changes |
|
314 | adding file changes | |
317 | adding f1.txt revisions |
|
315 | adding f1.txt revisions | |
318 |
bundle2-input-part: total payload size 1 |
|
316 | bundle2-input-part: total payload size 1255 | |
319 | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |
|
317 | bundle2-input-part: "cache:rev-branch-cache" (advisory) supported | |
320 |
bundle2-input-part: total payload size |
|
318 | bundle2-input-part: total payload size 54 | |
321 | bundle2-input-part: "phase-heads" supported |
|
319 | bundle2-input-part: "phase-heads" supported | |
322 | bundle2-input-part: total payload size 24 |
|
320 | bundle2-input-part: total payload size 24 | |
323 | bundle2-input-bundle: 3 parts total |
|
321 | bundle2-input-bundle: 3 parts total |
General Comments 0
You need to be logged in to leave comments.
Login now