Mercurial > hg
comparison hgext/largefiles/overrides.py @ 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 | e26df4e774f6 |
| children | 509e2cbee679 |
comparison
equal
deleted
inserted
replaced
| 22629:b3f74b405c20 | 22630:0290982e5ac7 |
|---|---|
| 161 return int(len(files) > 0) | 161 return int(len(files) > 0) |
| 162 | 162 |
| 163 result = 0 | 163 result = 0 |
| 164 | 164 |
| 165 if after: | 165 if after: |
| 166 remove, forget = deleted, [] | 166 remove = deleted |
| 167 result = warn(modified + added + clean, | 167 result = warn(modified + added + clean, |
| 168 _('not removing %s: file still exists\n')) | 168 _('not removing %s: file still exists\n')) |
| 169 else: | 169 else: |
| 170 remove, forget = deleted + clean, [] | 170 remove = deleted + clean |
| 171 result = warn(modified, _('not removing %s: file is modified (use -f' | 171 result = warn(modified, _('not removing %s: file is modified (use -f' |
| 172 ' to force removal)\n')) | 172 ' to force removal)\n')) |
| 173 result = warn(added, _('not removing %s: file has been marked for add' | 173 result = warn(added, _('not removing %s: file has been marked for add' |
| 174 ' (use forget to undo)\n')) or result | 174 ' (use forget to undo)\n')) or result |
| 175 | 175 |
| 176 for f in sorted(remove + forget): | 176 for f in sorted(remove): |
| 177 if ui.verbose or not m.exact(f): | 177 if ui.verbose or not m.exact(f): |
| 178 ui.status(_('removing %s\n') % m.rel(f)) | 178 ui.status(_('removing %s\n') % m.rel(f)) |
| 179 | 179 |
| 180 # Need to lock because standin files are deleted then removed from the | 180 # Need to lock because standin files are deleted then removed from the |
| 181 # repository and we could race in-between. | 181 # repository and we could race in-between. |
| 189 if getattr(repo, "_isaddremove", False): | 189 if getattr(repo, "_isaddremove", False): |
| 190 ui.status(_('removing %s\n') % f) | 190 ui.status(_('removing %s\n') % f) |
| 191 util.unlinkpath(repo.wjoin(f), ignoremissing=True) | 191 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
| 192 lfdirstate.remove(f) | 192 lfdirstate.remove(f) |
| 193 lfdirstate.write() | 193 lfdirstate.write() |
| 194 forget = [lfutil.standin(f) for f in forget] | |
| 195 remove = [lfutil.standin(f) for f in remove] | 194 remove = [lfutil.standin(f) for f in remove] |
| 196 repo[None].forget(forget) | |
| 197 # If this is being called by addremove, let the original addremove | 195 # If this is being called by addremove, let the original addremove |
| 198 # function handle this. | 196 # function handle this. |
| 199 if not getattr(repo, "_isaddremove", False): | 197 if not getattr(repo, "_isaddremove", False): |
| 200 for f in remove: | 198 for f in remove: |
| 201 util.unlinkpath(repo.wjoin(f), ignoremissing=True) | 199 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |