Show More
@@ -1,6 +1,11 b'' | |||
|
1 | 1 | #testcases flat tree |
|
2 | 2 | $ . "$TESTDIR/narrow-library.sh" |
|
3 | 3 | |
|
4 | $ cat >> $HGRCPATH <<EOF | |
|
5 | > [alias] | |
|
6 | > l = log -G -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
7 | > EOF | |
|
8 | ||
|
4 | 9 | #if tree |
|
5 | 10 | $ cat << EOF >> $HGRCPATH |
|
6 | 11 | > [experimental] |
@@ -76,15 +81,23 b' add more upstream files which we will in' | |||
|
76 | 81 | $ echo 'widest v4' > widest/f |
|
77 | 82 | $ hg commit -m 'update widest v4' |
|
78 | 83 | |
|
79 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
80 | 7: update widest v4 | |
|
81 | 6: add outside2 | |
|
82 | 5: update inside | |
|
83 | 4: update widest v3 | |
|
84 | 3: add wider, update widest | |
|
85 | 2: add outside | |
|
86 |
|
|
|
87 | 0: add inside | |
|
84 | $ hg l | |
|
85 | @ 7: update widest v4 | |
|
86 | | | |
|
87 | o 6: add outside2 | |
|
88 | | | |
|
89 | o 5: update inside | |
|
90 | | | |
|
91 | o 4: update widest v3 | |
|
92 | | | |
|
93 | o 3: add wider, update widest | |
|
94 | | | |
|
95 | o 2: add outside | |
|
96 | | | |
|
97 | o 1: add widest | |
|
98 | | | |
|
99 | o 0: add inside | |
|
100 | ||
|
88 | 101 | |
|
89 | 102 | $ cd .. |
|
90 | 103 | |
@@ -92,6 +105,11 b' Widen the narrow spec to see the widest ' | |||
|
92 | 105 | added upstream revisions. |
|
93 | 106 | |
|
94 | 107 | $ cd narrow |
|
108 | $ hg l | |
|
109 | @ ...1: add outside | |
|
110 | | | |
|
111 | o 0: add inside | |
|
112 | ||
|
95 | 113 | $ hg tracked --addinclude widest/f |
|
96 | 114 | comparing with ssh://user@dummy/master |
|
97 | 115 | searching for changes |
@@ -100,6 +118,13 b' added upstream revisions.' | |||
|
100 | 118 | adding manifests |
|
101 | 119 | adding file changes |
|
102 | 120 | added 3 changesets with 2 changes to 2 files |
|
121 | $ hg l | |
|
122 | @ ...2: add outside | |
|
123 | | | |
|
124 | o 1: add widest | |
|
125 | | | |
|
126 | o 0: add inside | |
|
127 | ||
|
103 | 128 | $ hg tracked |
|
104 | 129 | I path:inside |
|
105 | 130 | I path:widest/f |
@@ -130,15 +155,23 b' Pull down the newly added upstream revis' | |||
|
130 | 155 | $ cat inside/f |
|
131 | 156 | inside v2 |
|
132 | 157 | |
|
133 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
134 | 7: update widest v4 | |
|
135 | ...6: add outside2 | |
|
136 | 5: update inside | |
|
137 | 4: update widest v3 | |
|
138 | 3: add wider, update widest | |
|
139 | ...2: add outside | |
|
140 |
|
|
|
141 | 0: add inside | |
|
158 | $ hg l | |
|
159 | o 7: update widest v4 | |
|
160 | | | |
|
161 | o ...6: add outside2 | |
|
162 | | | |
|
163 | @ 5: update inside | |
|
164 | | | |
|
165 | o 4: update widest v3 | |
|
166 | | | |
|
167 | o 3: add wider, update widest | |
|
168 | | | |
|
169 | o ...2: add outside | |
|
170 | | | |
|
171 | o 1: add widest | |
|
172 | | | |
|
173 | o 0: add inside | |
|
174 | ||
|
142 | 175 | |
|
143 | 176 | Check that widening with a newline fails |
|
144 | 177 | |
@@ -180,15 +213,23 b' widen the narrow spec to include the wid' | |||
|
180 | 213 | $ cat widest/f |
|
181 | 214 | widest v4 |
|
182 | 215 | |
|
183 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
184 | 7: update widest v4 | |
|
185 | ...6: add outside2 | |
|
186 | 5: update inside | |
|
187 | 4: update widest v3 | |
|
188 | 3: add wider, update widest | |
|
189 | ...2: add outside | |
|
190 |
|
|
|
191 | 0: add inside | |
|
216 | $ hg l | |
|
217 | @ 7: update widest v4 | |
|
218 | | | |
|
219 | o ...6: add outside2 | |
|
220 | | | |
|
221 | o 5: update inside | |
|
222 | | | |
|
223 | o 4: update widest v3 | |
|
224 | | | |
|
225 | o 3: add wider, update widest | |
|
226 | | | |
|
227 | o ...2: add outside | |
|
228 | | | |
|
229 | o 1: add widest | |
|
230 | | | |
|
231 | o 0: add inside | |
|
232 | ||
|
192 | 233 | |
|
193 | 234 | separate suite of tests: files from 0-10 modified in changes 0-10. This allows |
|
194 | 235 | more obvious precise tests tickling particular corner cases. |
@@ -245,15 +286,23 b' make narrow clone with every third node.' | |||
|
245 | 286 | crosschecking files in changesets and manifests |
|
246 | 287 | checking files |
|
247 | 288 | checked 8 changesets with 4 changes to 4 files |
|
248 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
249 | ...7: add d10/f | |
|
250 | 6: add d9/f | |
|
251 |
|
|
|
252 | 4: add d6/f | |
|
253 |
... |
|
|
254 | 2: add d3/f | |
|
255 |
|
|
|
256 | 0: add d0/f | |
|
289 | $ hg l | |
|
290 | @ ...7: add d10/f | |
|
291 | | | |
|
292 | o 6: add d9/f | |
|
293 | | | |
|
294 | o ...5: add d8/f | |
|
295 | | | |
|
296 | o 4: add d6/f | |
|
297 | | | |
|
298 | o ...3: add d5/f | |
|
299 | | | |
|
300 | o 2: add d3/f | |
|
301 | | | |
|
302 | o ...1: add d2/f | |
|
303 | | | |
|
304 | o 0: add d0/f | |
|
305 | ||
|
257 | 306 | $ hg tracked --addinclude d1 |
|
258 | 307 | comparing with ssh://user@dummy/upstream |
|
259 | 308 | searching for changes |
@@ -268,16 +317,25 b' make narrow clone with every third node.' | |||
|
268 | 317 | I path:d3 |
|
269 | 318 | I path:d6 |
|
270 | 319 | I path:d9 |
|
271 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
272 | ...8: add d10/f | |
|
273 | 7: add d9/f | |
|
274 |
|
|
|
275 | 5: add d6/f | |
|
276 |
... |
|
|
277 | 3: add d3/f | |
|
278 |
|
|
|
279 | 1: add d1/f | |
|
280 |
|
|
|
320 | $ hg l | |
|
321 | @ ...8: add d10/f | |
|
322 | | | |
|
323 | o 7: add d9/f | |
|
324 | | | |
|
325 | o ...6: add d8/f | |
|
326 | | | |
|
327 | o 5: add d6/f | |
|
328 | | | |
|
329 | o ...4: add d5/f | |
|
330 | | | |
|
331 | o 3: add d3/f | |
|
332 | | | |
|
333 | o ...2: add d2/f | |
|
334 | | | |
|
335 | o 1: add d1/f | |
|
336 | | | |
|
337 | o 0: add d0/f | |
|
338 | ||
|
281 | 339 | |
|
282 | 340 | Verify shouldn't claim the repo is corrupt after a widen. |
|
283 | 341 | |
@@ -294,16 +352,42 b' Widening preserves parent of local commi' | |||
|
294 | 352 | $ cd .. |
|
295 | 353 | $ hg clone -q --narrow ssh://user@dummy/upstream narrow3 --include d2 -r 2 |
|
296 | 354 | $ cd narrow3 |
|
297 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
298 | 1: add d2/f | |
|
299 | ...0: add d1/f | |
|
355 | $ hg l | |
|
356 | @ 1: add d2/f | |
|
357 | | | |
|
358 | o ...0: add d1/f | |
|
359 | ||
|
300 | 360 | $ hg pull -q -r 3 |
|
301 | 361 | $ hg co -q tip |
|
302 | 362 | $ hg pull -q -r 4 |
|
303 | 363 | $ echo local > d2/f |
|
304 | 364 | $ hg ci -m local |
|
305 | 365 | created new head |
|
366 | $ hg l | |
|
367 | @ 4: local | |
|
368 | | | |
|
369 | | o ...3: add d4/f | |
|
370 | |/ | |
|
371 | o ...2: add d3/f | |
|
372 | | | |
|
373 | o 1: add d2/f | |
|
374 | | | |
|
375 | o ...0: add d1/f | |
|
376 | ||
|
306 | 377 | $ hg tracked -q --addinclude d0 --addinclude d9 |
|
378 | $ hg l | |
|
379 | @ 5: local | |
|
380 | | | |
|
381 | | o ...4: add d4/f | |
|
382 | |/ | |
|
383 | o ...3: add d3/f | |
|
384 | | | |
|
385 | o 2: add d2/f | |
|
386 | | | |
|
387 | o ...1: add d1/f | |
|
388 | | | |
|
389 | o 0: add d0/f | |
|
390 | ||
|
307 | 391 | |
|
308 | 392 | Widening preserves bookmarks |
|
309 | 393 | |
@@ -328,10 +412,13 b' Widening that fails can be recovered fro' | |||
|
328 | 412 | $ cd interrupted |
|
329 | 413 | $ echo local > d0/f |
|
330 | 414 | $ hg ci -m local |
|
331 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
332 | 2: local | |
|
333 | ...1: add d10/f | |
|
334 |
|
|
|
415 | $ hg l | |
|
416 | @ 2: local | |
|
417 | | | |
|
418 | o ...1: add d10/f | |
|
419 | | | |
|
420 | o 0: add d0/f | |
|
421 | ||
|
335 | 422 | $ hg bookmarks bookmark |
|
336 | 423 | $ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1 |
|
337 | 424 | comparing with ssh://user@dummy/upstream |
@@ -344,7 +431,7 b' Widening that fails can be recovered fro' | |||
|
344 | 431 | rollback completed |
|
345 | 432 | abort: pretxnchangegroup.bad hook exited with status 1 |
|
346 | 433 | [255] |
|
347 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
434 | $ hg l | |
|
348 | 435 | $ hg bookmarks |
|
349 | 436 | no bookmarks set |
|
350 | 437 | $ hg unbundle .hg/strip-backup/*-widen.hg |
@@ -354,9 +441,12 b' Widening that fails can be recovered fro' | |||
|
354 | 441 | added 3 changesets with 2 changes to 1 files |
|
355 | 442 | new changesets *:* (glob) |
|
356 | 443 | (run 'hg update' to get a working copy) |
|
357 | $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" | |
|
358 | 2: local | |
|
359 | ...1: add d10/f | |
|
360 |
|
|
|
444 | $ hg l | |
|
445 | o 2: local | |
|
446 | | | |
|
447 | o ...1: add d10/f | |
|
448 | | | |
|
449 | o 0: add d0/f | |
|
450 | ||
|
361 | 451 | $ hg bookmarks |
|
362 | 452 | * bookmark 2:* (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now