# HG changeset patch # User Denis Laxalde # Date 2019-04-07 15:14:29 # Node ID 54e6d7ef5ca548126e3182bedb20b40144ca111e # Parent 42537dfc7a7c6d5dd90174d67cdacab43b87f0e9 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. diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -256,13 +256,13 @@ def badmatch(match, badfn): 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'):