( )⚙ D3842 cleanup: migrate from re.escape to stringutil.reescape

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3842

cleanup: migrate from re.escape to stringutil.reescape
ClosedPublic

Authored by durin42 on Jun 26 2018, 11:22 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG67dc32d4e790: cleanup: migrate from re.escape to stringutil.reescape
Summary

This has consistent behavior on Python 2.7, 3.6, and 3.7 and has the
benefit of probably being a little faster. Test output changes are
largely because / used to be pointlessly escaped.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Jun 26 2018, 11:22 AM
pulkit accepted this revision.Jun 26 2018, 1:28 PM
Closed by commit rHG67dc32d4e790: cleanup: migrate from re.escape to stringutil.reescape (authored by durin42). · Explain WhyJun 26 2018, 1:51 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9309

hgext/keyword.py

@property @property
def repo(self): def repo(self):
return self._repo() return self._repo()
@util.propertycache @util.propertycache
def escape(self): def escape(self):
'''Returns bar-separated and escaped keywords.''' '''Returns bar-separated and escaped keywords.'''
return '|'.join(map(re.escape, self.templates.keys())) return '|'.join(map(stringutil.reescape, self.templates.keys()))
@util.propertycache @util.propertycache
def rekw(self): def rekw(self):
'''Returns regex for unexpanded keywords.''' '''Returns regex for unexpanded keywords.'''
return re.compile(r'\$(%s)\$' % self.escape) return re.compile(r'\$(%s)\$' % self.escape)
@util.propertycache @util.propertycache
def rekwexp(self): def rekwexp(self):

hgext/lfs/pointer.py

# regular expressions used by _validate # regular expressions used by _validate
# see https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md # see https://github.com/git-lfs/git-lfs/blob/master/docs/spec.md
_keyre = re.compile(br'\A[a-z0-9.-]+\Z') _keyre = re.compile(br'\A[a-z0-9.-]+\Z')
_valuere = re.compile(br'\A[^\n]*\Z') _valuere = re.compile(br'\A[^\n]*\Z')
_requiredre = { _requiredre = {
'size': re.compile(br'\A[0-9]+\Z'), 'size': re.compile(br'\A[0-9]+\Z'),
'oid': re.compile(br'\Asha256:[0-9a-f]{64}\Z'), 'oid': re.compile(br'\Asha256:[0-9a-f]{64}\Z'),
'version': re.compile(br'\A%s\Z' % re.escape(VERSION)), 'version': re.compile(br'\A%s\Z' % stringutil.reescape(VERSION)),
} }
def validate(self): def validate(self):
"""raise InvalidPointer on error. return self if there is no error""" """raise InvalidPointer on error. return self if there is no error"""
requiredcount = 0 requiredcount = 0
for k, v in self.iteritems(): for k, v in self.iteritems():
if k in self._requiredre: if k in self._requiredre:
if not self._requiredre[k].match(v): if not self._requiredre[k].match(v):

mercurial/hgweb/webutil.py

def getwebsubs(repo): def getwebsubs(repo):
websubtable = [] websubtable = []
websubdefs = repo.ui.configitems('websub') websubdefs = repo.ui.configitems('websub')
# we must maintain interhg backwards compatibility # we must maintain interhg backwards compatibility
websubdefs += repo.ui.configitems('interhg') websubdefs += repo.ui.configitems('interhg')
for key, pattern in websubdefs: for key, pattern in websubdefs:
# grab the delimiter from the character after the "s" # grab the delimiter from the character after the "s"
unesc = pattern[1:2] unesc = pattern[1:2]
delim = re.escape(unesc) delim = stringutil.reescape(unesc)
# identify portions of the pattern, taking care to avoid escaped # identify portions of the pattern, taking care to avoid escaped
# delimiters. the replace format and flags are optional, but # delimiters. the replace format and flags are optional, but
# delimiters are required. # delimiters are required.
match = re.match( match = re.match(
br'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$' br'^s%s(.+)(?:(?<=\\\\)|(?<!\\))%s(.*)%s([ilmsux])*$'
% (delim, delim, delim), pattern) % (delim, delim, delim), pattern)
if not match: if not match:

mercurial/match.py

. .
>>> bprint(_globre(br'*')) >>> bprint(_globre(br'*'))
[^/]* [^/]*
>>> bprint(_globre(br'**')) >>> bprint(_globre(br'**'))
.* .*
>>> bprint(_globre(br'**/a')) >>> bprint(_globre(br'**/a'))
(?:.*/)?a (?:.*/)?a
>>> bprint(_globre(br'a/**/b')) >>> bprint(_globre(br'a/**/b'))
a\/(?:.*/)?b a/(?:.*/)?b
>>> bprint(_globre(br'[a*?!^][^b][!c]')) >>> bprint(_globre(br'[a*?!^][^b][!c]'))
[a*?!^][\^b][^c] [a*?!^][\^b][^c]
>>> bprint(_globre(br'{a,b}')) >>> bprint(_globre(br'{a,b}'))
(?:a|b) (?:a|b)
>>> bprint(_globre(br'.\*\?')) >>> bprint(_globre(br'.\*\?'))
\.\*\? \.\*\?
''' '''
i, n = 0, len(pat) i, n = 0, len(pat)
res = '' res = ''
group = 0 group = 0
escape = util.re.escape escape = util.stringutil.reescape
def peek(): def peek():
return i < n and pat[i:i + 1] return i < n and pat[i:i + 1]
while i < n: while i < n:
c = pat[i:i + 1] c = pat[i:i + 1]
i += 1 i += 1
if c not in '*?[{},\\': if c not in '*?[{},\\':
res += escape(c) res += escape(c)
elif c == '*': elif c == '*':
globsuffix is appended to the regexp of globs.''' globsuffix is appended to the regexp of globs.'''
if not pat: if not pat:
return '' return ''
if kind == 're': if kind == 're':
return pat return pat
if kind in ('path', 'relpath'): if kind in ('path', 'relpath'):
if pat == '.': if pat == '.':
return '' return ''
return util.re.escape(pat) + '(?:/|$)' return util.stringutil.reescape(pat) + '(?:/|$)'
if kind == 'rootfilesin': if kind == 'rootfilesin':
if pat == '.': if pat == '.':
escaped = '' escaped = ''
else: else:
# Pattern is a directory name. # Pattern is a directory name.
escaped = util.re.escape(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 return '(?:|.*/)' + _globre(pat) + globsuffix
if kind == 'relre': if kind == 'relre':
if pat.startswith('^'): if pat.startswith('^'):
return pat return pat
return '.*' + pat return '.*' + pat

mercurial/sshpeer.py

util, util,
wireprotoserver, wireprotoserver,
wireprototypes, wireprototypes,
wireprotov1peer, wireprotov1peer,
wireprotov1server, wireprotov1server,
) )
from .utils import ( from .utils import (
procutil, procutil,
stringutil,
) )
def _serverquote(s): def _serverquote(s):
"""quote a string for the remote shell ... which we assume is sh""" """quote a string for the remote shell ... which we assume is sh"""
if not s: if not s:
return s return s
if re.match('[a-zA-Z0-9@%_+=:,./-]*$', s): if re.match('[a-zA-Z0-9@%_+=:,./-]*$', s):
return s return s
stdin.write(''.join(handshake)) stdin.write(''.join(handshake))
stdin.flush() stdin.flush()
except IOError: except IOError:
badresponse() badresponse()
# Assume version 1 of wire protocol by default. # Assume version 1 of wire protocol by default.
protoname = wireprototypes.SSHV1 protoname = wireprototypes.SSHV1
reupgraded = re.compile(b'^upgraded %s (.*)$' % re.escape(token)) reupgraded = re.compile(b'^upgraded %s (.*)$' % stringutil.reescape(token))
lines = ['', 'dummy'] lines = ['', 'dummy']
max_noise = 500 max_noise = 500
while lines[-1] and max_noise: while lines[-1] and max_noise:
try: try:
l = stdout.readline() l = stdout.readline()
_forwardoutput(ui, stderr) _forwardoutput(ui, stderr)

mercurial/sslutil.py

# When '*' is a fragment by itself, it matches a non-empty dotless # When '*' is a fragment by itself, it matches a non-empty dotless
# fragment. # fragment.
pats.append('[^.]+') pats.append('[^.]+')
elif leftmost.startswith('xn--') or hostname.startswith('xn--'): elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
# RFC 6125, section 6.4.3, subitem 3. # RFC 6125, section 6.4.3, subitem 3.
# The client SHOULD NOT attempt to match a presented identifier # The client SHOULD NOT attempt to match a presented identifier
# where the wildcard character is embedded within an A-label or # where the wildcard character is embedded within an A-label or
# U-label of an internationalized domain name. # U-label of an internationalized domain name.
pats.append(re.escape(leftmost)) pats.append(stringutil.reescape(leftmost))
else: else:
# Otherwise, '*' matches any dotless string, e.g. www* # Otherwise, '*' matches any dotless string, e.g. www*
pats.append(re.escape(leftmost).replace(br'\*', '[^.]*')) pats.append(stringutil.reescape(leftmost).replace(br'\*', '[^.]*'))
# add the remaining fragments, ignore any wildcards # add the remaining fragments, ignore any wildcards
for frag in remainder: for frag in remainder:
pats.append(re.escape(frag)) pats.append(stringutil.reescape(frag))
pat = re.compile(br'\A' + br'\.'.join(pats) + br'\Z', re.IGNORECASE) pat = re.compile(br'\A' + br'\.'.join(pats) + br'\Z', re.IGNORECASE)
return pat.match(hostname) is not None return pat.match(hostname) is not None
def _verifycert(cert, hostname): def _verifycert(cert, hostname):
'''Verify that cert (in socket.getpeercert() format) matches hostname. '''Verify that cert (in socket.getpeercert() format) matches hostname.
CRLs is not handled. CRLs is not handled.

tests/test-walk.t

f fenugreek ../fenugreek f fenugreek ../fenugreek
f fiddlehead ../fiddlehead f fiddlehead ../fiddlehead
f mammals/Procyonidae/cacomistle Procyonidae/cacomistle f mammals/Procyonidae/cacomistle Procyonidae/cacomistle
f mammals/Procyonidae/coatimundi Procyonidae/coatimundi f mammals/Procyonidae/coatimundi Procyonidae/coatimundi
f mammals/Procyonidae/raccoon Procyonidae/raccoon f mammals/Procyonidae/raccoon Procyonidae/raccoon
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v -I '*k' $ hg debugwalk -v -I '*k'
* matcher: * matcher:
<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:
<includematcher includes='(?:mammals(?:/|$))'> <includematcher includes='(?:mammals(?:/|$))'>
f mammals/Procyonidae/cacomistle Procyonidae/cacomistle f mammals/Procyonidae/cacomistle Procyonidae/cacomistle
f mammals/Procyonidae/coatimundi Procyonidae/coatimundi f mammals/Procyonidae/coatimundi Procyonidae/coatimundi
f mammals/Procyonidae/raccoon Procyonidae/raccoon f mammals/Procyonidae/raccoon Procyonidae/raccoon
f mammals/skunk skunk f mammals/skunk skunk
$ hg debugwalk -v Procyonidae $ hg debugwalk -v Procyonidae
* matcher: * matcher:
<patternmatcher patterns='(?:mammals\\/Procyonidae(?:/|$))'> <patternmatcher patterns='(?:mammals/Procyonidae(?:/|$))'>
f mammals/Procyonidae/cacomistle Procyonidae/cacomistle f mammals/Procyonidae/cacomistle Procyonidae/cacomistle
f mammals/Procyonidae/coatimundi Procyonidae/coatimundi f mammals/Procyonidae/coatimundi Procyonidae/coatimundi
f mammals/Procyonidae/raccoon Procyonidae/raccoon f mammals/Procyonidae/raccoon Procyonidae/raccoon
$ cd Procyonidae $ cd Procyonidae
$ hg debugwalk -v . $ hg debugwalk -v .
* matcher: * matcher:
<patternmatcher patterns='(?:mammals\\/Procyonidae(?:/|$))'> <patternmatcher patterns='(?:mammals/Procyonidae(?:/|$))'>
f mammals/Procyonidae/cacomistle cacomistle f mammals/Procyonidae/cacomistle cacomistle
f mammals/Procyonidae/coatimundi coatimundi f mammals/Procyonidae/coatimundi coatimundi
f mammals/Procyonidae/raccoon raccoon f mammals/Procyonidae/raccoon raccoon
$ hg debugwalk -v .. $ hg debugwalk -v ..
* matcher: * matcher:
<patternmatcher patterns='(?:mammals(?:/|$))'> <patternmatcher patterns='(?:mammals(?:/|$))'>
f mammals/Procyonidae/cacomistle cacomistle f mammals/Procyonidae/cacomistle cacomistle
f mammals/Procyonidae/coatimundi coatimundi f mammals/Procyonidae/coatimundi coatimundi
f beans/black beans/black f beans/black beans/black
f beans/borlotti beans/borlotti f beans/borlotti beans/borlotti
f beans/kidney beans/kidney f beans/kidney beans/kidney
f beans/navy beans/navy f beans/navy beans/navy
f beans/pinto beans/pinto f beans/pinto beans/pinto
f beans/turtle beans/turtle f beans/turtle beans/turtle
$ hg debugwalk -v -I '{*,{b,m}*/*}k' $ hg debugwalk -v -I '{*,{b,m}*/*}k'
* matcher: * matcher:
<includematcher includes='(?:(?:[^/]*|(?:b|m)[^/]*\\/[^/]*)k(?:/|$))'> <includematcher includes='(?:(?:[^/]*|(?:b|m)[^/]*/[^/]*)k(?:/|$))'>
f beans/black beans/black f beans/black beans/black
f fenugreek fenugreek f fenugreek fenugreek
f mammals/skunk mammals/skunk f mammals/skunk mammals/skunk
$ hg debugwalk -v -Ibeans mammals $ hg debugwalk -v -Ibeans mammals
* matcher: * matcher:
<intersectionmatcher <intersectionmatcher
m1=<patternmatcher patterns='(?:mammals(?:/|$))'>, m1=<patternmatcher patterns='(?:mammals(?:/|$))'>,
m2=<includematcher includes='(?:beans(?:/|$))'>> m2=<includematcher includes='(?:beans(?:/|$))'>>
$ hg debugwalk -v -Inon-existent $ hg debugwalk -v -Inon-existent
* matcher: * matcher:
<includematcher includes='(?:non\\-existent(?:/|$))'> <includematcher includes='(?:non\\-existent(?:/|$))'>
$ hg debugwalk -v -Inon-existent -Ibeans/black $ hg debugwalk -v -Inon-existent -Ibeans/black
* matcher: * matcher:
<includematcher includes='(?:non\\-existent(?:/|$)|beans\\/black(?:/|$))'> <includematcher includes='(?:non\\-existent(?:/|$)|beans/black(?:/|$))'>
f beans/black beans/black f beans/black beans/black
$ hg debugwalk -v -Ibeans beans/black $ hg debugwalk -v -Ibeans beans/black
* matcher: * matcher:
<intersectionmatcher <intersectionmatcher
m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m1=<patternmatcher patterns='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans(?:/|$))'>> m2=<includematcher includes='(?:beans(?:/|$))'>>
f beans/black beans/black exact f beans/black beans/black exact
$ hg debugwalk -v -Ibeans/black beans $ hg debugwalk -v -Ibeans/black beans
* matcher: * matcher:
<intersectionmatcher <intersectionmatcher
m1=<patternmatcher patterns='(?:beans(?:/|$))'>, m1=<patternmatcher patterns='(?:beans(?:/|$))'>,
m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> m2=<includematcher includes='(?:beans/black(?:/|$))'>>
f beans/black beans/black f beans/black beans/black
$ hg debugwalk -v -Xbeans/black beans $ hg debugwalk -v -Xbeans/black beans
* matcher: * matcher:
<differencematcher <differencematcher
m1=<patternmatcher patterns='(?:beans(?:/|$))'>, m1=<patternmatcher patterns='(?:beans(?:/|$))'>,
m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> m2=<includematcher includes='(?:beans/black(?:/|$))'>>
f beans/borlotti beans/borlotti f beans/borlotti beans/borlotti
f beans/kidney beans/kidney f beans/kidney beans/kidney
f beans/navy beans/navy f beans/navy beans/navy
f beans/pinto beans/pinto f beans/pinto beans/pinto
f beans/turtle beans/turtle f beans/turtle beans/turtle
$ hg debugwalk -v -Xbeans/black -Ibeans $ hg debugwalk -v -Xbeans/black -Ibeans
* matcher: * matcher:
<differencematcher <differencematcher
m1=<includematcher includes='(?:beans(?:/|$))'>, m1=<includematcher includes='(?:beans(?:/|$))'>,
m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> m2=<includematcher includes='(?:beans/black(?:/|$))'>>
f beans/borlotti beans/borlotti f beans/borlotti beans/borlotti
f beans/kidney beans/kidney f beans/kidney beans/kidney
f beans/navy beans/navy f beans/navy beans/navy
f beans/pinto beans/pinto f beans/pinto beans/pinto
f beans/turtle beans/turtle f beans/turtle beans/turtle
$ hg debugwalk -v -Xbeans/black beans/black $ hg debugwalk -v -Xbeans/black beans/black
* matcher: * matcher:
<differencematcher <differencematcher
m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m1=<patternmatcher patterns='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> m2=<includematcher includes='(?:beans/black(?:/|$))'>>
$ hg debugwalk -v -Xbeans/black -Ibeans/black $ hg debugwalk -v -Xbeans/black -Ibeans/black
* matcher: * matcher:
<differencematcher <differencematcher
m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m1=<includematcher includes='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans\\/black(?:/|$))'>> m2=<includematcher includes='(?:beans/black(?:/|$))'>>
$ hg debugwalk -v -Xbeans beans/black $ hg debugwalk -v -Xbeans beans/black
* matcher: * matcher:
<differencematcher <differencematcher
m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m1=<patternmatcher patterns='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans(?:/|$))'>> m2=<includematcher includes='(?:beans(?:/|$))'>>
$ hg debugwalk -v -Xbeans -Ibeans/black $ hg debugwalk -v -Xbeans -Ibeans/black
* matcher: * matcher:
<differencematcher <differencematcher
m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m1=<includematcher includes='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans(?:/|$))'>> m2=<includematcher includes='(?:beans(?:/|$))'>>
$ hg debugwalk -v 'glob:mammals/../beans/b*' $ hg debugwalk -v 'glob:mammals/../beans/b*'
* matcher: * matcher:
<patternmatcher patterns='(?:beans\\/b[^/]*$)'> <patternmatcher patterns='(?:beans/b[^/]*$)'>
f beans/black beans/black f beans/black beans/black
f beans/borlotti beans/borlotti f beans/borlotti beans/borlotti
$ hg debugwalk -v '-X*/Procyonidae' mammals $ hg debugwalk -v '-X*/Procyonidae' mammals
* matcher: * matcher:
<differencematcher <differencematcher
m1=<patternmatcher patterns='(?:mammals(?:/|$))'>, m1=<patternmatcher patterns='(?:mammals(?:/|$))'>,
m2=<includematcher includes='(?:[^/]*\\/Procyonidae(?:/|$))'>> m2=<includematcher includes='(?:[^/]*/Procyonidae(?:/|$))'>>
f mammals/skunk mammals/skunk f mammals/skunk mammals/skunk
$ hg debugwalk -v path:mammals $ hg debugwalk -v path:mammals
* matcher: * matcher:
<patternmatcher patterns='(?:mammals(?:/|$))'> <patternmatcher patterns='(?:mammals(?:/|$))'>
f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle
f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi
f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon
f mammals/skunk mammals/skunk f mammals/skunk mammals/skunk
$ hg debugwalk -v fennel -X 'f*' $ hg debugwalk -v fennel -X 'f*'
* matcher: * matcher:
<differencematcher <differencematcher
m1=<patternmatcher patterns='(?:fennel(?:/|$))'>, m1=<patternmatcher patterns='(?:fennel(?:/|$))'>,
m2=<includematcher includes='(?:f[^/]*(?:/|$))'>> m2=<includematcher includes='(?:f[^/]*(?:/|$))'>>
$ hg debugwalk -v beans/black -X 'path:beans' $ hg debugwalk -v beans/black -X 'path:beans'
* matcher: * matcher:
<differencematcher <differencematcher
m1=<patternmatcher patterns='(?:beans\\/black(?:/|$))'>, m1=<patternmatcher patterns='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans(?:/|$))'>> m2=<includematcher includes='(?:beans(?:/|$))'>>
$ hg debugwalk -v -I 'path:beans/black' -X 'path:beans' $ hg debugwalk -v -I 'path:beans/black' -X 'path:beans'
* matcher: * matcher:
<differencematcher <differencematcher
m1=<includematcher includes='(?:beans\\/black(?:/|$))'>, m1=<includematcher includes='(?:beans/black(?:/|$))'>,
m2=<includematcher includes='(?:beans(?:/|$))'>> m2=<includematcher includes='(?:beans(?:/|$))'>>
Test absolute paths: Test absolute paths:
$ hg debugwalk -v `pwd`/beans $ hg debugwalk -v `pwd`/beans
* matcher: * matcher:
<patternmatcher patterns='(?:beans(?:/|$))'> <patternmatcher patterns='(?:beans(?:/|$))'>
f beans/black beans/black f beans/black beans/black
f fiddlehead fiddlehead f fiddlehead fiddlehead
f glob:glob glob:glob f glob:glob glob:glob
$ hg debugwalk -v glob:glob $ hg debugwalk -v glob:glob
* matcher: * matcher:
<patternmatcher patterns='(?:glob$)'> <patternmatcher patterns='(?:glob$)'>
glob: $ENOENT$ glob: $ENOENT$
$ hg debugwalk -v glob:glob:glob $ hg debugwalk -v glob:glob:glob
* matcher: * matcher:
<patternmatcher patterns='(?:glob\\:glob$)'> <patternmatcher patterns='(?:glob:glob$)'>
f glob:glob glob:glob exact f glob:glob glob:glob exact
$ hg debugwalk -v path:glob:glob $ hg debugwalk -v path:glob:glob
* matcher: * matcher:
<patternmatcher patterns='(?:glob\\:glob(?:/|$))'> <patternmatcher patterns='(?:glob:glob(?:/|$))'>
f glob:glob glob:glob exact f glob:glob glob:glob exact
$ rm glob:glob $ rm glob:glob
$ hg addremove $ hg addremove
removing glob:glob removing glob:glob
#endif #endif
$ hg debugwalk -v 'glob:**e' $ hg debugwalk -v 'glob:**e'
* matcher: * matcher:
<patternmatcher patterns='(?:.*e$)'> <patternmatcher patterns='(?:.*e$)'>
f beans/turtle beans/turtle f beans/turtle beans/turtle
f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle
$ hg debugwalk -v 're:.*[kb]$' $ hg debugwalk -v 're:.*[kb]$'
* matcher: * matcher:
<patternmatcher patterns='(?:.*[kb]$)'> <patternmatcher patterns='(?:.*[kb]$)'>
f beans/black beans/black f beans/black beans/black
f fenugreek fenugreek f fenugreek fenugreek
f mammals/skunk mammals/skunk f mammals/skunk mammals/skunk
$ hg debugwalk -v path:beans/black $ hg debugwalk -v path:beans/black
* matcher: * matcher:
<patternmatcher patterns='(?:beans\\/black(?:/|$))'> <patternmatcher patterns='(?:beans/black(?:/|$))'>
f beans/black beans/black exact f beans/black beans/black exact
$ hg debugwalk -v path:beans//black $ hg debugwalk -v path:beans//black
* matcher: * matcher:
<patternmatcher patterns='(?:beans\\/black(?:/|$))'> <patternmatcher patterns='(?:beans/black(?:/|$))'>
f beans/black beans/black exact f beans/black beans/black exact
$ hg debugwalk -v relglob:Procyonidae $ hg debugwalk -v relglob:Procyonidae
* matcher: * matcher:
<patternmatcher patterns='(?:(?:|.*/)Procyonidae$)'> <patternmatcher patterns='(?:(?:|.*/)Procyonidae$)'>
$ hg debugwalk -v 'relglob:Procyonidae/**' $ hg debugwalk -v 'relglob:Procyonidae/**'
* matcher: * matcher:
<patternmatcher patterns='(?:(?:|.*/)Procyonidae\\/.*$)'> <patternmatcher patterns='(?:(?:|.*/)Procyonidae/.*$)'>
f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle
f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi
f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon
$ hg debugwalk -v 'relglob:Procyonidae/**' fennel $ hg debugwalk -v 'relglob:Procyonidae/**' fennel
* matcher: * matcher:
<patternmatcher patterns='(?:(?:|.*/)Procyonidae\\/.*$|fennel(?:/|$))'> <patternmatcher patterns='(?:(?:|.*/)Procyonidae/.*$|fennel(?:/|$))'>
f fennel fennel exact f fennel fennel exact
f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle f mammals/Procyonidae/cacomistle mammals/Procyonidae/cacomistle
f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi f mammals/Procyonidae/coatimundi mammals/Procyonidae/coatimundi
f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon f mammals/Procyonidae/raccoon mammals/Procyonidae/raccoon
$ hg debugwalk -v beans 'glob:beans/*' $ hg debugwalk -v beans 'glob:beans/*'
* matcher: * matcher:
<patternmatcher patterns='(?:beans(?:/|$)|beans\\/[^/]*$)'> <patternmatcher patterns='(?:beans(?:/|$)|beans/[^/]*$)'>
f beans/black beans/black f beans/black beans/black
f beans/borlotti beans/borlotti f beans/borlotti beans/borlotti
f beans/kidney beans/kidney f beans/kidney beans/kidney
f beans/navy beans/navy f beans/navy beans/navy
f beans/pinto beans/pinto f beans/pinto beans/pinto
f beans/turtle beans/turtle f beans/turtle beans/turtle
$ hg debugwalk -v 'glob:mamm**' $ hg debugwalk -v 'glob:mamm**'
* matcher: * matcher:
$ mkdir ignored $ mkdir ignored
$ touch ignored/file $ touch ignored/file
$ echo '^ignored$' > .hgignore $ echo '^ignored$' > .hgignore
$ hg debugwalk -v ignored $ hg debugwalk -v ignored
* matcher: * matcher:
<patternmatcher patterns='(?:ignored(?:/|$))'> <patternmatcher patterns='(?:ignored(?:/|$))'>
$ hg debugwalk -v ignored/file $ hg debugwalk -v ignored/file
* matcher: * matcher:
<patternmatcher patterns='(?:ignored\\/file(?:/|$))'> <patternmatcher patterns='(?:ignored/file(?:/|$))'>
f ignored/file ignored/file exact f ignored/file ignored/file exact
Test listfile and listfile0 Test listfile and listfile0
$ $PYTHON -c "open('listfile0', 'wb').write(b'fenugreek\0new\0')" $ $PYTHON -c "open('listfile0', 'wb').write(b'fenugreek\0new\0')"
$ hg debugwalk -v -I 'listfile0:listfile0' $ hg debugwalk -v -I 'listfile0:listfile0'
* matcher: * matcher:
<includematcher includes='(?:fenugreek(?:/|$)|new(?:/|$))'> <includematcher includes='(?:fenugreek(?:/|$)|new(?:/|$))'>
f fenugreek fenugreek f fenugreek fenugreek
f new new f new new
$ $PYTHON -c "open('listfile', 'wb').write(b'fenugreek\nnew\r\nmammals/skunk\n')" $ $PYTHON -c "open('listfile', 'wb').write(b'fenugreek\nnew\r\nmammals/skunk\n')"
$ hg debugwalk -v -I 'listfile:listfile' $ hg debugwalk -v -I 'listfile:listfile'
* matcher: * matcher:
<includematcher includes='(?:fenugreek(?:/|$)|new(?:/|$)|mammals\\/skunk(?:/|$))'> <includematcher includes='(?:fenugreek(?:/|$)|new(?:/|$)|mammals/skunk(?:/|$))'>
f fenugreek fenugreek f fenugreek fenugreek
f mammals/skunk mammals/skunk f mammals/skunk mammals/skunk
f new new f new new
$ cd .. $ cd ..
$ hg debugwalk -v -R t t/mammals/skunk $ hg debugwalk -v -R t t/mammals/skunk
* matcher: * matcher:
<patternmatcher patterns='(?:mammals\\/skunk(?:/|$))'> <patternmatcher patterns='(?:mammals/skunk(?:/|$))'>
f mammals/skunk t/mammals/skunk exact f mammals/skunk t/mammals/skunk exact
$ mkdir t2 $ mkdir t2
$ cd t2 $ cd t2
$ hg debugwalk -v -R ../t ../t/mammals/skunk $ hg debugwalk -v -R ../t ../t/mammals/skunk
* matcher: * matcher:
<patternmatcher patterns='(?:mammals\\/skunk(?:/|$))'> <patternmatcher patterns='(?:mammals/skunk(?:/|$))'>
f mammals/skunk ../t/mammals/skunk exact f mammals/skunk ../t/mammals/skunk exact
$ hg debugwalk -v --cwd ../t mammals/skunk $ hg debugwalk -v --cwd ../t mammals/skunk
* matcher: * matcher:
<patternmatcher patterns='(?:mammals\\/skunk(?:/|$))'> <patternmatcher patterns='(?:mammals/skunk(?:/|$))'>
f mammals/skunk mammals/skunk exact f mammals/skunk mammals/skunk exact
$ cd .. $ cd ..
Test split patterns on overflow Test split patterns on overflow
$ cd t $ cd t
$ echo fennel > overflow.list $ echo fennel > overflow.list