##// END OF EJS Templates
bundle: don't send too many changesets (Issue1704)...
bundle: don't send too many changesets (Issue1704) The fast path in changegroupsubset can send too many csets. This happens because it uses the parents of all bases as common nodes and then goes forward from this again. If a base has a parent that has another child, which is -not- a base, then this other child will nevertheless end up in the changegroup. The fix is to not use findmissing(), but use nodesbetween() instead, as do the slow path and incoming/outgoing. The change to test-notify.out is correct, because it actually hits this bug, as can be seen by glog'ing the two repos: @ 22c88 |\ | o 0a184 | | o | 0647d |/ o cb9a9 and o 0647d | @ cb9a9 It used to pull 0647d again, which is unnecessary.

File last commit:

r9820:0b999aec default
r9820:0b999aec default
Show More
test-bundle.out
348 lines | 9.0 KiB | text/plain | TextLexer
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Setting up test
Benoit Boissinot
tests for bundles and bundlerepo
r2274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Benoit Boissinot
tests for bundles and bundlerepo
r2274 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
John Mulligan
Add --all option to bundle command
r6171 ====== Bundle --all
9 changesets found
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Bundle test to full.hg
Benoit Boissinot
tests for bundles and bundlerepo
r2274 searching for changes
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 9 changesets found
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Unbundle full.hg in test
Benoit Boissinot
tests for bundles and bundlerepo
r2274 adding changesets
adding manifests
adding file changes
added 0 changesets with 0 changes to 4 files
(run 'hg update' to get a working copy)
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Verify empty
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 changeset: -1:000000000000
tag: tip
user:
date: Thu Jan 01 00:00:00 1970 +0000
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Pull full.hg into test (using --cwd)
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 pulling from ../full.hg
searching for changes
no changes found
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Pull full.hg into empty (using --cwd)
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 pulling from ../full.hg
requesting all changes
Benoit Boissinot
tests for bundles and bundlerepo
r2274 adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Rollback empty
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 rolling back last transaction
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Pull full.hg into empty again (using --cwd)
Vadim Gelfer
pull: allow to pull from bundle file without need for bundle: syntax
r2738 pulling from ../full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
r5664 ====== Pull full.hg into test (using -R)
pulling from full.hg
searching for changes
no changes found
====== Pull full.hg into empty (using -R)
pulling from full.hg
searching for changes
no changes found
====== Rollback empty
rolling back last transaction
====== Pull full.hg into empty again (using -R)
pulling from full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Log -R full.hg in fresh empty
Benoit Boissinot
tests for bundles and bundlerepo
r2274 changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
changeset: 7:80fe151401c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3m
changeset: 6:1e3f6b843bd6
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3
changeset: 5:024e4e7df376
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.2
changeset: 4:5f4f3ceb285e
parent: 0:5649c9d34dd8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.1
changeset: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3
changeset: 2:d62976ca1e50
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.2
changeset: 1:10b2180f755b
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.1
changeset: 0:5649c9d34dd8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.0
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Pull ../full.hg into empty (with hook)
Alexis S. L. Carvalho
test-bundle: use printenv.py
r4287 changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:../full.hg
Benoit Boissinot
tests for bundles and bundlerepo
r2274 pulling from bundle://../full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
Peter Arrenbrecht
bundlerepo: test exposing inconsistency of parsed and internal name (issue #821)
r6128 ====== Rollback empty
rolling back last transaction
====== Log -R bundle:empty+full.hg
8 7 6 5 4 3 2 1 0
====== Pull full.hg into empty again (using -R; with hook)
Peter Arrenbrecht
bundlerepo: fix inconsistency of parsed and internal name (issue #821)
r6129 changegroup hook: HG_NODE=5649c9d34dd87d0ecb5fd39672128376e83b22e1 HG_SOURCE=pull HG_URL=bundle:empty+full.hg
Peter Arrenbrecht
bundlerepo: test exposing inconsistency of parsed and internal name (issue #821)
r6128 pulling from full.hg
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Create partial clones
Benoit Boissinot
tests for bundles and bundlerepo
r2274 requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
Benoit Boissinot
tests for bundles and bundlerepo
r2274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
Benoit Boissinot
tests for bundles and bundlerepo
r2274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Log -R full.hg in partial
Benoit Boissinot
tests for bundles and bundlerepo
r2274 changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
changeset: 7:80fe151401c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3m
changeset: 6:1e3f6b843bd6
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3
changeset: 5:024e4e7df376
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.2
changeset: 4:5f4f3ceb285e
parent: 0:5649c9d34dd8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.1
changeset: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3
changeset: 2:d62976ca1e50
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.2
changeset: 1:10b2180f755b
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.1
changeset: 0:5649c9d34dd8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.0
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Incoming full.hg in partial
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
r4162 comparing with bundle://../full.hg
Benoit Boissinot
tests for bundles and bundlerepo
r2274 searching for changes
changeset: 4:5f4f3ceb285e
parent: 0:5649c9d34dd8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.1
changeset: 5:024e4e7df376
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.2
changeset: 6:1e3f6b843bd6
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3
changeset: 7:80fe151401c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3m
changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Outgoing -R full.hg vs partial2 in partial
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
r4162 comparing with ../partial2
Benoit Boissinot
tests for bundles and bundlerepo
r2274 searching for changes
changeset: 4:5f4f3ceb285e
parent: 0:5649c9d34dd8
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.1
changeset: 5:024e4e7df376
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.2
changeset: 6:1e3f6b843bd6
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3
changeset: 7:80fe151401c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3m
changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Outgoing -R does-not-exist.hg vs partial2 in partial
Alexis S. L. Carvalho
bundlerepo: avoid exception in __del__ when the bundle doesn't exist...
r3429 abort: No such file or directory: ../does-not-exist.hg
John Mulligan
Add tests for cloning from a all-history bundle
r6316 ====== Direct clone from bundle (all-history)
requesting all changes
adding changesets
adding manifests
adding file changes
added 9 changesets with 7 changes to 4 files (+1 heads)
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
John Mulligan
Add tests for cloning from a all-history bundle
r6316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 8:836ac62537ab
tag: tip
parent: 3:ac69c658229d
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0.3m
changeset: 7:80fe151401c2
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1.3m
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== Unbundle incremental bundles into fresh empty in one go
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 1 changesets found
1 changesets found
Giorgos Keramidas
unbundle: accept multiple file arguments...
r4699 adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Peter Arrenbrecht
Add output markers to test-bundle so it's easier to spot the source of...
r5663 ====== test for 540d1059c802
Adrian Buehlmann
hg.clone: report branch name on update
r9611 updating to branch default
Alexis S. L. Carvalho
add test for 540d1059c802
r4042 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
searching for changes
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
r5763 1 changesets found
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
r4162 comparing with ../bundle.hg
Alexis S. L. Carvalho
add test for 540d1059c802
r4042 searching for changes
changeset: 2:ed1b79f46b9a
tag: tip
parent: 0:bbd179dfa0a7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: change foo
John Mulligan
issue 1144: prevent traceback on verify of bundles
r7141 ===== test that verify bundle does not traceback
abort: 00changelog.i@bbd179dfa0a7: unknown parent!
abort: cannot verify bundle or remote repos
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions
Matt Mackall
bundlerepo: reintroduce dirstate
r7853 ====== diff against bundle
diff -r 836ac62537ab anotherfile
--- a/anotherfile Mon Jan 12 13:46:40 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-0
-1
-2
-3
Peter Arrenbrecht
bundle: don't send too many changesets (Issue1704)...
r9820 ====== bundle single branch
adding a
adding b
adding b1
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
adding c
created new head
adding c1
== bundling via incoming
comparing with .
searching for changes
d2ae7f538514cd87c17547b0de4cea71fe1af9fb
5ece8e77363e2b5269e27c66828b72da29e4341a
== bundling
searching for changes
common changesets up to c0025332f9ed
2 changesets found
list of changesets:
d2ae7f538514cd87c17547b0de4cea71fe1af9fb
5ece8e77363e2b5269e27c66828b72da29e4341a