Show More
@@ -163,17 +163,17 b' def removelargefiles(ui, repo, *pats, **' | |||||
163 | result = 0 |
|
163 | result = 0 | |
164 |
|
164 | |||
165 | if after: |
|
165 | if after: | |
166 |
remove |
|
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 |
|
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 |
|
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 | |||
@@ -191,9 +191,7 b' def removelargefiles(ui, repo, *pats, **' | |||||
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): |
General Comments 0
You need to be logged in to leave comments.
Login now