Mercurial > hg
changeset 41665:0ed7a8ac5711
scmutil: respect ui.relative-paths in default match.badfn
We should probably be passing in a uipathfn here instead, so the
caller can get consistent output (between match.badfn and whatever
else it prints). I think we should ideally remove the badfn from the
matcher completely, but that's a different story. This patch is at
least not making it worse.
Differential Revision: https://phab.mercurial-scm.org/D5916
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 08 Feb 2019 13:33:40 -0800 |
| parents | 0cbf491db7ee |
| children | a950b65cbe1b |
| files | mercurial/scmutil.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Feb 08 13:00:28 2019 -0800 +++ b/mercurial/scmutil.py Fri Feb 08 13:33:40 2019 -0800 @@ -802,8 +802,9 @@ if not globbed and default == 'relpath': pats = expandpats(pats or []) + uipathfn = getuipathfn(ctx.repo(), legacyrelativevalue=True) def bad(f, msg): - ctx.repo().ui.warn("%s: %s\n" % (m.rel(f), msg)) + ctx.repo().ui.warn("%s: %s\n" % (uipathfn(f), msg)) if badfn is None: badfn = bad