##// END OF EJS Templates
rebase: allow in-memory merge of the working copy parent...
rebase: allow in-memory merge of the working copy parent Before this patch and when the rebase involved the working copy parent (and thus the working copy too), we would not do in-memory rebase even if requested to. The in-code comment explains that the reason had something to do with avoiding an extra update, but I don't know which update that refers to. Perhaps an earlier version of the code used to update to the destination before rebasing even if in-memory rebase was requested? That seems to not be done at least since aa660c1203a9 (rebase: do not bail on uncomitted changes if rebasing in-memory, 2017-12-07). To see if this still made it slower, I create a single tiny commit on top of one branch of the mozilla-unified repo (commit a1098c82 to be exact) and rebased it to another branch (commit d4e9a7be). Before this patch that took 11.8s and after this patch it took 8.6s (I only did two runs each, but the timings were very consistent). Differential Revision: https://phab.mercurial-scm.org/D2876

File last commit:

r35818:d5288b96 stable
r36993:795eb53f default
Show More
minifileset.py
85 lines | 3.3 KiB | text/x-python | PythonLexer
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 # minifileset.py - a simple language to select files
#
# Copyright 2017 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from .i18n import _
from . import (
error,
fileset,
)
def _compile(tree):
if not tree:
raise error.ParseError(_("missing argument"))
op = tree[0]
Yuya Nishihara
fileset: add kind:pat operator...
r35759 if op in {'symbol', 'string', 'kindpat'}:
name = fileset.getpattern(tree, {'path'}, _('invalid file pattern'))
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 if name.startswith('**'): # file extension test, ex. "**.tar.gz"
ext = name[2:]
for c in ext:
if c in '*{}[]?/\\':
raise error.ParseError(_('reserved character: %s') % c)
return lambda n, s: n.endswith(ext)
Yuya Nishihara
minifileset: unify handling of symbol and string patterns...
r35758 elif name.startswith('path:'): # directory or full path test
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 p = name[5:] # prefix
pl = len(p)
f = lambda n, s: n.startswith(p) and (len(n) == pl or n[pl] == '/')
return f
Matt Harbison
minifileset: note the unsupported file pattern when raising a parse error...
r35818 raise error.ParseError(_("unsupported file pattern: %s") % name,
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 hint=_('paths must be prefixed with "path:"'))
elif op == 'or':
func1 = _compile(tree[1])
func2 = _compile(tree[2])
return lambda n, s: func1(n, s) or func2(n, s)
elif op == 'and':
func1 = _compile(tree[1])
func2 = _compile(tree[2])
return lambda n, s: func1(n, s) and func2(n, s)
elif op == 'not':
return lambda n, s: not _compile(tree[1])(n, s)
elif op == 'group':
return _compile(tree[1])
elif op == 'func':
symbols = {
'all': lambda n, s: True,
'none': lambda n, s: False,
'size': lambda n, s: fileset.sizematcher(tree[2])(s),
}
Yuya Nishihara
fileset: make it robust for bad function calls...
r35709 name = fileset.getsymbol(tree[1])
if name in symbols:
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 return symbols[name]
raise error.UnknownIdentifier(name, symbols.keys())
elif op == 'minus': # equivalent to 'x and not y'
func1 = _compile(tree[1])
func2 = _compile(tree[2])
return lambda n, s: func1(n, s) and not func2(n, s)
elif op == 'negate':
raise error.ParseError(_("can't use negate operator in this context"))
elif op == 'list':
raise error.ParseError(_("can't use a list in this context"),
hint=_('see hg help "filesets.x or y"'))
raise error.ProgrammingError('illegal tree: %r' % (tree,))
def compile(text):
"""generate a function (path, size) -> bool from filter specification.
"text" could contain the operators defined by the fileset language for
common logic operations, and parenthesis for grouping. The supported path
tests are '**.extname' for file extension test, and '"path:dir/subdir"'
for prefix test. The ``size()`` predicate is borrowed from filesets to test
file size. The predicates ``all()`` and ``none()`` are also supported.
Yuya Nishihara
fileset: add kind:pat operator...
r35759 '(**.php & size(">10MB")) | **.zip | (path:bin & !path:bin/README)' for
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 example, will catch all php files whose size is greater than 10 MB, all
files whose name ends with ".zip", and all files under "bin" in the repo
root except for "bin/README".
"""
tree = fileset.parse(text)
return _compile(tree)