# HG changeset patch # User Siddharth Agarwal # Date 2013-04-03 22:32:15 # Node ID 2487a594b439d4db87b94338b70e791736016026 # Parent 7a4eab2456de9b869ec93eeac5c4e34c17769d45 scmutil.addremove: rename local 'copies' to 'renames' An upcoming patch will refactor some code out into a method called _findrenames. Having a line saying "copies = _findrenames..." is confusing. Besides, 'renames' is a more precise name for this local anyway. diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py --- a/mercurial/scmutil.py +++ b/mercurial/scmutil.py @@ -703,7 +703,7 @@ def addremove(repo, pats=[], opts={}, dr status = _('removing %s\n') % ((pats and rel) or abs) repo.ui.status(status) - copies = {} + renames = {} if similarity > 0: for old, new, score in similar.findrenames(repo, added + unknown, removed + deleted, similarity): @@ -711,7 +711,7 @@ def addremove(repo, pats=[], opts={}, dr repo.ui.status(_('recording removal of %s as rename to %s ' '(%d%% similar)\n') % (m.rel(old), m.rel(new), score * 100)) - copies[new] = old + renames[new] = old if not dry_run: wctx = repo[None] @@ -719,7 +719,7 @@ def addremove(repo, pats=[], opts={}, dr try: wctx.forget(deleted) wctx.add(unknown) - for new, old in copies.iteritems(): + for new, old in renames.iteritems(): wctx.copy(old, new) finally: wlock.release()