( )⚙ D6764 match: simplify the regexps created for glob patterns

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6764

match: simplify the regexps created for glob patterns
ClosedPublic

Authored by valentin.gatienbaron on Aug 26 2019, 12:16 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG72890d8f9860: match: simplify the regexps created for glob patterns
rHGcf165e064f1d: match: simplify the regexps created for glob patterns
Summary

For legibility of the resulting regexes, although it may help with
performance as well.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

Diff 16317

mercurial/match.py

if pat == '.': if pat == '.':
escaped = '' escaped = ''
else: else:
# Pattern is a directory name. # Pattern is a directory name.
escaped = util.stringutil.reescape(pat) + '/' escaped = util.stringutil.reescape(pat) + '/'
# Anything after the pattern must be a non-directory. # Anything after the pattern must be a non-directory.
return escaped + '[^/]+$' return escaped + '[^/]+$'
if kind == 'relglob': if kind == 'relglob':
return '(?:|.*/)' + _globre(pat) + globsuffix globre = _globre(pat)
if globre.startswith('[^/]*'):
# When pat has the form *XYZ (common), make the returned regex more
# legible by returning the regex for **XYZ instead of **/*XYZ.
return '.*' + globre[len('[^/]*'):] + globsuffix
return '(?:|.*/)' + globre + globsuffix
if kind == 'relre': if kind == 'relre':
if pat.startswith('^'): if pat.startswith('^'):
return pat return pat
return '.*' + pat return '.*' + pat
if kind in ('glob', 'rootglob'): if kind in ('glob', 'rootglob'):
return _globre(pat) + globsuffix return _globre(pat) + globsuffix
raise error.ProgrammingError('not a regex pattern: %s:%s' % (kind, pat)) raise error.ProgrammingError('not a regex pattern: %s:%s' % (kind, pat))

rust/hg-core/src/filepatterns.rs

as_vec.push(b'/'); as_vec.push(b'/');
as_vec as_vec
}; };
// Anything after the pattern must be a non-directory. // Anything after the pattern must be a non-directory.
res.extend(b"[^/]+$"); res.extend(b"[^/]+$");
res res
} }
PatternSyntax::Glob PatternSyntax::RelGlob => {
| PatternSyntax::RelGlob
| PatternSyntax::RootGlob => {
let mut res: Vec<u8> = vec![]; let mut res: Vec<u8> = vec![];
if syntax == PatternSyntax::RelGlob { let glob_re = glob_to_re(pattern);
if let Some(rest) = glob_re.chop_prefix(b"[^/]*") {
res.extend(b".*");
res.extend(rest);
} else {
res.extend(b"(?:|.*/)"); res.extend(b"(?:|.*/)");
res.extend(glob_re);
} }
res.extend(globsuffix.iter());
res
}
PatternSyntax::Glob
| PatternSyntax::RootGlob => {
let mut res: Vec<u8> = vec![];
res.extend(glob_to_re(pattern)); res.extend(glob_to_re(pattern));
res.extend(globsuffix.iter()); res.extend(globsuffix.iter());
res res
} }
} }
} }
const GLOB_SPECIAL_CHARACTERS: [u8; 7] = const GLOB_SPECIAL_CHARACTERS: [u8; 7] =
} }
let mut line = line.trim_end(); let mut line = line.trim_end();
if line.is_empty() { if line.is_empty() {
continue; continue;
} }
if line.starts_with(b"syntax:") { if let Some(syntax) = line.chop_prefix(b"syntax:") {
let syntax = line[b"syntax:".len()..].trim(); let syntax = syntax.trim();
if let Some(rel_syntax) = SYNTAXES.get(syntax) { if let Some(rel_syntax) = SYNTAXES.get(syntax) {
current_syntax = rel_syntax; current_syntax = rel_syntax;
} else if warn { } else if warn {
warnings.push((file_path.to_owned(), syntax.to_owned())); warnings.push((file_path.to_owned(), syntax.to_owned()));
} }
continue; continue;
} }

rust/hg-core/src/utils.rs

} }
} }
} }
pub trait SliceExt { pub trait SliceExt {
fn trim_end(&self) -> &Self; fn trim_end(&self) -> &Self;
fn trim_start(&self) -> &Self; fn trim_start(&self) -> &Self;
fn trim(&self) -> &Self; fn trim(&self) -> &Self;
fn chop_prefix(&self, needle:&[u8]) -> Option<&[u8]>;
} }
fn is_not_whitespace(c: &u8) -> bool { fn is_not_whitespace(c: &u8) -> bool {
!(*c as char).is_whitespace() !(*c as char).is_whitespace()
} }
impl SliceExt for [u8] { impl SliceExt for [u8] {
fn trim_end(&self) -> &[u8] { fn trim_end(&self) -> &[u8] {
/// assert_eq!( /// assert_eq!(
/// b" to trim".trim(), /// b" to trim".trim(),
/// b"to trim" /// b"to trim"
/// ); /// );
/// ``` /// ```
fn trim(&self) -> &[u8] { fn trim(&self) -> &[u8] {
self.trim_start().trim_end() self.trim_start().trim_end()
} }
fn chop_prefix(&self, needle:&[u8]) -> Option<&[u8]> {
if self.starts_with(needle) {
Some(&self[needle.len()..])
} else {
None
}
}
} }

tests/test-hgignore.t

$ echo "glob:*.o" > .hg/testhgignorerel $ echo "glob:*.o" > .hg/testhgignorerel
$ cd dir $ cd dir
$ hg status $ hg status
A dir/b.o A dir/b.o
? .hgignore ? .hgignore
? a.c ? a.c
? syntax ? syntax
$ hg debugignore $ hg debugignore
<includematcher includes='(?:|.*/)[^/]*\\.o(?:/|$)'> <includematcher includes='.*\\.o(?:/|$)'>
$ cd .. $ cd ..
$ echo > .hg/testhgignorerel $ echo > .hg/testhgignorerel
$ echo "syntax: glob" > .hgignore $ echo "syntax: glob" > .hgignore
$ echo "re:.*\.o" >> .hgignore $ echo "re:.*\.o" >> .hgignore
$ hg status $ hg status
A dir/b.o A dir/b.o
? .hgignore ? .hgignore
$ hg status $ hg status
A dir/b.o A dir/b.o
$ cd dir $ cd dir
$ hg status . $ hg status .
A b.o A b.o
$ hg debugignore $ hg debugignore
<includematcher includes='(?:|.*/)[^/]*(?:/|$)'> <includematcher includes='.*(?:/|$)'>
$ hg debugignore b.o $ hg debugignore b.o
b.o is ignored b.o is ignored
(ignore rule in $TESTTMP/ignorerepo/.hgignore, line 1: '*') (glob) (ignore rule in $TESTTMP/ignorerepo/.hgignore, line 1: '*') (glob)
$ cd .. $ cd ..
Check patterns that match only the directory Check patterns that match only the directory

tests/test-walk.t

<includematcher includes='mammals/[^/]*k(?:/|$)'> <includematcher includes='mammals/[^/]*k(?:/|$)'>
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v -I 'glob:*k' $ hg debugwalk -v -I 'glob:*k'
* matcher: * matcher:
<includematcher includes='mammals/[^/]*k(?:/|$)'> <includematcher includes='mammals/[^/]*k(?:/|$)'>
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v -I 'relglob:*k' $ hg debugwalk -v -I 'relglob:*k'
* matcher: * matcher:
<includematcher includes='(?:|.*/)[^/]*k(?:/|$)'> <includematcher includes='.*k(?:/|$)'>
f beans/black ../beans/black f beans/black ../beans/black
f fenugreek ../fenugreek f fenugreek ../fenugreek
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v -I 'relglob:*k' . $ hg debugwalk -v -I 'relglob:*k' .
* matcher: * matcher:
<intersectionmatcher <intersectionmatcher
m1=<patternmatcher patterns='mammals(?:/|$)'>, m1=<patternmatcher patterns='mammals(?:/|$)'>,
m2=<includematcher includes='(?:|.*/)[^/]*k(?:/|$)'>> m2=<includematcher includes='.*k(?:/|$)'>>
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v -I 're:.*k$' $ hg debugwalk -v -I 're:.*k$'
* matcher: * matcher:
<includematcher includes='.*k$'> <includematcher includes='.*k$'>
f beans/black ../beans/black f beans/black ../beans/black
f fenugreek ../fenugreek f fenugreek ../fenugreek
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v -I 'relre:.*k$' $ hg debugwalk -v -I 'relre:.*k$'