| hg-reviewers |
It seems that all callers use match.exact() instead of match.match(exact=True).
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| matchers.extend(fms) | matchers.extend(fms) | ||||
| if not matchers: | if not matchers: | ||||
| return nevermatcher(root, cwd, badfn=badfn) | return nevermatcher(root, cwd, badfn=badfn) | ||||
| if len(matchers) == 1: | if len(matchers) == 1: | ||||
| return matchers[0] | return matchers[0] | ||||
| return unionmatcher(matchers) | return unionmatcher(matchers) | ||||
| def match(root, cwd, patterns=None, include=None, exclude=None, default='glob', | def match(root, cwd, patterns=None, include=None, exclude=None, default='glob', | ||||
| exact=False, auditor=None, ctx=None, listsubrepos=False, warn=None, | auditor=None, ctx=None, listsubrepos=False, warn=None, | ||||
| badfn=None, icasefs=False): | badfn=None, icasefs=False): | ||||
| """build an object to match a set of file patterns | """build an object to match a set of file patterns | ||||
| arguments: | arguments: | ||||
| root - the canonical root of the tree you're matching against | root - the canonical root of the tree you're matching against | ||||
| cwd - the current working directory, if relevant | cwd - the current working directory, if relevant | ||||
| patterns - patterns to find | patterns - patterns to find | ||||
| include - patterns to include (unless they are excluded) | include - patterns to include (unless they are excluded) | ||||
| exclude - patterns to exclude (even if they are included) | exclude - patterns to exclude (even if they are included) | ||||
| default - if a pattern in patterns has no explicit type, assume this one | default - if a pattern in patterns has no explicit type, assume this one | ||||
| exact - patterns are actually filenames (include/exclude still apply) | |||||
| warn - optional function used for printing warnings | warn - optional function used for printing warnings | ||||
| badfn - optional bad() callback for this matcher instead of the default | badfn - optional bad() callback for this matcher instead of the default | ||||
| icasefs - make a matcher for wdir on case insensitive filesystems, which | icasefs - make a matcher for wdir on case insensitive filesystems, which | ||||
| normalizes the given patterns to the case in the filesystem | normalizes the given patterns to the case in the filesystem | ||||
| a pattern is one of: | a pattern is one of: | ||||
| 'glob:<glob>' - a glob relative to cwd | 'glob:<glob>' - a glob relative to cwd | ||||
| 're:<regexp>' - a regular expression | 're:<regexp>' - a regular expression | ||||
| 'path:<path>' - a path relative to repository root, which is matched | 'path:<path>' - a path relative to repository root, which is matched | ||||
| recursively | recursively | ||||
| 'rootfilesin:<path>' - a path relative to repository root, which is | 'rootfilesin:<path>' - a path relative to repository root, which is | ||||
| matched non-recursively (will not match subdirectories) | matched non-recursively (will not match subdirectories) | ||||
| 'relglob:<glob>' - an unrooted glob (*.c matches C files in all dirs) | 'relglob:<glob>' - an unrooted glob (*.c matches C files in all dirs) | ||||
| 'relpath:<path>' - a path relative to cwd | 'relpath:<path>' - a path relative to cwd | ||||
| 'relre:<regexp>' - a regexp that needn't match the start of a name | 'relre:<regexp>' - a regexp that needn't match the start of a name | ||||
| 'set:<fileset>' - a fileset expression | 'set:<fileset>' - a fileset expression | ||||
| 'include:<path>' - a file of patterns to read and include | 'include:<path>' - a file of patterns to read and include | ||||
| 'subinclude:<path>' - a file of patterns to match against files under | 'subinclude:<path>' - a file of patterns to match against files under | ||||
| the same directory | the same directory | ||||
| '<something>' - a pattern of the specified default type | '<something>' - a pattern of the specified default type | ||||
| """ | """ | ||||
| normalize = _donormalize | normalize = _donormalize | ||||
| if icasefs: | if icasefs: | ||||
| if exact: | |||||
| raise error.ProgrammingError("a case-insensitive exact matcher " | |||||
| "doesn't make sense") | |||||
| dirstate = ctx.repo().dirstate | dirstate = ctx.repo().dirstate | ||||
| dsnormalize = dirstate.normalize | dsnormalize = dirstate.normalize | ||||
| def normalize(patterns, default, root, cwd, auditor, warn): | def normalize(patterns, default, root, cwd, auditor, warn): | ||||
| kp = _donormalize(patterns, default, root, cwd, auditor, warn) | kp = _donormalize(patterns, default, root, cwd, auditor, warn) | ||||
| kindpats = [] | kindpats = [] | ||||
| for kind, pats, source in kp: | for kind, pats, source in kp: | ||||
| if kind not in ('re', 'relre'): # regex can't be normalized | if kind not in ('re', 'relre'): # regex can't be normalized | ||||
| p = pats | p = pats | ||||
| pats = dsnormalize(pats) | pats = dsnormalize(pats) | ||||
| # Preserve the original to handle a case only rename. | # Preserve the original to handle a case only rename. | ||||
| if p != pats and p in dirstate: | if p != pats and p in dirstate: | ||||
| kindpats.append((kind, p, source)) | kindpats.append((kind, p, source)) | ||||
| kindpats.append((kind, pats, source)) | kindpats.append((kind, pats, source)) | ||||
| return kindpats | return kindpats | ||||
| if exact: | if patterns: | ||||
| m = exactmatcher(root, cwd, patterns, badfn) | |||||
| elif patterns: | |||||
| kindpats = normalize(patterns, default, root, cwd, auditor, warn) | kindpats = normalize(patterns, default, root, cwd, auditor, warn) | ||||
| if _kindpatsalwaysmatch(kindpats): | if _kindpatsalwaysmatch(kindpats): | ||||
| m = alwaysmatcher(root, cwd, badfn, relativeuipath=True) | m = alwaysmatcher(root, cwd, badfn, relativeuipath=True) | ||||
| else: | else: | ||||
| m = _buildkindpatsmatcher(patternmatcher, root, cwd, kindpats, | m = _buildkindpatsmatcher(patternmatcher, root, cwd, kindpats, | ||||
| ctx=ctx, listsubrepos=listsubrepos, | ctx=ctx, listsubrepos=listsubrepos, | ||||
| badfn=badfn) | badfn=badfn) | ||||
| else: | else: | ||||