equal
deleted
inserted
replaced
155 for f in remove: |
155 for f in remove: |
156 if not after: |
156 if not after: |
157 # If this is being called by addremove, notify the user that we |
157 # If this is being called by addremove, notify the user that we |
158 # are removing the file. |
158 # are removing the file. |
159 if getattr(repo, "_isaddremove", False): |
159 if getattr(repo, "_isaddremove", False): |
160 ui.status(_('removing %s\n' % f)) |
160 ui.status(_('removing %s\n') % f) |
161 if os.path.exists(repo.wjoin(f)): |
161 if os.path.exists(repo.wjoin(f)): |
162 util.unlinkpath(repo.wjoin(f)) |
162 util.unlinkpath(repo.wjoin(f)) |
163 lfdirstate.remove(f) |
163 lfdirstate.remove(f) |
164 lfdirstate.write() |
164 lfdirstate.write() |
165 forget = [lfutil.standin(f) for f in forget] |
165 forget = [lfutil.standin(f) for f in forget] |
671 heads = lfutil.getcurrentheads(repo) |
671 heads = lfutil.getcurrentheads(repo) |
672 newheads = set(heads).difference(set(oldheads)) |
672 newheads = set(heads).difference(set(oldheads)) |
673 for head in newheads: |
673 for head in newheads: |
674 (cached, missing) = lfcommands.cachelfiles(ui, repo, head) |
674 (cached, missing) = lfcommands.cachelfiles(ui, repo, head) |
675 numcached += len(cached) |
675 numcached += len(cached) |
676 ui.status(_("%d largefiles cached\n" % numcached)) |
676 ui.status(_("%d largefiles cached\n") % numcached) |
677 return result |
677 return result |
678 |
678 |
679 def override_rebase(orig, ui, repo, **opts): |
679 def override_rebase(orig, ui, repo, **opts): |
680 repo._isrebasing = True |
680 repo._isrebasing = True |
681 try: |
681 try: |