##// END OF EJS Templates
remove: print message for each file in verbose mode only while using `-A` (BC)...
pavanpc@fb.com -
r35120:7a586082 default
parent child Browse files
Show More
@@ -2982,8 +2982,9 b' def remove(ui, repo, m, prefix, after, f'
2982 for f in remaining:
2982 for f in remaining:
2983 count += 1
2983 count += 1
2984 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2984 ui.progress(_('skipping'), count, total=total, unit=_('files'))
2985 warnings.append(_('not removing %s: file still exists\n')
2985 if ui.verbose or (f in files):
2986 % m.rel(f))
2986 warnings.append(_('not removing %s: file still exists\n')
2987 % m.rel(f))
2987 ret = 1
2988 ret = 1
2988 ui.progress(_('skipping'), None)
2989 ui.progress(_('skipping'), None)
2989 else:
2990 else:
@@ -189,9 +189,9 b' 20 state added, options -A'
189 \r (no-eol) (esc)
189 \r (no-eol) (esc)
190 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
190 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
191
191
192 21 state clean, options -A
192 21 state clean, options -Av
193
193
194 $ remove -A foo
194 $ remove -Av foo
195 \r (no-eol) (esc)
195 \r (no-eol) (esc)
196 deleting [===========================================>] 1/1\r (no-eol) (esc)
196 deleting [===========================================>] 1/1\r (no-eol) (esc)
197 \r (no-eol) (esc)
197 \r (no-eol) (esc)
@@ -205,10 +205,10 b' 21 state clean, options -A'
205 ./foo
205 ./foo
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
206 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
207
207
208 22 state modified, options -A
208 22 state modified, options -Av
209
209
210 $ echo b >> foo
210 $ echo b >> foo
211 $ remove -A foo
211 $ remove -Av foo
212 \r (no-eol) (esc)
212 \r (no-eol) (esc)
213 deleting [===========================================>] 1/1\r (no-eol) (esc)
213 deleting [===========================================>] 1/1\r (no-eol) (esc)
214 \r (no-eol) (esc)
214 \r (no-eol) (esc)
@@ -357,9 +357,32 b' dir, options -f'
357 \r (no-eol) (esc)
357 \r (no-eol) (esc)
358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
358 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
359
359
360 dir, options -A
360 dir, options -Av
361
361
362 $ rm test/bar
362 $ rm test/bar
363 $ remove -Av test
364 \r (no-eol) (esc)
365 deleting [===========================================>] 1/1\r (no-eol) (esc)
366 \r (no-eol) (esc)
367 \r (no-eol) (esc)
368 skipping [===========================================>] 1/1\r (no-eol) (esc)
369 \r (no-eol) (esc)
370 \r (no-eol) (esc)
371 deleting [===========================================>] 1/1\r (no-eol) (esc)
372 \r (no-eol) (esc)
373 removing test/bar (glob)
374 not removing test/foo: file still exists (glob)
375 exit code: 1
376 R test/bar
377 ./foo
378 ./test/foo
379 \r (no-eol) (esc)
380 updating [===========================================>] 1/1\r (no-eol) (esc)
381 \r (no-eol) (esc)
382 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
383
384 dir, options -A <dir>
385 $ rm test/bar
363 $ remove -A test
386 $ remove -A test
364 \r (no-eol) (esc)
387 \r (no-eol) (esc)
365 deleting [===========================================>] 1/1\r (no-eol) (esc)
388 deleting [===========================================>] 1/1\r (no-eol) (esc)
@@ -371,7 +394,26 b' dir, options -A'
371 deleting [===========================================>] 1/1\r (no-eol) (esc)
394 deleting [===========================================>] 1/1\r (no-eol) (esc)
372 \r (no-eol) (esc)
395 \r (no-eol) (esc)
373 removing test/bar (glob)
396 removing test/bar (glob)
374 not removing test/foo: file still exists (glob)
397 exit code: 1
398 R test/bar
399 ./foo
400 ./test/foo
401 \r (no-eol) (esc)
402 updating [===========================================>] 1/1\r (no-eol) (esc)
403 \r (no-eol) (esc)
404 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
405
406 without any files/dirs, options -A
407 $ rm test/bar
408 $ remove -A
409 \r (no-eol) (esc)
410 skipping [=====================> ] 1/2\r (no-eol) (esc)
411 skipping [===========================================>] 2/2\r (no-eol) (esc)
412 \r (no-eol) (esc)
413 \r (no-eol) (esc)
414 deleting [===========================================>] 1/1\r (no-eol) (esc)
415 \r (no-eol) (esc)
416 removing test/bar (glob)
375 exit code: 1
417 exit code: 1
376 R test/bar
418 R test/bar
377 ./foo
419 ./foo
General Comments 0
You need to be logged in to leave comments. Login now