Show More
@@ -1,600 +1,598 | |||||
1 | $ "$TESTDIR/hghave" system-sh || exit 80 |
|
|||
2 |
|
||||
3 | Setting up test |
|
1 | Setting up test | |
4 |
|
2 | |||
5 | $ hg init test |
|
3 | $ hg init test | |
6 | $ cd test |
|
4 | $ cd test | |
7 | $ echo 0 > afile |
|
5 | $ echo 0 > afile | |
8 | $ hg add afile |
|
6 | $ hg add afile | |
9 | $ hg commit -m "0.0" |
|
7 | $ hg commit -m "0.0" | |
10 | $ echo 1 >> afile |
|
8 | $ echo 1 >> afile | |
11 | $ hg commit -m "0.1" |
|
9 | $ hg commit -m "0.1" | |
12 | $ echo 2 >> afile |
|
10 | $ echo 2 >> afile | |
13 | $ hg commit -m "0.2" |
|
11 | $ hg commit -m "0.2" | |
14 | $ echo 3 >> afile |
|
12 | $ echo 3 >> afile | |
15 | $ hg commit -m "0.3" |
|
13 | $ hg commit -m "0.3" | |
16 | $ hg update -C 0 |
|
14 | $ hg update -C 0 | |
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | $ echo 1 >> afile |
|
16 | $ echo 1 >> afile | |
19 | $ hg commit -m "1.1" |
|
17 | $ hg commit -m "1.1" | |
20 | created new head |
|
18 | created new head | |
21 | $ echo 2 >> afile |
|
19 | $ echo 2 >> afile | |
22 | $ hg commit -m "1.2" |
|
20 | $ hg commit -m "1.2" | |
23 | $ echo "a line" > fred |
|
21 | $ echo "a line" > fred | |
24 | $ echo 3 >> afile |
|
22 | $ echo 3 >> afile | |
25 | $ hg add fred |
|
23 | $ hg add fred | |
26 | $ hg commit -m "1.3" |
|
24 | $ hg commit -m "1.3" | |
27 | $ hg mv afile adifferentfile |
|
25 | $ hg mv afile adifferentfile | |
28 | $ hg commit -m "1.3m" |
|
26 | $ hg commit -m "1.3m" | |
29 | $ hg update -C 3 |
|
27 | $ hg update -C 3 | |
30 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
28 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
31 | $ hg mv afile anotherfile |
|
29 | $ hg mv afile anotherfile | |
32 | $ hg commit -m "0.3m" |
|
30 | $ hg commit -m "0.3m" | |
33 | $ hg verify |
|
31 | $ hg verify | |
34 | checking changesets |
|
32 | checking changesets | |
35 | checking manifests |
|
33 | checking manifests | |
36 | crosschecking files in changesets and manifests |
|
34 | crosschecking files in changesets and manifests | |
37 | checking files |
|
35 | checking files | |
38 | 4 files, 9 changesets, 7 total revisions |
|
36 | 4 files, 9 changesets, 7 total revisions | |
39 | $ cd .. |
|
37 | $ cd .. | |
40 | $ hg init empty |
|
38 | $ hg init empty | |
41 |
|
39 | |||
42 | Bundle and phase |
|
40 | Bundle and phase | |
43 |
|
41 | |||
44 | $ hg -R test phase --force --secret 0 |
|
42 | $ hg -R test phase --force --secret 0 | |
45 | $ hg -R test bundle phase.hg empty |
|
43 | $ hg -R test bundle phase.hg empty | |
46 | searching for changes |
|
44 | searching for changes | |
47 | no changes found (ignored 9 secret changesets) |
|
45 | no changes found (ignored 9 secret changesets) | |
48 | [1] |
|
46 | [1] | |
49 | $ hg -R test phase --draft -r 'head()' |
|
47 | $ hg -R test phase --draft -r 'head()' | |
50 |
|
48 | |||
51 | Bundle --all |
|
49 | Bundle --all | |
52 |
|
50 | |||
53 | $ hg -R test bundle --all all.hg |
|
51 | $ hg -R test bundle --all all.hg | |
54 | 9 changesets found |
|
52 | 9 changesets found | |
55 |
|
53 | |||
56 | Bundle test to full.hg |
|
54 | Bundle test to full.hg | |
57 |
|
55 | |||
58 | $ hg -R test bundle full.hg empty |
|
56 | $ hg -R test bundle full.hg empty | |
59 | searching for changes |
|
57 | searching for changes | |
60 | 9 changesets found |
|
58 | 9 changesets found | |
61 |
|
59 | |||
62 | Unbundle full.hg in test |
|
60 | Unbundle full.hg in test | |
63 |
|
61 | |||
64 | $ hg -R test unbundle full.hg |
|
62 | $ hg -R test unbundle full.hg | |
65 | adding changesets |
|
63 | adding changesets | |
66 | adding manifests |
|
64 | adding manifests | |
67 | adding file changes |
|
65 | adding file changes | |
68 | added 0 changesets with 0 changes to 4 files |
|
66 | added 0 changesets with 0 changes to 4 files | |
69 | (run 'hg update' to get a working copy) |
|
67 | (run 'hg update' to get a working copy) | |
70 |
|
68 | |||
71 | Verify empty |
|
69 | Verify empty | |
72 |
|
70 | |||
73 | $ hg -R empty heads |
|
71 | $ hg -R empty heads | |
74 | [1] |
|
72 | [1] | |
75 | $ hg -R empty verify |
|
73 | $ hg -R empty verify | |
76 | checking changesets |
|
74 | checking changesets | |
77 | checking manifests |
|
75 | checking manifests | |
78 | crosschecking files in changesets and manifests |
|
76 | crosschecking files in changesets and manifests | |
79 | checking files |
|
77 | checking files | |
80 | 0 files, 0 changesets, 0 total revisions |
|
78 | 0 files, 0 changesets, 0 total revisions | |
81 |
|
79 | |||
82 | Pull full.hg into test (using --cwd) |
|
80 | Pull full.hg into test (using --cwd) | |
83 |
|
81 | |||
84 | $ hg --cwd test pull ../full.hg |
|
82 | $ hg --cwd test pull ../full.hg | |
85 | pulling from ../full.hg |
|
83 | pulling from ../full.hg | |
86 | searching for changes |
|
84 | searching for changes | |
87 | no changes found |
|
85 | no changes found | |
88 |
|
86 | |||
89 | Pull full.hg into empty (using --cwd) |
|
87 | Pull full.hg into empty (using --cwd) | |
90 |
|
88 | |||
91 | $ hg --cwd empty pull ../full.hg |
|
89 | $ hg --cwd empty pull ../full.hg | |
92 | pulling from ../full.hg |
|
90 | pulling from ../full.hg | |
93 | requesting all changes |
|
91 | requesting all changes | |
94 | adding changesets |
|
92 | adding changesets | |
95 | adding manifests |
|
93 | adding manifests | |
96 | adding file changes |
|
94 | adding file changes | |
97 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
95 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
98 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
96 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
99 |
|
97 | |||
100 | Rollback empty |
|
98 | Rollback empty | |
101 |
|
99 | |||
102 | $ hg -R empty rollback |
|
100 | $ hg -R empty rollback | |
103 | repository tip rolled back to revision -1 (undo pull) |
|
101 | repository tip rolled back to revision -1 (undo pull) | |
104 |
|
102 | |||
105 | Pull full.hg into empty again (using --cwd) |
|
103 | Pull full.hg into empty again (using --cwd) | |
106 |
|
104 | |||
107 | $ hg --cwd empty pull ../full.hg |
|
105 | $ hg --cwd empty pull ../full.hg | |
108 | pulling from ../full.hg |
|
106 | pulling from ../full.hg | |
109 | requesting all changes |
|
107 | requesting all changes | |
110 | adding changesets |
|
108 | adding changesets | |
111 | adding manifests |
|
109 | adding manifests | |
112 | adding file changes |
|
110 | adding file changes | |
113 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
111 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
114 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
112 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
115 |
|
113 | |||
116 | Pull full.hg into test (using -R) |
|
114 | Pull full.hg into test (using -R) | |
117 |
|
115 | |||
118 | $ hg -R test pull full.hg |
|
116 | $ hg -R test pull full.hg | |
119 | pulling from full.hg |
|
117 | pulling from full.hg | |
120 | searching for changes |
|
118 | searching for changes | |
121 | no changes found |
|
119 | no changes found | |
122 |
|
120 | |||
123 | Pull full.hg into empty (using -R) |
|
121 | Pull full.hg into empty (using -R) | |
124 |
|
122 | |||
125 | $ hg -R empty pull full.hg |
|
123 | $ hg -R empty pull full.hg | |
126 | pulling from full.hg |
|
124 | pulling from full.hg | |
127 | searching for changes |
|
125 | searching for changes | |
128 | no changes found |
|
126 | no changes found | |
129 |
|
127 | |||
130 | Rollback empty |
|
128 | Rollback empty | |
131 |
|
129 | |||
132 | $ hg -R empty rollback |
|
130 | $ hg -R empty rollback | |
133 | repository tip rolled back to revision -1 (undo pull) |
|
131 | repository tip rolled back to revision -1 (undo pull) | |
134 |
|
132 | |||
135 | Pull full.hg into empty again (using -R) |
|
133 | Pull full.hg into empty again (using -R) | |
136 |
|
134 | |||
137 | $ hg -R empty pull full.hg |
|
135 | $ hg -R empty pull full.hg | |
138 | pulling from full.hg |
|
136 | pulling from full.hg | |
139 | requesting all changes |
|
137 | requesting all changes | |
140 | adding changesets |
|
138 | adding changesets | |
141 | adding manifests |
|
139 | adding manifests | |
142 | adding file changes |
|
140 | adding file changes | |
143 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
141 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
144 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
142 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
145 |
|
143 | |||
146 | Log -R full.hg in fresh empty |
|
144 | Log -R full.hg in fresh empty | |
147 |
|
145 | |||
148 | $ rm -r empty |
|
146 | $ rm -r empty | |
149 | $ hg init empty |
|
147 | $ hg init empty | |
150 | $ cd empty |
|
148 | $ cd empty | |
151 | $ hg -R bundle://../full.hg log |
|
149 | $ hg -R bundle://../full.hg log | |
152 | changeset: 8:aa35859c02ea |
|
150 | changeset: 8:aa35859c02ea | |
153 | tag: tip |
|
151 | tag: tip | |
154 | parent: 3:eebf5a27f8ca |
|
152 | parent: 3:eebf5a27f8ca | |
155 | user: test |
|
153 | user: test | |
156 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
154 | date: Thu Jan 01 00:00:00 1970 +0000 | |
157 | summary: 0.3m |
|
155 | summary: 0.3m | |
158 |
|
156 | |||
159 | changeset: 7:a6a34bfa0076 |
|
157 | changeset: 7:a6a34bfa0076 | |
160 | user: test |
|
158 | user: test | |
161 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
159 | date: Thu Jan 01 00:00:00 1970 +0000 | |
162 | summary: 1.3m |
|
160 | summary: 1.3m | |
163 |
|
161 | |||
164 | changeset: 6:7373c1169842 |
|
162 | changeset: 6:7373c1169842 | |
165 | user: test |
|
163 | user: test | |
166 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
164 | date: Thu Jan 01 00:00:00 1970 +0000 | |
167 | summary: 1.3 |
|
165 | summary: 1.3 | |
168 |
|
166 | |||
169 | changeset: 5:1bb50a9436a7 |
|
167 | changeset: 5:1bb50a9436a7 | |
170 | user: test |
|
168 | user: test | |
171 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
169 | date: Thu Jan 01 00:00:00 1970 +0000 | |
172 | summary: 1.2 |
|
170 | summary: 1.2 | |
173 |
|
171 | |||
174 | changeset: 4:095197eb4973 |
|
172 | changeset: 4:095197eb4973 | |
175 | parent: 0:f9ee2f85a263 |
|
173 | parent: 0:f9ee2f85a263 | |
176 | user: test |
|
174 | user: test | |
177 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
175 | date: Thu Jan 01 00:00:00 1970 +0000 | |
178 | summary: 1.1 |
|
176 | summary: 1.1 | |
179 |
|
177 | |||
180 | changeset: 3:eebf5a27f8ca |
|
178 | changeset: 3:eebf5a27f8ca | |
181 | user: test |
|
179 | user: test | |
182 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
180 | date: Thu Jan 01 00:00:00 1970 +0000 | |
183 | summary: 0.3 |
|
181 | summary: 0.3 | |
184 |
|
182 | |||
185 | changeset: 2:e38ba6f5b7e0 |
|
183 | changeset: 2:e38ba6f5b7e0 | |
186 | user: test |
|
184 | user: test | |
187 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
185 | date: Thu Jan 01 00:00:00 1970 +0000 | |
188 | summary: 0.2 |
|
186 | summary: 0.2 | |
189 |
|
187 | |||
190 | changeset: 1:34c2bf6b0626 |
|
188 | changeset: 1:34c2bf6b0626 | |
191 | user: test |
|
189 | user: test | |
192 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
190 | date: Thu Jan 01 00:00:00 1970 +0000 | |
193 | summary: 0.1 |
|
191 | summary: 0.1 | |
194 |
|
192 | |||
195 | changeset: 0:f9ee2f85a263 |
|
193 | changeset: 0:f9ee2f85a263 | |
196 | user: test |
|
194 | user: test | |
197 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
195 | date: Thu Jan 01 00:00:00 1970 +0000 | |
198 | summary: 0.0 |
|
196 | summary: 0.0 | |
199 |
|
197 | |||
200 | Make sure bundlerepo doesn't leak tempfiles (issue2491) |
|
198 | Make sure bundlerepo doesn't leak tempfiles (issue2491) | |
201 |
|
199 | |||
202 | $ ls .hg |
|
200 | $ ls .hg | |
203 | 00changelog.i |
|
201 | 00changelog.i | |
204 | cache |
|
202 | cache | |
205 | requires |
|
203 | requires | |
206 | store |
|
204 | store | |
207 |
|
205 | |||
208 | Pull ../full.hg into empty (with hook) |
|
206 | Pull ../full.hg into empty (with hook) | |
209 |
|
207 | |||
210 |
$ echo |
|
208 | $ echo "[hooks]" >> .hg/hgrc | |
211 |
$ echo |
|
209 | $ echo "changegroup = python \"$TESTDIR\"/printenv.py changegroup" >> .hg/hgrc | |
212 |
|
210 | |||
213 | doesn't work (yet ?) |
|
211 | doesn't work (yet ?) | |
214 |
|
212 | |||
215 | hg -R bundle://../full.hg verify |
|
213 | hg -R bundle://../full.hg verify | |
216 |
|
214 | |||
217 | $ hg pull bundle://../full.hg |
|
215 | $ hg pull bundle://../full.hg | |
218 | pulling from bundle:../full.hg |
|
216 | pulling from bundle:../full.hg | |
219 | requesting all changes |
|
217 | requesting all changes | |
220 | adding changesets |
|
218 | adding changesets | |
221 | adding manifests |
|
219 | adding manifests | |
222 | adding file changes |
|
220 | adding file changes | |
223 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
221 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
224 | changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg |
|
222 | changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:../full.hg | |
225 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
223 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
226 |
|
224 | |||
227 | Rollback empty |
|
225 | Rollback empty | |
228 |
|
226 | |||
229 | $ hg rollback |
|
227 | $ hg rollback | |
230 | repository tip rolled back to revision -1 (undo pull) |
|
228 | repository tip rolled back to revision -1 (undo pull) | |
231 | $ cd .. |
|
229 | $ cd .. | |
232 |
|
230 | |||
233 | Log -R bundle:empty+full.hg |
|
231 | Log -R bundle:empty+full.hg | |
234 |
|
232 | |||
235 | $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" |
|
233 | $ hg -R bundle:empty+full.hg log --template="{rev} "; echo "" | |
236 | 8 7 6 5 4 3 2 1 0 |
|
234 | 8 7 6 5 4 3 2 1 0 | |
237 |
|
235 | |||
238 | Pull full.hg into empty again (using -R; with hook) |
|
236 | Pull full.hg into empty again (using -R; with hook) | |
239 |
|
237 | |||
240 | $ hg -R empty pull full.hg |
|
238 | $ hg -R empty pull full.hg | |
241 | pulling from full.hg |
|
239 | pulling from full.hg | |
242 | requesting all changes |
|
240 | requesting all changes | |
243 | adding changesets |
|
241 | adding changesets | |
244 | adding manifests |
|
242 | adding manifests | |
245 | adding file changes |
|
243 | adding file changes | |
246 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
244 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
247 | changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg |
|
245 | changegroup hook: HG_NODE=f9ee2f85a263049e9ae6d37a0e67e96194ffb735 HG_SOURCE=pull HG_URL=bundle:empty+full.hg | |
248 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
246 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
249 |
|
247 | |||
250 | Create partial clones |
|
248 | Create partial clones | |
251 |
|
249 | |||
252 | $ rm -r empty |
|
250 | $ rm -r empty | |
253 | $ hg init empty |
|
251 | $ hg init empty | |
254 | $ hg clone -r 3 test partial |
|
252 | $ hg clone -r 3 test partial | |
255 | adding changesets |
|
253 | adding changesets | |
256 | adding manifests |
|
254 | adding manifests | |
257 | adding file changes |
|
255 | adding file changes | |
258 | added 4 changesets with 4 changes to 1 files |
|
256 | added 4 changesets with 4 changes to 1 files | |
259 | updating to branch default |
|
257 | updating to branch default | |
260 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
258 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
261 | $ hg clone partial partial2 |
|
259 | $ hg clone partial partial2 | |
262 | updating to branch default |
|
260 | updating to branch default | |
263 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
261 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
264 | $ cd partial |
|
262 | $ cd partial | |
265 |
|
263 | |||
266 | Log -R full.hg in partial |
|
264 | Log -R full.hg in partial | |
267 |
|
265 | |||
268 | $ hg -R bundle://../full.hg log |
|
266 | $ hg -R bundle://../full.hg log | |
269 | changeset: 8:aa35859c02ea |
|
267 | changeset: 8:aa35859c02ea | |
270 | tag: tip |
|
268 | tag: tip | |
271 | parent: 3:eebf5a27f8ca |
|
269 | parent: 3:eebf5a27f8ca | |
272 | user: test |
|
270 | user: test | |
273 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
271 | date: Thu Jan 01 00:00:00 1970 +0000 | |
274 | summary: 0.3m |
|
272 | summary: 0.3m | |
275 |
|
273 | |||
276 | changeset: 7:a6a34bfa0076 |
|
274 | changeset: 7:a6a34bfa0076 | |
277 | user: test |
|
275 | user: test | |
278 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
276 | date: Thu Jan 01 00:00:00 1970 +0000 | |
279 | summary: 1.3m |
|
277 | summary: 1.3m | |
280 |
|
278 | |||
281 | changeset: 6:7373c1169842 |
|
279 | changeset: 6:7373c1169842 | |
282 | user: test |
|
280 | user: test | |
283 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
281 | date: Thu Jan 01 00:00:00 1970 +0000 | |
284 | summary: 1.3 |
|
282 | summary: 1.3 | |
285 |
|
283 | |||
286 | changeset: 5:1bb50a9436a7 |
|
284 | changeset: 5:1bb50a9436a7 | |
287 | user: test |
|
285 | user: test | |
288 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
286 | date: Thu Jan 01 00:00:00 1970 +0000 | |
289 | summary: 1.2 |
|
287 | summary: 1.2 | |
290 |
|
288 | |||
291 | changeset: 4:095197eb4973 |
|
289 | changeset: 4:095197eb4973 | |
292 | parent: 0:f9ee2f85a263 |
|
290 | parent: 0:f9ee2f85a263 | |
293 | user: test |
|
291 | user: test | |
294 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
292 | date: Thu Jan 01 00:00:00 1970 +0000 | |
295 | summary: 1.1 |
|
293 | summary: 1.1 | |
296 |
|
294 | |||
297 | changeset: 3:eebf5a27f8ca |
|
295 | changeset: 3:eebf5a27f8ca | |
298 | user: test |
|
296 | user: test | |
299 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
297 | date: Thu Jan 01 00:00:00 1970 +0000 | |
300 | summary: 0.3 |
|
298 | summary: 0.3 | |
301 |
|
299 | |||
302 | changeset: 2:e38ba6f5b7e0 |
|
300 | changeset: 2:e38ba6f5b7e0 | |
303 | user: test |
|
301 | user: test | |
304 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
302 | date: Thu Jan 01 00:00:00 1970 +0000 | |
305 | summary: 0.2 |
|
303 | summary: 0.2 | |
306 |
|
304 | |||
307 | changeset: 1:34c2bf6b0626 |
|
305 | changeset: 1:34c2bf6b0626 | |
308 | user: test |
|
306 | user: test | |
309 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
307 | date: Thu Jan 01 00:00:00 1970 +0000 | |
310 | summary: 0.1 |
|
308 | summary: 0.1 | |
311 |
|
309 | |||
312 | changeset: 0:f9ee2f85a263 |
|
310 | changeset: 0:f9ee2f85a263 | |
313 | user: test |
|
311 | user: test | |
314 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
312 | date: Thu Jan 01 00:00:00 1970 +0000 | |
315 | summary: 0.0 |
|
313 | summary: 0.0 | |
316 |
|
314 | |||
317 |
|
315 | |||
318 | Incoming full.hg in partial |
|
316 | Incoming full.hg in partial | |
319 |
|
317 | |||
320 | $ hg incoming bundle://../full.hg |
|
318 | $ hg incoming bundle://../full.hg | |
321 | comparing with bundle:../full.hg |
|
319 | comparing with bundle:../full.hg | |
322 | searching for changes |
|
320 | searching for changes | |
323 | changeset: 4:095197eb4973 |
|
321 | changeset: 4:095197eb4973 | |
324 | parent: 0:f9ee2f85a263 |
|
322 | parent: 0:f9ee2f85a263 | |
325 | user: test |
|
323 | user: test | |
326 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
324 | date: Thu Jan 01 00:00:00 1970 +0000 | |
327 | summary: 1.1 |
|
325 | summary: 1.1 | |
328 |
|
326 | |||
329 | changeset: 5:1bb50a9436a7 |
|
327 | changeset: 5:1bb50a9436a7 | |
330 | user: test |
|
328 | user: test | |
331 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
329 | date: Thu Jan 01 00:00:00 1970 +0000 | |
332 | summary: 1.2 |
|
330 | summary: 1.2 | |
333 |
|
331 | |||
334 | changeset: 6:7373c1169842 |
|
332 | changeset: 6:7373c1169842 | |
335 | user: test |
|
333 | user: test | |
336 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
334 | date: Thu Jan 01 00:00:00 1970 +0000 | |
337 | summary: 1.3 |
|
335 | summary: 1.3 | |
338 |
|
336 | |||
339 | changeset: 7:a6a34bfa0076 |
|
337 | changeset: 7:a6a34bfa0076 | |
340 | user: test |
|
338 | user: test | |
341 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
339 | date: Thu Jan 01 00:00:00 1970 +0000 | |
342 | summary: 1.3m |
|
340 | summary: 1.3m | |
343 |
|
341 | |||
344 | changeset: 8:aa35859c02ea |
|
342 | changeset: 8:aa35859c02ea | |
345 | tag: tip |
|
343 | tag: tip | |
346 | parent: 3:eebf5a27f8ca |
|
344 | parent: 3:eebf5a27f8ca | |
347 | user: test |
|
345 | user: test | |
348 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
346 | date: Thu Jan 01 00:00:00 1970 +0000 | |
349 | summary: 0.3m |
|
347 | summary: 0.3m | |
350 |
|
348 | |||
351 |
|
349 | |||
352 | Outgoing -R full.hg vs partial2 in partial |
|
350 | Outgoing -R full.hg vs partial2 in partial | |
353 |
|
351 | |||
354 | $ hg -R bundle://../full.hg outgoing ../partial2 |
|
352 | $ hg -R bundle://../full.hg outgoing ../partial2 | |
355 | comparing with ../partial2 |
|
353 | comparing with ../partial2 | |
356 | searching for changes |
|
354 | searching for changes | |
357 | changeset: 4:095197eb4973 |
|
355 | changeset: 4:095197eb4973 | |
358 | parent: 0:f9ee2f85a263 |
|
356 | parent: 0:f9ee2f85a263 | |
359 | user: test |
|
357 | user: test | |
360 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
358 | date: Thu Jan 01 00:00:00 1970 +0000 | |
361 | summary: 1.1 |
|
359 | summary: 1.1 | |
362 |
|
360 | |||
363 | changeset: 5:1bb50a9436a7 |
|
361 | changeset: 5:1bb50a9436a7 | |
364 | user: test |
|
362 | user: test | |
365 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
363 | date: Thu Jan 01 00:00:00 1970 +0000 | |
366 | summary: 1.2 |
|
364 | summary: 1.2 | |
367 |
|
365 | |||
368 | changeset: 6:7373c1169842 |
|
366 | changeset: 6:7373c1169842 | |
369 | user: test |
|
367 | user: test | |
370 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
368 | date: Thu Jan 01 00:00:00 1970 +0000 | |
371 | summary: 1.3 |
|
369 | summary: 1.3 | |
372 |
|
370 | |||
373 | changeset: 7:a6a34bfa0076 |
|
371 | changeset: 7:a6a34bfa0076 | |
374 | user: test |
|
372 | user: test | |
375 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
373 | date: Thu Jan 01 00:00:00 1970 +0000 | |
376 | summary: 1.3m |
|
374 | summary: 1.3m | |
377 |
|
375 | |||
378 | changeset: 8:aa35859c02ea |
|
376 | changeset: 8:aa35859c02ea | |
379 | tag: tip |
|
377 | tag: tip | |
380 | parent: 3:eebf5a27f8ca |
|
378 | parent: 3:eebf5a27f8ca | |
381 | user: test |
|
379 | user: test | |
382 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
380 | date: Thu Jan 01 00:00:00 1970 +0000 | |
383 | summary: 0.3m |
|
381 | summary: 0.3m | |
384 |
|
382 | |||
385 |
|
383 | |||
386 | Outgoing -R does-not-exist.hg vs partial2 in partial |
|
384 | Outgoing -R does-not-exist.hg vs partial2 in partial | |
387 |
|
385 | |||
388 | $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 |
|
386 | $ hg -R bundle://../does-not-exist.hg outgoing ../partial2 | |
389 |
abort: * |
|
387 | abort: *../does-not-exist.hg* (glob) | |
390 | [255] |
|
388 | [255] | |
391 | $ cd .. |
|
389 | $ cd .. | |
392 |
|
390 | |||
393 | Direct clone from bundle (all-history) |
|
391 | Direct clone from bundle (all-history) | |
394 |
|
392 | |||
395 | $ hg clone full.hg full-clone |
|
393 | $ hg clone full.hg full-clone | |
396 | requesting all changes |
|
394 | requesting all changes | |
397 | adding changesets |
|
395 | adding changesets | |
398 | adding manifests |
|
396 | adding manifests | |
399 | adding file changes |
|
397 | adding file changes | |
400 | added 9 changesets with 7 changes to 4 files (+1 heads) |
|
398 | added 9 changesets with 7 changes to 4 files (+1 heads) | |
401 | updating to branch default |
|
399 | updating to branch default | |
402 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
400 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
403 | $ hg -R full-clone heads |
|
401 | $ hg -R full-clone heads | |
404 | changeset: 8:aa35859c02ea |
|
402 | changeset: 8:aa35859c02ea | |
405 | tag: tip |
|
403 | tag: tip | |
406 | parent: 3:eebf5a27f8ca |
|
404 | parent: 3:eebf5a27f8ca | |
407 | user: test |
|
405 | user: test | |
408 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
406 | date: Thu Jan 01 00:00:00 1970 +0000 | |
409 | summary: 0.3m |
|
407 | summary: 0.3m | |
410 |
|
408 | |||
411 | changeset: 7:a6a34bfa0076 |
|
409 | changeset: 7:a6a34bfa0076 | |
412 | user: test |
|
410 | user: test | |
413 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
411 | date: Thu Jan 01 00:00:00 1970 +0000 | |
414 | summary: 1.3m |
|
412 | summary: 1.3m | |
415 |
|
413 | |||
416 | $ rm -r full-clone |
|
414 | $ rm -r full-clone | |
417 |
|
415 | |||
418 | When cloning from a non-copiable repository into '', do not |
|
416 | When cloning from a non-copiable repository into '', do not | |
419 | recurse infinitely (issue 2528) |
|
417 | recurse infinitely (issue 2528) | |
420 |
|
418 | |||
421 | $ hg clone full.hg '' |
|
419 | $ hg clone full.hg '' | |
422 | abort: * (glob) |
|
420 | abort: * (glob) | |
423 | [255] |
|
421 | [255] | |
424 |
|
422 | |||
425 | test for http://mercurial.selenic.com/bts/issue216 |
|
423 | test for http://mercurial.selenic.com/bts/issue216 | |
426 |
|
424 | |||
427 | Unbundle incremental bundles into fresh empty in one go |
|
425 | Unbundle incremental bundles into fresh empty in one go | |
428 |
|
426 | |||
429 | $ rm -r empty |
|
427 | $ rm -r empty | |
430 | $ hg init empty |
|
428 | $ hg init empty | |
431 | $ hg -R test bundle --base null -r 0 ../0.hg |
|
429 | $ hg -R test bundle --base null -r 0 ../0.hg | |
432 | 1 changesets found |
|
430 | 1 changesets found | |
433 | $ hg -R test bundle --base 0 -r 1 ../1.hg |
|
431 | $ hg -R test bundle --base 0 -r 1 ../1.hg | |
434 | 1 changesets found |
|
432 | 1 changesets found | |
435 | $ hg -R empty unbundle -u ../0.hg ../1.hg |
|
433 | $ hg -R empty unbundle -u ../0.hg ../1.hg | |
436 | adding changesets |
|
434 | adding changesets | |
437 | adding manifests |
|
435 | adding manifests | |
438 | adding file changes |
|
436 | adding file changes | |
439 | added 1 changesets with 1 changes to 1 files |
|
437 | added 1 changesets with 1 changes to 1 files | |
440 | adding changesets |
|
438 | adding changesets | |
441 | adding manifests |
|
439 | adding manifests | |
442 | adding file changes |
|
440 | adding file changes | |
443 | added 1 changesets with 1 changes to 1 files |
|
441 | added 1 changesets with 1 changes to 1 files | |
444 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
442 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
445 |
|
443 | |||
446 | test for 540d1059c802 |
|
444 | test for 540d1059c802 | |
447 |
|
445 | |||
448 | test for 540d1059c802 |
|
446 | test for 540d1059c802 | |
449 |
|
447 | |||
450 | $ hg init orig |
|
448 | $ hg init orig | |
451 | $ cd orig |
|
449 | $ cd orig | |
452 | $ echo foo > foo |
|
450 | $ echo foo > foo | |
453 | $ hg add foo |
|
451 | $ hg add foo | |
454 | $ hg ci -m 'add foo' |
|
452 | $ hg ci -m 'add foo' | |
455 |
|
453 | |||
456 | $ hg clone . ../copy |
|
454 | $ hg clone . ../copy | |
457 | updating to branch default |
|
455 | updating to branch default | |
458 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
456 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
459 | $ hg tag foo |
|
457 | $ hg tag foo | |
460 |
|
458 | |||
461 | $ cd ../copy |
|
459 | $ cd ../copy | |
462 | $ echo >> foo |
|
460 | $ echo >> foo | |
463 | $ hg ci -m 'change foo' |
|
461 | $ hg ci -m 'change foo' | |
464 | $ hg bundle ../bundle.hg ../orig |
|
462 | $ hg bundle ../bundle.hg ../orig | |
465 | searching for changes |
|
463 | searching for changes | |
466 | 1 changesets found |
|
464 | 1 changesets found | |
467 |
|
465 | |||
468 | $ cd ../orig |
|
466 | $ cd ../orig | |
469 | $ hg incoming ../bundle.hg |
|
467 | $ hg incoming ../bundle.hg | |
470 | comparing with ../bundle.hg |
|
468 | comparing with ../bundle.hg | |
471 | searching for changes |
|
469 | searching for changes | |
472 | changeset: 2:ed1b79f46b9a |
|
470 | changeset: 2:ed1b79f46b9a | |
473 | tag: tip |
|
471 | tag: tip | |
474 | parent: 0:bbd179dfa0a7 |
|
472 | parent: 0:bbd179dfa0a7 | |
475 | user: test |
|
473 | user: test | |
476 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
474 | date: Thu Jan 01 00:00:00 1970 +0000 | |
477 | summary: change foo |
|
475 | summary: change foo | |
478 |
|
476 | |||
479 | $ cd .. |
|
477 | $ cd .. | |
480 |
|
478 | |||
481 | test bundle with # in the filename (issue2154): |
|
479 | test bundle with # in the filename (issue2154): | |
482 |
|
480 | |||
483 | $ cp bundle.hg 'test#bundle.hg' |
|
481 | $ cp bundle.hg 'test#bundle.hg' | |
484 | $ cd orig |
|
482 | $ cd orig | |
485 | $ hg incoming '../test#bundle.hg' |
|
483 | $ hg incoming '../test#bundle.hg' | |
486 | comparing with ../test |
|
484 | comparing with ../test | |
487 | abort: unknown revision 'bundle.hg'! |
|
485 | abort: unknown revision 'bundle.hg'! | |
488 | [255] |
|
486 | [255] | |
489 |
|
487 | |||
490 | note that percent encoding is not handled: |
|
488 | note that percent encoding is not handled: | |
491 |
|
489 | |||
492 | $ hg incoming ../test%23bundle.hg |
|
490 | $ hg incoming ../test%23bundle.hg | |
493 | abort: repository ../test%23bundle.hg not found! |
|
491 | abort: repository ../test%23bundle.hg not found! | |
494 | [255] |
|
492 | [255] | |
495 | $ cd .. |
|
493 | $ cd .. | |
496 |
|
494 | |||
497 | test for http://mercurial.selenic.com/bts/issue1144 |
|
495 | test for http://mercurial.selenic.com/bts/issue1144 | |
498 |
|
496 | |||
499 | test that verify bundle does not traceback |
|
497 | test that verify bundle does not traceback | |
500 |
|
498 | |||
501 | partial history bundle, fails w/ unkown parent |
|
499 | partial history bundle, fails w/ unkown parent | |
502 |
|
500 | |||
503 | $ hg -R bundle.hg verify |
|
501 | $ hg -R bundle.hg verify | |
504 | abort: 00changelog.i@bbd179dfa0a7: unknown parent! |
|
502 | abort: 00changelog.i@bbd179dfa0a7: unknown parent! | |
505 | [255] |
|
503 | [255] | |
506 |
|
504 | |||
507 | full history bundle, refuses to verify non-local repo |
|
505 | full history bundle, refuses to verify non-local repo | |
508 |
|
506 | |||
509 | $ hg -R all.hg verify |
|
507 | $ hg -R all.hg verify | |
510 | abort: cannot verify bundle or remote repos |
|
508 | abort: cannot verify bundle or remote repos | |
511 | [255] |
|
509 | [255] | |
512 |
|
510 | |||
513 | but, regular verify must continue to work |
|
511 | but, regular verify must continue to work | |
514 |
|
512 | |||
515 | $ hg -R orig verify |
|
513 | $ hg -R orig verify | |
516 | checking changesets |
|
514 | checking changesets | |
517 | checking manifests |
|
515 | checking manifests | |
518 | crosschecking files in changesets and manifests |
|
516 | crosschecking files in changesets and manifests | |
519 | checking files |
|
517 | checking files | |
520 | 2 files, 2 changesets, 2 total revisions |
|
518 | 2 files, 2 changesets, 2 total revisions | |
521 |
|
519 | |||
522 | diff against bundle |
|
520 | diff against bundle | |
523 |
|
521 | |||
524 | $ hg init b |
|
522 | $ hg init b | |
525 | $ cd b |
|
523 | $ cd b | |
526 | $ hg -R ../all.hg diff -r tip |
|
524 | $ hg -R ../all.hg diff -r tip | |
527 | diff -r aa35859c02ea anotherfile |
|
525 | diff -r aa35859c02ea anotherfile | |
528 | --- a/anotherfile Thu Jan 01 00:00:00 1970 +0000 |
|
526 | --- a/anotherfile Thu Jan 01 00:00:00 1970 +0000 | |
529 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
527 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | |
530 | @@ -1,4 +0,0 @@ |
|
528 | @@ -1,4 +0,0 @@ | |
531 | -0 |
|
529 | -0 | |
532 | -1 |
|
530 | -1 | |
533 | -2 |
|
531 | -2 | |
534 | -3 |
|
532 | -3 | |
535 | $ cd .. |
|
533 | $ cd .. | |
536 |
|
534 | |||
537 | bundle single branch |
|
535 | bundle single branch | |
538 |
|
536 | |||
539 | $ hg init branchy |
|
537 | $ hg init branchy | |
540 | $ cd branchy |
|
538 | $ cd branchy | |
541 | $ echo a >a |
|
539 | $ echo a >a | |
542 | $ echo x >x |
|
540 | $ echo x >x | |
543 | $ hg ci -Ama |
|
541 | $ hg ci -Ama | |
544 | adding a |
|
542 | adding a | |
545 | adding x |
|
543 | adding x | |
546 | $ echo c >c |
|
544 | $ echo c >c | |
547 | $ echo xx >x |
|
545 | $ echo xx >x | |
548 | $ hg ci -Amc |
|
546 | $ hg ci -Amc | |
549 | adding c |
|
547 | adding c | |
550 | $ echo c1 >c1 |
|
548 | $ echo c1 >c1 | |
551 | $ hg ci -Amc1 |
|
549 | $ hg ci -Amc1 | |
552 | adding c1 |
|
550 | adding c1 | |
553 | $ hg up 0 |
|
551 | $ hg up 0 | |
554 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
552 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
555 | $ echo b >b |
|
553 | $ echo b >b | |
556 | $ hg ci -Amb |
|
554 | $ hg ci -Amb | |
557 | adding b |
|
555 | adding b | |
558 | created new head |
|
556 | created new head | |
559 | $ echo b1 >b1 |
|
557 | $ echo b1 >b1 | |
560 | $ echo xx >x |
|
558 | $ echo xx >x | |
561 | $ hg ci -Amb1 |
|
559 | $ hg ci -Amb1 | |
562 | adding b1 |
|
560 | adding b1 | |
563 | $ hg clone -q -r2 . part |
|
561 | $ hg clone -q -r2 . part | |
564 |
|
562 | |||
565 | == bundling via incoming |
|
563 | == bundling via incoming | |
566 |
|
564 | |||
567 | $ hg in -R part --bundle incoming.hg --template "{node}\n" . |
|
565 | $ hg in -R part --bundle incoming.hg --template "{node}\n" . | |
568 | comparing with . |
|
566 | comparing with . | |
569 | searching for changes |
|
567 | searching for changes | |
570 | 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a |
|
568 | 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a | |
571 | 057f4db07f61970e1c11e83be79e9d08adc4dc31 |
|
569 | 057f4db07f61970e1c11e83be79e9d08adc4dc31 | |
572 |
|
570 | |||
573 | == bundling |
|
571 | == bundling | |
574 |
|
572 | |||
575 | $ hg bundle bundle.hg part --debug |
|
573 | $ hg bundle bundle.hg part --debug | |
576 | query 1; heads |
|
574 | query 1; heads | |
577 | searching for changes |
|
575 | searching for changes | |
578 | all remote heads known locally |
|
576 | all remote heads known locally | |
579 | 2 changesets found |
|
577 | 2 changesets found | |
580 | list of changesets: |
|
578 | list of changesets: | |
581 | 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a |
|
579 | 1a38c1b849e8b70c756d2d80b0b9a3ac0b7ea11a | |
582 | 057f4db07f61970e1c11e83be79e9d08adc4dc31 |
|
580 | 057f4db07f61970e1c11e83be79e9d08adc4dc31 | |
583 | bundling: 1/2 changesets (50.00%) |
|
581 | bundling: 1/2 changesets (50.00%) | |
584 | bundling: 2/2 changesets (100.00%) |
|
582 | bundling: 2/2 changesets (100.00%) | |
585 | bundling: 1/2 manifests (50.00%) |
|
583 | bundling: 1/2 manifests (50.00%) | |
586 | bundling: 2/2 manifests (100.00%) |
|
584 | bundling: 2/2 manifests (100.00%) | |
587 | bundling: b 1/3 files (33.33%) |
|
585 | bundling: b 1/3 files (33.33%) | |
588 | bundling: b1 2/3 files (66.67%) |
|
586 | bundling: b1 2/3 files (66.67%) | |
589 | bundling: x 3/3 files (100.00%) |
|
587 | bundling: x 3/3 files (100.00%) | |
590 |
|
588 | |||
591 | == Test for issue3441 |
|
589 | == Test for issue3441 | |
592 |
|
590 | |||
593 | $ hg clone -q -r0 . part2 |
|
591 | $ hg clone -q -r0 . part2 | |
594 | $ hg -q -R part2 pull bundle.hg |
|
592 | $ hg -q -R part2 pull bundle.hg | |
595 | $ hg -R part2 verify |
|
593 | $ hg -R part2 verify | |
596 | checking changesets |
|
594 | checking changesets | |
597 | checking manifests |
|
595 | checking manifests | |
598 | crosschecking files in changesets and manifests |
|
596 | crosschecking files in changesets and manifests | |
599 | checking files |
|
597 | checking files | |
600 | 4 files, 3 changesets, 5 total revisions |
|
598 | 4 files, 3 changesets, 5 total revisions |
General Comments 0
You need to be logged in to leave comments.
Login now