Mercurial > hg-stable
changeset 33710:2be0bf186950
match: expose some data and functionality to other modules
This patch makes sure that other modules can check whether patterns
are CWD-relative.
| author | Kostia Balytskyi <ikostia@fb.com> |
|---|---|
| date | Wed, 02 Aug 2017 15:48:57 -0700 |
| parents | 7dcb517122f9 |
| children | e1c56486d1aa |
| files | mercurial/match.py |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/match.py Wed Aug 02 15:05:21 2017 -0700 +++ b/mercurial/match.py Wed Aug 02 15:48:57 2017 -0700 @@ -18,6 +18,11 @@ util, ) +allpatternkinds = ('re', 'glob', 'path', 'relglob', 'relpath', 'relre', + 'listfile', 'listfile0', 'set', 'include', 'subinclude', + 'rootfilesin') +cwdrelativepatternkinds = ('relpath', 'glob') + propertycache = util.propertycache def _rematcher(regex): @@ -190,7 +195,7 @@ normalized and rooted patterns and with listfiles expanded.''' kindpats = [] for kind, pat in [_patsplit(p, default) for p in patterns]: - if kind in ('glob', 'relpath'): + if kind in cwdrelativepatternkinds: pat = pathutil.canonpath(root, cwd, pat, auditor) elif kind in ('relglob', 'path', 'rootfilesin'): pat = util.normpath(pat) @@ -691,9 +696,7 @@ pattern.""" if ':' in pattern: kind, pat = pattern.split(':', 1) - if kind in ('re', 'glob', 'path', 'relglob', 'relpath', 'relre', - 'listfile', 'listfile0', 'set', 'include', 'subinclude', - 'rootfilesin'): + if kind in allpatternkinds: return kind, pat return default, pattern