##// END OF EJS Templates
match: match explicit file using a set...
match: match explicit file using a set The matcher as all the logic to do quick comparison against explicit patterns, however the pattern matcher was shadowing the code using that set and used the compiled regex pattern in all cases, which is quite slow. We restore the usage of the set based matching to boost performance. Building the regexp is still consuming a large amount of time (actually, the majority of the time), which is still silly. Maybe using re2 would help that, but this is a quest for another adventure. Another path to improve this is to have a pattern type dedicated to match the exact path to a file only (not a directory). This pattern could use the set matching only and be skipped in the regex all together. Benchmarks ========== In the following benchmark we are comparing the `hg cat` and `hg files` run time when matching against all files in the repository. They are run: - without the rust extensions - with the standard python engine (so without re2) Performance improvement in this series -------------------------------------- ###### hg files ############################################################### ### mercurial-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 0.230092 seconds prev-changeset: 0.230069 seconds this-changeset: 0.211425 seconds (-8.36%) ### mercurial-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 0.234235 seconds prev-changeset: 0.231165 seconds (-1.38%) this-changeset: 0.212300 seconds (-9.43%) ### pypy-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 0.613567 seconds prev-changeset: 0.616799 seconds this-changeset: 0.510852 seconds (-16.82%) ### pypy-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 0.801880 seconds prev-changeset: 0.616393 seconds (-23.22%) this-changeset: 0.511903 seconds (-36.23%) ### netbeans-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 21.541828 seconds prev-changeset: 21.586773 seconds this-changeset: 13.648347 seconds (-36.76%) ### netbeans-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 172.759857 seconds prev-changeset: 21.908197 seconds (-87.32%) this-changeset: 13.945110 seconds (-91.93%) ### mozilla-central-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 62.474221 seconds prev-changeset: 61.279490 seconds (-1.22%) this-changeset: 29.529469 seconds (-52.40%) ### mozilla-central-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 1364.180218 seconds prev-changeset: 62.473549 seconds (-95.40%) this-changeset: 30.625249 seconds (-97.75%) ###### hg cat ################################################################# ### mercurial-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 0.764407 seconds prev-changeset: 0.763883 seconds this-changeset: 0.737326 seconds (-3.68%) ### mercurial-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 0.768924 seconds prev-changeset: 0.765848 seconds this-changeset: 0.174d0b seconds (-4.44%) ### pypy-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 2.065220 seconds prev-changeset: 2.070498 seconds this-changeset: 1.939482 seconds (-6.08%) ### pypy-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 2.276388 seconds prev-changeset: 2.069197 seconds (-9.15%) this-changeset: 1.931746 seconds (-15.19%) ### netbeans-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 40.967983 seconds prev-changeset: 41.392423 seconds this-changeset: 32.181681 seconds (-22.20%) ### netbeans-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 216.388709 seconds prev-changeset: 41.648689 seconds (-80.88%) this-changeset: 32.580817 seconds (-85.04%) ### mozilla-central-2018-08-01-zstd-sparse-revlog ### sorted base-changeset: 105.228510 seconds prev-changeset: 103.315670 seconds (-1.23%) this-changeset: 69.416118 seconds (-33.64%) ### mozilla-central-2018-08-01-zstd-sparse-revlog ### shuffled base-changeset: 1448.722784 seconds prev-changeset: 104.369358 seconds (-92.80%) this-changeset: 70.554789 seconds (-95.13%) Different way to list the same data with this revision ------------------------------------------------------ ###### hg files ############################################################### ### mercurial-2018-08-01-zstd-sparse-revlog root: 0.119182 seconds glob: 0.120697 seconds (+1.27%) sorted: 0.211425 seconds (+77.40%) shuffled: 0.212300 seconds (+78.13%) ### pypy-2018-08-01-zstd-sparse-revlog root: 0.121986 seconds glob: 0.124822 seconds (+2.32%) sorted: 0.510852 seconds (+318.78%) shuffled: 0.511903 seconds (+319.64%) ### netbeans-2018-08-01-zstd-sparse-revlog root: 0.173984 seconds glob: 0.227203 seconds (+30.59%) sorted: 13.648347 seconds (+7744.59%) shuffled: 13.945110 seconds (+7915.16%) ### mozilla-central-2018-08-01-zstd-sparse-revlog root: 0.366463 seconds glob: 0.491030 seconds (+33.99%) sorted: 29.529469 seconds (+7957.96%) shuffled: 30.625249 seconds (+8256.97%) ###### hg cat ################################################################# ### mercurial-2018-08-01-zstd-sparse-revlog glob: 0.647471 seconds root: 0.643120 seconds shuffled: 0.174d0b seconds (+13.92%) sorted: 0.737326 seconds (+13.88%) ### mozilla-central-2018-08-01-zstd-sparse-revlog glob: 40.596983 seconds root: 40.129136 seconds shuffled: 70.554789 seconds (+73.79%) sorted: 69.416118 seconds (+70.99%) ### netbeans-2018-08-01-zstd-sparse-revlog glob: 18.777924 seconds root: 18.613905 seconds shuffled: 32.580817 seconds (+73.51%) sorted: 32.181681 seconds (+71.38%) ### pypy-2018-08-01-zstd-sparse-revlog glob: 1.555319 seconds root: 1.536534 seconds shuffled: 1.931746 seconds (+24.20%) sorted: 1.939482 seconds (+24.70%)

File last commit:

r51147:a6b8b1ab merge default
r51286:81c7d04f stable
Show More
diffutil.py
157 lines | 5.0 KiB | text/x-python | PythonLexer
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 # diffutil.py - utility functions related to diff and patch
#
# Copyright 2006 Brendan Cully <brendan@kublai.com>
# Copyright 2007 Chris Mason <chris.mason@oracle.com>
# Copyright 2018 Octobus <octobus@octobus.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Matt Harbison
typing: add typehints to mercurial/diffutil.py...
r51142 import typing
from typing import (
Any,
Dict,
Optional,
)
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
from .i18n import _
from . import (
mdiff,
pycompat,
)
Matt Harbison
typing: add typehints to mercurial/diffutil.py...
r51142 if typing.TYPE_CHECKING:
from . import ui as uimod
# TODO: narrow the value after the config module is typed
_Opts = Dict[bytes, Any]
Augie Fackler
formatting: blacken the codebase...
r43346
def diffallopts(
Matt Harbison
typing: add typehints to mercurial/diffutil.py...
r51142 ui: "uimod.ui",
opts: Optional[_Opts] = None,
untrusted: bool = False,
section: bytes = b'diff',
configprefix: bytes = b'',
) -> mdiff.diffopts:
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 '''return diffopts with all features supported and parsed'''
Augie Fackler
formatting: blacken the codebase...
r43346 return difffeatureopts(
ui,
opts=opts,
untrusted=untrusted,
section=section,
git=True,
whitespace=True,
formatchanging=True,
configprefix=configprefix,
)
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
Augie Fackler
formatting: blacken the codebase...
r43346
def difffeatureopts(
Matt Harbison
typing: add typehints to mercurial/diffutil.py...
r51142 ui: "uimod.ui",
opts: Optional[_Opts] = None,
untrusted: bool = False,
section: bytes = b'diff',
git: bool = False,
whitespace: bool = False,
formatchanging: bool = False,
configprefix: bytes = b'',
) -> mdiff.diffopts:
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """return diffopts with only opted-in features parsed
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
Features:
- git: git-style diffs
- whitespace: whitespace options like ignoreblanklines and ignorews
- formatchanging: options that will likely break or cause correctness issues
with most diff parsers
Augie Fackler
formating: upgrade to black 20.8b1...
r46554 """
Augie Fackler
formatting: blacken the codebase...
r43346
Matt Harbison
typing: add typehints to mercurial/diffutil.py...
r51142 def get(
key: bytes,
name: Optional[bytes] = None,
getter=ui.configbool,
forceplain: Optional[bool] = None,
) -> Any:
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 if opts:
v = opts.get(key)
# diffopts flags are either None-default (which is passed
# through unchanged, so we can identify unset values), or
# some other falsey default (eg --unified, which defaults
# to an empty string). We only want to override the config
# entries from hgrc with command line values if they
# appear to have been set, which is any truthy value,
# True, or False.
if v or isinstance(v, bool):
return v
if forceplain is not None and ui.plain():
return forceplain
Augie Fackler
formatting: blacken the codebase...
r43346 return getter(
section, configprefix + (name or key), untrusted=untrusted
)
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
# core options, expected to be understood by every diff parser
buildopts = {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'nodates': get(b'nodates'),
b'showfunc': get(b'show_function', b'showfunc'),
b'context': get(b'unified', getter=ui.config),
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 }
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'xdiff'] = ui.configbool(b'experimental', b'xdiff')
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
if git:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'git'] = get(b'git')
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
# since this is in the experimental section, we need to call
# ui.configbool directory
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'showsimilarity'] = ui.configbool(
b'experimental', b'extendedheader.similarity'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
# need to inspect the ui object instead of using get() since we want to
# test for an int
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 hconf = ui.config(b'experimental', b'extendedheader.index')
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 if hconf is not None:
hlen = None
try:
# the hash config could be an integer (for length of hash) or a
# word (e.g. short, full, none)
hlen = int(hconf)
if hlen < 0 or hlen > 40:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 msg = _(b"invalid length for extendedheader.index: '%d'\n")
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 ui.warn(msg % hlen)
except ValueError:
# default value
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if hconf == b'short' or hconf == b'':
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 hlen = 12
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif hconf == b'full':
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 hlen = 40
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 elif hconf != b'none':
msg = _(b"invalid value for extendedheader.index: '%s'\n")
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 ui.warn(msg % hconf)
finally:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'index'] = hlen
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
if whitespace:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'ignorews'] = get(b'ignore_all_space', b'ignorews')
buildopts[b'ignorewsamount'] = get(
b'ignore_space_change', b'ignorewsamount'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'ignoreblanklines'] = get(
b'ignore_blank_lines', b'ignoreblanklines'
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'ignorewseol'] = get(b'ignore_space_at_eol', b'ignorewseol')
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 if formatchanging:
Matt Harbison
diffutil: rewrite an ersatz ternary operator for building diffopts.text...
r50793 buildopts[b'text'] = None if opts is None else opts.get(b'text')
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 binary = None if opts is None else opts.get(b'binary')
buildopts[b'nobinary'] = (
Augie Fackler
formatting: blacken the codebase...
r43346 not binary
if binary is not None
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 else get(b'nobinary', forceplain=False)
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 buildopts[b'noprefix'] = get(b'noprefix', forceplain=False)
buildopts[b'worddiff'] = get(
b'word_diff', b'word-diff', forceplain=False
)
Yuya Nishihara
diffutil: move the module out of utils package...
r38607
return mdiff.diffopts(**pycompat.strkwargs(buildopts))