# HG changeset patch # User Denis Laxalde <de...@laxalde.org> # Date 1554650069 -7200 # Sun Apr 07 17:14:29 2019 +0200 # Node ID a544e90f7c163576fe84234b024bf0c0052d995e # Parent c7e9ddf8b24e9768d331872af1e61cd5d65c3668 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'): _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel