# HG changeset patch # User Martin von Zweigbergk # Date 2019-04-17 21:35:42 # Node ID 770f5f586ae5e9e6cc4bd2cf252eb509f45aa1d1 # Parent 607a0de9bae31df526da75b68ab2853787d8c31e narrow: make warning about possibly dirty files respect ui.relative-paths Differential Revision: https://phab.mercurial-scm.org/D6264 diff --git a/mercurial/narrowspec.py b/mercurial/narrowspec.py --- a/mercurial/narrowspec.py +++ b/mercurial/narrowspec.py @@ -15,6 +15,7 @@ from . import ( match as matchmod, merge, repository, + scmutil, sparse, util, ) @@ -302,8 +303,9 @@ def updateworkingcopy(repo, assumeclean= else: trackeddirty.extend(lookup) _deletecleanfiles(repo, clean) + uipathfn = scmutil.getuipathfn(repo) for f in sorted(trackeddirty): - repo.ui.status(_('not deleting possibly dirty file %s\n') % f) + repo.ui.status(_('not deleting possibly dirty file %s\n') % uipathfn(f)) for f in clean + trackeddirty: ds.drop(f)