##// END OF EJS Templates
narrow: add more status messages when narrowing...
Martin von Zweigbergk -
r47790:f851c833 default draft
parent child Browse files
Show More
@@ -281,6 +281,10 b' def _narrow('
281 )
281 )
282 hg.clean(repo, urev)
282 hg.clean(repo, urev)
283 overrides = {(b'devel', b'strip-obsmarkers'): False}
283 overrides = {(b'devel', b'strip-obsmarkers'): False}
284 if backup:
285 ui.status(_(b'moving unwanted changesets to backup\n'))
286 else:
287 ui.status(_(b'deleting unwanted changesets\n'))
284 with ui.configoverride(overrides, b'narrow'):
288 with ui.configoverride(overrides, b'narrow'):
285 repair.strip(ui, unfi, tostrip, topic=b'narrow', backup=backup)
289 repair.strip(ui, unfi, tostrip, topic=b'narrow', backup=backup)
286
290
@@ -316,6 +320,7 b' def _narrow('
316 util.unlinkpath(repo.svfs.join(f))
320 util.unlinkpath(repo.svfs.join(f))
317 repo.store.markremoved(f)
321 repo.store.markremoved(f)
318
322
323 ui.status(_(b'deleting unwanted files from working copy\n'))
319 narrowspec.updateworkingcopy(repo, assumeclean=True)
324 narrowspec.updateworkingcopy(repo, assumeclean=True)
320 narrowspec.copytoworkingcopy(repo)
325 narrowspec.copytoworkingcopy(repo)
321
326
@@ -57,6 +57,7 b' gracefully:'
57 comparing with http://localhost:$HGPORT1/
57 comparing with http://localhost:$HGPORT1/
58 searching for changes
58 searching for changes
59 looking for local changes to affected paths
59 looking for local changes to affected paths
60 deleting unwanted files from working copy
60
61
61 $ hg tracked --addinclude f1 http://localhost:$HGPORT1/
62 $ hg tracked --addinclude f1 http://localhost:$HGPORT1/
62 nothing to widen or narrow
63 nothing to widen or narrow
@@ -193,6 +193,7 b' widen narrow spec again, but exclude a f'
193 deleting data/dir1/dirA/bar.i (reporevlogstore !)
193 deleting data/dir1/dirA/bar.i (reporevlogstore !)
194 deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
194 deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
195 deleting data/dir1/dirA/bar/index (reposimplestore !)
195 deleting data/dir1/dirA/bar/index (reposimplestore !)
196 deleting unwanted files from working copy
196 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
197 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
197 adding changesets
198 adding changesets
198 adding manifests
199 adding manifests
@@ -249,6 +250,7 b' widen narrow spec yet again, excluding a'
249 deleting data/dir1/dirA/foo.i (reporevlogstore !)
250 deleting data/dir1/dirA/foo.i (reporevlogstore !)
250 deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
251 deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
251 deleting data/dir1/dirA/foo/index (reposimplestore !)
252 deleting data/dir1/dirA/foo/index (reposimplestore !)
253 deleting unwanted files from working copy
252 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
254 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
253 adding changesets
255 adding changesets
254 adding manifests
256 adding manifests
@@ -94,6 +94,7 b' Narrow the share and check that the main'
94 deleting meta/d1/00manifest.i (tree !)
94 deleting meta/d1/00manifest.i (tree !)
95 deleting meta/d3/00manifest.i (tree !)
95 deleting meta/d3/00manifest.i (tree !)
96 deleting meta/d5/00manifest.i (tree !)
96 deleting meta/d5/00manifest.i (tree !)
97 deleting unwanted files from working copy
97 $ hg -R main tracked
98 $ hg -R main tracked
98 I path:d7
99 I path:d7
99 $ hg -R main files
100 $ hg -R main files
@@ -150,6 +150,7 b' Testing the --import-rules flag of `hg t'
150 looking for local changes to affected paths
150 looking for local changes to affected paths
151 deleting data/inside/f.i
151 deleting data/inside/f.i
152 deleting meta/inside/00manifest.i (tree !)
152 deleting meta/inside/00manifest.i (tree !)
153 deleting unwanted files from working copy
153 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
154 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
154 adding changesets
155 adding changesets
155 adding manifests
156 adding manifests
@@ -191,6 +192,7 b' Testing the --import-rules flag with --a'
191 looking for local changes to affected paths
192 looking for local changes to affected paths
192 deleting data/widest/f.i
193 deleting data/widest/f.i
193 deleting meta/widest/00manifest.i (tree !)
194 deleting meta/widest/00manifest.i (tree !)
195 deleting unwanted files from working copy
194 $ hg tracked
196 $ hg tracked
195 I path:outisde
197 I path:outisde
196 I path:wider
198 I path:wider
@@ -132,12 +132,14 b' Force deletion of local changes'
132 looking for local changes to affected paths
132 looking for local changes to affected paths
133 The following changeset(s) or their ancestors have local changes not on the remote:
133 The following changeset(s) or their ancestors have local changes not on the remote:
134 * (glob)
134 * (glob)
135 moving unwanted changesets to backup
135 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
136 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
136 deleting data/d0/f.i (reporevlogstore !)
137 deleting data/d0/f.i (reporevlogstore !)
137 deleting meta/d0/00manifest.i (tree !)
138 deleting meta/d0/00manifest.i (tree !)
138 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
139 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
139 deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
140 deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
140 deleting data/d0/f/index (reposimplestore !)
141 deleting data/d0/f/index (reposimplestore !)
142 deleting unwanted files from working copy
141
143
142 $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
144 $ hg log -T "{rev}: {desc} {outsidenarrow}\n"
143 7: local change to d3
145 7: local change to d3
@@ -164,12 +166,14 b' Pruned commits affecting removed paths s'
164 comparing with ssh://user@dummy/master
166 comparing with ssh://user@dummy/master
165 searching for changes
167 searching for changes
166 looking for local changes to affected paths
168 looking for local changes to affected paths
169 moving unwanted changesets to backup
167 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
170 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
168 deleting data/d0/f.i (reporevlogstore !)
171 deleting data/d0/f.i (reporevlogstore !)
169 deleting meta/d0/00manifest.i (tree !)
172 deleting meta/d0/00manifest.i (tree !)
170 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
173 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
171 deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
174 deleting data/d0/f/4374b5650fc5ae54ac857c0f0381971fdde376f7 (reposimplestore !)
172 deleting data/d0/f/index (reposimplestore !)
175 deleting data/d0/f/index (reposimplestore !)
176 deleting unwanted files from working copy
173
177
174 Updates off of stripped commit if necessary
178 Updates off of stripped commit if necessary
175 $ hg co -r 'desc("local change to d3")' -q
179 $ hg co -r 'desc("local change to d3")' -q
@@ -183,12 +187,14 b' Updates off of stripped commit if necess'
183 * (glob)
187 * (glob)
184 * (glob)
188 * (glob)
185 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
189 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
190 moving unwanted changesets to backup
186 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
191 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
187 deleting data/d3/f.i (reporevlogstore !)
192 deleting data/d3/f.i (reporevlogstore !)
188 deleting meta/d3/00manifest.i (tree !)
193 deleting meta/d3/00manifest.i (tree !)
189 deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
194 deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
190 deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !)
195 deleting data/d3/f/99fa7136105a15e2045ce3d9152e4837c5349e4d (reposimplestore !)
191 deleting data/d3/f/index (reposimplestore !)
196 deleting data/d3/f/index (reposimplestore !)
197 deleting unwanted files from working copy
192 $ hg log -T '{desc}\n' -r .
198 $ hg log -T '{desc}\n' -r .
193 add d10/f
199 add d10/f
194 Updates to nullid if necessary
200 Updates to nullid if necessary
@@ -206,12 +212,14 b' Updates to nullid if necessary'
206 The following changeset(s) or their ancestors have local changes not on the remote:
212 The following changeset(s) or their ancestors have local changes not on the remote:
207 * (glob)
213 * (glob)
208 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
214 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
215 moving unwanted changesets to backup
209 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
216 saved backup bundle to $TESTTMP/narrow-local-changes/.hg/strip-backup/*-narrow.hg (glob)
210 deleting data/d3/f.i (reporevlogstore !)
217 deleting data/d3/f.i (reporevlogstore !)
211 deleting meta/d3/00manifest.i (tree !)
218 deleting meta/d3/00manifest.i (tree !)
212 deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
219 deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
213 deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
220 deleting data/d3/f/5ce0767945cbdbca3b924bb9fbf5143f72ab40ac (reposimplestore !)
214 deleting data/d3/f/index (reposimplestore !)
221 deleting data/d3/f/index (reposimplestore !)
222 deleting unwanted files from working copy
215 $ hg id
223 $ hg id
216 000000000000
224 000000000000
217 $ cd ..
225 $ cd ..
@@ -272,6 +280,7 b' Can remove last include, making repo emp'
272 deleting meta/d0/00manifest.i (tree !)
280 deleting meta/d0/00manifest.i (tree !)
273 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
281 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
274 deleting data/d0/f/index (reposimplestore !)
282 deleting data/d0/f/index (reposimplestore !)
283 deleting unwanted files from working copy
275 $ hg tracked
284 $ hg tracked
276 $ hg files
285 $ hg files
277 [1]
286 [1]
@@ -332,6 +341,7 b' https://bitbucket.org/Google/narrowhg/is'
332 deleting meta/d6/00manifest.i (tree !)
341 deleting meta/d6/00manifest.i (tree !)
333 deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !)
342 deleting data/d6/f/7339d30678f451ac8c3f38753beeb4cf2e1655c7 (reposimplestore !)
334 deleting data/d6/f/index (reposimplestore !)
343 deleting data/d6/f/index (reposimplestore !)
344 deleting unwanted files from working copy
335 $ hg tracked
345 $ hg tracked
336 I path:d0
346 I path:d0
337 I path:d3
347 I path:d3
@@ -355,6 +365,7 b' https://bitbucket.org/Google/narrowhg/is'
355 deleting data/d3/f.i (reporevlogstore !)
365 deleting data/d3/f.i (reporevlogstore !)
356 deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
366 deleting data/d3/f/2661d26c649684b482d10f91960cc3db683c38b4 (reposimplestore !)
357 deleting data/d3/f/index (reposimplestore !)
367 deleting data/d3/f/index (reposimplestore !)
368 deleting unwanted files from working copy
358 $ hg tracked
369 $ hg tracked
359 I path:d0
370 I path:d0
360 I path:d3
371 I path:d3
@@ -378,6 +389,7 b' https://bitbucket.org/Google/narrowhg/is'
378 deleting meta/d0/00manifest.i (tree !)
389 deleting meta/d0/00manifest.i (tree !)
379 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
390 deleting data/d0/f/362fef284ce2ca02aecc8de6d5e8a1c3af0556fe (reposimplestore !)
380 deleting data/d0/f/index (reposimplestore !)
391 deleting data/d0/f/index (reposimplestore !)
392 deleting unwanted files from working copy
381 $ hg tracked
393 $ hg tracked
382 I path:d3
394 I path:d3
383 I path:d9
395 I path:d9
@@ -478,11 +490,13 b' Test --auto-remove-includes'
478 path:d2
490 path:d2
479 remove these unused includes (yn)? y
491 remove these unused includes (yn)? y
480 looking for local changes to affected paths
492 looking for local changes to affected paths
493 moving unwanted changesets to backup
481 saved backup bundle to $TESTTMP/narrow-auto-remove/.hg/strip-backup/*-narrow.hg (glob)
494 saved backup bundle to $TESTTMP/narrow-auto-remove/.hg/strip-backup/*-narrow.hg (glob)
482 deleting data/d0/f.i
495 deleting data/d0/f.i
483 deleting data/d2/f.i
496 deleting data/d2/f.i
484 deleting meta/d0/00manifest.i (tree !)
497 deleting meta/d0/00manifest.i (tree !)
485 deleting meta/d2/00manifest.i (tree !)
498 deleting meta/d2/00manifest.i (tree !)
499 deleting unwanted files from working copy
486 $ hg tracked
500 $ hg tracked
487 I path:d1
501 I path:d1
488 $ hg files
502 $ hg files
@@ -504,10 +518,12 b' Test --no-backup'
504 path:d2
518 path:d2
505 remove these unused includes (yn)? y
519 remove these unused includes (yn)? y
506 looking for local changes to affected paths
520 looking for local changes to affected paths
521 deleting unwanted changesets
507 deleting data/d0/f.i
522 deleting data/d0/f.i
508 deleting data/d2/f.i
523 deleting data/d2/f.i
509 deleting meta/d0/00manifest.i (tree !)
524 deleting meta/d0/00manifest.i (tree !)
510 deleting meta/d2/00manifest.i (tree !)
525 deleting meta/d2/00manifest.i (tree !)
526 deleting unwanted files from working copy
511 $ ls .hg/strip-backup/
527 $ ls .hg/strip-backup/
512
528
513
529
@@ -521,4 +537,5 b' Test removing include while concurrently'
521 looking for local changes to affected paths
537 looking for local changes to affected paths
522 deleting data/d0/f.i
538 deleting data/d0/f.i
523 deleting meta/d0/00manifest.i (tree !)
539 deleting meta/d0/00manifest.i (tree !)
540 deleting unwanted files from working copy
524 not deleting possibly dirty file d0/f
541 not deleting possibly dirty file d0/f
General Comments 0
You need to be logged in to leave comments. Login now