Mercurial > public > mercurial-scm > hg-stable
diff mercurial/fileset.py @ 38904:899b4c74209c
fileset: combine union of basic patterns into single matcher
This appears to improve query performance in a big repository than I thought.
Writing less Python in a hot loop, faster computation we gain.
$ hg files --cwd mozilla-central --time 'set:a* + b* + c* + d* + e*'
(orig) time: real 0.670 secs (user 0.640+0.000 sys 0.030+0.000)
(new) time: real 0.210 secs (user 0.180+0.000 sys 0.020+0.000)
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 21 Jul 2018 17:19:12 +0900 |
| parents | 61ab546b71c3 |
| children | da3bd2afd68d |
line wrap: on
line diff
--- a/mercurial/fileset.py Sat Jul 21 17:13:34 2018 +0900 +++ b/mercurial/fileset.py Sat Jul 21 17:19:12 2018 +0900 @@ -50,6 +50,12 @@ return stringmatch(mctx, _getkindpat(x, y, matchmod.allpatternkinds, _("pattern must be a string"))) +def patternsmatch(mctx, *xs): + allkinds = matchmod.allpatternkinds + patterns = [getpattern(x, allkinds, _("pattern must be a string")) + for x in xs] + return mctx.matcher(patterns) + def andmatch(mctx, x, y): xm = getmatch(mctx, x) ym = getmatch(mctx, y) @@ -436,6 +442,7 @@ 'string': stringmatch, 'symbol': stringmatch, 'kindpat': kindpatmatch, + 'patterns': patternsmatch, 'and': andmatch, 'or': ormatch, 'minus': minusmatch,