mercurial-scm/hg: mercurial/revset.py comparison

comparison mercurial/revset.py @ 16161:5a627b49b4d9

graphlog: paths/-I/-X handling requires a new revset The filtering logic of match objects cannot be reproduced with the existing revsets as it operates at changeset files level. A changeset touching "a" and "b" is matched by "-I a -X b" but not by "file(a) and not file(b)". To solve this, a new internal "_matchfiles(...)" revset is introduced. It works like "file(x)" but accepts more than one argument and its arguments are prefixed with "p:", "i:" and "x:" to be used as patterns, include patterns or exclude patterns respectively. The _matchfiles revset is kept private for now: - There are probably smarter ways to pass the arguments in a user-friendly way - A "rev:" argument is likely appear at some point to emulate log command behaviour with regard to filesets: they are evaluated for the parent revision and applied everywhere instead of being reevaluated for each revision.

author	Patrick Mezard <patrick@mezard.eu>
date	Thu, 23 Feb 2012 18:05:20 +0100
parents	b8be450638f6
children	0a73c4bd9f47

comparison

equal deleted inserted replaced

-:1bfc7ba8b404
+:5a627b49b4d9
 return getlist(x[1]) + [x[2]]
 return [x]
 def getargs(x, min, max, err):
 l = getlist(x)
-if len(l) < min or len(l) > max:
+if len(l) < min or (max >= 0 and len(l) > max):
 raise error.ParseError(err)
 return l
 def getset(repo, subset, x):
 if not x:
 if gr.search(e):
 l.append(r)
 break
 return l
-def hasfile(repo, subset, x):
+def _matchfiles(repo, subset, x):
-"""``file(pattern)``
+# _matchfiles takes a revset list of prefixed arguments:
-Changesets affecting files matched by pattern.
+#
-"""
+#   [p:foo, i:bar, x:baz]
-# i18n: "file" is a keyword
+#
-pat = getstring(x, _("file requires a pattern"))
+# builds a match object from them and filters subset. Allowed
+# prefixes are 'p:' for regular patterns, 'i:' for include
+# patterns and 'x:' for exclude patterns.
+# i18n: "_matchfiles" is a keyword
+l = getargs(x, 1, -1, _("_matchfiles requires at least one argument"))
+pats, inc, exc = [], [], []
+hasset = False
+for arg in l:
+s = getstring(arg, _("_matchfiles requires string arguments"))
+prefix, value = s[:2], s[2:]
+if prefix == 'p:':
+pats.append(value)
+elif prefix == 'i:':
+inc.append(value)
+elif prefix == 'x:':
+exc.append(value)
+else:
+raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix)
+if not hasset and matchmod.patkind(value) == 'set':
+hasset = True
 m = None
 s = []
 for r in subset:
 c = repo[r]
-if not m or matchmod.patkind(pat) == 'set':
+if not m or hasset:
-m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
+m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc,
+exclude=exc, ctx=c)
 for f in c.files():
 if m(f):
 s.append(r)
 break
 return s
+def hasfile(repo, subset, x):
+"""``file(pattern)``
+Changesets affecting files matched by pattern.
+"""
+# i18n: "file" is a keyword
+pat = getstring(x, _("file requires a pattern"))
+return _matchfiles(repo, subset, ('string', 'p:' + pat))
 def head(repo, subset, x):
 """``head()``
 Changeset is a named branch head.
 """
 "heads": heads,
 "id": node,
 "keyword": keyword,
 "last": last,
 "limit": limit,
+"_matchfiles": _matchfiles,
 "max": maxrev,
 "merge": merge,
 "min": minrev,
 "modifies": modifies,
 "outgoing": outgoing,

Mercurial > public > mercurial-scm > hg

comparison mercurial/revset.py @ 16161:5a627b49b4d9