##// END OF EJS Templates
largefiles: eliminate a duplicate message when removing files in verbose mode...
Matt Harbison -
r23658:55c92618 default
parent child Browse files
Show More
@@ -189,21 +189,16 b' def removelargefiles(ui, repo, isaddremo'
189 result = warn(added, _('not removing %s: file has been marked for add'
189 result = warn(added, _('not removing %s: file has been marked for add'
190 ' (use forget to undo)\n')) or result
190 ' (use forget to undo)\n')) or result
191
191
192 for f in sorted(remove):
193 if ui.verbose or not m.exact(f):
194 ui.status(_('removing %s\n') % m.rel(f))
195
196 # Need to lock because standin files are deleted then removed from the
192 # Need to lock because standin files are deleted then removed from the
197 # repository and we could race in-between.
193 # repository and we could race in-between.
198 wlock = repo.wlock()
194 wlock = repo.wlock()
199 try:
195 try:
200 lfdirstate = lfutil.openlfdirstate(ui, repo)
196 lfdirstate = lfutil.openlfdirstate(ui, repo)
201 for f in remove:
197 for f in sorted(remove):
202 if not after:
203 # If this is being called by addremove, notify the user that we
204 # are removing the file.
205 if isaddremove:
198 if isaddremove:
206 ui.status(_('removing %s\n') % f)
199 ui.status(_('removing %s\n') % f)
200 elif ui.verbose or not m.exact(f):
201 ui.status(_('removing %s\n') % m.rel(f))
207
202
208 if not opts.get('dry_run'):
203 if not opts.get('dry_run'):
209 if not after:
204 if not after:
@@ -491,7 +491,7 b' Test addremove with -R'
491 $ echo "testing addremove with patterns" > testaddremove.dat
491 $ echo "testing addremove with patterns" > testaddremove.dat
492 $ echo "normaladdremove" > normaladdremove
492 $ echo "normaladdremove" > normaladdremove
493 $ cd ..
493 $ cd ..
494 $ hg -R a addremove
494 $ hg -R a -v addremove
495 removing sub/large4
495 removing sub/large4
496 adding a/testaddremove.dat as a largefile (glob)
496 adding a/testaddremove.dat as a largefile (glob)
497 removing normal3
497 removing normal3
General Comments 0
You need to be logged in to leave comments. Login now