Show More
@@ -1,546 +1,574 b'' | |||
|
1 | 1 | #testcases flat tree |
|
2 | 2 | #testcases lfs-on lfs-off |
|
3 | 3 | |
|
4 | 4 | $ cat >> $HGRCPATH << EOF |
|
5 | 5 | > [experimental] |
|
6 | 6 | > evolution=createmarkers |
|
7 | 7 | > EOF |
|
8 | 8 | |
|
9 | 9 | #if lfs-on |
|
10 | 10 | $ cat >> $HGRCPATH <<EOF |
|
11 | 11 | > [extensions] |
|
12 | 12 | > lfs = |
|
13 | 13 | > EOF |
|
14 | 14 | #endif |
|
15 | 15 | |
|
16 | 16 | $ . "$TESTDIR/narrow-library.sh" |
|
17 | 17 | |
|
18 | 18 | #if tree |
|
19 | 19 | $ cat << EOF >> $HGRCPATH |
|
20 | 20 | > [experimental] |
|
21 | 21 | > treemanifest = 1 |
|
22 | 22 | > EOF |
|
23 | 23 | #endif |
|
24 | 24 | |
|
25 | 25 | $ hg init master |
|
26 | 26 | $ cd master |
|
27 | 27 | $ cat >> .hg/hgrc <<EOF |
|
28 | 28 | > [narrow] |
|
29 | 29 | > serveellipses=True |
|
30 | 30 | > EOF |
|
31 | 31 | $ for x in `$TESTDIR/seq.py 0 10` |
|
32 | 32 | > do |
|
33 | 33 | > mkdir d$x |
|
34 | 34 | > echo $x > d$x/f |
|
35 | 35 | > hg add d$x/f |
|
36 | 36 | > hg commit -m "add d$x/f" |
|
37 | 37 | > done |
|
38 | 38 | $ hg log -T "{rev}: {desc}\n" |
|
39 | 39 | 10: add d10/f |
|
40 | 40 | 9: add d9/f |
|
41 | 41 | 8: add d8/f |
|
42 | 42 | 7: add d7/f |
|
43 | 43 | 6: add d6/f |
|
44 | 44 | 5: add d5/f |
|
45 | 45 | 4: add d4/f |
|
46 | 46 | 3: add d3/f |
|
47 | 47 | 2: add d2/f |
|
48 | 48 | 1: add d1/f |
|
49 | 49 | 0: add d0/f |
|
50 | 50 | $ cd .. |
|
51 | 51 | |
|
52 | 52 | Error if '.' or '..' are in the directory to track. |
|
53 | 53 | $ hg clone --narrow ssh://user@dummy/master foo --include ./asdf |
|
54 | 54 | abort: "." and ".." are not allowed in narrowspec paths |
|
55 | 55 | [255] |
|
56 | 56 | $ hg clone --narrow ssh://user@dummy/master foo --include asdf/.. |
|
57 | 57 | abort: "." and ".." are not allowed in narrowspec paths |
|
58 | 58 | [255] |
|
59 | 59 | $ hg clone --narrow ssh://user@dummy/master foo --include a/./c |
|
60 | 60 | abort: "." and ".." are not allowed in narrowspec paths |
|
61 | 61 | [255] |
|
62 | 62 | |
|
63 | 63 | Names with '.' in them are OK. |
|
64 | 64 | $ hg clone --narrow ./master should-work --include a/.b/c |
|
65 | 65 | requesting all changes |
|
66 | 66 | adding changesets |
|
67 | 67 | adding manifests |
|
68 | 68 | adding file changes |
|
69 | 69 | added 1 changesets with 0 changes to 0 files |
|
70 | 70 | new changesets * (glob) |
|
71 | 71 | updating to branch default |
|
72 | 72 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
73 | 73 | |
|
74 | 74 | The "narrow" repo requirement is ignored by [debugupgraderepo] |
|
75 | 75 | |
|
76 | 76 | $ (cd should-work; hg debugupgraderepo | grep 'no format upgrades found in existing repository') |
|
77 | 77 | (no format upgrades found in existing repository) |
|
78 | 78 | |
|
79 | 79 | Test repo with local changes |
|
80 | 80 | $ hg clone --narrow ssh://user@dummy/master narrow-local-changes --include d0 --include d3 --include d6 |
|
81 | 81 | requesting all changes |
|
82 | 82 | adding changesets |
|
83 | 83 | adding manifests |
|
84 | 84 | adding file changes |
|
85 | 85 | added 6 changesets with 3 changes to 3 files |
|
86 | 86 | new changesets *:* (glob) |
|
87 | 87 | updating to branch default |
|
88 | 88 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 | 89 | $ cd narrow-local-changes |
|
90 | 90 | $ echo local change >> d0/f |
|
91 | 91 | $ hg ci -m 'local change to d0' |
|
92 | 92 | $ hg co '.^' |
|
93 | 93 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
94 | 94 | $ echo local change >> d3/f |
|
95 | 95 | $ hg ci -m 'local hidden change to d3' |
|
96 | 96 | created new head |
|
97 | 97 | $ hg ci --amend -m 'local change to d3' |
|
98 | 98 | $ hg tracked --removeinclude d0 |
|
99 | 99 | comparing with ssh://user@dummy/master |
|
100 | 100 | searching for changes |
|
101 | 101 | looking for local changes to affected paths |
|
102 | 102 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
103 | 103 | * (glob) |
|
104 | 104 | abort: local changes found |
|
105 | 105 | (use --force-delete-local-changes to ignore) |
|
106 | 106 | [20] |
|
107 | 107 | Check that nothing was removed by the failed attempts |
|
108 | 108 | $ hg tracked |
|
109 | 109 | I path:d0 |
|
110 | 110 | I path:d3 |
|
111 | 111 | I path:d6 |
|
112 | 112 | $ hg files |
|
113 | 113 | d0/f |
|
114 | 114 | d3/f |
|
115 | 115 | d6/f |
|
116 | 116 | $ find * |
|
117 | 117 | d0 |
|
118 | 118 | d0/f |
|
119 | 119 | d3 |
|
120 | 120 | d3/f |
|
121 | 121 | d6 |
|
122 | 122 | d6/f |
|
123 | 123 | $ hg verify -q |
|
124 | 124 | Force deletion of local changes |
|
125 | 125 | $ hg log -T "{rev}: {desc} {outsidenarrow}\n" |
|
126 | 126 | 8: local change to d3 |
|
127 | 127 | 6: local change to d0 |
|
128 | 128 | 5: add d10/f outsidenarrow |
|
129 | 129 | 4: add d6/f |
|
130 | 130 | 3: add d5/f outsidenarrow |
|
131 | 131 | 2: add d3/f |
|
132 | 132 | 1: add d2/f outsidenarrow |
|
133 | 133 | 0: add d0/f |
|
134 | 134 | $ hg tracked --removeinclude d0 --force-delete-local-changes |
|
135 | 135 | comparing with ssh://user@dummy/master |
|
136 | 136 | searching for changes |
|
137 | 137 | looking for local changes to affected paths |
|
138 | 138 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
139 | 139 | * (glob) |
|
140 | 140 | moving unwanted changesets to backup |
|
141 | 141 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
142 | 142 | deleting data/d0/f.i (reporevlogstore !) |
|
143 | 143 | deleting meta/d0/00manifest.i (tree !) |
|
144 | 144 | deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) |
|
145 | 145 | deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !) |
|
146 | 146 | deleting data/d0/f/index (reposimplestore !) |
|
147 | 147 | deleting unwanted files from working copy |
|
148 | 148 | |
|
149 | 149 | $ hg log -T "{rev}: {desc} {outsidenarrow}\n" |
|
150 | 150 | 7: local change to d3 |
|
151 | 151 | 5: add d10/f outsidenarrow |
|
152 | 152 | 4: add d6/f |
|
153 | 153 | 3: add d5/f outsidenarrow |
|
154 | 154 | 2: add d3/f |
|
155 | 155 | 1: add d2/f outsidenarrow |
|
156 | 156 | 0: add d0/f outsidenarrow |
|
157 | 157 | Can restore stripped local changes after widening |
|
158 | 158 | $ hg tracked --addinclude d0 -q |
|
159 | 159 | $ hg unbundle .hg/strip-backup/*-narrow.hg -q |
|
160 | 160 | $ hg --hidden co -r 'desc("local change to d0")' -q |
|
161 | 161 | $ cat d0/f |
|
162 | 162 | 0 |
|
163 | 163 | local change |
|
164 | 164 | Pruned commits affecting removed paths should not prevent narrowing |
|
165 | 165 | $ hg co '.^' |
|
166 | 166 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 | 167 | $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'` |
|
168 | 168 | 1 new obsolescence markers |
|
169 | 169 | obsoleted 1 changesets |
|
170 | 170 | $ hg tracked --removeinclude d0 |
|
171 | 171 | comparing with ssh://user@dummy/master |
|
172 | 172 | searching for changes |
|
173 | 173 | looking for local changes to affected paths |
|
174 | 174 | moving unwanted changesets to backup |
|
175 | 175 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
176 | 176 | deleting data/d0/f.i (reporevlogstore !) |
|
177 | 177 | deleting meta/d0/00manifest.i (tree !) |
|
178 | 178 | deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) |
|
179 | 179 | deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !) |
|
180 | 180 | deleting data/d0/f/index (reposimplestore !) |
|
181 | 181 | deleting unwanted files from working copy |
|
182 | 182 | |
|
183 | 183 | Updates off of stripped commit if necessary |
|
184 | 184 | $ hg co -r 'desc("local change to d3")' -q |
|
185 | 185 | $ echo local change >> d6/f |
|
186 | 186 | $ hg ci -m 'local change to d6' |
|
187 | 187 | $ hg tracked --removeinclude d3 --force-delete-local-changes |
|
188 | 188 | comparing with ssh://user@dummy/master |
|
189 | 189 | searching for changes |
|
190 | 190 | looking for local changes to affected paths |
|
191 | 191 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
192 | 192 | * (glob) |
|
193 | 193 | * (glob) |
|
194 | 194 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
195 | 195 | moving unwanted changesets to backup |
|
196 | 196 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
197 | 197 | deleting data/d3/f.i (reporevlogstore !) |
|
198 | 198 | deleting meta/d3/00manifest.i (tree !) |
|
199 | 199 | deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !) |
|
200 | 200 | deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !) |
|
201 | 201 | deleting data/d3/f/index (reposimplestore !) |
|
202 | 202 | deleting unwanted files from working copy |
|
203 | 203 | $ hg log -T '{desc}\n' -r . |
|
204 | 204 | add d10/f |
|
205 | 205 | Updates to nullid if necessary |
|
206 | 206 | $ hg tracked --addinclude d3 -q |
|
207 | 207 | $ hg co null -q |
|
208 | 208 | $ mkdir d3 |
|
209 | 209 | $ echo local change > d3/f |
|
210 | 210 | $ hg add d3/f |
|
211 | 211 | $ hg ci -m 'local change to d3' |
|
212 | 212 | created new head |
|
213 | 213 | $ hg tracked --removeinclude d3 --force-delete-local-changes |
|
214 | 214 | comparing with ssh://user@dummy/master |
|
215 | 215 | searching for changes |
|
216 | 216 | looking for local changes to affected paths |
|
217 | 217 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
218 | 218 | * (glob) |
|
219 | 219 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
220 | 220 | moving unwanted changesets to backup |
|
221 | 221 | saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob) |
|
222 | 222 | deleting data/d3/f.i (reporevlogstore !) |
|
223 | 223 | deleting meta/d3/00manifest.i (tree !) |
|
224 | 224 | deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !) |
|
225 | 225 | deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !) |
|
226 | 226 | deleting data/d3/f/index (reposimplestore !) |
|
227 | 227 | deleting unwanted files from working copy |
|
228 | 228 | $ hg id |
|
229 | 229 | 000000000000 |
|
230 | 230 | $ cd .. |
|
231 | 231 | |
|
232 | 232 | Narrowing doesn't resurrect old commits (unlike what regular `hg strip` does) |
|
233 | 233 | $ hg clone --narrow ssh://user@dummy/master narrow-obsmarkers --include d0 --include d3 -q |
|
234 | 234 | $ cd narrow-obsmarkers |
|
235 | 235 | $ echo a >> d0/f2 |
|
236 | 236 | $ hg add d0/f2 |
|
237 | 237 | $ hg ci -m 'modify d0/' |
|
238 | 238 | $ echo a >> d3/f2 |
|
239 | 239 | $ hg add d3/f2 |
|
240 | 240 | $ hg commit --amend -m 'modify d0/ and d3/' |
|
241 | 241 | $ hg log -T "{rev}: {desc}\n" |
|
242 | 242 | 5: modify d0/ and d3/ |
|
243 | 243 | 3: add d10/f |
|
244 | 244 | 2: add d3/f |
|
245 | 245 | 1: add d2/f |
|
246 | 246 | 0: add d0/f |
|
247 | 247 | $ hg tracked --removeinclude d3 --force-delete-local-changes -q |
|
248 | 248 | $ hg log -T "{rev}: {desc}\n" |
|
249 | 249 | 3: add d10/f |
|
250 | 250 | 2: add d3/f |
|
251 | 251 | 1: add d2/f |
|
252 | 252 | 0: add d0/f |
|
253 | 253 | $ cd .. |
|
254 | 254 | |
|
255 | 255 | Widening doesn't lose bookmarks |
|
256 | 256 | $ hg clone --narrow ssh://user@dummy/master widen-bookmarks --include d0 -q |
|
257 | 257 | $ cd widen-bookmarks |
|
258 | 258 | $ hg bookmark my-bookmark |
|
259 | 259 | $ hg log -T "{rev}: {desc} {bookmarks}\n" |
|
260 | 260 | 1: add d10/f my-bookmark |
|
261 | 261 | 0: add d0/f |
|
262 | 262 | $ hg tracked --addinclude d3 -q |
|
263 | 263 | $ hg log -T "{rev}: {desc} {bookmarks}\n" |
|
264 | 264 | 3: add d10/f my-bookmark |
|
265 | 265 | 2: add d3/f |
|
266 | 266 | 1: add d2/f |
|
267 | 267 | 0: add d0/f |
|
268 | 268 | $ cd .. |
|
269 | 269 | |
|
270 | 270 | Can remove last include, making repo empty |
|
271 | 271 | $ hg clone --narrow ssh://user@dummy/master narrow-empty --include d0 -r 5 |
|
272 | 272 | adding changesets |
|
273 | 273 | adding manifests |
|
274 | 274 | adding file changes |
|
275 | 275 | added 2 changesets with 1 changes to 1 files |
|
276 | 276 | new changesets *:* (glob) |
|
277 | 277 | updating to branch default |
|
278 | 278 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
279 | 279 | $ cd narrow-empty |
|
280 | 280 | $ hg tracked --removeinclude d0 |
|
281 | 281 | comparing with ssh://user@dummy/master |
|
282 | 282 | searching for changes |
|
283 | 283 | looking for local changes to affected paths |
|
284 | 284 | deleting data/d0/f.i (reporevlogstore !) |
|
285 | 285 | deleting meta/d0/00manifest.i (tree !) |
|
286 | 286 | deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) |
|
287 | 287 | deleting data/d0/f/index (reposimplestore !) |
|
288 | 288 | deleting unwanted files from working copy |
|
289 | 289 | $ hg tracked |
|
290 | 290 | $ hg files |
|
291 | 291 | [1] |
|
292 | 292 | $ test -d d0 |
|
293 | 293 | [1] |
|
294 | 294 | Do some work in the empty clone |
|
295 | 295 | $ hg diff --change . |
|
296 | 296 | $ hg branch foo |
|
297 | 297 | marked working directory as branch foo |
|
298 | 298 | (branches are permanent and global, did you want a bookmark?) |
|
299 | 299 | $ hg ci -m empty |
|
300 | 300 | $ hg log -T "{rev}: {desc} {outsidenarrow}\n" |
|
301 | 301 | 2: empty |
|
302 | 302 | 1: add d5/f outsidenarrow |
|
303 | 303 | 0: add d0/f outsidenarrow |
|
304 | 304 | $ hg pull -q |
|
305 | 305 | Can widen the empty clone |
|
306 | 306 | $ hg tracked --addinclude d0 |
|
307 | 307 | comparing with ssh://user@dummy/master |
|
308 | 308 | searching for changes |
|
309 | 309 | saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob) |
|
310 | 310 | adding changesets |
|
311 | 311 | adding manifests |
|
312 | 312 | adding file changes |
|
313 | 313 | added 4 changesets with 1 changes to 1 files (+1 heads) |
|
314 | 314 | $ hg tracked |
|
315 | 315 | I path:d0 |
|
316 | 316 | $ hg files |
|
317 | 317 | d0/f |
|
318 | 318 | $ find * |
|
319 | 319 | d0 |
|
320 | 320 | d0/f |
|
321 | 321 | $ cd .. |
|
322 | 322 | |
|
323 | 323 | TODO(martinvonz): test including e.g. d3/g and then removing it once |
|
324 | 324 | https://bitbucket.org/Google/narrowhg/issues/6 is fixed |
|
325 | 325 | |
|
326 | 326 | $ hg clone --narrow ssh://user@dummy/master narrow --include d0 --include d3 --include d6 --include d9 |
|
327 | 327 | requesting all changes |
|
328 | 328 | adding changesets |
|
329 | 329 | adding manifests |
|
330 | 330 | adding file changes |
|
331 | 331 | added 8 changesets with 4 changes to 4 files |
|
332 | 332 | new changesets *:* (glob) |
|
333 | 333 | updating to branch default |
|
334 | 334 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
335 | 335 | $ cd narrow |
|
336 | 336 | $ hg tracked |
|
337 | 337 | I path:d0 |
|
338 | 338 | I path:d3 |
|
339 | 339 | I path:d6 |
|
340 | 340 | I path:d9 |
|
341 | 341 | $ hg tracked --removeinclude d6 |
|
342 | 342 | comparing with ssh://user@dummy/master |
|
343 | 343 | searching for changes |
|
344 | 344 | looking for local changes to affected paths |
|
345 | 345 | deleting data/d6/f.i (reporevlogstore !) |
|
346 | 346 | deleting meta/d6/00manifest.i (tree !) |
|
347 | 347 | deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !) |
|
348 | 348 | deleting data/d6/f/index (reposimplestore !) |
|
349 | 349 | deleting unwanted files from working copy |
|
350 | 350 | $ hg tracked |
|
351 | 351 | I path:d0 |
|
352 | 352 | I path:d3 |
|
353 | 353 | I path:d9 |
|
354 | 354 | #if repofncache |
|
355 | 355 | $ hg debugrebuildfncache |
|
356 | 356 | fncache already up to date |
|
357 | 357 | #endif |
|
358 | 358 | $ find * |
|
359 | 359 | d0 |
|
360 | 360 | d0/f |
|
361 | 361 | d3 |
|
362 | 362 | d3/f |
|
363 | 363 | d9 |
|
364 | 364 | d9/f |
|
365 | 365 | $ hg verify -q |
|
366 | 366 | $ hg tracked --addexclude d3/f |
|
367 | 367 | comparing with ssh://user@dummy/master |
|
368 | 368 | searching for changes |
|
369 | 369 | looking for local changes to affected paths |
|
370 | 370 | deleting data/d3/f.i (reporevlogstore !) |
|
371 | 371 | deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !) |
|
372 | 372 | deleting data/d3/f/index (reposimplestore !) |
|
373 | 373 | deleting unwanted files from working copy |
|
374 | 374 | $ hg tracked |
|
375 | 375 | I path:d0 |
|
376 | 376 | I path:d3 |
|
377 | 377 | I path:d9 |
|
378 | 378 | X path:d3/f |
|
379 | 379 | #if repofncache |
|
380 | 380 | $ hg debugrebuildfncache |
|
381 | 381 | fncache already up to date |
|
382 | 382 | #endif |
|
383 | 383 | $ find * |
|
384 | 384 | d0 |
|
385 | 385 | d0/f |
|
386 | 386 | d9 |
|
387 | 387 | d9/f |
|
388 | 388 | $ hg verify -q |
|
389 | 389 | $ hg tracked --addexclude d0 |
|
390 | 390 | comparing with ssh://user@dummy/master |
|
391 | 391 | searching for changes |
|
392 | 392 | looking for local changes to affected paths |
|
393 | 393 | deleting data/d0/f.i (reporevlogstore !) |
|
394 | 394 | deleting meta/d0/00manifest.i (tree !) |
|
395 | 395 | deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !) |
|
396 | 396 | deleting data/d0/f/index (reposimplestore !) |
|
397 | 397 | deleting unwanted files from working copy |
|
398 | 398 | $ hg tracked |
|
399 | 399 | I path:d3 |
|
400 | 400 | I path:d9 |
|
401 | 401 | X path:d0 |
|
402 | 402 | X path:d3/f |
|
403 | 403 | #if repofncache |
|
404 | 404 | $ hg debugrebuildfncache |
|
405 | 405 | fncache already up to date |
|
406 | 406 | #endif |
|
407 | 407 | $ find * |
|
408 | 408 | d9 |
|
409 | 409 | d9/f |
|
410 | 410 | |
|
411 | 411 | Make a 15 of changes to d9 to test the path without --verbose |
|
412 | 412 | (Note: using regexes instead of "* (glob)" because if the test fails, it |
|
413 | 413 | produces more sensible diffs) |
|
414 | 414 | $ hg tracked |
|
415 | 415 | I path:d3 |
|
416 | 416 | I path:d9 |
|
417 | 417 | X path:d0 |
|
418 | 418 | X path:d3/f |
|
419 | 419 | $ for x in `$TESTDIR/seq.py 1 15` |
|
420 | 420 | > do |
|
421 | 421 | > echo local change >> d9/f |
|
422 | 422 | > hg commit -m "change $x to d9/f" |
|
423 | 423 | > done |
|
424 | 424 | $ hg tracked --removeinclude d9 |
|
425 | 425 | comparing with ssh://user@dummy/master |
|
426 | 426 | searching for changes |
|
427 | 427 | looking for local changes to affected paths |
|
428 | 428 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
429 | 429 | ^[0-9a-f]{12}$ (re) |
|
430 | 430 | ^[0-9a-f]{12}$ (re) |
|
431 | 431 | ^[0-9a-f]{12}$ (re) |
|
432 | 432 | ^[0-9a-f]{12}$ (re) |
|
433 | 433 | ^[0-9a-f]{12}$ (re) |
|
434 | 434 | ^[0-9a-f]{12}$ (re) |
|
435 | 435 | ^[0-9a-f]{12}$ (re) |
|
436 | 436 | ^[0-9a-f]{12}$ (re) |
|
437 | 437 | ^[0-9a-f]{12}$ (re) |
|
438 | 438 | ^[0-9a-f]{12}$ (re) |
|
439 | 439 | ...and 5 more, use --verbose to list all |
|
440 | 440 | abort: local changes found |
|
441 | 441 | (use --force-delete-local-changes to ignore) |
|
442 | 442 | [20] |
|
443 | 443 | Now test it *with* verbose. |
|
444 | 444 | $ hg tracked --removeinclude d9 --verbose |
|
445 | 445 | comparing with ssh://user@dummy/master |
|
446 | 446 | searching for changes |
|
447 | 447 | looking for local changes to affected paths |
|
448 | 448 | The following changeset(s) or their ancestors have local changes not on the remote: |
|
449 | 449 | ^[0-9a-f]{12}$ (re) |
|
450 | 450 | ^[0-9a-f]{12}$ (re) |
|
451 | 451 | ^[0-9a-f]{12}$ (re) |
|
452 | 452 | ^[0-9a-f]{12}$ (re) |
|
453 | 453 | ^[0-9a-f]{12}$ (re) |
|
454 | 454 | ^[0-9a-f]{12}$ (re) |
|
455 | 455 | ^[0-9a-f]{12}$ (re) |
|
456 | 456 | ^[0-9a-f]{12}$ (re) |
|
457 | 457 | ^[0-9a-f]{12}$ (re) |
|
458 | 458 | ^[0-9a-f]{12}$ (re) |
|
459 | 459 | ^[0-9a-f]{12}$ (re) |
|
460 | 460 | ^[0-9a-f]{12}$ (re) |
|
461 | 461 | ^[0-9a-f]{12}$ (re) |
|
462 | 462 | ^[0-9a-f]{12}$ (re) |
|
463 | 463 | ^[0-9a-f]{12}$ (re) |
|
464 | 464 | abort: local changes found |
|
465 | 465 | (use --force-delete-local-changes to ignore) |
|
466 | 466 | [20] |
|
467 | 467 | $ cd .. |
|
468 | 468 | |
|
469 | 469 | Test --auto-remove-includes |
|
470 | 470 | $ hg clone --narrow ssh://user@dummy/master narrow-auto-remove -q \ |
|
471 | 471 | > --include d0 --include d1 --include d2 |
|
472 | 472 | $ cd narrow-auto-remove |
|
473 | 473 | $ echo a >> d0/f |
|
474 | 474 | $ hg ci -m 'local change to d0' |
|
475 | 475 | $ hg co '.^' |
|
476 | 476 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
477 | 477 | $ echo a >> d1/f |
|
478 | 478 | $ hg ci -m 'local change to d1' |
|
479 | 479 | created new head |
|
480 | 480 | $ hg debugobsolete $(hg log -T '{node}' -r 'desc("local change to d0")') |
|
481 | 481 | 1 new obsolescence markers |
|
482 | 482 | obsoleted 1 changesets |
|
483 | 483 | $ echo n | hg tracked --auto-remove-includes --config ui.interactive=yes |
|
484 | 484 | comparing with ssh://user@dummy/master |
|
485 | 485 | searching for changes |
|
486 | 486 | looking for unused includes to remove |
|
487 | 487 | path:d0 |
|
488 | 488 | path:d2 |
|
489 | 489 | remove these unused includes (Yn)? n |
|
490 | 490 | $ hg tracked --auto-remove-includes |
|
491 | 491 | comparing with ssh://user@dummy/master |
|
492 | 492 | searching for changes |
|
493 | 493 | looking for unused includes to remove |
|
494 | 494 | path:d0 |
|
495 | 495 | path:d2 |
|
496 | 496 | remove these unused includes (Yn)? y |
|
497 | 497 | looking for local changes to affected paths |
|
498 | 498 | moving unwanted changesets to backup |
|
499 | 499 | saved backup bundle to $TESTTMP/narrow-auto-remove/.hg/strip-backup/*-narrow.hg (glob) |
|
500 | 500 | deleting data/d0/f.i |
|
501 | 501 | deleting data/d2/f.i |
|
502 | 502 | deleting meta/d0/00manifest.i (tree !) |
|
503 | 503 | deleting meta/d2/00manifest.i (tree !) |
|
504 | 504 | deleting unwanted files from working copy |
|
505 | 505 | $ hg tracked |
|
506 | 506 | I path:d1 |
|
507 | 507 | $ hg files |
|
508 | 508 | d1/f |
|
509 | 509 | $ hg tracked --auto-remove-includes |
|
510 | 510 | comparing with ssh://user@dummy/master |
|
511 | 511 | searching for changes |
|
512 | 512 | looking for unused includes to remove |
|
513 | 513 | found no unused includes |
|
514 | 514 | Test --no-backup |
|
515 | 515 | $ hg tracked --addinclude d0 --addinclude d2 -q |
|
516 | 516 | $ hg unbundle .hg/strip-backup/*-narrow.hg -q |
|
517 | 517 | $ rm .hg/strip-backup/* |
|
518 | 518 | $ hg tracked --auto-remove-includes --no-backup |
|
519 | 519 | comparing with ssh://user@dummy/master |
|
520 | 520 | searching for changes |
|
521 | 521 | looking for unused includes to remove |
|
522 | 522 | path:d0 |
|
523 | 523 | path:d2 |
|
524 | 524 | remove these unused includes (Yn)? y |
|
525 | 525 | looking for local changes to affected paths |
|
526 | 526 | deleting unwanted changesets |
|
527 | 527 | deleting data/d0/f.i |
|
528 | 528 | deleting data/d2/f.i |
|
529 | 529 | deleting meta/d0/00manifest.i (tree !) |
|
530 | 530 | deleting meta/d2/00manifest.i (tree !) |
|
531 | 531 | deleting unwanted files from working copy |
|
532 | 532 | $ ls .hg/strip-backup/ |
|
533 | 533 | |
|
534 | 534 | |
|
535 | 535 | Test removing include while concurrently modifying file in that path |
|
536 | 536 | $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \ |
|
537 | 537 | > --include d0 --include d1 |
|
538 | 538 | $ cd narrow-concurrent-modify |
|
539 | 539 | $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude d0 |
|
540 | 540 | comparing with ssh://user@dummy/master |
|
541 | 541 | searching for changes |
|
542 | 542 | looking for local changes to affected paths |
|
543 | 543 | deleting data/d0/f.i |
|
544 | 544 | deleting meta/d0/00manifest.i (tree !) |
|
545 | 545 | deleting unwanted files from working copy |
|
546 | 546 | not deleting possibly dirty file d0/f |
|
547 | ||
|
548 | ||
|
549 | Test removing `rootfilesin:` include | |
|
550 | $ hg clone --narrow ssh://user@dummy/master narrow-concurrent-modify -q \ | |
|
551 | > --include rootfilesin:d0 --include rootfilesin:d1 | |
|
552 | $ cd narrow-concurrent-modify | |
|
553 | #if flat | |
|
554 | $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude rootfilesin:d0 | |
|
555 | comparing with ssh://user@dummy/master | |
|
556 | searching for changes | |
|
557 | looking for local changes to affected paths | |
|
558 | deleting data/d0/f.i | |
|
559 | deleting unwanted files from working copy | |
|
560 | not deleting possibly dirty file d0/f | |
|
561 | #endif | |
|
562 | #if tree | |
|
563 | $ hg --config 'hooks.pretxnopen = echo modified >> d0/f' tracked --removeinclude rootfilesin:d0 | |
|
564 | comparing with ssh://user@dummy/master | |
|
565 | searching for changes | |
|
566 | looking for local changes to affected paths | |
|
567 | deleting data/d0/f.i | |
|
568 | deleting meta/d0/00manifest.i | |
|
569 | deleting meta/d1/00manifest.i (known-bad-output !) | |
|
570 | deleting unwanted files from working copy | |
|
571 | not deleting possibly dirty file d0/f | |
|
572 | abort: meta/d1/00manifest@77a3e194be076ae47ba9282271028916012d815c: no node (known-bad-output !) | |
|
573 | [50] | |
|
574 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now