annotate tests/test-bundle.t @ 15182:de496752d936

merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 30 Sep 2011 15:11:19 -0500
parents 7c26ce9edbd2
children bb9ad375b51c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
1 Setting up test
2274
89b15372df18 tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
2
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
3 $ hg init test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
4 $ cd test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
5 $ echo 0 > afile
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
6 $ hg add afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
7 $ hg commit -m "0.0"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
8 $ echo 1 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
9 $ hg commit -m "0.1"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
10 $ echo 2 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
11 $ hg commit -m "0.2"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
12 $ echo 3 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
13 $ hg commit -m "0.3"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
14 $ hg update -C 0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
16 $ echo 1 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
17 $ hg commit -m "1.1"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
18 created new head
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
19 $ echo 2 >> afile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
20 $ hg commit -m "1.2"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
21 $ echo "a line" > fred
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
22 $ echo 3 >> afile
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
23 $ hg add fred
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
24 $ hg commit -m "1.3"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
25 $ hg mv afile adifferentfile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
26 $ hg commit -m "1.3m"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
27 $ hg update -C 3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
28 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
29 $ hg mv afile anotherfile
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
30 $ hg commit -m "0.3m"
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
31 $ hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
32 checking changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
33 checking manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
34 crosschecking files in changesets and manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
35 checking files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
36 4 files, 9 changesets, 7 total revisions
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
37 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
38 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
39
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
40 Bundle --all
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
41
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
42 $ hg -R test bundle --all all.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
43 9 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
44
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
45 Bundle test to full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
46
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
47 $ hg -R test bundle full.hg empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
48 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
49 9 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
50
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
51 Unbundle full.hg in test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
52
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
53 $ hg -R test unbundle full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
54 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
55 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
56 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
57 added 0 changesets with 0 changes to 4 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
58 (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
59
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
60 Verify empty
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 empty heads
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
63 [1]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
64 $ hg -R empty verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
65 checking changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
66 checking manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
67 crosschecking files in changesets and manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
68 checking files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
69 0 files, 0 changesets, 0 total revisions
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
70
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
71 Pull full.hg into test (using --cwd)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
72
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
73 $ hg --cwd test pull ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
74 pulling from ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
75 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
76 no changes found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
77
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
78 Pull full.hg into empty (using --cwd)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
79
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
80 $ hg --cwd empty pull ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
81 pulling from ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
82 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
83 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
84 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
85 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
86 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
87 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
88
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
89 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
90
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
91 $ 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
92 repository tip rolled back to revision -1 (undo pull)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
93
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
94 Pull full.hg into empty again (using --cwd)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
95
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
96 $ hg --cwd empty pull ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
97 pulling from ../full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
98 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
99 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
100 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
101 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
102 added 9 changesets with 7 changes to 4 files (+1 heads)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
103 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
104
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
105 Pull full.hg into test (using -R)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
106
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
107 $ hg -R test pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
108 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
109 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
110 no changes found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
111
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
112 Pull full.hg into empty (using -R)
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 $ hg -R empty pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
115 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
116 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
117 no changes found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
118
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
119 Rollback empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
120
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
121 $ 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
122 repository tip rolled back to revision -1 (undo pull)
7853
af062a9fea9b bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 7141
diff changeset
123
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
124 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
125
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
126 $ hg -R empty pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
127 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
128 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
129 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
130 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
131 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
132 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
133 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
134
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
135 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
136
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
137 $ rm -r empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
138 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
139 $ cd empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
140 $ hg -R bundle://../full.hg log
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
141 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
142 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
143 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
144 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
145 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
146 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
147
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
148 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
149 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
150 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
151 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
152
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
153 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
154 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
155 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
156 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
157
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
158 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
159 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
160 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
161 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
162
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
163 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
164 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
165 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
166 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
167 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
168
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
169 changeset: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
170 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
171 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
172 summary: 0.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
173
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
174 changeset: 2:e38ba6f5b7e0
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
175 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
176 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
177 summary: 0.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
178
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
179 changeset: 1:34c2bf6b0626
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
180 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
181 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
182 summary: 0.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
183
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
184 changeset: 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: 0.0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
188
13382
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
189 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
190
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
191 $ ls .hg
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
192 00changelog.i
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
193 cache
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
194 requires
d747774ca9da Make sure bundlerepo doesn't leak temp files (issue2491)
Adrian Buehlmann <adrian@cadifra.com>
parents: 13116
diff changeset
195 store
5664
da72b4d24797 Fix income/pull with bundle and -R (issue 820).
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 5663
diff changeset
196
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
197 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
198
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
199 $ echo '[hooks]' >> .hg/hgrc
13405
682edefe7dbb tests: use printenv.py where it is - don't copy it around
Mads Kiilerich <mads@kiilerich.com>
parents: 13382
diff changeset
200 $ echo 'changegroup = python "$TESTDIR"/printenv.py changegroup' >> .hg/hgrc
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
201
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
202 doesn't work (yet ?)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
203
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
204 hg -R bundle://../full.hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
205
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
206 $ hg pull bundle://../full.hg
13818
bf6156bab41b url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org>
parents: 13783
diff changeset
207 pulling from bundle:../full.hg
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
208 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
209 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
210 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
211 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
212 added 9 changesets with 7 changes to 4 files (+1 heads)
13439
d724a69309e0 util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents: 13405
diff changeset
213 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
214 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
215
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
216 Rollback empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
217
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
218 $ hg rollback
13446
1e497df514e2 rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents: 13439
diff changeset
219 repository tip rolled back to revision -1 (undo pull)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
220 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
221
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
222 Log -R bundle:empty+full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
223
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
224 $ hg -R bundle:empty+full.hg log --template="{rev} "; echo ""
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
225 8 7 6 5 4 3 2 1 0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
226
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
227 Pull full.hg into empty again (using -R; with hook)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
228
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
229 $ hg -R empty pull full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
230 pulling from full.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
231 requesting all changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
232 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
233 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
234 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
235 added 9 changesets with 7 changes to 4 files (+1 heads)
13439
d724a69309e0 util: flush stdout before calling external processes
Mads Kiilerich <mads@kiilerich.com>
parents: 13405
diff changeset
236 changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
237 (run 'hg heads' to see heads, 'hg merge' to merge)
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
238
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
239 Create partial clones
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
240
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
241 $ rm -r empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
242 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
243 $ hg clone -r 3 test partial
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
244 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
245 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
246 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
247 added 4 changesets with 4 changes to 1 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
248 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
249 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
250 $ hg clone partial partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
251 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
252 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
253 $ cd partial
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
254
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
255 Log -R full.hg in partial
2274
89b15372df18 tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff changeset
256
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
257 $ hg -R bundle://../full.hg log
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
258 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
259 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
260 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
261 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
262 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
263 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
264
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
265 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
266 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
267 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
268 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
269
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
270 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
271 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
272 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
273 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
274
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
275 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
276 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
277 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
278 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
279
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
280 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
281 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
282 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
283 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
284 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
285
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
286 changeset: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
287 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
288 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
289 summary: 0.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
290
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
291 changeset: 2:e38ba6f5b7e0
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
292 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
293 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
294 summary: 0.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
295
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
296 changeset: 1:34c2bf6b0626
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
297 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
298 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
299 summary: 0.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
300
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
301 changeset: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
302 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
303 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
304 summary: 0.0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
305
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
306
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
307 Incoming full.hg in partial
4042
f6f65a8d8ed3 add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3988
diff changeset
308
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
309 $ hg incoming bundle://../full.hg
13818
bf6156bab41b url: use url.url in url.open()
Brodie Rao <brodie@bitheap.org>
parents: 13783
diff changeset
310 comparing with bundle:../full.hg
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
311 searching for changes
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
312 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
313 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
314 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
315 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
316 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
317
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
318 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
319 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
320 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
321 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
322
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
323 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
324 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
325 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
326 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
327
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
328 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
329 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
330 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
331 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
332
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
333 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
334 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
335 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
336 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
337 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
338 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
339
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
340
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
341 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
342
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
343 $ hg -R bundle://../full.hg outgoing ../partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
344 comparing with ../partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
345 searching for changes
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
346 changeset: 4:095197eb4973
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
347 parent: 0:f9ee2f85a263
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
348 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
349 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
350 summary: 1.1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
351
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
352 changeset: 5:1bb50a9436a7
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
353 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
354 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
355 summary: 1.2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
356
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
357 changeset: 6:7373c1169842
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
358 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
359 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
360 summary: 1.3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
361
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
362 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
363 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
364 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
365 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
366
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
367 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
368 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
369 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
370 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
371 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
372 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
373
4699
a6b62584d0b2 unbundle: accept multiple file arguments
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents: 4287
diff changeset
374
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
375 Outgoing -R does-not-exist.hg vs partial2 in partial
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
376
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
377 $ hg -R bundle://../does-not-exist.hg outgoing ../partial2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
378 abort: No such file or directory: ../does-not-exist.hg
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
379 [255]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
380 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
381
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
382 Direct clone from bundle (all-history)
4042
f6f65a8d8ed3 add test for 540d1059c802
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3988
diff changeset
383
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
384 $ hg clone full.hg full-clone
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
385 requesting all changes
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 9 changesets with 7 changes to 4 files (+1 heads)
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 -R full-clone heads
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
393 changeset: 8:aa35859c02ea
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
394 tag: tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
395 parent: 3:eebf5a27f8ca
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
396 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
397 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
398 summary: 0.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
399
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
400 changeset: 7:a6a34bfa0076
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
401 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
402 date: Thu Jan 01 00:00:00 1970 +0000
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
403 summary: 1.3m
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
404
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
405 $ rm -r full-clone
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
406
13053
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
407 When cloning from a non-copiable repository into '', do not
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
408 recurse infinitely (issue 2528)
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
409
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
410 $ hg clone full.hg ''
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
411 abort: No such file or directory
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
412 [255]
2649be11ab0b util: do not recurse in makedirs if name is '' (issue2528)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 12847
diff changeset
413
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
414 test for http://mercurial.selenic.com/bts/issue216
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
415
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
416 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
417
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
418 $ rm -r empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
419 $ hg init empty
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
420 $ hg -R test bundle --base null -r 0 ../0.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
421 1 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
422 $ hg -R test bundle --base 0 -r 1 ../1.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
423 1 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
424 $ hg -R empty unbundle -u ../0.hg ../1.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
425 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
426 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
427 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
428 added 1 changesets with 1 changes to 1 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
429 adding changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
430 adding manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
431 adding file changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
432 added 1 changesets with 1 changes to 1 files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
433 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
434
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
435 test for 540d1059c802
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
436
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
437 test for 540d1059c802
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
438
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
439 $ hg init orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
440 $ cd orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
441 $ echo foo > foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
442 $ hg add foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
443 $ hg ci -m 'add foo'
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
444
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
445 $ hg clone . ../copy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
446 updating to branch default
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
447 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
448 $ hg tag foo
7141
8d1bdaf842de issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6316
diff changeset
449
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
450 $ cd ../copy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
451 $ echo >> foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
452 $ hg ci -m 'change foo'
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
453 $ hg bundle ../bundle.hg ../orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
454 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
455 1 changesets found
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 $ cd ../orig
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
458 $ hg incoming ../bundle.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
459 comparing with ../bundle.hg
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
460 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
461 changeset: 2:ed1b79f46b9a
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
462 tag: tip
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
463 parent: 0:bbd179dfa0a7
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
464 user: test
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
465 date: Thu Jan 01 00:00:00 1970 +0000
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
466 summary: change foo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
467
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
468 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
469
13826
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
470 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
471
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
472 $ 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
473 $ cd orig
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
474 $ 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
475 comparing with ../test
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
476 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
477 [255]
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
478
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
479 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
480
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
481 $ 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
482 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
483 [255]
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
484 $ cd ..
e574207e3bcd url: refactor util.drop_scheme() and hg.localpath() into url.localpath()
Brodie Rao <brodie@bitheap.org>
parents: 13818
diff changeset
485
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
486 test for http://mercurial.selenic.com/bts/issue1144
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
487
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
488 test that verify bundle does not traceback
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
489
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
490 partial history bundle, fails w/ unkown parent
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 $ hg -R bundle.hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
493 abort: 00changelog.i@bbd179dfa0a7: unknown parent!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
494 [255]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
495
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
496 full history bundle, refuses to verify non-local repo
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
497
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
498 $ hg -R all.hg verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
499 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
500 [255]
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
501
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
502 but, regular verify must continue to work
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
503
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
504 $ hg -R orig verify
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
505 checking changesets
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
506 checking manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
507 crosschecking files in changesets and manifests
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
508 checking files
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
509 2 files, 2 changesets, 2 total revisions
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
510
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
511 diff against bundle
7141
8d1bdaf842de issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6316
diff changeset
512
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
513 $ hg init b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
514 $ cd b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
515 $ hg -R ../all.hg diff -r tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
516 diff -r aa35859c02ea anotherfile
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11870
diff changeset
517 --- 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
518 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
519 @@ -1,4 +0,0 @@
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
520 -0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
521 -1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
522 -2
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
523 -3
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
524 $ cd ..
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
525
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
526 bundle single branch
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 init branchy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
529 $ cd branchy
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
530 $ echo a >a
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
531 $ hg ci -Ama
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
532 adding a
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
533 $ echo b >b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
534 $ hg ci -Amb
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
535 adding b
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
536 $ echo b1 >b1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
537 $ hg ci -Amb1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
538 adding b1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
539 $ hg up 0
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
540 0 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
541 $ echo c >c
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
542 $ hg ci -Amc
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
543 adding c
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
544 created new head
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
545 $ echo c1 >c1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
546 $ hg ci -Amc1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
547 adding c1
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
548 $ hg clone -q .#tip part
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
549
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
550 == bundling via incoming
7141
8d1bdaf842de issue 1144: prevent traceback on verify of bundles
John Mulligan <phlogistonjohn@asynchrono.us>
parents: 6316
diff changeset
551
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
552 $ hg in -R part --bundle incoming.hg --template "{node}\n" .
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
553 comparing with .
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
554 searching for changes
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
555 d2ae7f538514cd87c17547b0de4cea71fe1af9fb
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
556 5ece8e77363e2b5269e27c66828b72da29e4341a
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
557
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
558 == bundling
7853
af062a9fea9b bundlerepo: reintroduce dirstate
Matt Mackall <mpm@selenic.com>
parents: 7141
diff changeset
559
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
560 $ hg bundle bundle.hg part --debug
14164
cb98fed52495 discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
561 query 1; heads
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
562 searching for changes
14164
cb98fed52495 discovery: add new set-based discovery
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 14073
diff changeset
563 all remote heads known locally
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
564 2 changesets found
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
565 list of changesets:
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
566 d2ae7f538514cd87c17547b0de4cea71fe1af9fb
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
567 5ece8e77363e2b5269e27c66828b72da29e4341a
14520
9d8d2fecb72e localrepo: add total to changeset progress in bundle/push
Sune Foldager <cryo@cyanite.org>
parents: 14164
diff changeset
568 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
569 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
570 bundling: 1/2 manifests (50.00%)
c36dad4f6e54 bundle progress: offer best-guess deterministic progress information
Augie Fackler <durin42@gmail.com>
parents: 13053
diff changeset
571 bundling: 2/2 manifests (100.00%)
14522
5ca61ef6ff00 localrepo: simplify file bundling code and fix progress bug
Sune Foldager <cryo@cyanite.org>
parents: 14520
diff changeset
572 bundling: b 1/2 files (50.00%)
5ca61ef6ff00 localrepo: simplify file bundling code and fix progress bug
Sune Foldager <cryo@cyanite.org>
parents: 14520
diff changeset
573 bundling: b1 2/2 files (100.00%)
11870
33eb803e9343 tests: unify test-bundle
Martin Geisler <mg@lazybytes.net>
parents: 9820
diff changeset
574