This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5916

scmutil: respect ui.relative-paths in default match.badfn
ClosedPublic

Authored by martinvonz on Feb 8 2019, 5:36 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG0ed7a8ac5711: scmutil: respect ui.relative-paths in default match.badfn
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (3 lines)

Diff 13997

mercurial/scmutil.py

is provided.''' is provided.'''
if pats == ("",): if pats == ("",):
pats = [] pats = []
if opts is None: if opts is None:
opts = {} opts = {}
if not globbed and default == 'relpath': if not globbed and default == 'relpath':
pats = expandpats(pats or []) pats = expandpats(pats or [])
uipathfn = getuipathfn(ctx.repo(), legacyrelativevalue=True)
def bad(f, msg): 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: if badfn is None:
badfn = bad badfn = bad
m = ctx.match(pats, opts.get('include'), opts.get('exclude'), m = ctx.match(pats, opts.get('include'), opts.get('exclude'),
default, listsubrepos=opts.get('subrepos'), badfn=badfn) default, listsubrepos=opts.get('subrepos'), badfn=badfn)
if m.always(): if m.always():