##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r38709:1500cbe2 default
r38817:bb54db4a @96 default
Show More
minifileset.py
92 lines | 3.5 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,
Augie Fackler
minifileset: fix on Python 3...
r37893 pycompat,
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 )
Yuya Nishihara
fileset: parse argument of size() by predicate function...
r38709 def _sizep(x):
# i18n: "size" is a keyword
expr = fileset.getstring(x, _("size requires an expression"))
return fileset.sizematcher(expr)
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 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:]
Augie Fackler
minifileset: fix on Python 3...
r37893 for c in pycompat.bytestr(ext):
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 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)
Augie Fackler
minifileset: fix on Python 3...
r37893 f = lambda n, s: n.startswith(p) and (len(n) == pl
or n[pl:pl + 1] == '/')
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 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,
Yuya Nishihara
fileset: parse argument of size() by predicate function...
r38709 'size': lambda n, s: _sizep(tree[2])(s),
Matt Harbison
fileset: add a lightweight file filtering language...
r35634 }
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)