This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10064

re2: byteify some regex used to get check re2 availability
ClosedPublic

Authored by marmoute on Feb 24 2021, 9:32 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGebc6d3484fdd: re2: byteify some regex used to get check re2 availability
Summary

Changeset 687b865b95ad failed to properly byteify this because it was a raw
string. This went undetected so far because re2 does not seems to be widely
tested.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Feb 24 2021, 9:32 AM
marmoute added a comment.Feb 24 2021, 9:33 AM

/!\ This is intended for stable

Alphare accepted this revision.Feb 24 2021, 9:34 AM
marmoute added a commit: rHGebc6d3484fdd: re2: byteify some regex used to get check re2 availability.Feb 24 2021, 10:54 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGebc6d3484fdd: re2: byteify some regex used to get check re2 availability (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (2 lines)

Diff 25807

mercurial/util.py

_re2 = False _re2 = False
class _re(object): class _re(object):
def _checkre2(self): def _checkre2(self):
global _re2 global _re2
try: try:
# check if match works, see issue3964 # check if match works, see issue3964
_re2 = bool(re2.match(r'\[([^\[]+)\]', b'[ui]')) _re2 = bool(re2.match(br'\[([^\[]+)\]', b'[ui]'))
except ImportError: except ImportError:
_re2 = False _re2 = False
def compile(self, pat, flags=0): def compile(self, pat, flags=0):
"""Compile a regular expression, using re2 if possible """Compile a regular expression, using re2 if possible
For best performance, use only re2-compatible regexp features. The For best performance, use only re2-compatible regexp features. The
only flags from the re module that are re2-compatible are only flags from the re module that are re2-compatible are