# HG changeset patch # User Martin von Zweigbergk # Date 2019-02-08 21:20:46 # Node ID f89aad980025421ce7b81cde63a14ac7578548e6 # Parent ecf7f4ef52fb12031c29f3bae7d283189223a45b automv: respect ui.relative-paths Differential Revision: https://phab.mercurial-scm.org/D5910 diff --git a/hgext/automv.py b/hgext/automv.py --- a/hgext/automv.py +++ b/hgext/automv.py @@ -64,7 +64,8 @@ def mvcheck(orig, ui, repo, *pats, **opt if threshold > 0: match = scmutil.match(repo[None], pats, opts) added, removed = _interestingfiles(repo, match) - renames = _findrenames(repo, match, added, removed, + uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) + renames = _findrenames(repo, uipathfn, added, removed, threshold / 100.0) with repo.wlock(): @@ -89,7 +90,7 @@ def _interestingfiles(repo, matcher): return added, removed -def _findrenames(repo, matcher, added, removed, similarity): +def _findrenames(repo, uipathfn, added, removed, similarity): """Find what files in added are really moved files. Any file named in removed that is at least similarity% similar to a file @@ -103,7 +104,7 @@ def _findrenames(repo, matcher, added, r if repo.ui.verbose: repo.ui.status( _('detected move of %s as %s (%d%% similar)\n') % ( - matcher.rel(src), matcher.rel(dst), score * 100)) + uipathfn(src), uipathfn(dst), score * 100)) renames[dst] = src if renames: repo.ui.status(_('detected move of %d files\n') % len(renames))