Mercurial > hg
annotate tests/test-bundle.t @ 48141:42ab0bcb6ded
dirstate: narrow gathering of parent data
The parent data are only going to be useful is the file might be clean. And it
might only be clean if it is tracked in both p1 and the working copy.
Differential Revision: https://phab.mercurial-scm.org/D11584
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 01 Oct 2021 02:01:12 +0200 |
parents | 8ae828fd008b |
children | 8c4881c07f57 |
rev | line source |
---|---|
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
1 Setting up test |
2274
89b15372df18
tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
2 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
3 $ hg init test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
4 $ cd test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
5 $ echo 0 > afile |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
6 $ hg add afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
7 $ hg commit -m "0.0" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
8 $ echo 1 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
9 $ hg commit -m "0.1" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
10 $ echo 2 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
11 $ hg commit -m "0.2" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
12 $ echo 3 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
13 $ hg commit -m "0.3" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
14 $ hg update -C 0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
15 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
|
16 $ echo 1 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
17 $ hg commit -m "1.1" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
18 created new head |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
19 $ echo 2 >> afile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
20 $ hg commit -m "1.2" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
21 $ echo "a line" > fred |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
22 $ echo 3 >> afile |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
23 $ hg add fred |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
24 $ hg commit -m "1.3" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
25 $ hg mv afile adifferentfile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
26 $ hg commit -m "1.3m" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
27 $ hg update -C 3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
28 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
|
29 $ hg mv afile anotherfile |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
30 $ hg commit -m "0.3m" |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
31 $ hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
32 checking changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
33 checking manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
34 crosschecking files in changesets and manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
35 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
36 checked 9 changesets with 7 changes to 4 files |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
37 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
38 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
39 |
15991
85ec8036d0b9
bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15521
diff
changeset
|
40 Bundle and phase |
85ec8036d0b9
bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15521
diff
changeset
|
41 |
85ec8036d0b9
bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15521
diff
changeset
|
42 $ 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
|
43 $ 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
|
44 searching for changes |
15993
0b05e0bfdc1c
scmutil: unify some 'no changes found' messages
Matt Mackall <mpm@selenic.com>
parents:
15991
diff
changeset
|
45 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
|
46 [1] |
85ec8036d0b9
bundle: display info about secret changets while no sharable changeset found
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15521
diff
changeset
|
47 $ 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
|
48 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
49 Bundle --all |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
50 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
51 $ hg -R test bundle --all all.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
52 9 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
53 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
54 Bundle test to full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
55 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
56 $ hg -R test bundle full.hg empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
57 searching for changes |
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 Unbundle full.hg in test |
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 unbundle full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
63 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
64 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
65 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
66 added 0 changesets with 0 changes to 4 files |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
67 (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
|
68 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
69 Verify empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
70 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
71 $ hg -R empty heads |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
72 [1] |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
73 $ hg -R empty verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
74 checking changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
75 checking manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
76 crosschecking files in changesets and manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
77 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
78 checked 0 changesets with 0 changes to 0 files |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
79 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
80 #if repobundlerepo |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
81 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
82 Pull full.hg into test (using --cwd) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
83 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
84 $ hg --cwd test pull ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
85 pulling from ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
86 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
87 no changes found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
88 |
20576
7f865a94691e
pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents:
18701
diff
changeset
|
89 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
|
90 |
7f865a94691e
pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents:
18701
diff
changeset
|
91 $ ls test/.hg | grep .hg10un |
7f865a94691e
pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents:
18701
diff
changeset
|
92 [1] |
7f865a94691e
pull: close peer repo on completion (issue2491) (issue2797)
Piotr Klecha <pklecha@forcom.com.pl>
parents:
18701
diff
changeset
|
93 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
94 Pull full.hg into empty (using --cwd) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
95 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
96 $ hg --cwd empty pull ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
97 pulling from ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
98 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
99 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
100 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
101 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
102 added 9 changesets with 7 changes to 4 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
103 new changesets f9ee2f85a263:aa35859c02ea (9 drafts) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
104 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
105 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
106 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
|
107 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
108 $ 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
|
109 repository tip rolled back to revision -1 (undo pull) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
110 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
111 Pull full.hg into empty again (using --cwd) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
112 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
113 $ hg --cwd empty pull ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
114 pulling from ../full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
115 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
116 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
117 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
118 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
119 added 9 changesets with 7 changes to 4 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
120 new changesets f9ee2f85a263:aa35859c02ea (9 drafts) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
121 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
122 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
123 Pull full.hg into test (using -R) |
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 $ hg -R test pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
126 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
127 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
128 no changes found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
129 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
130 Pull full.hg into empty (using -R) |
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 $ hg -R empty pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
133 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
134 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
135 no changes found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
136 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
137 Rollback empty |
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 $ 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
|
140 repository tip rolled back to revision -1 (undo pull) |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7141
diff
changeset
|
141 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
142 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
|
143 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
144 $ hg -R empty pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
145 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
146 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
147 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
148 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
149 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
150 added 9 changesets with 7 changes to 4 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
151 new changesets f9ee2f85a263:aa35859c02ea (9 drafts) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
152 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
153 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
154 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
|
155 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
156 $ rm -r empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
157 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
158 $ cd empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
159 $ hg -R bundle://../full.hg log |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
160 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
161 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
162 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
163 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
164 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
165 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
166 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
167 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
168 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
169 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
170 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
171 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
172 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
173 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
174 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
175 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
176 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
177 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
178 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
179 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
180 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
181 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
182 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
183 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
184 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
185 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
186 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
187 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
188 changeset: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
189 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
190 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
191 summary: 0.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
192 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
193 changeset: 2:e38ba6f5b7e0 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
194 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
195 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
196 summary: 0.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
197 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
198 changeset: 1:34c2bf6b0626 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
199 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
200 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
201 summary: 0.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
202 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
203 changeset: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
204 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
205 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
206 summary: 0.0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
207 |
13382
d747774ca9da
Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13116
diff
changeset
|
208 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
|
209 |
d747774ca9da
Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13116
diff
changeset
|
210 $ ls .hg |
d747774ca9da
Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13116
diff
changeset
|
211 00changelog.i |
d747774ca9da
Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13116
diff
changeset
|
212 cache |
d747774ca9da
Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13116
diff
changeset
|
213 requires |
d747774ca9da
Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents:
13116
diff
changeset
|
214 store |
40794
d5622dfe4ba3
cache: create `wcache` directory at init time
Boris Feld <boris.feld@octobus.net>
parents:
40433
diff
changeset
|
215 wcache |
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 |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30013
diff
changeset
|
219 $ cat >> .hg/hgrc <<EOF |
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30013
diff
changeset
|
220 > [hooks] |
41637
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
221 > changegroup = sh -c "printenv.py --line changegroup" |
30234
34a5f6c66bc5
tests: invoke printenv.py via sh -c for test portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
30013
diff
changeset
|
222 > EOF |
11870
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 doesn't work (yet ?) |
41731
92055d539e49
tests: conditionalize msys path mangling in test-bundle.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
41637
diff
changeset
|
225 NOTE: msys is mangling the URL below |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
226 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
227 hg -R bundle://../full.hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
228 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
229 $ hg pull bundle://../full.hg |
13818
bf6156bab41b
url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org>
parents:
13783
diff
changeset
|
230 pulling from bundle:../full.hg |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
231 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
232 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
233 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
234 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
235 added 9 changesets with 7 changes to 4 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
236 new changesets f9ee2f85a263:aa35859c02ea (9 drafts) |
41637
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
237 changegroup hook: HG_HOOKNAME=changegroup |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
238 HG_HOOKTYPE=changegroup |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
239 HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
240 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
241 HG_SOURCE=pull |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
242 HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41731
diff
changeset
|
243 HG_TXNNAME=pull |
41929
35e29a3aa441
tests: stabilize test-bundle.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
41896
diff
changeset
|
244 bundle:../full.hg (no-msys !) |
35e29a3aa441
tests: stabilize test-bundle.t on Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
41896
diff
changeset
|
245 bundle;../full.hg (msys !) |
41731
92055d539e49
tests: conditionalize msys path mangling in test-bundle.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
41637
diff
changeset
|
246 HG_URL=bundle:../full.hg (no-msys !) |
92055d539e49
tests: conditionalize msys path mangling in test-bundle.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
41637
diff
changeset
|
247 HG_URL=bundle;../full.hg (msys !) |
41637
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
248 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
249 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
250 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
251 Rollback empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
252 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
253 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13439
diff
changeset
|
254 repository tip rolled back to revision -1 (undo pull) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
255 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
256 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
257 Log -R bundle:empty+full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
258 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
259 $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
260 8 7 6 5 4 3 2 1 0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
261 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
262 Pull full.hg into empty again (using -R; with hook) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
263 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
264 $ hg -R empty pull full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
265 pulling from full.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
266 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
267 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
268 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
269 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
270 added 9 changesets with 7 changes to 4 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
271 new changesets f9ee2f85a263:aa35859c02ea (9 drafts) |
41637
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
272 changegroup hook: HG_HOOKNAME=changegroup |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
273 HG_HOOKTYPE=changegroup |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
274 HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
275 HG_NODE_LAST=aa35859c02ea8bd48da5da68cd2740ac71afcbaf |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
276 HG_SOURCE=pull |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
277 HG_TXNID=TXN:$ID$ |
41896
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41731
diff
changeset
|
278 HG_TXNNAME=pull |
94faa2e84094
transaction: include txnname in the hookargs dictionary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41731
diff
changeset
|
279 bundle:empty+full.hg |
41637
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
280 HG_URL=bundle:empty+full.hg |
252cc56c9ff6
test: use `printenv.py --line` in `test-bundle.t`
Boris Feld <boris.feld@octobus.net>
parents:
40919
diff
changeset
|
281 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
282 (run 'hg heads' to see heads, 'hg merge' to merge) |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
283 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
284 #endif |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
285 |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
286 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
|
287 |
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
288 $ 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
|
289 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
|
290 (use 'hg debugcreatestreamclonebundle') |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
41929
diff
changeset
|
291 [10] |
26757
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 packed1 is produced properly |
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
294 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
295 #if reporevlogstore |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
296 |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
297 $ hg -R test debugcreatestreamclonebundle packed.hg |
46874
84a93fa7ecfd
revlog-compression: use zstd by default (if available)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46651
diff
changeset
|
298 writing 2664 bytes for 6 files (no-zstd !) |
84a93fa7ecfd
revlog-compression: use zstd by default (if available)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46651
diff
changeset
|
299 writing 2665 bytes for 6 files (zstd !) |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
300 bundle requirements: generaldelta, revlogv1, sparserevlog (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
301 bundle requirements: generaldelta, persistent-nodemap, revlogv1, sparserevlog (rust !) |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
302 |
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
303 $ f -B 64 --size --sha1 --hexdump packed.hg |
46874
84a93fa7ecfd
revlog-compression: use zstd by default (if available)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46651
diff
changeset
|
304 packed.hg: size=2840, sha1=12bf3eee3eb8a04c503ce2d29b48f0135c7edff5 (no-zstd !) |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
305 packed.hg: size=2841, sha1=8b645a65f49b0ae43042a9f3da56d4bfdf1c7f99 (zstd no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
306 packed.hg: size=2860, sha1=81d7a2e535892cda51e82c200f818de2cca828d3 (rust !) |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
307 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 06 00 00 |HGS1UN..........| |
46874
84a93fa7ecfd
revlog-compression: use zstd by default (if available)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46651
diff
changeset
|
308 0010: 00 00 00 00 0a 68 00 23 67 65 6e 65 72 61 6c 64 |.....h.#generald| (no-zstd !) |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
309 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp| (no-zstd !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
310 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/| (no-zstd !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
311 0010: 00 00 00 00 0a 69 00 23 67 65 6e 65 72 61 6c 64 |.....i.#generald| (zstd no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
312 0020: 65 6c 74 61 2c 72 65 76 6c 6f 67 76 31 2c 73 70 |elta,revlogv1,sp| (zstd no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
313 0030: 61 72 73 65 72 65 76 6c 6f 67 00 64 61 74 61 2f |arserevlog.data/| (zstd no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
314 0010: 00 00 00 00 0a 69 00 36 67 65 6e 65 72 61 6c 64 |.....i.6generald| (rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
315 0020: 65 6c 74 61 2c 70 65 72 73 69 73 74 65 6e 74 2d |elta,persistent-| (rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
316 0030: 6e 6f 64 65 6d 61 70 2c 72 65 76 6c 6f 67 76 31 |nodemap,revlogv1| (rust !) |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
317 |
27885
2370c66110cb
commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27739
diff
changeset
|
318 $ hg debugbundle --spec packed.hg |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
319 none-packed1;requirements%3Dgeneraldelta%2Crevlogv1%2Csparserevlog (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
320 none-packed1;requirements%3Dgeneraldelta%2Cpersistent-nodemap%2Crevlogv1%2Csparserevlog (rust !) |
27885
2370c66110cb
commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27739
diff
changeset
|
321 |
30013
1659549870e1
tests: actually test non-generaldelta variant for stream clones
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29919
diff
changeset
|
322 generaldelta requirement is not listed in stream clone bundles unless used |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
323 |
30013
1659549870e1
tests: actually test non-generaldelta variant for stream clones
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29919
diff
changeset
|
324 $ hg --config format.usegeneraldelta=false init testnongd |
1659549870e1
tests: actually test non-generaldelta variant for stream clones
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29919
diff
changeset
|
325 $ cd testnongd |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
326 $ touch foo |
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
327 $ hg -q commit -A -m initial |
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
328 $ cd .. |
30013
1659549870e1
tests: actually test non-generaldelta variant for stream clones
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29919
diff
changeset
|
329 $ hg -R testnongd debugcreatestreamclonebundle packednongd.hg |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
330 writing 301 bytes for 3 files |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
331 bundle requirements: revlogv1 (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
332 bundle requirements: persistent-nodemap, revlogv1 (rust !) |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
333 |
30013
1659549870e1
tests: actually test non-generaldelta variant for stream clones
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29919
diff
changeset
|
334 $ f -B 64 --size --sha1 --hexdump packednongd.hg |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
335 packednongd.hg: size=383, sha1=1d9c230238edd5d38907100b729ba72b1831fe6f (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
336 packednongd.hg: size=402, sha1=d3cc1417f0e8142cf9340aaaa520b660ad3ec3ea (rust !) |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
337 0000: 48 47 53 31 55 4e 00 00 00 00 00 00 00 03 00 00 |HGS1UN..........| |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
338 0010: 00 00 00 00 01 2d 00 09 72 65 76 6c 6f 67 76 31 |.....-..revlogv1| (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
339 0020: 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 34 0a 00 |.data/foo.i.64..| (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
340 0030: 01 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
341 0010: 00 00 00 00 01 2d 00 1c 70 65 72 73 69 73 74 65 |.....-..persiste| (rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
342 0020: 6e 74 2d 6e 6f 64 65 6d 61 70 2c 72 65 76 6c 6f |nt-nodemap,revlo| (rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
343 0030: 67 76 31 00 64 61 74 61 2f 66 6f 6f 2e 69 00 36 |gv1.data/foo.i.6| (rust !) |
26757
43708f92f471
commands: support creating stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26420
diff
changeset
|
344 |
30013
1659549870e1
tests: actually test non-generaldelta variant for stream clones
Gregory Szorc <gregory.szorc@gmail.com>
parents:
29919
diff
changeset
|
345 $ hg debugbundle --spec packednongd.hg |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
346 none-packed1;requirements%3Drevlogv1 (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
347 none-packed1;requirements%3Dpersistent-nodemap%2Crevlogv1 (rust !) |
27885
2370c66110cb
commands: teach debugbundle to print bundle specification
Gregory Szorc <gregory.szorc@gmail.com>
parents:
27739
diff
changeset
|
348 |
32745
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
349 Warning emitted when packed bundles contain secret changesets |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
350 |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
351 $ hg init testsecret |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
352 $ cd testsecret |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
353 $ touch foo |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
354 $ hg -q commit -A -m initial |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
355 $ hg phase --force --secret -r . |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
356 $ cd .. |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
357 |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
358 $ hg -R testsecret debugcreatestreamclonebundle packedsecret.hg |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
359 (warning: stream clone bundle will contain secret revisions) |
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
360 writing 301 bytes for 3 files |
46884
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
361 bundle requirements: generaldelta, revlogv1, sparserevlog (no-rust !) |
cc3ad5c3af3b
persistent-nodemap: enable the feature by default when using Rust
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46874
diff
changeset
|
362 bundle requirements: generaldelta, persistent-nodemap, revlogv1, sparserevlog (rust !) |
32745
23734c0e361f
debugcommands: issue warning when repo has secret changesets (issue5589)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
31851
diff
changeset
|
363 |
26758
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
364 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
|
365 |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
366 $ hg init packed |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
367 $ hg -R packed unbundle packed.hg |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
368 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
|
369 (use "hg debugapplystreamclonebundle") |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
41929
diff
changeset
|
370 [10] |
26758
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
371 |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
372 packed1 can be consumed from debug command |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
373 |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
374 (this also confirms that streamclone-ed changes are visible via |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
375 @filecache properties to in-process procedures before closing |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
376 transaction) |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
377 |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
378 $ cat > $TESTTMP/showtip.py <<EOF |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
379 > from __future__ import absolute_import |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
380 > |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
381 > def showtip(ui, repo, hooktype, **kwargs): |
38596
1fad808f2a6b
py3: byte-stringify literals in hook script in test-bundle.t
Yuya Nishihara <yuya@tcha.org>
parents:
37842
diff
changeset
|
382 > ui.warn(b'%s: %s\n' % (hooktype, repo[b'tip'].hex()[:12])) |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
383 > |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
384 > def reposetup(ui, repo): |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
385 > # this confirms (and ensures) that (empty) 00changelog.i |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
386 > # before streamclone is already cached as repo.changelog |
38596
1fad808f2a6b
py3: byte-stringify literals in hook script in test-bundle.t
Yuya Nishihara <yuya@tcha.org>
parents:
37842
diff
changeset
|
387 > ui.setconfig(b'hooks', b'pretxnopen.showtip', showtip) |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
388 > |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
389 > # this confirms that streamclone-ed changes are visible to |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
390 > # in-process procedures before closing transaction |
38596
1fad808f2a6b
py3: byte-stringify literals in hook script in test-bundle.t
Yuya Nishihara <yuya@tcha.org>
parents:
37842
diff
changeset
|
391 > ui.setconfig(b'hooks', b'pretxnclose.showtip', showtip) |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
392 > |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
393 > # this confirms that streamclone-ed changes are still visible |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
394 > # after closing transaction |
38596
1fad808f2a6b
py3: byte-stringify literals in hook script in test-bundle.t
Yuya Nishihara <yuya@tcha.org>
parents:
37842
diff
changeset
|
395 > ui.setconfig(b'hooks', b'txnclose.showtip', showtip) |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
396 > EOF |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
397 $ cat >> $HGRCPATH <<EOF |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
398 > [extensions] |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
399 > showtip = $TESTTMP/showtip.py |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
400 > EOF |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
401 |
26758
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
402 $ 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
|
403 6 files to transfer, 2.60 KB of data |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
404 pretxnopen: 000000000000 |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
405 pretxnclose: aa35859c02ea |
47868
8ae828fd008b
clone: automatically glob stream clone output in test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
47155
diff
changeset
|
406 transferred 2.60 KB in * seconds (* */sec) (glob) |
29919
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
407 txnclose: aa35859c02ea |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
408 |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
409 (for safety, confirm visibility of streamclone-ed changes by another |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
410 process, too) |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
411 |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
412 $ hg -R packed tip -T "{node|short}\n" |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
413 aa35859c02ea |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
414 |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
415 $ cat >> $HGRCPATH <<EOF |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
416 > [extensions] |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
417 > showtip = ! |
519a02267f90
streamclone: clear caches after writing changes into files for visibility
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
29593
diff
changeset
|
418 > EOF |
26758
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
419 |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
420 Does not work on non-empty repo |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
421 |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
422 $ hg -R packed debugapplystreamclonebundle packed.hg |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
423 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
|
424 [255] |
bde7ef23340d
commands: support consuming stream clone bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26757
diff
changeset
|
425 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
426 #endif |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
427 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
428 Create partial clones |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
429 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
430 $ rm -r empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
431 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
432 $ hg clone -r 3 test partial |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
433 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
434 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
435 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
436 added 4 changesets with 4 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32745
diff
changeset
|
437 new changesets f9ee2f85a263:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
438 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
439 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
|
440 $ hg clone partial partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
441 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
442 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
|
443 $ cd partial |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
444 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
445 #if repobundlerepo |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
446 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
447 Log -R full.hg in partial |
2274
89b15372df18
tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
448 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
449 $ hg -R bundle://../full.hg log -T phases |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
450 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
451 tag: tip |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
452 phase: draft |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
453 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
454 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
455 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
456 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
457 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
458 changeset: 7:a6a34bfa0076 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
459 phase: draft |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
460 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
461 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
462 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
463 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
464 changeset: 6:7373c1169842 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
465 phase: draft |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
466 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
467 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
468 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
469 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
470 changeset: 5:1bb50a9436a7 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
471 phase: draft |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
472 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
473 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
474 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
475 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
476 changeset: 4:095197eb4973 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
477 phase: draft |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
478 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
479 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
480 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
481 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
482 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
483 changeset: 3:eebf5a27f8ca |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
484 phase: public |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
485 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
486 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
487 summary: 0.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
488 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
489 changeset: 2:e38ba6f5b7e0 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
490 phase: public |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
491 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
492 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
493 summary: 0.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
494 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
495 changeset: 1:34c2bf6b0626 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
496 phase: public |
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: 0.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
500 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
501 changeset: 0:f9ee2f85a263 |
23632
e7fcf58acd71
bundlerepo: retract phase boundary
Eric Sumner <ericsumner@fb.com>
parents:
22960
diff
changeset
|
502 phase: public |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
503 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
504 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
505 summary: 0.0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
506 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
507 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
508 Incoming full.hg in partial |
4042
f6f65a8d8ed3
add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
509 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
510 $ hg incoming bundle://../full.hg |
13818
bf6156bab41b
url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org>
parents:
13783
diff
changeset
|
511 comparing with bundle:../full.hg |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
512 searching for changes |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
513 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
514 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
515 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
516 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
517 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
518 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
519 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
520 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
521 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
522 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
523 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
524 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
525 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
526 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
527 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
528 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
529 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
530 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
531 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
532 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
533 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
534 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
535 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
536 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
537 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
538 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
539 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
540 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
541 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
542 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
|
543 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
544 $ hg -R bundle://../full.hg outgoing ../partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
545 comparing with ../partial2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
546 searching for changes |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
547 changeset: 4:095197eb4973 |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
548 parent: 0:f9ee2f85a263 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
549 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
550 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
551 summary: 1.1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
552 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
553 changeset: 5:1bb50a9436a7 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
554 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
555 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
556 summary: 1.2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
557 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
558 changeset: 6:7373c1169842 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
559 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
560 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
561 summary: 1.3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
562 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
563 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
564 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
565 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
566 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
567 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
568 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
569 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
570 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
571 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
572 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
573 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
574 |
4699
a6b62584d0b2
unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
4287
diff
changeset
|
575 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
576 Outgoing -R does-not-exist.hg vs partial2 in partial |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
577 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
578 $ 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
|
579 abort: *../does-not-exist.hg* (glob) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
580 [255] |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
581 |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
582 #endif |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
583 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
584 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
585 |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
586 hide outer repo |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
587 $ hg init |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16982
diff
changeset
|
588 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
589 Direct clone from bundle (all-history) |
4042
f6f65a8d8ed3
add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3988
diff
changeset
|
590 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
591 #if repobundlerepo |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
592 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
593 $ hg clone full.hg full-clone |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
594 requesting all changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
595 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
596 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
597 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
598 added 9 changesets with 7 changes to 4 files (+1 heads) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
599 new changesets f9ee2f85a263:aa35859c02ea (9 drafts) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
600 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
601 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
|
602 $ hg -R full-clone heads |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
603 changeset: 8:aa35859c02ea |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
604 tag: tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
605 parent: 3:eebf5a27f8ca |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
606 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
607 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
608 summary: 0.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
609 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
610 changeset: 7:a6a34bfa0076 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
611 user: test |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
612 date: Thu Jan 01 00:00:00 1970 +0000 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
613 summary: 1.3m |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
614 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
615 $ rm -r full-clone |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
616 |
13053
2649be11ab0b
util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12847
diff
changeset
|
617 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
|
618 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
|
619 |
2649be11ab0b
util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12847
diff
changeset
|
620 $ 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
|
621 abort: empty destination path is not valid |
45847
d68618954ade
errors: use InputError for some errors on `hg clone`
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
622 [10] |
13053
2649be11ab0b
util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12847
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/216 |
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 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
|
627 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
628 $ rm -r empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
629 $ hg init empty |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
630 $ hg -R test bundle --base null -r 0 ../0.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
631 1 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
632 $ hg -R test bundle --base 0 -r 1 ../1.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
633 1 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
634 $ hg -R empty unbundle -u ../0.hg ../1.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
635 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
636 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
637 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
638 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
639 new changesets f9ee2f85a263 (1 drafts) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
640 adding changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
641 adding manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
642 adding file changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
643 added 1 changesets with 1 changes to 1 files |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
39239
diff
changeset
|
644 new changesets 34c2bf6b0626 (1 drafts) |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
645 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
|
646 |
17913
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
647 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
|
648 $ 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
|
649 4 changesets found |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
650 $ cd test |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
651 $ 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
|
652 changeset: 0:f9ee2f85a263 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
653 user: test |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
654 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
|
655 summary: 0.0 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
656 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
657 changeset: 1:34c2bf6b0626 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
658 user: test |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
659 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
|
660 summary: 0.1 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
661 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
662 changeset: 2:e38ba6f5b7e0 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
663 user: test |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
664 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
|
665 summary: 0.2 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
666 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
667 changeset: 3:eebf5a27f8ca |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
668 user: test |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
669 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
|
670 summary: 0.3 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
671 |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
672 $ cd .. |
03e552aaae67
bundle: add revset expression to show bundle contents (issue3487)
Tomasz Kleczek <tkleczek@fb.com>
parents:
17159
diff
changeset
|
673 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
674 #endif |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
675 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
676 test for 540d1059c802 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
677 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
678 $ hg init orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
679 $ cd orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
680 $ echo foo > foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
681 $ hg add foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
682 $ hg ci -m 'add foo' |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
683 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
684 $ hg clone . ../copy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
685 updating to branch default |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
686 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
|
687 $ hg tag foo |
7141
8d1bdaf842de
issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6316
diff
changeset
|
688 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
689 $ cd ../copy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
690 $ echo >> foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
691 $ hg ci -m 'change foo' |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
692 $ hg bundle ../bundle.hg ../orig |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
693 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
694 1 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
695 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
696 $ cd .. |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
697 |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
698 #if repobundlerepo |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
699 $ cd orig |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
700 $ hg incoming ../bundle.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
701 comparing with ../bundle.hg |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
702 searching for changes |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
703 changeset: 2:ed1b79f46b9a |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
704 tag: tip |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
705 parent: 0:bbd179dfa0a7 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
706 user: test |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
707 date: Thu Jan 01 00:00:00 1970 +0000 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
708 summary: change foo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
709 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
710 $ cd .. |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
711 |
13826
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
712 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
|
713 |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
714 $ 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
|
715 $ cd orig |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
716 $ 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
|
717 comparing with ../test |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45847
diff
changeset
|
718 abort: unknown revision 'bundle.hg' |
13826
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
719 [255] |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
720 |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
721 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
|
722 |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
723 $ hg incoming ../test%23bundle.hg |
45906
95c4cca641f6
errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents:
45847
diff
changeset
|
724 abort: repository ../test%23bundle.hg not found |
13826
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
725 [255] |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
726 $ cd .. |
e574207e3bcd
url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents:
13818
diff
changeset
|
727 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
728 #endif |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
729 |
18701
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
730 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
|
731 |
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
732 $ 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
|
733 $ cd test |
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
734 |
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
735 $ 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
|
736 $ 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
|
737 $ 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
|
738 9:b4f5acb1ee27 |
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
739 $ hg -q bundle --branch foo foo.hg ../test-clone |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
740 #if repobundlerepo |
18701
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
741 $ 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
|
742 9:b4f5acb1ee27 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
743 #endif |
18701
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
744 |
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
745 $ cd .. |
61c8327ced50
bundle: treat branches created newly on the local correctly (issue3828)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17913
diff
changeset
|
746 |
26420
2fc86d92c4a9
urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents:
25478
diff
changeset
|
747 test for https://bz.mercurial-scm.org/1144 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
748 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
749 test that verify bundle does not traceback |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
750 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20576
diff
changeset
|
751 partial history bundle, fails w/ unknown parent |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
752 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
753 $ hg -R bundle.hg verify |
47155
96ee8ca99f5a
revlog: use revlog.display_id in LookupError
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
46884
diff
changeset
|
754 abort: 00changelog@bbd179dfa0a71671c253b3ae0aa1513b60d199fa: unknown parent |
46116
17a695357270
errors: use detailed exit code 50 for StorageError
Martin von Zweigbergk <martinvonz@google.com>
parents:
45906
diff
changeset
|
755 [50] |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
756 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
757 full history bundle, refuses to verify non-local repo |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
758 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
759 #if repobundlerepo |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
760 $ hg -R all.hg verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
761 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
|
762 [255] |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
763 #endif |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
764 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
765 but, regular verify must continue to work |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
766 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
767 $ hg -R orig verify |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
768 checking changesets |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
769 checking manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
770 crosschecking files in changesets and manifests |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
771 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
772 checked 2 changesets with 2 changes to 2 files |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
773 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
774 #if repobundlerepo |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
775 diff against bundle |
7141
8d1bdaf842de
issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6316
diff
changeset
|
776 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
777 $ hg init b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
778 $ cd b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
779 $ hg -R ../all.hg diff -r tip |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
780 diff -r aa35859c02ea anotherfile |
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11870
diff
changeset
|
781 --- 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
|
782 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
783 @@ -1,4 +0,0 @@ |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
784 -0 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
785 -1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
786 -2 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
787 -3 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
788 $ cd .. |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
789 #endif |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
790 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
791 bundle single branch |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
792 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
793 $ hg init branchy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
794 $ cd branchy |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
795 $ echo a >a |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
796 $ echo x >x |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
797 $ hg ci -Ama |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
798 adding a |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
799 adding x |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
800 $ echo c >c |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
801 $ echo xx >x |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
802 $ hg ci -Amc |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
803 adding c |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
804 $ echo c1 >c1 |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
805 $ hg ci -Amc1 |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
806 adding c1 |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
807 $ hg up 0 |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
808 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
|
809 $ echo b >b |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
810 $ hg ci -Amb |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
811 adding b |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
812 created new head |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
813 $ echo b1 >b1 |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
814 $ echo xx >x |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
815 $ hg ci -Amb1 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
816 adding b1 |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
817 $ hg clone -q -r2 . part |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
818 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
819 == bundling via incoming |
7141
8d1bdaf842de
issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents:
6316
diff
changeset
|
820 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
821 $ hg in -R part --bundle incoming.hg --template "{node}\n" . |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
822 comparing with . |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
823 searching for changes |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
824 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
825 057f4db07f61970e1c11e83be79e9d08adc4dc31 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
826 |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
827 == bundling |
7853
af062a9fea9b
bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents:
7141
diff
changeset
|
828 |
25125
bd625cd4e5e7
progress: get the extremely verbose output out of default debug
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24740
diff
changeset
|
829 $ 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
|
830 query 1; heads |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
831 searching for changes |
14164
cb98fed52495
discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14073
diff
changeset
|
832 all remote heads known locally |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
833 2 changesets found |
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
834 list of changesets: |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
835 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
836 057f4db07f61970e1c11e83be79e9d08adc4dc31 |
36965
b89a7ef29013
bundle: include advisory rev branch cache part in bundle2 bundle
Boris Feld <boris.feld@octobus.net>
parents:
35393
diff
changeset
|
837 bundle2-output-bundle: "HG20", (1 params) 2 parts total |
29593
953839de96ab
bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28961
diff
changeset
|
838 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
39239
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
839 changesets: 1/2 chunks (50.00%) |
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
840 changesets: 2/2 chunks (100.00%) |
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
841 manifests: 1/2 chunks (50.00%) |
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
842 manifests: 2/2 chunks (100.00%) |
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
843 files: b 1/3 files (33.33%) |
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
844 files: b1 2/3 files (66.67%) |
0617a700ef7b
changegroup: change topics during generation
Gregory Szorc <gregory.szorc@gmail.com>
parents:
38596
diff
changeset
|
845 files: x 3/3 files (100.00%) |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37426
diff
changeset
|
846 bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
847 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
848 #if repobundlerepo |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
849 == Test for issue3441 |
11870
33eb803e9343
tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents:
9820
diff
changeset
|
850 |
16736
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
851 $ hg clone -q -r0 . part2 |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
852 $ hg -q -R part2 pull bundle.hg |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
853 $ hg -R part2 verify |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
854 checking changesets |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
855 checking manifests |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
856 crosschecking files in changesets and manifests |
025b3b763ba9
bundle: make bundles more portable (isue3441)
Sune Foldager <cryo@cyanite.org>
parents:
16107
diff
changeset
|
857 checking files |
39489
f1186c292d03
verify: make output less confusing (issue5924)
Meirambek Omyrzak <meirambek77@gmail.com>
parents:
39480
diff
changeset
|
858 checked 3 changesets with 5 changes to 4 files |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
859 #endif |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16903
diff
changeset
|
860 |
27911
645e78845383
bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents:
27885
diff
changeset
|
861 == Test bundling no commits |
645e78845383
bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents:
27885
diff
changeset
|
862 |
645e78845383
bundle: exit early when there are no commits to bundle
Durham Goode <durham@fb.com>
parents:
27885
diff
changeset
|
863 $ 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
|
864 abort: no commits to bundle |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
41929
diff
changeset
|
865 [10] |
28714
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
866 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
867 $ cd .. |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
868 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
869 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
|
870 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
|
871 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
|
872 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
873 $ 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
|
874 $ cd update2bundled |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
875 $ 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
|
876 > [extensions] |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
877 > strip = |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
878 > EOF |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
879 $ 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
|
880 $ 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
|
881 adding a |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
882 $ 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
|
883 $ 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
|
884 adding b |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
885 $ 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
|
886 $ 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
|
887 adding c |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
888 $ 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
|
889 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
|
890 $ 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
|
891 $ 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
|
892 adding d |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
893 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
|
894 $ 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
|
895 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
|
896 $ 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
|
897 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
|
898 | tag: tip |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
899 | 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
|
900 | user: test |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
901 | 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
|
902 | summary: 3 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
903 | |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
904 | @ 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
|
905 |/ user: test |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
906 | 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
|
907 | summary: 2 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
908 | |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
909 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
|
910 | user: test |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
911 | 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
|
912 | summary: 1 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
913 | |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
914 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
|
915 user: test |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
916 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
|
917 summary: 0 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
918 |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
919 |
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
920 #if repobundlerepo |
28714
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
921 $ 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
|
922 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
|
923 $ hg strip -r 3 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
924 saved backup bundle to $TESTTMP/update2bundled/.hg/strip-backup/8bd3e1f196af-017e56d8-backup.hg |
28714
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
925 $ 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
|
926 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
|
927 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
|
928 (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
|
929 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
930 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
|
931 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
|
932 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
933 $ 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
|
934 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
|
935 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
|
936 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
937 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
|
938 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
|
939 |
dac81729fea4
bundle: warn when update to revision existing only in a bundle (issue5004)
liscju <piotr.listkiewicz@gmail.com>
parents:
27911
diff
changeset
|
940 $ 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
|
941 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
37426
09907cd7a17a
tests: conditionalize test-bundle.t
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
942 #endif |
40432
968dd7e02ac5
changegroup: allow to force delta to be against p1
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
943 |
968dd7e02ac5
changegroup: allow to force delta to be against p1
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
944 Test the option that create slim bundle |
968dd7e02ac5
changegroup: allow to force delta to be against p1
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
945 |
968dd7e02ac5
changegroup: allow to force delta to be against p1
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
946 $ hg bundle -a --config devel.bundle.delta=p1 ./slim.hg |
968dd7e02ac5
changegroup: allow to force delta to be against p1
Boris Feld <boris.feld@octobus.net>
parents:
39489
diff
changeset
|
947 3 changesets found |
40433
808b762679cd
changegroup: add a option to create bundle with full snapshot only
Boris Feld <boris.feld@octobus.net>
parents:
40432
diff
changeset
|
948 |
808b762679cd
changegroup: add a option to create bundle with full snapshot only
Boris Feld <boris.feld@octobus.net>
parents:
40432
diff
changeset
|
949 Test the option that create and no-delta's bundle |
808b762679cd
changegroup: add a option to create bundle with full snapshot only
Boris Feld <boris.feld@octobus.net>
parents:
40432
diff
changeset
|
950 $ hg bundle -a --config devel.bundle.delta=full ./full.hg |
808b762679cd
changegroup: add a option to create bundle with full snapshot only
Boris Feld <boris.feld@octobus.net>
parents:
40432
diff
changeset
|
951 3 changesets found |