annotate tests/test-bundle.t @ 33611:a2b55ee62803 stable

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