annotate tests/test-bundle.t @ 29593:953839de96ab

bundle2: store changeset count when creating file bundles The bundle2 changegroup part has an advisory param saying how many changesets are in the part. Before this patch, we were setting this part when generating bundle2 parts via the wire protocol but not when generating local bundle2 files. A side effect of not setting the changeset count part is that progress bars don't work when applying changesets. As the tests show, this impacted clone bundles, shelve, backup bundles, `hg unbundle`, and anything touching bundle2 files. This patch adds a backdoor to allow us to pass state from changegroup generation into the unbundler. We store the number of changesets in the changegroup in this state and use it to populate the aforementioned advisory part parameter when generating the bundle2 bundle. I concede that I'm not thrilled by how state is being passed in changegroup.py (it feels a bit hacky). I would love to overhaul the rather confusing set of functions in changegroup.py with something that passes rich objects around instead of e.g. low-level generators. However, given the code freeze for 3.9 is imminent, I'd rather not undertake this endeavor right now. This feels like the easiest way to get the parameter added to the changegroup part.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 17 Jul 2016 15:13:51 -0700
parents 2e58dc022caa
children 519a02267f90
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26923
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
1
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
2 $ cat << EOF >> $HGRCPATH
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
3 > [format]
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
4 > usegeneraldelta=yes
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
5 > EOF
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
6
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
7 Setting up test
2274
89b15372df18 tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
8
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
9 $ hg init test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
10 $ cd test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
11 $ echo 0 > afile
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
12 $ hg add afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
13 $ hg commit -m "0.0"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
14 $ echo 1 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
15 $ hg commit -m "0.1"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
16 $ echo 2 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
17 $ hg commit -m "0.2"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
18 $ echo 3 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
19 $ hg commit -m "0.3"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
20 $ hg update -C 0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
22 $ echo 1 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
23 $ hg commit -m "1.1"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
24 created new head
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
25 $ echo 2 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
26 $ hg commit -m "1.2"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
27 $ echo "a line" > fred
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
28 $ echo 3 >> afile
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
29 $ hg add fred
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
30 $ hg commit -m "1.3"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
31 $ hg mv afile adifferentfile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
32 $ hg commit -m "1.3m"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
33 $ hg update -C 3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
34 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
35 $ hg mv afile anotherfile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
36 $ hg commit -m "0.3m"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
37 $ hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
38 checking changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
39 checking manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
40 crosschecking files in changesets and manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
41 checking files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
42 4 files, 9 changesets, 7 total revisions
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
43 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
44 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
45
15991
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
46 Bundle and phase
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
47
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
48 $ hg -R test phase --force --secret 0
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
49 $ hg -R test bundle phase.hg empty
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
50 searching for changes
15993
0b05e0bfdc1c scmutil: unify some 'no changes found' messages
Matt Mackall <mpm@selenic.com>
parents: 15991
diff changeset
51 no changes found (ignored 9 secret changesets)
15991
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
52 [1]
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
53 $ hg -R test phase --draft -r 'head()'
85ec8036d0b9 bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents: 15521
diff changeset
54
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
55 Bundle --all
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
56
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
57 $ hg -R test bundle --all all.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
58 9 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
59
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
60 Bundle test to full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
61
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
62 $ hg -R test bundle full.hg empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
63 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
64 9 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
65
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
66 Unbundle full.hg in test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
67
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
68 $ hg -R test unbundle full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
69 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
70 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
71 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
72 added 0 changesets with 0 changes to 4 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
73 (run 'hg update' to get a working copy)
4287
ce71da8ab4f5 test-bundle: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4042
diff changeset
74
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
75 Verify empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
76
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
77 $ hg -R empty heads
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
78 [1]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
79 $ hg -R empty verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
80 checking changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
81 checking manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
82 crosschecking files in changesets and manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
83 checking files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
84 0 files, 0 changesets, 0 total revisions
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
85
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
86 Pull full.hg into test (using --cwd)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
87
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
88 $ hg --cwd test pull ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
89 pulling from ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
90 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
91 no changes found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
92
20576
7f865a94691e pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents: 18701
diff changeset
93 Verify that there are no leaked temporary files after pull (issue2797)
7f865a94691e pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents: 18701
diff changeset
94
7f865a94691e pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents: 18701
diff changeset
95 $ ls test/.hg | grep .hg10un
7f865a94691e pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents: 18701
diff changeset
96 [1]
7f865a94691e pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents: 18701
diff changeset
97
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
98 Pull full.hg into empty (using --cwd)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
99
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
100 $ hg --cwd empty pull ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
101 pulling from ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
102 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
103 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
104 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
105 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
106 added 9 changesets with 7 changes to 4 files (+1 heads)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
107 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
108
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
109 Rollback empty
5663
99fdef2e6793 Add output markers to test-bundle so it's easier to spot the source of
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 4699
diff changeset
110
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
111 $ hg -R empty rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 13439
diff changeset
112 repository tip rolled back to revision -1 (undo pull)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
113
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
114 Pull full.hg into empty again (using --cwd)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
115
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
116 $ hg --cwd empty pull ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
117 pulling from ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
118 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
119 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
120 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
121 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
122 added 9 changesets with 7 changes to 4 files (+1 heads)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
123 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
124
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
125 Pull full.hg into test (using -R)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
126
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
127 $ hg -R test pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
128 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
129 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
130 no changes found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
131
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
132 Pull full.hg into empty (using -R)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
133
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
134 $ hg -R empty pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
135 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
136 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
137 no changes found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
138
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
139 Rollback empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
140
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
141 $ hg -R empty rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 13439
diff changeset
142 repository tip rolled back to revision -1 (undo pull)
7853
af062a9fea9b bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 7141
diff changeset
143
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
144 Pull full.hg into empty again (using -R)
2274
89b15372df18 tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
145
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
146 $ hg -R empty pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
147 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
148 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
149 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
150 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
151 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
152 added 9 changesets with 7 changes to 4 files (+1 heads)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
153 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
154
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
155 Log -R full.hg in fresh empty
2738
400a4a502001 pull: allow to pull from bundle file without need for bundle: syntax
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2673
diff changeset
156
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
157 $ rm -r empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
158 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
159 $ cd empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
160 $ hg -R bundle://../full.hg log
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
161 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
162 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
163 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
164 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
165 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
166 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
167
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
168 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
169 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
170 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
171 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
172
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
173 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
174 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
175 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
176 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
177
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
178 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
179 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
180 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
181 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
182
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
183 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
184 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
185 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
186 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
187 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
188
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
189 changeset: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
190 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
191 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
192 summary: 0.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
193
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
194 changeset: 2:e38ba6f5b7e0
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
195 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
196 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
197 summary: 0.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
198
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
199 changeset: 1:34c2bf6b0626
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
200 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
201 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
202 summary: 0.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
203
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
204 changeset: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
205 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
206 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
207 summary: 0.0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
208
13382
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
209 Make sure bundlerepo doesn't leak tempfiles (issue2491)
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
210
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
211 $ ls .hg
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
212 00changelog.i
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
213 cache
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
214 requires
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
215 store
5664
da72b4d24797 Fix income/pull with bundle and -R (issue 820).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 5663
diff changeset
216
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
217 Pull ../full.hg into empty (with hook)
5663
99fdef2e6793 Add output markers to test-bundle so it's easier to spot the source of
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 4699
diff changeset
218
16903
a1a57d3fe0eb test-bundle: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 16736
diff changeset
219 $ echo "[hooks]" >> .hg/hgrc
25478
d19787db6fe0 tests: simplify printenv calls
Matt Mackall <mpm@selenic.com>
parents: 25125
diff changeset
220 $ echo "changegroup = printenv.py changegroup" >> .hg/hgrc
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
221
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
222 doesn't work (yet ?)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
223
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
224 hg -R bundle://../full.hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
225
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
226 $ hg pull bundle://../full.hg
13818
bf6156bab41b url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org>
parents: 13783
diff changeset
227 pulling from bundle:../full.hg
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
228 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
229 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
230 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
231 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
232 added 9 changesets with 7 changes to 4 files (+1 heads)
27739
d6d3cf5fda6f hooks: add HG_NODE_LAST to txnclose and changegroup hook environments
Mateusz Kwapich <mitrandir@fb.com>
parents: 27251
diff changeset
233 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=bundle:../full.hg (glob)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
234 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
235
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
236 Rollback empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
237
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
238 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 13439
diff changeset
239 repository tip rolled back to revision -1 (undo pull)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
240 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
241
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
242 Log -R bundle:empty+full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
243
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
244 $ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
245 8 7 6 5 4 3 2 1 0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
246
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
247 Pull full.hg into empty again (using -R; with hook)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
248
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
249 $ hg -R empty pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
250 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
251 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
252 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
253 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
254 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
255 added 9 changesets with 7 changes to 4 files (+1 heads)
27739
d6d3cf5fda6f hooks: add HG_NODE_LAST to txnclose and changegroup hook environments
Mateusz Kwapich <mitrandir@fb.com>
parents: 27251
diff changeset
256 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf HG_SOURCE=pull HG_TXNID=TXN:* HG_URL=bundle:empty+full.hg (glob)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
257 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
258
26757
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
259 Cannot produce streaming clone bundles with "hg bundle"
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
260
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
261 $ hg -R test bundle -t packed1 packed.hg
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
262 abort: packed bundles cannot be produced by "hg bundle"
28961
2e58dc022caa debugcreatestreamclonebundle: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28714
diff changeset
263 (use 'hg debugcreatestreamclonebundle')
26757
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
264 [255]
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
265
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
266 packed1 is produced properly
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
267
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
268 $ hg -R test debugcreatestreamclonebundle packed.hg
27251
d9bfe6289acf revlog: don't consider nullrev when choosing delta base
Martin von Zweigbergk <martinvonz@google.com>
parents: 27191
diff changeset
269 writing 2663 bytes for 6 files
26923
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
270 bundle requirements: generaldelta, revlogv1
26757
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
271
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
272 $ f -B 64 --size --sha1 --hexdump packed.hg
27251
d9bfe6289acf revlog: don't consider nullrev when choosing delta base
Martin von Zweigbergk <martinvonz@google.com>
parents: 27191
diff changeset
273 packed.hg: size=2826, sha1=e139f97692a142b19cdcff64a69697d5307ce6d4
26757
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
274 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........|
27251
d9bfe6289acf revlog: don't consider nullrev when choosing delta base
Martin von Zweigbergk <martinvonz@google.com>
parents: 27191
diff changeset
275 0010: 00 00 00 00 0a 67 00 16 67 65 6e 65 72 61 6c 64 |.....g..generald|
26923
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
276 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 00 64 61 |elta,revlogv1.da|
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
277 0030: 74 61 2f 61 64 69 66 66 65 72 65 6e 74 66 69 6c |ta/adifferentfil|
26757
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
278
27885
2370c66110cb commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27739
diff changeset
279 $ hg debugbundle --spec packed.hg
2370c66110cb commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27739
diff changeset
280 none-packed1;requirements%3Dgeneraldelta%2Crevlogv1
2370c66110cb commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27739
diff changeset
281
26757
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
282 generaldelta requirement is listed in stream clone bundles
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
283
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
284 $ hg --config format.generaldelta=true init testgd
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
285 $ cd testgd
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
286 $ touch foo
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
287 $ hg -q commit -A -m initial
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
288 $ cd ..
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
289 $ hg -R testgd debugcreatestreamclonebundle packedgd.hg
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
290 writing 301 bytes for 3 files
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
291 bundle requirements: generaldelta, revlogv1
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
292
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
293 $ f -B 64 --size --sha1 --hexdump packedgd.hg
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
294 packedgd.hg: size=396, sha1=981f9e589799335304a5a9a44caa3623a48d2a9f
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
295 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........|
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
296 0010: 00 00 00 00 01 2d 00 16 67 65 6e 65 72 61 6c 64 |.....-..generald|
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
297 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 00 64 61 |elta,revlogv1.da|
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
298 0030: 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 03 00 01 |ta/foo.i.64.....|
43708f92f471 commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26420
diff changeset
299
27885
2370c66110cb commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27739
diff changeset
300 $ hg debugbundle --spec packedgd.hg
2370c66110cb commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27739
diff changeset
301 none-packed1;requirements%3Dgeneraldelta%2Crevlogv1
2370c66110cb commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents: 27739
diff changeset
302
26758
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
303 Unpacking packed1 bundles with "hg unbundle" isn't allowed
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
304
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
305 $ hg init packed
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
306 $ hg -R packed unbundle packed.hg
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
307 abort: packed bundles cannot be applied with "hg unbundle"
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
308 (use "hg debugapplystreamclonebundle")
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
309 [255]
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
310
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
311 packed1 can be consumed from debug command
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
312
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
313 $ hg -R packed debugapplystreamclonebundle packed.hg
26923
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
314 6 files to transfer, 2.60 KB of data
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
315 transferred 2.60 KB in *.* seconds (* */sec) (glob)
26758
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
316
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
317 Does not work on non-empty repo
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
318
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
319 $ hg -R packed debugapplystreamclonebundle packed.hg
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
320 abort: cannot apply stream clone bundle on non-empty repo
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
321 [255]
bde7ef23340d commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 26757
diff changeset
322
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
323 Create partial clones
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
324
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
325 $ rm -r empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
326 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
327 $ hg clone -r 3 test partial
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
328 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
329 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
330 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
331 added 4 changesets with 4 changes to 1 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
332 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
334 $ hg clone partial partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
335 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
336 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
337 $ cd partial
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
338
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
339 Log -R full.hg in partial
2274
89b15372df18 tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
340
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
341 $ hg -R bundle://../full.hg log -T phases
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
342 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
343 tag: tip
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
344 phase: draft
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
345 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
346 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
347 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
348 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
349
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
350 changeset: 7:a6a34bfa0076
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
351 phase: draft
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
352 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
353 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
354 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
355
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
356 changeset: 6:7373c1169842
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
357 phase: draft
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
358 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
359 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
360 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
361
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
362 changeset: 5:1bb50a9436a7
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
363 phase: draft
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
364 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
365 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
366 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
367
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
368 changeset: 4:095197eb4973
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
369 phase: draft
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
370 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
371 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
372 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
373 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
374
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
375 changeset: 3:eebf5a27f8ca
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
376 phase: public
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
377 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
378 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
379 summary: 0.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
380
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
381 changeset: 2:e38ba6f5b7e0
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
382 phase: public
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
383 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
384 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
385 summary: 0.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
386
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
387 changeset: 1:34c2bf6b0626
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
388 phase: public
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
389 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
390 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
391 summary: 0.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
392
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
393 changeset: 0:f9ee2f85a263
23632
e7fcf58acd71 bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents: 22960
diff changeset
394 phase: public
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
395 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
396 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
397 summary: 0.0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
398
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
399
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
400 Incoming full.hg in partial
4042
f6f65a8d8ed3 add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3988
diff changeset
401
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
402 $ hg incoming bundle://../full.hg
13818
bf6156bab41b url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org>
parents: 13783
diff changeset
403 comparing with bundle:../full.hg
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
404 searching for changes
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
405 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
406 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
407 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
408 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
409 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
410
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
411 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
412 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
413 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
414 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
415
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
416 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
417 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
418 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
419 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
420
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
421 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
422 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
423 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
424 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
425
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
426 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
427 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
428 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
429 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
430 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
431 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
432
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
433
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
434 Outgoing -R full.hg vs partial2 in partial
6316
ad5baedeee02 Add tests for cloning from a all-history bundle
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6171
diff changeset
435
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
436 $ hg -R bundle://../full.hg outgoing ../partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
437 comparing with ../partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
438 searching for changes
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
439 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
440 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
441 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
442 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
443 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
444
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
445 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
446 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
447 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
448 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
449
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
450 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
451 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
452 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
453 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
454
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
455 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
456 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
457 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
458 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
459
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
460 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
461 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
462 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
463 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
464 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
465 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
466
4699
a6b62584d0b2 unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 4287
diff changeset
467
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
468 Outgoing -R does-not-exist.hg vs partial2 in partial
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
469
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
470 $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
16903
a1a57d3fe0eb test-bundle: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents: 16736
diff changeset
471 abort: *../does-not-exist.hg* (glob)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
472 [255]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
473 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
474
17015
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16982
diff changeset
475 hide outer repo
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16982
diff changeset
476 $ hg init
73d20de5f30b tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16982
diff changeset
477
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
478 Direct clone from bundle (all-history)
4042
f6f65a8d8ed3 add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3988
diff changeset
479
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
480 $ hg clone full.hg full-clone
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
481 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
482 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
483 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
484 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
485 added 9 changesets with 7 changes to 4 files (+1 heads)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
486 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
487 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
488 $ hg -R full-clone heads
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
489 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
490 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
491 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
492 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
493 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
494 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
495
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
496 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
497 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
498 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
499 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
500
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
501 $ rm -r full-clone
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
502
13053
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
503 When cloning from a non-copiable repository into '', do not
22183
4dd9f606d0a6 tests: fixup issue markers to make check-commit happy
Matt Mackall <mpm@selenic.com>
parents: 21024
diff changeset
504 recurse infinitely (issue2528)
13053
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
505
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
506 $ hg clone full.hg ''
17159
36a3016811d1 localrepo: use the path relative to "self.vfs" instead of "path" argument
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17018
diff changeset
507 abort: empty destination path is not valid
13053
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
508 [255]
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
509
26420
2fc86d92c4a9 urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents: 25478
diff changeset
510 test for https://bz.mercurial-scm.org/216
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
511
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
512 Unbundle incremental bundles into fresh empty in one go
4042
f6f65a8d8ed3 add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3988
diff changeset
513
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
514 $ rm -r empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
515 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
516 $ hg -R test bundle --base null -r 0 ../0.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
517 1 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
518 $ hg -R test bundle --base 0 -r 1 ../1.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
519 1 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
520 $ hg -R empty unbundle -u ../0.hg ../1.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
521 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
522 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
523 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
524 added 1 changesets with 1 changes to 1 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
525 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
526 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
527 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
528 added 1 changesets with 1 changes to 1 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4042
f6f65a8d8ed3 add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3988
diff changeset
530
17913
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
531 View full contents of the bundle
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
532 $ hg -R test bundle --base null -r 3 ../partial.hg
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
533 4 changesets found
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
534 $ cd test
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
535 $ hg -R ../../partial.hg log -r "bundle()"
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
536 changeset: 0:f9ee2f85a263
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
537 user: test
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
538 date: Thu Jan 01 00:00:00 1970 +0000
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
539 summary: 0.0
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
540
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
541 changeset: 1:34c2bf6b0626
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
542 user: test
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
543 date: Thu Jan 01 00:00:00 1970 +0000
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
544 summary: 0.1
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
545
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
546 changeset: 2:e38ba6f5b7e0
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
547 user: test
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
548 date: Thu Jan 01 00:00:00 1970 +0000
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
549 summary: 0.2
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
550
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
551 changeset: 3:eebf5a27f8ca
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
552 user: test
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
553 date: Thu Jan 01 00:00:00 1970 +0000
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
554 summary: 0.3
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
555
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
556 $ cd ..
03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents: 17159
diff changeset
557
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
558 test for 540d1059c802
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
559
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
560 test for 540d1059c802
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
561
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
562 $ hg init orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
563 $ cd orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
564 $ echo foo > foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
565 $ hg add foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
566 $ hg ci -m 'add foo'
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
567
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
568 $ hg clone . ../copy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
569 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
570 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
571 $ hg tag foo
7141
8d1bdaf842de issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6316
diff changeset
572
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
573 $ cd ../copy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
574 $ echo >> foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
575 $ hg ci -m 'change foo'
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
576 $ hg bundle ../bundle.hg ../orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
577 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
578 1 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
579
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
580 $ cd ../orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
581 $ hg incoming ../bundle.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
582 comparing with ../bundle.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
583 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
584 changeset: 2:ed1b79f46b9a
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
585 tag: tip
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
586 parent: 0:bbd179dfa0a7
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
587 user: test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
588 date: Thu Jan 01 00:00:00 1970 +0000
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
589 summary: change foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
590
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
591 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
592
13826
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
593 test bundle with # in the filename (issue2154):
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
594
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
595 $ cp bundle.hg 'test#bundle.hg'
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
596 $ cd orig
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
597 $ hg incoming '../test#bundle.hg'
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
598 comparing with ../test
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
599 abort: unknown revision 'bundle.hg'!
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
600 [255]
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
601
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
602 note that percent encoding is not handled:
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
603
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
604 $ hg incoming ../test%23bundle.hg
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
605 abort: repository ../test%23bundle.hg not found!
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
606 [255]
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
607 $ cd ..
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
608
18701
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
609 test to bundle revisions on the newly created branch (issue3828):
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
610
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
611 $ hg -q clone -U test test-clone
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
612 $ cd test
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
613
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
614 $ hg -q branch foo
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
615 $ hg commit -m "create foo branch"
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
616 $ hg -q outgoing ../test-clone
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
617 9:b4f5acb1ee27
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
618 $ hg -q bundle --branch foo foo.hg ../test-clone
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
619 $ hg -R foo.hg -q log -r "bundle()"
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
620 9:b4f5acb1ee27
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
621
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
622 $ cd ..
61c8327ced50 bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 17913
diff changeset
623
26420
2fc86d92c4a9 urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents: 25478
diff changeset
624 test for https://bz.mercurial-scm.org/1144
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
625
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
626 test that verify bundle does not traceback
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
627
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20576
diff changeset
628 partial history bundle, fails w/ unknown parent
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
629
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
630 $ hg -R bundle.hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
631 abort: 00changelog.i@bbd179dfa0a7: unknown parent!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
632 [255]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
633
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
634 full history bundle, refuses to verify non-local repo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
635
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
636 $ hg -R all.hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
637 abort: cannot verify bundle or remote repos
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
638 [255]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
639
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
640 but, regular verify must continue to work
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
641
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
642 $ hg -R orig verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
643 checking changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
644 checking manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
645 crosschecking files in changesets and manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
646 checking files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
647 2 files, 2 changesets, 2 total revisions
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
648
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
649 diff against bundle
7141
8d1bdaf842de issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6316
diff changeset
650
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
651 $ hg init b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
652 $ cd b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
653 $ hg -R ../all.hg diff -r tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
654 diff -r aa35859c02ea anotherfile
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
655 --- a/anotherfile Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
656 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
657 @@ -1,4 +0,0 @@
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
658 -0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
659 -1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
660 -2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
661 -3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
662 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
663
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
664 bundle single branch
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
665
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
666 $ hg init branchy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
667 $ cd branchy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
668 $ echo a >a
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
669 $ echo x >x
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
670 $ hg ci -Ama
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
671 adding a
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
672 adding x
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
673 $ echo c >c
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
674 $ echo xx >x
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
675 $ hg ci -Amc
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
676 adding c
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
677 $ echo c1 >c1
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
678 $ hg ci -Amc1
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
679 adding c1
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
680 $ hg up 0
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
681 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
682 $ echo b >b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
683 $ hg ci -Amb
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
684 adding b
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
685 created new head
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
686 $ echo b1 >b1
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
687 $ echo xx >x
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
688 $ hg ci -Amb1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
689 adding b1
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
690 $ hg clone -q -r2 . part
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
691
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
692 == bundling via incoming
7141
8d1bdaf842de issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6316
diff changeset
693
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
694 $ hg in -R part --bundle incoming.hg --template "{node}\n" .
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
695 comparing with .
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
696 searching for changes
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
697 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
698 057f4db07f61970e1c11e83be79e9d08adc4dc31
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
699
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
700 == bundling
7853
af062a9fea9b bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 7141
diff changeset
701
25125
bd625cd4e5e7 progress: get the extremely verbose output out of default debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 24740
diff changeset
702 $ hg bundle bundle.hg part --debug --config progress.debug=true
14164
cb98fed52495 discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
703 query 1; heads
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
704 searching for changes
14164
cb98fed52495 discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
705 all remote heads known locally
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
706 2 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
707 list of changesets:
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
708 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
709 057f4db07f61970e1c11e83be79e9d08adc4dc31
26923
608cabec1b15 test: use generaldelta for test-bundle.t
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26758
diff changeset
710 bundle2-output-bundle: "HG20", (1 params) 1 parts total
29593
953839de96ab bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 28961
diff changeset
711 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
14520
9d8d2fecb72e localrepo: add total to changeset progress in bundle/push
Sune Foldager <cryo@cyanite.org>
parents: 14164
diff changeset
712 bundling: 1/2 changesets (50.00%)
9d8d2fecb72e localrepo: add total to changeset progress in bundle/push
Sune Foldager <cryo@cyanite.org>
parents: 14164
diff changeset
713 bundling: 2/2 changesets (100.00%)
13116
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information
Augie Fackler <durin42@gmail.com>
parents: 13053
diff changeset
714 bundling: 1/2 manifests (50.00%)
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information
Augie Fackler <durin42@gmail.com>
parents: 13053
diff changeset
715 bundling: 2/2 manifests (100.00%)
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
716 bundling: b 1/3 files (33.33%)
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
717 bundling: b1 2/3 files (66.67%)
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
718 bundling: x 3/3 files (100.00%)
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
719
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
720 == Test for issue3441
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
721
16736
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
722 $ hg clone -q -r0 . part2
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
723 $ hg -q -R part2 pull bundle.hg
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
724 $ hg -R part2 verify
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
725 checking changesets
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
726 checking manifests
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
727 crosschecking files in changesets and manifests
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
728 checking files
025b3b763ba9 bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents: 16107
diff changeset
729 4 files, 3 changesets, 5 total revisions
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16903
diff changeset
730
27911
645e78845383 bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents: 27885
diff changeset
731 == Test bundling no commits
645e78845383 bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents: 27885
diff changeset
732
645e78845383 bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents: 27885
diff changeset
733 $ hg bundle -r 'public()' no-output.hg
645e78845383 bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents: 27885
diff changeset
734 abort: no commits to bundle
645e78845383 bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents: 27885
diff changeset
735 [255]
28714
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
736
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
737 $ cd ..
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
738
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
739 When user merges to the revision existing only in the bundle,
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
740 it should show warning that second parent of the working
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
741 directory does not exist
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
742
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
743 $ hg init update2bundled
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
744 $ cd update2bundled
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
745 $ cat <<EOF >> .hg/hgrc
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
746 > [extensions]
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
747 > strip =
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
748 > EOF
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
749 $ echo "aaa" >> a
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
750 $ hg commit -A -m 0
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
751 adding a
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
752 $ echo "bbb" >> b
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
753 $ hg commit -A -m 1
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
754 adding b
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
755 $ echo "ccc" >> c
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
756 $ hg commit -A -m 2
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
757 adding c
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
758 $ hg update -r 1
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
759 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
760 $ echo "ddd" >> d
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
761 $ hg commit -A -m 3
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
762 adding d
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
763 created new head
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
764 $ hg update -r 2
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
765 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
766 $ hg log -G
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
767 o changeset: 3:8bd3e1f196af
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
768 | tag: tip
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
769 | parent: 1:a01eca7af26d
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
770 | user: test
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
771 | date: Thu Jan 01 00:00:00 1970 +0000
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
772 | summary: 3
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
773 |
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
774 | @ changeset: 2:4652c276ac4f
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
775 |/ user: test
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
776 | date: Thu Jan 01 00:00:00 1970 +0000
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
777 | summary: 2
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
778 |
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
779 o changeset: 1:a01eca7af26d
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
780 | user: test
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
781 | date: Thu Jan 01 00:00:00 1970 +0000
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
782 | summary: 1
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
783 |
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
784 o changeset: 0:4fe08cd4693e
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
785 user: test
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
786 date: Thu Jan 01 00:00:00 1970 +0000
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
787 summary: 0
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
788
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
789 $ hg bundle --base 1 -r 3 ../update2bundled.hg
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
790 1 changesets found
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
791 $ hg strip -r 3
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
792 saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg (glob)
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
793 $ hg merge -R ../update2bundled.hg -r 3
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
794 setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
795 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
796 (branch merge, don't forget to commit)
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
797
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
798 When user updates to the revision existing only in the bundle,
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
799 it should show warning
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
800
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
801 $ hg update -R ../update2bundled.hg --clean -r 3
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
802 setting parent to node 8bd3e1f196af289b2b121be08031e76d7ae92098 that only exists in the bundle
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
803 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
804
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
805 When user updates to the revision existing in the local repository
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
806 the warning shouldn't be emitted
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
807
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
808 $ hg update -R ../update2bundled.hg -r 0
dac81729fea4 bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents: 27911
diff changeset
809 0 files updated, 0 files merged, 2 files removed, 0 files unresolved