equal
deleted
inserted
replaced
204 ui.status(_('removing %s\n') % f) |
204 ui.status(_('removing %s\n') % f) |
205 |
205 |
206 if not opts.get('dry_run'): |
206 if not opts.get('dry_run'): |
207 if not after: |
207 if not after: |
208 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
208 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
209 lfdirstate.remove(f) |
|
210 |
209 |
211 if opts.get('dry_run'): |
210 if opts.get('dry_run'): |
212 return result |
211 return result |
213 |
212 |
214 lfdirstate.write() |
|
215 remove = [lfutil.standin(f) for f in remove] |
213 remove = [lfutil.standin(f) for f in remove] |
216 # If this is being called by addremove, let the original addremove |
214 # If this is being called by addremove, let the original addremove |
217 # function handle this. |
215 # function handle this. |
218 if not isaddremove: |
216 if not isaddremove: |
219 for f in remove: |
217 for f in remove: |
220 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
218 util.unlinkpath(repo.wjoin(f), ignoremissing=True) |
221 repo[None].forget(remove) |
219 repo[None].forget(remove) |
|
220 |
|
221 for f in remove: |
|
222 lfutil.synclfdirstate(repo, lfdirstate, lfutil.splitstandin(f), |
|
223 False) |
|
224 |
|
225 lfdirstate.write() |
222 finally: |
226 finally: |
223 wlock.release() |
227 wlock.release() |
224 |
228 |
225 return result |
229 return result |
226 |
230 |