Show More
@@ -703,7 +703,7 b' def addremove(repo, pats=[], opts={}, dr' | |||||
703 | status = _('removing %s\n') % ((pats and rel) or abs) |
|
703 | status = _('removing %s\n') % ((pats and rel) or abs) | |
704 | repo.ui.status(status) |
|
704 | repo.ui.status(status) | |
705 |
|
705 | |||
706 |
|
|
706 | renames = {} | |
707 | if similarity > 0: |
|
707 | if similarity > 0: | |
708 | for old, new, score in similar.findrenames(repo, |
|
708 | for old, new, score in similar.findrenames(repo, | |
709 | added + unknown, removed + deleted, similarity): |
|
709 | added + unknown, removed + deleted, similarity): | |
@@ -711,7 +711,7 b' def addremove(repo, pats=[], opts={}, dr' | |||||
711 | repo.ui.status(_('recording removal of %s as rename to %s ' |
|
711 | repo.ui.status(_('recording removal of %s as rename to %s ' | |
712 | '(%d%% similar)\n') % |
|
712 | '(%d%% similar)\n') % | |
713 | (m.rel(old), m.rel(new), score * 100)) |
|
713 | (m.rel(old), m.rel(new), score * 100)) | |
714 |
|
|
714 | renames[new] = old | |
715 |
|
715 | |||
716 | if not dry_run: |
|
716 | if not dry_run: | |
717 | wctx = repo[None] |
|
717 | wctx = repo[None] | |
@@ -719,7 +719,7 b' def addremove(repo, pats=[], opts={}, dr' | |||||
719 | try: |
|
719 | try: | |
720 | wctx.forget(deleted) |
|
720 | wctx.forget(deleted) | |
721 | wctx.add(unknown) |
|
721 | wctx.add(unknown) | |
722 |
for new, old in |
|
722 | for new, old in renames.iteritems(): | |
723 | wctx.copy(old, new) |
|
723 | wctx.copy(old, new) | |
724 | finally: |
|
724 | finally: | |
725 | wlock.release() |
|
725 | wlock.release() |
General Comments 0
You need to be logged in to leave comments.
Login now