mercurial-scm/hg-stable: mercurial/fileset.py annotate

annotate mercurial/fileset.py @ 38689:ff5b6fca1082

fileset: rewrite predicates to return matcher not closed to subset (API) (BC) This makes fileset expression open to any input, so that we can just say "hg status 'set: not binary()'" to select text files including unknowns. With this and removal of subset computation, 'set:**' becomes as fast as 'glob:**'. Further optimization will probably be possible by narrowing the file tree to compute status for example. This also fixes 'subrepo()' to not ignore the current mctx.subset. .. bc:: The fileset expression may include untracked files by default. Use ``tracked()`` to explicitly filter out files not existing at the context revision.

author	Yuya Nishihara <yuya@tcha.org>
date	Sat, 09 Jun 2018 19:55:10 +0900
parents	1500cbe22d53
children	5d9749c598f0

rev	line source
14511 30506b894359 filesets: introduce basic fileset expression parser Matt Mackall <mpm@selenic.com> parents: 14509 diff changeset	1 # fileset.py - file set queries for mercurial
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2010 Matt Mackall <mpm@selenic.com>
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	7
25938 e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	8 from __future__ import absolute_import
e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	9
38684 07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	10 import errno
20034 1e5b38a919dd cleanup: move stdlib imports to their own import statement Augie Fackler <raf@durin42.com> parents: 19470 diff changeset	11 import re
25938 e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	12
e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	13 from .i18n import _
e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	14 from . import (
e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	15 error,
35739 9eb5c400f488 fileset: move import of match module to top Yuya Nishihara <yuya@tcha.org> parents: 35692 diff changeset	16 match as matchmod,
25938 e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	17 merge,
e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	18 parser,
32556 1fb0a85fb20e py3: use pycompat.bytestr so that we don't get ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 32331 diff changeset	19 pycompat,
28448 7108834c76a2 fileset: replace predicate by filesetpredicate of registrar (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28447 diff changeset	20 registrar,
31203 4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	21 scmutil,
25938 e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	22 util,
e194ada8d45f fileset: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25815 diff changeset	23 )
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36535 diff changeset	24 from .utils import (
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36535 diff changeset	25 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36535 diff changeset	26 )
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	27
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	28 elements = {
25815 e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	29 # token-type: binding-strength, primary, prefix, infix, suffix
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	30 "(": (20, None, ("group", 1, ")"), ("func", 1, ")"), None),
35741 73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	31 ":": (15, None, None, ("kindpat", 15), None),
25815 e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	32 "-": (5, None, ("negate", 19), ("minus", 5), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	33 "not": (10, None, ("not", 10), None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	34 "!": (10, None, ("not", 10), None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	35 "and": (5, None, None, ("and", 5), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	36 "&": (5, None, None, ("and", 5), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	37 "or": (4, None, None, ("or", 4), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	38 "\|": (4, None, None, ("or", 4), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	39 "+": (4, None, None, ("or", 4), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	40 ",": (2, None, None, ("list", 2), None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	41 ")": (0, None, None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	42 "symbol": (0, "symbol", None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	43 "string": (0, "string", None, None, None),
e71e5629e006 parser: separate actions for primary expression and prefix operator Yuya Nishihara <yuya@tcha.org> parents: 25801 diff changeset	44 "end": (0, None, None, None, None),
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	45 }
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	46
32331 bd872f64a8ba cleanup: use set literals Martin von Zweigbergk <martinvonz@google.com> parents: 32187 diff changeset	47 keywords = {'and', 'or', 'not'}
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	48
19470 19ac0d8ee9a2 fileset: handle underbar in symbols Matt Mackall <mpm@selenic.com> parents: 19194 diff changeset	49 globchars = ".*{}[]?/\\_"
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	50
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	51 def tokenize(program):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	52 pos, l = 0, len(program)
32556 1fb0a85fb20e py3: use pycompat.bytestr so that we don't get ascii values Pulkit Goyal <7895pulkit@gmail.com> parents: 32331 diff changeset	53 program = pycompat.bytestr(program)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	54 while pos < l:
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	55 c = program[pos]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	56 if c.isspace(): # skip inter-token whitespace
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	57 pass
35741 73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	58 elif c in "(),-:\|&+!": # handle simple operators
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	59 yield (c, None, pos)
12408 78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	60 elif (c in '"\'' or c == 'r' and
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	61 program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	62 if c == 'r':
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	63 pos += 1
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	64 c = program[pos]
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	65 decode = lambda x: x
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	66 else:
26233 d3dbb65c8dc6 fileset: handle error of string unescaping Yuya Nishihara <yuya@tcha.org> parents: 26195 diff changeset	67 decode = parser.unescapestr
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	68 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	69 s = pos
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	70 while pos < l: # find closing quote
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	71 d = program[pos]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	72 if d == '\\': # skip over escaped characters
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	73 pos += 2
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	74 continue
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	75 if d == c:
12408 78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	76 yield ('string', decode(program[s:pos]), s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	77 break
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	78 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	79 else:
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	80 raise error.ParseError(_("unterminated string"), s)
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	81 elif c.isalnum() or c in globchars or ord(c) > 127:
14513 85fe676c27e9 fileset: fix long line Matt Mackall <mpm@selenic.com> parents: 14511 diff changeset	82 # gather up a symbol/keyword
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	83 s = pos
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	84 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	85 while pos < l: # find end of symbol
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	86 d = program[pos]
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	87 if not (d.isalnum() or d in globchars or ord(d) > 127):
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	88 break
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	89 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	90 sym = program[s:pos]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	91 if sym in keywords: # operator keywords
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	92 yield (sym, None, s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	93 else:
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	94 yield ('symbol', sym, s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	95 pos -= 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	96 else:
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	97 raise error.ParseError(_("syntax error"), pos)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	98 pos += 1
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	99 yield ('end', None, pos)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	100
20208 61a47fd64f30 fileset, revset: do not use global parser object for thread safety Yuya Nishihara <yuya@tcha.org> parents: 19470 diff changeset	101 def parse(expr):
25654 af329a84310c parser: accept iterator of tokens instead of tokenizer function and program Yuya Nishihara <yuya@tcha.org> parents: 25633 diff changeset	102 p = parser.parser(elements)
af329a84310c parser: accept iterator of tokens instead of tokenizer function and program Yuya Nishihara <yuya@tcha.org> parents: 25633 diff changeset	103 tree, pos = p.parse(tokenize(expr))
25252 ac381dd7a21f fileset: move validation of incomplete parsing to parse() function Yuya Nishihara <yuya@tcha.org> parents: 24408 diff changeset	104 if pos != len(expr):
ac381dd7a21f fileset: move validation of incomplete parsing to parse() function Yuya Nishihara <yuya@tcha.org> parents: 24408 diff changeset	105 raise error.ParseError(_("invalid token"), pos)
ac381dd7a21f fileset: move validation of incomplete parsing to parse() function Yuya Nishihara <yuya@tcha.org> parents: 24408 diff changeset	106 return tree
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	107
35691 735f47b41521 fileset: make it robust for bad function calls Yuya Nishihara <yuya@tcha.org> parents: 35615 diff changeset	108 def getsymbol(x):
735f47b41521 fileset: make it robust for bad function calls Yuya Nishihara <yuya@tcha.org> parents: 35615 diff changeset	109 if x and x[0] == 'symbol':
735f47b41521 fileset: make it robust for bad function calls Yuya Nishihara <yuya@tcha.org> parents: 35615 diff changeset	110 return x[1]
735f47b41521 fileset: make it robust for bad function calls Yuya Nishihara <yuya@tcha.org> parents: 35615 diff changeset	111 raise error.ParseError(_('not a symbol'))
735f47b41521 fileset: make it robust for bad function calls Yuya Nishihara <yuya@tcha.org> parents: 35615 diff changeset	112
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	113 def getstring(x, err):
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	114 if x and (x[0] == 'string' or x[0] == 'symbol'):
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	115 return x[1]
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	116 raise error.ParseError(err)
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	117
35741 73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	118 def _getkindpat(x, y, allkinds, err):
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	119 kind = getsymbol(x)
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	120 pat = getstring(y, err)
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	121 if kind not in allkinds:
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	122 raise error.ParseError(_("invalid pattern kind: %s") % kind)
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	123 return '%s:%s' % (kind, pat)
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	124
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	125 def getpattern(x, allkinds, err):
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	126 if x and x[0] == 'kindpat':
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	127 return _getkindpat(x[1], x[2], allkinds, err)
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	128 return getstring(x, err)
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	129
38599 d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	130 def getlist(x):
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	131 if not x:
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	132 return []
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	133 if x[0] == 'list':
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	134 return getlist(x[1]) + [x[2]]
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	135 return [x]
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	136
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	137 def getargs(x, min, max, err):
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	138 l = getlist(x)
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	139 if len(l) < min or len(l) > max:
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	140 raise error.ParseError(err)
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	141 return l
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	142
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	143 def getmatch(mctx, x):
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	144 if not x:
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	145 raise error.ParseError(_("missing argument"))
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	146 return methods[x[0]](mctx, *x[1:])
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	147
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	148 def stringmatch(mctx, x):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	149 return mctx.matcher([x])
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	150
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	151 def kindpatmatch(mctx, x, y):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	152 return stringmatch(mctx, _getkindpat(x, y, matchmod.allpatternkinds,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	153 _("pattern must be a string")))
35741 73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	154
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	155 def andmatch(mctx, x, y):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	156 xm = getmatch(mctx, x)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	157 ym = getmatch(mctx, y)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	158 return matchmod.intersectmatchers(xm, ym)
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	159
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	160 def ormatch(mctx, x, y):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	161 xm = getmatch(mctx, x)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	162 ym = getmatch(mctx, y)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	163 return matchmod.unionmatcher([xm, ym])
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	164
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	165 def notmatch(mctx, x):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	166 m = getmatch(mctx, x)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	167 return mctx.predicate(lambda f: not m(f), predrepr=('<not %r>', m))
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	168
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	169 def minusmatch(mctx, x, y):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	170 xm = getmatch(mctx, x)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	171 ym = getmatch(mctx, y)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	172 return matchmod.differencematcher(xm, ym)
17363 5d9e2031c0b1 fileset: actually implement 'minusset' Patrick Mezard <patrick@mezard.eu> parents: 16443 diff changeset	173
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	174 def negatematch(mctx, x):
35692 a62b08f6626b fileset: do not crash by unary negate operation Yuya Nishihara <yuya@tcha.org> parents: 35691 diff changeset	175 raise error.ParseError(_("can't use negate operator in this context"))
a62b08f6626b fileset: do not crash by unary negate operation Yuya Nishihara <yuya@tcha.org> parents: 35691 diff changeset	176
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	177 def listmatch(mctx, x, y):
27518 737ffdabbde9 fileset: add hint for list error to use or timeless <timeless@mozdev.org> parents: 27464 diff changeset	178 raise error.ParseError(_("can't use a list in this context"),
737ffdabbde9 fileset: add hint for list error to use or timeless <timeless@mozdev.org> parents: 27464 diff changeset	179 hint=_('see hg help "filesets.x or y"'))
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	180
38599 d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	181 def func(mctx, a, b):
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	182 funcname = getsymbol(a)
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	183 if funcname in symbols:
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	184 enabled = mctx._existingenabled
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	185 mctx._existingenabled = funcname in _existingcallers
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	186 try:
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	187 return symbols[funcname](mctx, b)
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	188 finally:
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	189 mctx._existingenabled = enabled
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	190
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	191 keep = lambda fn: getattr(fn, '__doc__', None) is not None
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	192
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	193 syms = [s for (s, fn) in symbols.items() if keep(fn)]
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	194 raise error.UnknownIdentifier(funcname, syms)
d046bf37f1ba fileset: move helper functions to top Yuya Nishihara <yuya@tcha.org> parents: 38420 diff changeset	195
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	196 # symbols are callable like:
11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	197 # fun(mctx, x)
11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	198 # with:
11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	199 # mctx - current matchctx instance
11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	200 # x - argument in tree form
11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	201 symbols = {}
11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	202
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	203 # filesets using matchctx.status()
27463 a8afdc5a7885 fileset: use set instead of list to mark predicates for efficiency (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27462 diff changeset	204 _statuscallers = set()
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	205
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	206 # filesets using matchctx.existing()
27463 a8afdc5a7885 fileset: use set instead of list to mark predicates for efficiency (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27462 diff changeset	207 _existingcallers = set()
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	208
28448 7108834c76a2 fileset: replace predicate by filesetpredicate of registrar (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28447 diff changeset	209 predicate = registrar.filesetpredicate()
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	210
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	211 @predicate('modified()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	212 def modified(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	213 """File that is modified according to :hg:`status`.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	214 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	215 # i18n: "modified" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	216 getargs(x, 0, 0, _("modified takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	217 s = set(mctx.status().modified)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	218 return mctx.predicate(s.__contains__, predrepr='modified')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	219
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	220 @predicate('added()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	221 def added(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	222 """File that is added according to :hg:`status`.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	223 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	224 # i18n: "added" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	225 getargs(x, 0, 0, _("added takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	226 s = set(mctx.status().added)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	227 return mctx.predicate(s.__contains__, predrepr='added')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	228
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	229 @predicate('removed()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	230 def removed(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	231 """File that is removed according to :hg:`status`.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	232 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	233 # i18n: "removed" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	234 getargs(x, 0, 0, _("removed takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	235 s = set(mctx.status().removed)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	236 return mctx.predicate(s.__contains__, predrepr='removed')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	237
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	238 @predicate('deleted()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	239 def deleted(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	240 """Alias for ``missing()``.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	241 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	242 # i18n: "deleted" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	243 getargs(x, 0, 0, _("deleted takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	244 s = set(mctx.status().deleted)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	245 return mctx.predicate(s.__contains__, predrepr='deleted')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	246
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	247 @predicate('missing()', callstatus=True)
27024 ceef5fb14872 fileset: add missing() predicate (issue4925) liscju <piotr.listkiewicz@gmail.com> parents: 26995 diff changeset	248 def missing(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	249 """File that is missing according to :hg:`status`.
27024 ceef5fb14872 fileset: add missing() predicate (issue4925) liscju <piotr.listkiewicz@gmail.com> parents: 26995 diff changeset	250 """
ceef5fb14872 fileset: add missing() predicate (issue4925) liscju <piotr.listkiewicz@gmail.com> parents: 26995 diff changeset	251 # i18n: "missing" is a keyword
ceef5fb14872 fileset: add missing() predicate (issue4925) liscju <piotr.listkiewicz@gmail.com> parents: 26995 diff changeset	252 getargs(x, 0, 0, _("missing takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	253 s = set(mctx.status().deleted)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	254 return mctx.predicate(s.__contains__, predrepr='deleted')
27024 ceef5fb14872 fileset: add missing() predicate (issue4925) liscju <piotr.listkiewicz@gmail.com> parents: 26995 diff changeset	255
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	256 @predicate('unknown()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	257 def unknown(mctx, x):
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	258 """File that is unknown according to :hg:`status`."""
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	259 # i18n: "unknown" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	260 getargs(x, 0, 0, _("unknown takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	261 s = set(mctx.status().unknown)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	262 return mctx.predicate(s.__contains__, predrepr='unknown')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	263
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	264 @predicate('ignored()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	265 def ignored(mctx, x):
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	266 """File that is ignored according to :hg:`status`."""
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	267 # i18n: "ignored" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	268 getargs(x, 0, 0, _("ignored takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	269 s = set(mctx.status().ignored)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	270 return mctx.predicate(s.__contains__, predrepr='ignored')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	271
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	272 @predicate('clean()', callstatus=True)
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	273 def clean(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	274 """File that is clean according to :hg:`status`.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	275 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	276 # i18n: "clean" is a keyword
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	277 getargs(x, 0, 0, _("clean takes no arguments"))
31702 992882cef7e1 fileset: perform membership test against set for status queries Gregory Szorc <gregory.szorc@gmail.com> parents: 31264 diff changeset	278 s = set(mctx.status().clean)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	279 return mctx.predicate(s.__contains__, predrepr='clean')
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	280
38686 131aae58a316 fileset: add "tracked()" to explicitly select files in the revision Yuya Nishihara <yuya@tcha.org> parents: 38685 diff changeset	281 @predicate('tracked()')
131aae58a316 fileset: add "tracked()" to explicitly select files in the revision Yuya Nishihara <yuya@tcha.org> parents: 38685 diff changeset	282 def tracked(mctx, x):
131aae58a316 fileset: add "tracked()" to explicitly select files in the revision Yuya Nishihara <yuya@tcha.org> parents: 38685 diff changeset	283 """File that is under Mercurial control."""
131aae58a316 fileset: add "tracked()" to explicitly select files in the revision Yuya Nishihara <yuya@tcha.org> parents: 38685 diff changeset	284 # i18n: "tracked" is a keyword
131aae58a316 fileset: add "tracked()" to explicitly select files in the revision Yuya Nishihara <yuya@tcha.org> parents: 38685 diff changeset	285 getargs(x, 0, 0, _("tracked takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	286 return mctx.predicate(mctx.ctx.__contains__, predrepr='tracked')
38686 131aae58a316 fileset: add "tracked()" to explicitly select files in the revision Yuya Nishihara <yuya@tcha.org> parents: 38685 diff changeset	287
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	288 @predicate('binary()', callexisting=True)
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	289 def binary(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	290 """File that appears to be binary (contains NUL bytes).
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	291 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	292 # i18n: "binary" is a keyword
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	293 getargs(x, 0, 0, _("binary takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	294 return mctx.fpredicate(lambda fctx: fctx.isbinary(),
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	295 predrepr='binary', cache=True)
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	296
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	297 @predicate('exec()', callexisting=True)
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	298 def exec_(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	299 """File that is marked as executable.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	300 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	301 # i18n: "exec" is a keyword
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	302 getargs(x, 0, 0, _("exec takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	303 ctx = mctx.ctx
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	304 return mctx.predicate(lambda f: ctx.flags(f) == 'x', predrepr='exec')
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	305
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	306 @predicate('symlink()', callexisting=True)
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	307 def symlink(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	308 """File that is marked as a symlink.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	309 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	310 # i18n: "symlink" is a keyword
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	311 getargs(x, 0, 0, _("symlink takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	312 ctx = mctx.ctx
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	313 return mctx.predicate(lambda f: ctx.flags(f) == 'l', predrepr='symlink')
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	314
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	315 @predicate('resolved()')
14679 e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	316 def resolved(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	317 """File that is marked resolved according to :hg:`resolve -l`.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	318 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	319 # i18n: "resolved" is a keyword
14679 e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	320 getargs(x, 0, 0, _("resolved takes no arguments"))
e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	321 if mctx.ctx.rev() is not None:
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	322 return mctx.never()
26995 d5a6be56970b fileset: switch to mergestate.read() Siddharth Agarwal <sid0@fb.com> parents: 26587 diff changeset	323 ms = merge.mergestate.read(mctx.ctx.repo())
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	324 return mctx.predicate(lambda f: f in ms and ms[f] == 'r',
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	325 predrepr='resolved')
14679 e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	326
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	327 @predicate('unresolved()')
14679 e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	328 def unresolved(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	329 """File that is marked unresolved according to :hg:`resolve -l`.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	330 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	331 # i18n: "unresolved" is a keyword
14679 e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	332 getargs(x, 0, 0, _("unresolved takes no arguments"))
e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	333 if mctx.ctx.rev() is not None:
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	334 return mctx.never()
26995 d5a6be56970b fileset: switch to mergestate.read() Siddharth Agarwal <sid0@fb.com> parents: 26587 diff changeset	335 ms = merge.mergestate.read(mctx.ctx.repo())
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	336 return mctx.predicate(lambda f: f in ms and ms[f] == 'u',
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	337 predrepr='unresolved')
14679 e141e1cee0cc fileset: add resolved and unresolved predicates Matt Mackall <mpm@selenic.com> parents: 14678 diff changeset	338
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	339 @predicate('hgignore()')
14680 49af5fa3809b fileset: add hgignore Matt Mackall <mpm@selenic.com> parents: 14679 diff changeset	340 def hgignore(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	341 """File that matches the active .hgignore pattern.
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	342 """
23113 c2dd79ad99cb i18n: add i18n comment to error messages of filesets predicates FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 22924 diff changeset	343 # i18n: "hgignore" is a keyword
14680 49af5fa3809b fileset: add hgignore Matt Mackall <mpm@selenic.com> parents: 14679 diff changeset	344 getargs(x, 0, 0, _("hgignore takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	345 return mctx.ctx.repo().dirstate._ignore
14680 49af5fa3809b fileset: add hgignore Matt Mackall <mpm@selenic.com> parents: 14679 diff changeset	346
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	347 @predicate('portable()')
24408 caa6b6c65dc3 fileset: add a fileset for portable filenames Siddharth Agarwal <sid0@fb.com> parents: 24334 diff changeset	348 def portable(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	349 """File that has a portable name. (This doesn't include filenames with case
24408 caa6b6c65dc3 fileset: add a fileset for portable filenames Siddharth Agarwal <sid0@fb.com> parents: 24334 diff changeset	350 collisions.)
caa6b6c65dc3 fileset: add a fileset for portable filenames Siddharth Agarwal <sid0@fb.com> parents: 24334 diff changeset	351 """
caa6b6c65dc3 fileset: add a fileset for portable filenames Siddharth Agarwal <sid0@fb.com> parents: 24334 diff changeset	352 # i18n: "portable" is a keyword
caa6b6c65dc3 fileset: add a fileset for portable filenames Siddharth Agarwal <sid0@fb.com> parents: 24334 diff changeset	353 getargs(x, 0, 0, _("portable takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	354 return mctx.predicate(lambda f: util.checkwinfilename(f) is None,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	355 predrepr='portable')
24408 caa6b6c65dc3 fileset: add a fileset for portable filenames Siddharth Agarwal <sid0@fb.com> parents: 24334 diff changeset	356
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	357 @predicate('grep(regex)', callexisting=True)
14682 8785fd757077 fileset: add grep predicate Matt Mackall <mpm@selenic.com> parents: 14681 diff changeset	358 def grep(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	359 """File contains the given regular expression.
14682 8785fd757077 fileset: add grep predicate Matt Mackall <mpm@selenic.com> parents: 14681 diff changeset	360 """
17368 01cc267fc105 fileset: do not traceback on invalid grep pattern Patrick Mezard <patrick@mezard.eu> parents: 17367 diff changeset	361 try:
01cc267fc105 fileset: do not traceback on invalid grep pattern Patrick Mezard <patrick@mezard.eu> parents: 17367 diff changeset	362 # i18n: "grep" is a keyword
01cc267fc105 fileset: do not traceback on invalid grep pattern Patrick Mezard <patrick@mezard.eu> parents: 17367 diff changeset	363 r = re.compile(getstring(x, _("grep requires a pattern")))
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25654 diff changeset	364 except re.error as e:
38116 5f2dc1b71cf1 py3: use utils.stringutil.forcebytestr to convert error to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 37259 diff changeset	365 raise error.ParseError(_('invalid match pattern: %s') %
5f2dc1b71cf1 py3: use utils.stringutil.forcebytestr to convert error to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 37259 diff changeset	366 stringutil.forcebytestr(e))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	367 return mctx.fpredicate(lambda fctx: r.search(fctx.data()),
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	368 predrepr=('grep(%r)', r.pattern), cache=True)
14682 8785fd757077 fileset: add grep predicate Matt Mackall <mpm@selenic.com> parents: 14681 diff changeset	369
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	370 def _sizetomax(s):
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	371 try:
25925 23c4589fc678 filesets: ignore unit case in size() predicate for single value Anton Shestakov <av6@dwimlabs.net> parents: 25815 diff changeset	372 s = s.strip().lower()
19194 1d08df65cd3c util: migrate fileset._sizetoint to util.sizetoint Bryan O'Sullivan <bryano@fb.com> parents: 18842 diff changeset	373 for k, v in util._sizeunits:
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	374 if s.endswith(k):
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	375 # max(4k) = 5k - 1, max(4.5k) = 4.6k - 1
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	376 n = s[:-len(k)]
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	377 inc = 1.0
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	378 if "." in n:
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	379 inc /= 10 ** len(n.split(".")[1])
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	380 return int((float(n) + inc) * v) - 1
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	381 # no extension, this is a precise value
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	382 return int(s)
281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	383 except ValueError:
14716 552329013bac fileset: use ParseError pos field correctly Mads Kiilerich <mads@kiilerich.com> parents: 14701 diff changeset	384 raise error.ParseError(_("couldn't parse size: %s") % s)
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	385
38687 1500cbe22d53 fileset: parse argument of size() by predicate function Yuya Nishihara <yuya@tcha.org> parents: 38686 diff changeset	386 def sizematcher(expr):
35615 0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	387 """Return a function(size) -> bool from the ``size()`` expression"""
38687 1500cbe22d53 fileset: parse argument of size() by predicate function Yuya Nishihara <yuya@tcha.org> parents: 38686 diff changeset	388 expr = expr.strip()
35615 0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	389 if '-' in expr: # do we have a range?
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	390 a, b = expr.split('-', 1)
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	391 a = util.sizetoint(a)
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	392 b = util.sizetoint(b)
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	393 return lambda x: x >= a and x <= b
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	394 elif expr.startswith("<="):
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	395 a = util.sizetoint(expr[2:])
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	396 return lambda x: x <= a
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	397 elif expr.startswith("<"):
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	398 a = util.sizetoint(expr[1:])
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	399 return lambda x: x < a
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	400 elif expr.startswith(">="):
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	401 a = util.sizetoint(expr[2:])
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	402 return lambda x: x >= a
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	403 elif expr.startswith(">"):
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	404 a = util.sizetoint(expr[1:])
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	405 return lambda x: x > a
36535 db33c5bc781f fileset: drop bad "elif:" trying to check invalid size expression Yuya Nishihara <yuya@tcha.org> parents: 36503 diff changeset	406 else:
35615 0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	407 a = util.sizetoint(expr)
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	408 b = _sizetomax(expr)
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	409 return lambda x: x >= a and x <= b
0e369eca888f fileset: split the logic for matching a size expression to a separate method Matt Harbison <matt_harbison@yahoo.com> parents: 32556 diff changeset	410
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	411 @predicate('size(expression)', callexisting=True)
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	412 def size(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	413 """File size matches the given expression. Examples:
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	414
29991 d532ef155b0e help: clarify quotes are needed for filesets.size expressions timeless <timeless@mozdev.org> parents: 28448 diff changeset	415 - size('1k') - files from 1024 to 2047 bytes
d532ef155b0e help: clarify quotes are needed for filesets.size expressions timeless <timeless@mozdev.org> parents: 28448 diff changeset	416 - size('< 20k') - files less than 20480 bytes
d532ef155b0e help: clarify quotes are needed for filesets.size expressions timeless <timeless@mozdev.org> parents: 28448 diff changeset	417 - size('>= .5MB') - files at least 524288 bytes
d532ef155b0e help: clarify quotes are needed for filesets.size expressions timeless <timeless@mozdev.org> parents: 28448 diff changeset	418 - size('4k - 1MB') - files from 4096 bytes to 1048576 bytes
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	419 """
38687 1500cbe22d53 fileset: parse argument of size() by predicate function Yuya Nishihara <yuya@tcha.org> parents: 38686 diff changeset	420 # i18n: "size" is a keyword
1500cbe22d53 fileset: parse argument of size() by predicate function Yuya Nishihara <yuya@tcha.org> parents: 38686 diff changeset	421 expr = getstring(x, _("size requires an expression"))
1500cbe22d53 fileset: parse argument of size() by predicate function Yuya Nishihara <yuya@tcha.org> parents: 38686 diff changeset	422 m = sizematcher(expr)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	423 return mctx.fpredicate(lambda fctx: m(fctx.size()),
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	424 predrepr=('size(%r)', expr), cache=True)
14683 281102f37b24 fileset: add size() predicate Matt Mackall <mpm@selenic.com> parents: 14682 diff changeset	425
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	426 @predicate('encoding(name)', callexisting=True)
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	427 def encoding(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	428 """File can be successfully decoded with the given character
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	429 encoding. May not be useful for encodings other than ASCII and
87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	430 UTF-8.
87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	431 """
87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	432
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	433 # i18n: "encoding" is a keyword
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	434 enc = getstring(x, _("encoding requires an encoding name"))
87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	435
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	436 def encp(fctx):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	437 d = fctx.data()
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	438 try:
38334 5cb39a368c80 py3: cast bytes encoding name to str in fileset.py Yuya Nishihara <yuya@tcha.org> parents: 38116 diff changeset	439 d.decode(pycompat.sysstr(enc))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	440 return True
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	441 except LookupError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26233 diff changeset	442 raise error.Abort(_("unknown encoding '%s'") % enc)
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	443 except UnicodeDecodeError:
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	444 return False
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	445
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	446 return mctx.fpredicate(encp, predrepr=('encoding(%r)', enc), cache=True)
14684 87b9d6a7d807 fileset: add encoding() predicate Matt Mackall <mpm@selenic.com> parents: 14683 diff changeset	447
27462 470ea34ba593 fileset: use decorator to mark a predicate as "existing caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27461 diff changeset	448 @predicate('eol(style)', callexisting=True)
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	449 def eol(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	450 """File contains newlines of the given style (dos, unix, mac). Binary
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	451 files are excluded, files with mixed line endings match multiple
3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	452 styles.
3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	453 """
3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	454
28056 4f8ced23345e fileset: fix copy/paste in eol() error message Matt Harbison <matt_harbison@yahoo.com> parents: 27518 diff changeset	455 # i18n: "eol" is a keyword
4f8ced23345e fileset: fix copy/paste in eol() error message Matt Harbison <matt_harbison@yahoo.com> parents: 27518 diff changeset	456 enc = getstring(x, _("eol requires a style name"))
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	457
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	458 def eolp(fctx):
38420 235d0bc11e1d fileset: use filectx.isbinary() to filter out binaries in eol() Matt Harbison <matt_harbison@yahoo.com> parents: 38335 diff changeset	459 if fctx.isbinary():
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	460 return False
38420 235d0bc11e1d fileset: use filectx.isbinary() to filter out binaries in eol() Matt Harbison <matt_harbison@yahoo.com> parents: 38335 diff changeset	461 d = fctx.data()
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	462 if (enc == 'dos' or enc == 'win') and '\r\n' in d:
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	463 return True
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	464 elif enc == 'unix' and re.search('(?<!\r)\n', d):
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	465 return True
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	466 elif enc == 'mac' and re.search('\r(?!\n)', d):
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	467 return True
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	468 return False
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	469 return mctx.fpredicate(eolp, predrepr=('eol(%r)', enc), cache=True)
18842 3ce3f2b059a1 filesets: add eol predicate Matt Mackall <mpm@selenic.com> parents: 18364 diff changeset	470
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	471 @predicate('copied()')
14685 394121d9f4fc fileset: add copied predicate Matt Mackall <mpm@selenic.com> parents: 14684 diff changeset	472 def copied(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	473 """File that is recorded as being copied.
14685 394121d9f4fc fileset: add copied predicate Matt Mackall <mpm@selenic.com> parents: 14684 diff changeset	474 """
14785 0f0bd4d028d3 fileset: add i18n hints for keywords Wagner Bruna <wbruna@softwareexpress.com.br> parents: 14718 diff changeset	475 # i18n: "copied" is a keyword
14718 0c81948636f3 fileset: copied takes no arguments Mads Kiilerich <mads@kiilerich.com> parents: 14717 diff changeset	476 getargs(x, 0, 0, _("copied takes no arguments"))
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	477 def copiedp(fctx):
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	478 p = fctx.parents()
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	479 return p and p[0].path() != fctx.path()
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	480 return mctx.fpredicate(copiedp, predrepr='copied', cache=True)
14685 394121d9f4fc fileset: add copied predicate Matt Mackall <mpm@selenic.com> parents: 14684 diff changeset	481
31203 4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	482 @predicate('revs(revs, pattern)')
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	483 def revs(mctx, x):
31264 2140e12d3258 fileset: drop false function signatures from revs() and status() docs Yuya Nishihara <yuya@tcha.org> parents: 31205 diff changeset	484 """Evaluate set in the specified revisions. If the revset match multiple
2140e12d3258 fileset: drop false function signatures from revs() and status() docs Yuya Nishihara <yuya@tcha.org> parents: 31205 diff changeset	485 revs, this will return file matching pattern in any of the revision.
31203 4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	486 """
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	487 # i18n: "revs" is a keyword
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	488 r, x = getargs(x, 2, 2, _("revs takes two arguments"))
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	489 # i18n: "revs" is a keyword
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	490 revspec = getstring(r, _("first argument to revs must be a revision"))
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	491 repo = mctx.ctx.repo()
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	492 revs = scmutil.revrange(repo, [revspec])
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	493
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	494 matchers = []
31203 4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	495 for r in revs:
4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	496 ctx = repo[r]
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	497 matchers.append(getmatch(mctx.switch(ctx, _buildstatus(ctx, x)), x))
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	498 if not matchers:
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	499 return mctx.never()
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	500 if len(matchers) == 1:
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	501 return matchers[0]
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	502 return matchmod.unionmatcher(matchers)
31203 4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	503
31205 6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	504 @predicate('status(base, rev, pattern)')
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	505 def status(mctx, x):
31264 2140e12d3258 fileset: drop false function signatures from revs() and status() docs Yuya Nishihara <yuya@tcha.org> parents: 31205 diff changeset	506 """Evaluate predicate using status change between ``base`` and
31205 6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	507 ``rev``. Examples:
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	508
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	509 - ``status(3, 7, added())`` - matches files added from "3" to "7"
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	510 """
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	511 repo = mctx.ctx.repo()
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	512 # i18n: "status" is a keyword
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	513 b, r, x = getargs(x, 3, 3, _("status takes three arguments"))
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	514 # i18n: "status" is a keyword
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	515 baseerr = _("first argument to status must be a revision")
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	516 baserevspec = getstring(b, baseerr)
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	517 if not baserevspec:
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	518 raise error.ParseError(baseerr)
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	519 reverr = _("second argument to status must be a revision")
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	520 revspec = getstring(r, reverr)
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	521 if not revspec:
6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	522 raise error.ParseError(reverr)
37259 f290f130d7fc fileset: use context-returning revpair() Martin von Zweigbergk <martinvonz@google.com> parents: 37253 diff changeset	523 basectx, ctx = scmutil.revpair(repo, [baserevspec, revspec])
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	524 return getmatch(mctx.switch(ctx, _buildstatus(ctx, x, basectx=basectx)), x)
31205 6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	525
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	526 @predicate('subrepo([pattern])')
16443 9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	527 def subrepo(mctx, x):
27460 11286ac374f3 fileset: use decorator to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27459 diff changeset	528 """Subrepositories whose paths match the given pattern.
16443 9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	529 """
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	530 # i18n: "subrepo" is a keyword
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	531 getargs(x, 0, 1, _("subrepo takes at most one argument"))
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	532 ctx = mctx.ctx
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	533 sstate = ctx.substate
16443 9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	534 if x:
35741 73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	535 pat = getpattern(x, matchmod.allpatternkinds,
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	536 # i18n: "subrepo" is a keyword
73432eee0ac4 fileset: add kind:pat operator Yuya Nishihara <yuya@tcha.org> parents: 35739 diff changeset	537 _("subrepo requires a pattern or no arguments"))
16443 9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	538 fast = not matchmod.patkind(pat)
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	539 if fast:
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	540 def m(s):
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	541 return (s == pat)
9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	542 else:
24334 eda2f36889b5 fileset: replace 'ctx._repo' with 'ctx.repo()' Matt Harbison <matt_harbison@yahoo.com> parents: 24218 diff changeset	543 m = matchmod.match(ctx.repo().root, '', [pat], ctx=ctx)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	544 return mctx.predicate(lambda f: f in sstate and m(f),
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	545 predrepr=('subrepo(%r)', pat))
16443 9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	546 else:
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	547 return mctx.predicate(sstate.__contains__, predrepr='subrepo')
16443 9e02e032b522 fileset: add "subrepo" fileset symbol Angel Ezquerra <angel.ezquerra@gmail.com> parents: 15963 diff changeset	548
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	549 methods = {
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	550 'string': stringmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	551 'symbol': stringmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	552 'kindpat': kindpatmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	553 'and': andmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	554 'or': ormatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	555 'minus': minusmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	556 'negate': negatematch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	557 'list': listmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	558 'group': getmatch,
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	559 'not': notmatch,
14676 e80fa502b8cf fileset: add some basic predicates Matt Mackall <mpm@selenic.com> parents: 14673 diff changeset	560 'func': func,
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	561 }
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	562
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	563 class matchctx(object):
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	564 def __init__(self, ctx, subset, status=None, badfn=None):
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	565 self.ctx = ctx
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	566 self.subset = subset
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	567 self._status = status
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	568 self._badfn = badfn
27464 c39ecb2b86b3 fileset: detect unintentional existing() invocation at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27463 diff changeset	569 self._existingenabled = False
14677 2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	570 def status(self):
2a758ffc821e fileset: add support for file status predicates Matt Mackall <mpm@selenic.com> parents: 14676 diff changeset	571 return self._status
38684 07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	572
14673 b0566467c492 fileset: drop matchfn Matt Mackall <mpm@selenic.com> parents: 14554 diff changeset	573 def matcher(self, patterns):
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	574 return self.ctx.match(patterns, badfn=self._badfn)
38684 07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	575
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	576 def predicate(self, predfn, predrepr=None, cache=False):
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	577 """Create a matcher to select files by predfn(filename)"""
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	578 if cache:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	579 predfn = util.cachefunc(predfn)
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	580 repo = self.ctx.repo()
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	581 return matchmod.predicatematcher(repo.root, repo.getcwd(), predfn,
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	582 predrepr=predrepr, badfn=self._badfn)
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	583
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	584 def fpredicate(self, predfn, predrepr=None, cache=False):
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	585 """Create a matcher to select files by predfn(fctx) at the current
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	586 revision
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	587
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	588 Missing files are ignored.
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	589 """
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	590 ctx = self.ctx
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	591 if ctx.rev() is None:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	592 def fctxpredfn(f):
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	593 try:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	594 fctx = ctx[f]
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	595 except error.LookupError:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	596 return False
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	597 try:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	598 fctx.audit()
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	599 except error.Abort:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	600 return False
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	601 try:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	602 return predfn(fctx)
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	603 except (IOError, OSError) as e:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	604 if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EISDIR):
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	605 return False
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	606 raise
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	607 else:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	608 def fctxpredfn(f):
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	609 try:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	610 fctx = ctx[f]
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	611 except error.LookupError:
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	612 return False
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	613 return predfn(fctx)
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	614 return self.predicate(fctxpredfn, predrepr=predrepr, cache=cache)
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	615
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	616 def never(self):
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	617 """Create a matcher to select nothing"""
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	618 repo = self.ctx.repo()
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	619 return matchmod.nevermatcher(repo.root, repo.getcwd(),
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	620 badfn=self._badfn)
07b551a4df44 fileset: add helpers to make predicatematcher and nevermatcher Yuya Nishihara <yuya@tcha.org> parents: 38614 diff changeset	621
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	622 def filter(self, files):
68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	623 return [f for f in files if f in self.subset]
15963 042e84e39dee fileset: don't attempt to check data predicates against removed files Matt Mackall <mpm@selenic.com> parents: 14830 diff changeset	624 def existing(self):
38335 8783f128048e fileset: raise ProgrammingError for bad existing() calls Yuya Nishihara <yuya@tcha.org> parents: 38334 diff changeset	625 if not self._existingenabled:
8783f128048e fileset: raise ProgrammingError for bad existing() calls Yuya Nishihara <yuya@tcha.org> parents: 38334 diff changeset	626 raise error.ProgrammingError('unexpected existing() invocation')
17365 8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	627 if self._status is not None:
8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	628 removed = set(self._status[3])
17367 ce625185cfd9 fileset: matchctx.existing() must consider ignored files Patrick Mezard <patrick@mezard.eu> parents: 17366 diff changeset	629 unknown = set(self._status[4] + self._status[5])
17365 8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	630 else:
8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	631 removed = set()
17366 04c65cb59467 fileset: matchctx.existing() must consider unknown files Patrick Mezard <patrick@mezard.eu> parents: 17365 diff changeset	632 unknown = set()
17365 8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	633 return (f for f in self.subset
17366 04c65cb59467 fileset: matchctx.existing() must consider unknown files Patrick Mezard <patrick@mezard.eu> parents: 17365 diff changeset	634 if (f in self.ctx and f not in removed) or f in unknown)
38685 80466fd85ac9 fileset: rewrite andset() to not use mctx.narrow() Yuya Nishihara <yuya@tcha.org> parents: 38684 diff changeset	635
31202 951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	636 def switch(self, ctx, status=None):
951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	637 subset = self.filter(_buildsubset(ctx, status))
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	638 return matchctx(ctx, subset, status, self._badfn)
14551 68d814a3cefd fileset: basic pattern and boolean support Matt Mackall <mpm@selenic.com> parents: 14513 diff changeset	639
31198 ec5b56b50e19 fileset: add class to host special handling of initial subset Yuya Nishihara <yuya@tcha.org> parents: 29991 diff changeset	640 class fullmatchctx(matchctx):
ec5b56b50e19 fileset: add class to host special handling of initial subset Yuya Nishihara <yuya@tcha.org> parents: 29991 diff changeset	641 """A match context where any files in any revisions should be valid"""
ec5b56b50e19 fileset: add class to host special handling of initial subset Yuya Nishihara <yuya@tcha.org> parents: 29991 diff changeset	642
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	643 def __init__(self, ctx, status=None, badfn=None):
31200 2f881e7d1ade fileset: build initial subset in fullmatchctx class Yuya Nishihara <yuya@tcha.org> parents: 31199 diff changeset	644 subset = _buildsubset(ctx, status)
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	645 super(fullmatchctx, self).__init__(ctx, subset, status, badfn)
31202 951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	646 def switch(self, ctx, status=None):
38614 5cbcbe51d38d fileset: pass in badfn to inner matchers Yuya Nishihara <yuya@tcha.org> parents: 38613 diff changeset	647 return fullmatchctx(ctx, status, self._badfn)
31202 951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	648
951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	649 # filesets using matchctx.switch()
951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	650 _switchcallers = [
31203 4140d49d2efb fileset: add revs(revs, fileset) to evaluate set in working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31202 diff changeset	651 'revs',
31205 6b098ac4542e fileset: add a 'status(...)' predicate to control evaluation context Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31204 diff changeset	652 'status',
31202 951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	653 ]
31198 ec5b56b50e19 fileset: add class to host special handling of initial subset Yuya Nishihara <yuya@tcha.org> parents: 29991 diff changeset	654
14678 5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	655 def _intree(funcs, tree):
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	656 if isinstance(tree, tuple):
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	657 if tree[0] == 'func' and tree[1][0] == 'symbol':
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	658 if tree[1][1] in funcs:
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	659 return True
31202 951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	660 if tree[1][1] in _switchcallers:
951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	661 # arguments won't be evaluated in the current context
951d95b13487 fileset: add function to switch revision where fileset will be evaluated Yuya Nishihara <yuya@tcha.org> parents: 31201 diff changeset	662 return False
14678 5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	663 for s in tree[1:]:
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	664 if _intree(funcs, s):
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	665 return True
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	666 return False
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	667
31199 3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	668 def _buildsubset(ctx, status):
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	669 if status:
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	670 subset = []
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	671 for c in status:
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	672 subset.extend(c)
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	673 return subset
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	674 else:
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	675 return list(ctx.walk(ctx.match([])))
3c32a3fdfd16 fileset: extract function that builds initial subset from ctx or status Yuya Nishihara <yuya@tcha.org> parents: 31198 diff changeset	676
38613 760cc5dc01e8 fileset: restrict getfileset() to not return a computed set (API) Yuya Nishihara <yuya@tcha.org> parents: 38599 diff changeset	677 def match(ctx, expr, badfn=None):
760cc5dc01e8 fileset: restrict getfileset() to not return a computed set (API) Yuya Nishihara <yuya@tcha.org> parents: 38599 diff changeset	678 """Create a matcher for a single fileset expression"""
25252 ac381dd7a21f fileset: move validation of incomplete parsing to parse() function Yuya Nishihara <yuya@tcha.org> parents: 24408 diff changeset	679 tree = parse(expr)
38689 ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	680 mctx = fullmatchctx(ctx, _buildstatus(ctx, tree), badfn=badfn)
ff5b6fca1082 fileset: rewrite predicates to return matcher not closed to subset (API) (BC) Yuya Nishihara <yuya@tcha.org> parents: 38687 diff changeset	681 return getmatch(mctx, tree)
14678 5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	682
31204 016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	683 def _buildstatus(ctx, tree, basectx=None):
14678 5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	684 # do we need status info?
31204 016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	685
016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	686 # temporaty boolean to simplify the next conditional
016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	687 purewdir = ctx.rev() is None and basectx is None
016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	688
27461 afa76585c955 fileset: use decorator to mark a predicate as "status caller" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27460 diff changeset	689 if (_intree(_statuscallers, tree) or
17365 8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	690 # Using matchctx.existing() on a workingctx requires us to check
8a0513bf030a fileset: exclude deleted files from matchctx.existing() Patrick Mezard <patrick@mezard.eu> parents: 17363 diff changeset	691 # for deleted files.
31204 016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	692 (purewdir and _intree(_existingcallers, tree))):
14678 5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	693 unknown = _intree(['unknown'], tree)
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	694 ignored = _intree(['ignored'], tree)
5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	695
24334 eda2f36889b5 fileset: replace 'ctx._repo' with 'ctx.repo()' Matt Harbison <matt_harbison@yahoo.com> parents: 24218 diff changeset	696 r = ctx.repo()
31204 016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	697 if basectx is None:
016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	698 basectx = ctx.p1()
016c63d6658c fileset: allow to specify a basectx for status Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31203 diff changeset	699 return r.status(basectx, ctx,
31201 3c3ab84e6e78 fileset: extract function that builds status tuple only if necessary Yuya Nishihara <yuya@tcha.org> parents: 31200 diff changeset	700 unknown=unknown, ignored=ignored, clean=True)
14678 5ef7b87530f6 fileset: prescan parse tree to optimize status usage Matt Mackall <mpm@selenic.com> parents: 14677 diff changeset	701 else:
31201 3c3ab84e6e78 fileset: extract function that builds status tuple only if necessary Yuya Nishihara <yuya@tcha.org> parents: 31200 diff changeset	702 return None
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	703
25255 ad1d2c952889 fileset: pretty print syntax tree in debug output Yuya Nishihara <yuya@tcha.org> parents: 25252 diff changeset	704 def prettyformat(tree):
ad1d2c952889 fileset: pretty print syntax tree in debug output Yuya Nishihara <yuya@tcha.org> parents: 25252 diff changeset	705 return parser.prettyformat(tree, ('string', 'symbol'))
ad1d2c952889 fileset: pretty print syntax tree in debug output Yuya Nishihara <yuya@tcha.org> parents: 25252 diff changeset	706
28447 4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	707 def loadpredicate(ui, extname, registrarobj):
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	708 """Load fileset predicates from specified registrarobj
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	709 """
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	710 for name, func in registrarobj._table.iteritems():
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	711 symbols[name] = func
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	712 if func._callstatus:
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	713 _statuscallers.add(name)
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	714 if func._callexisting:
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	715 _existingcallers.add(name)
4eb5496c2bd4 registrar: add filesetpredicate to mark a function as fileset predicate FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28056 diff changeset	716
28448 7108834c76a2 fileset: replace predicate by filesetpredicate of registrar (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28447 diff changeset	717 # load built-in predicates explicitly to setup _statuscallers/_existingcallers
7108834c76a2 fileset: replace predicate by filesetpredicate of registrar (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28447 diff changeset	718 loadpredicate(None, None, predicate)
7108834c76a2 fileset: replace predicate by filesetpredicate of registrar (API) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28447 diff changeset	719
14681 0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	720 # tell hggettext to extract docstrings from these functions:
0744db5eb51c fileset: add some function help text Matt Mackall <mpm@selenic.com> parents: 14680 diff changeset	721 i18nfunctions = symbols.values()

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/fileset.py @ 38689:ff5b6fca1082