Mercurial > hg
changeset 22630:0290982e5ac7
largefiles: remove 'forget' list that's always empty
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Tue, 30 Sep 2014 14:32:49 -0700 |
parents | b3f74b405c20 |
children | d246eb9cabbc |
files | hgext/largefiles/overrides.py |
diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Thu Oct 02 16:43:50 2014 -0500 +++ b/hgext/largefiles/overrides.py Tue Sep 30 14:32:49 2014 -0700 @@ -163,17 +163,17 @@ result = 0 if after: - remove, forget = deleted, [] + remove = deleted result = warn(modified + added + clean, _('not removing %s: file still exists\n')) else: - remove, forget = deleted + clean, [] + remove = deleted + clean result = warn(modified, _('not removing %s: file is modified (use -f' ' to force removal)\n')) result = warn(added, _('not removing %s: file has been marked for add' ' (use forget to undo)\n')) or result - for f in sorted(remove + forget): + for f in sorted(remove): if ui.verbose or not m.exact(f): ui.status(_('removing %s\n') % m.rel(f)) @@ -191,9 +191,7 @@ util.unlinkpath(repo.wjoin(f), ignoremissing=True) lfdirstate.remove(f) lfdirstate.write() - forget = [lfutil.standin(f) for f in forget] remove = [lfutil.standin(f) for f in remove] - repo[None].forget(forget) # If this is being called by addremove, let the original addremove # function handle this. if not getattr(repo, "_isaddremove", False):