Mercurial > hg-stable
changeset 42085:54e6d7ef5ca5
match: make _donormalize's auditor and warn arguments optional
Argument 'warn' is actually non-required, since there's a 'if warn:'
check before usage. Argument 'auditor' is passed to
pathutil.canonpath(), in which it is optional.
| author | Denis Laxalde <denis@laxalde.org> |
|---|---|
| date | Sun, 07 Apr 2019 17:14:29 +0200 |
| parents | 42537dfc7a7c |
| children | 1721b92f2b5e |
| files | mercurial/match.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/match.py Mon Apr 08 09:34:50 2019 +0200 +++ b/mercurial/match.py Sun Apr 07 17:14:29 2019 +0200 @@ -256,13 +256,13 @@ m.bad = badfn return m -def _donormalize(patterns, default, root, cwd, auditor, warn): +def _donormalize(patterns, default, root, cwd, auditor=None, warn=None): '''Convert 'kind:pat' from the patterns list to tuples with kind and normalized and rooted patterns and with listfiles expanded.''' kindpats = [] for kind, pat in [_patsplit(p, default) for p in patterns]: if kind in cwdrelativepatternkinds: - pat = pathutil.canonpath(root, cwd, pat, auditor) + pat = pathutil.canonpath(root, cwd, pat, auditor=auditor) elif kind in ('relglob', 'path', 'rootfilesin', 'rootglob'): pat = util.normpath(pat) elif kind in ('listfile', 'listfile0'):