diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -189,21 +189,16 @@ def removelargefiles(ui, repo, isaddremo result = warn(added, _('not removing %s: file has been marked for add' ' (use forget to undo)\n')) or result - for f in sorted(remove): - if ui.verbose or not m.exact(f): - ui.status(_('removing %s\n') % m.rel(f)) - # Need to lock because standin files are deleted then removed from the # repository and we could race in-between. wlock = repo.wlock() try: lfdirstate = lfutil.openlfdirstate(ui, repo) - for f in remove: - if not after: - # If this is being called by addremove, notify the user that we - # are removing the file. - if isaddremove: - ui.status(_('removing %s\n') % f) + for f in sorted(remove): + if isaddremove: + ui.status(_('removing %s\n') % f) + elif ui.verbose or not m.exact(f): + ui.status(_('removing %s\n') % m.rel(f)) if not opts.get('dry_run'): if not after: diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t --- a/tests/test-largefiles.t +++ b/tests/test-largefiles.t @@ -491,7 +491,7 @@ Test addremove with -R $ echo "testing addremove with patterns" > testaddremove.dat $ echo "normaladdremove" > normaladdremove $ cd .. - $ hg -R a addremove + $ hg -R a -v addremove removing sub/large4 adding a/testaddremove.dat as a largefile (glob) removing normal3