revset.py
3348 lines
| 105.0 KiB
| text/x-python
|
PythonLexer
/ mercurial / revset.py
|
r11275 | # revset.py - revision set queries for mercurial | ||
# | ||||
# Copyright 2010 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
# GNU General Public License version 2 or any later version. | ||||
|
r16834 | import re | ||
|
r15819 | import parser, util, error, discovery, hbisect, phases | ||
|
r16417 | import node | ||
|
r20690 | import heapq | ||
|
r12085 | import match as matchmod | ||
|
r13593 | from i18n import _ | ||
|
r15726 | import encoding | ||
|
r17469 | import obsolete as obsmod | ||
|
r20286 | import pathutil | ||
|
r18251 | import repoview | ||
|
r11275 | |||
|
r16409 | def _revancestors(repo, revs, followfirst): | ||
"""Like revlog.ancestors(), but supports followfirst.""" | ||||
cut = followfirst and 1 or None | ||||
cl = repo.changelog | ||||
|
r20690 | |||
def iterate(): | ||||
|
r20691 | revqueue, revsnode = None, None | ||
h = [] | ||||
|
r22832 | revs.sort(reverse=True) | ||
|
r20691 | revqueue = util.deque(revs) | ||
if revqueue: | ||||
revsnode = revqueue.popleft() | ||||
heapq.heappush(h, -revsnode) | ||||
|
r23956 | seen = set() | ||
|
r20690 | while h: | ||
current = -heapq.heappop(h) | ||||
if current not in seen: | ||||
|
r20691 | if revsnode and current == revsnode: | ||
if revqueue: | ||||
revsnode = revqueue.popleft() | ||||
heapq.heappush(h, -revsnode) | ||||
|
r20690 | seen.add(current) | ||
yield current | ||||
for parent in cl.parentrevs(current)[:cut]: | ||||
if parent != node.nullrev: | ||||
heapq.heappush(h, -parent) | ||||
|
r22795 | return generatorset(iterate(), iterasc=False) | ||
|
r16409 | |||
def _revdescendants(repo, revs, followfirst): | ||||
"""Like revlog.descendants() but supports followfirst.""" | ||||
cut = followfirst and 1 or None | ||||
|
r20692 | def iterate(): | ||
cl = repo.changelog | ||||
first = min(revs) | ||||
nullrev = node.nullrev | ||||
if first == nullrev: | ||||
# Are there nodes with a null first parent and a non-null | ||||
# second one? Maybe. Do we care? Probably not. | ||||
for i in cl: | ||||
|
r16409 | yield i | ||
|
r20692 | else: | ||
seen = set(revs) | ||||
for i in cl.revs(first + 1): | ||||
for x in cl.parentrevs(i)[:cut]: | ||||
if x != nullrev and x in seen: | ||||
seen.add(i) | ||||
yield i | ||||
break | ||||
|
r22795 | return generatorset(iterate(), iterasc=True) | ||
|
r16409 | |||
|
r16862 | def _revsbetween(repo, roots, heads): | ||
"""Return all paths between roots and heads, inclusive of both endpoint | ||||
sets.""" | ||||
if not roots: | ||||
|
r22802 | return baseset() | ||
|
r16862 | parentrevs = repo.changelog.parentrevs | ||
|
r22487 | visit = list(heads) | ||
|
r16862 | reachable = set() | ||
seen = {} | ||||
minroot = min(roots) | ||||
roots = set(roots) | ||||
# open-code the post-order traversal due to the tiny size of | ||||
# sys.getrecursionlimit() | ||||
while visit: | ||||
rev = visit.pop() | ||||
if rev in roots: | ||||
reachable.add(rev) | ||||
parents = parentrevs(rev) | ||||
seen[rev] = parents | ||||
for parent in parents: | ||||
if parent >= minroot and parent not in seen: | ||||
visit.append(parent) | ||||
if not reachable: | ||||
|
r22802 | return baseset() | ||
|
r16862 | for rev in sorted(seen): | ||
for parent in seen[rev]: | ||||
if parent in reachable: | ||||
reachable.add(rev) | ||||
|
r20364 | return baseset(sorted(reachable)) | ||
|
r16862 | |||
|
r11275 | elements = { | ||
|
r23742 | "(": (21, ("group", 1, ")"), ("func", 1, ")")), | ||
"##": (20, None, ("_concat", 20)), | ||||
|
r14070 | "~": (18, None, ("ancestor", 18)), | ||
"^": (18, None, ("parent", 18), ("parentpost", 18)), | ||||
|
r12616 | "-": (5, ("negate", 19), ("minus", 5)), | ||
|
r11278 | "::": (17, ("dagrangepre", 17), ("dagrange", 17), | ||
("dagrangepost", 17)), | ||||
"..": (17, ("dagrangepre", 17), ("dagrange", 17), | ||||
("dagrangepost", 17)), | ||||
":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)), | ||||
|
r11275 | "not": (10, ("not", 10)), | ||
"!": (10, ("not", 10)), | ||||
"and": (5, None, ("and", 5)), | ||||
"&": (5, None, ("and", 5)), | ||||
|
r23765 | "%": (5, None, ("only", 5), ("onlypost", 5)), | ||
|
r11275 | "or": (4, None, ("or", 4)), | ||
"|": (4, None, ("or", 4)), | ||||
"+": (4, None, ("or", 4)), | ||||
",": (2, None, ("list", 2)), | ||||
")": (0, None, None), | ||||
"symbol": (0, ("symbol",), None), | ||||
"string": (0, ("string",), None), | ||||
"end": (0, None, None), | ||||
} | ||||
keywords = set(['and', 'or', 'not']) | ||||
|
r23842 | # default set of valid characters for the initial letter of symbols | ||
_syminitletters = set(c for c in [chr(i) for i in xrange(256)] | ||||
if c.isalnum() or c in '._@' or ord(c) > 127) | ||||
# default set of valid characters for non-initial letters of symbols | ||||
_symletters = set(c for c in [chr(i) for i in xrange(256)] | ||||
if c.isalnum() or c in '-._/@' or ord(c) > 127) | ||||
def tokenize(program, lookup=None, syminitletters=None, symletters=None): | ||||
|
r17886 | ''' | ||
Parse a revset statement into a stream of tokens | ||||
|
r23842 | ``syminitletters`` is the set of valid characters for the initial | ||
letter of symbols. | ||||
By default, character ``c`` is recognized as valid for initial | ||||
letter of symbols, if ``c.isalnum() or c in '._@' or ord(c) > 127``. | ||||
``symletters`` is the set of valid characters for non-initial | ||||
letters of symbols. | ||||
By default, character ``c`` is recognized as valid for non-initial | ||||
letters of symbols, if ``c.isalnum() or c in '-._/@' or ord(c) > 127``. | ||||
|
r17886 | Check that @ is a valid unquoted token character (issue3686): | ||
>>> list(tokenize("@::")) | ||||
[('symbol', '@', 0), ('::', None, 1), ('end', None, 3)] | ||||
''' | ||||
|
r23842 | if syminitletters is None: | ||
syminitletters = _syminitletters | ||||
if symletters is None: | ||||
symletters = _symletters | ||||
|
r17886 | |||
|
r11275 | pos, l = 0, len(program) | ||
while pos < l: | ||||
c = program[pos] | ||||
if c.isspace(): # skip inter-token whitespace | ||||
pass | ||||
|
r11278 | elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully | ||
|
r11289 | yield ('::', None, pos) | ||
|
r11278 | pos += 1 # skip ahead | ||
|
r11275 | elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully | ||
|
r11289 | yield ('..', None, pos) | ||
|
r11275 | pos += 1 # skip ahead | ||
|
r23742 | elif c == '#' and program[pos:pos + 2] == '##': # look ahead carefully | ||
yield ('##', None, pos) | ||||
pos += 1 # skip ahead | ||||
|
r23765 | elif c in "():,-|&+!~^%": # handle simple operators | ||
|
r11289 | yield (c, None, pos) | ||
|
r12408 | elif (c in '"\'' or c == 'r' and | ||
program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings | ||||
if c == 'r': | ||||
pos += 1 | ||||
c = program[pos] | ||||
decode = lambda x: x | ||||
else: | ||||
decode = lambda x: x.decode('string-escape') | ||||
|
r11275 | pos += 1 | ||
s = pos | ||||
while pos < l: # find closing quote | ||||
d = program[pos] | ||||
if d == '\\': # skip over escaped characters | ||||
pos += 2 | ||||
continue | ||||
if d == c: | ||||
|
r12408 | yield ('string', decode(program[s:pos]), s) | ||
|
r11275 | break | ||
pos += 1 | ||||
else: | ||||
|
r11383 | raise error.ParseError(_("unterminated string"), s) | ||
|
r16683 | # gather up a symbol/keyword | ||
|
r23842 | elif c in syminitletters: | ||
|
r11275 | s = pos | ||
pos += 1 | ||||
while pos < l: # find end of symbol | ||||
d = program[pos] | ||||
|
r23842 | if d not in symletters: | ||
|
r11275 | break | ||
if d == '.' and program[pos - 1] == '.': # special case for .. | ||||
pos -= 1 | ||||
break | ||||
pos += 1 | ||||
sym = program[s:pos] | ||||
if sym in keywords: # operator keywords | ||||
|
r11289 | yield (sym, None, s) | ||
|
r20780 | elif '-' in sym: | ||
# some jerk gave us foo-bar-baz, try to check if it's a symbol | ||||
if lookup and lookup(sym): | ||||
# looks like a real symbol | ||||
yield ('symbol', sym, s) | ||||
else: | ||||
# looks like an expression | ||||
parts = sym.split('-') | ||||
for p in parts[:-1]: | ||||
if p: # possible consecutive - | ||||
yield ('symbol', p, s) | ||||
s += len(p) | ||||
yield ('-', None, pos) | ||||
s += 1 | ||||
if parts[-1]: # possible trailing - | ||||
yield ('symbol', parts[-1], s) | ||||
|
r11275 | else: | ||
|
r11289 | yield ('symbol', sym, s) | ||
|
r11275 | pos -= 1 | ||
else: | ||||
|
r11383 | raise error.ParseError(_("syntax error"), pos) | ||
|
r11275 | pos += 1 | ||
|
r11289 | yield ('end', None, pos) | ||
|
r11275 | |||
|
r23843 | def parseerrordetail(inst): | ||
"""Compose error message from specified ParseError object | ||||
""" | ||||
if len(inst.args) > 1: | ||||
return _('at %s: %s') % (inst.args[1], inst.args[0]) | ||||
else: | ||||
return inst.args[0] | ||||
|
r11275 | # helpers | ||
def getstring(x, err): | ||||
|
r11406 | if x and (x[0] == 'string' or x[0] == 'symbol'): | ||
|
r11275 | return x[1] | ||
|
r11289 | raise error.ParseError(err) | ||
|
r11275 | |||
def getlist(x): | ||||
if not x: | ||||
return [] | ||||
if x[0] == 'list': | ||||
return getlist(x[1]) + [x[2]] | ||||
return [x] | ||||
|
r11339 | def getargs(x, min, max, err): | ||
|
r11275 | l = getlist(x) | ||
|
r16161 | if len(l) < min or (max >= 0 and len(l) > max): | ||
|
r11289 | raise error.ParseError(err) | ||
|
r11275 | return l | ||
|
r23845 | def isvalidsymbol(tree): | ||
"""Examine whether specified ``tree`` is valid ``symbol`` or not | ||||
""" | ||||
return tree[0] == 'symbol' and len(tree) > 1 | ||||
def getsymbol(tree): | ||||
"""Get symbol name from valid ``symbol`` in ``tree`` | ||||
This assumes that ``tree`` is already examined by ``isvalidsymbol``. | ||||
""" | ||||
return tree[1] | ||||
def isvalidfunc(tree): | ||||
"""Examine whether specified ``tree`` is valid ``func`` or not | ||||
""" | ||||
return tree[0] == 'func' and len(tree) > 1 and isvalidsymbol(tree[1]) | ||||
def getfuncname(tree): | ||||
"""Get function name from valid ``func`` in ``tree`` | ||||
This assumes that ``tree`` is already examined by ``isvalidfunc``. | ||||
""" | ||||
return getsymbol(tree[1]) | ||||
def getfuncargs(tree): | ||||
"""Get list of function arguments from valid ``func`` in ``tree`` | ||||
This assumes that ``tree`` is already examined by ``isvalidfunc``. | ||||
""" | ||||
if len(tree) > 2: | ||||
return getlist(tree[2]) | ||||
else: | ||||
return [] | ||||
|
r11275 | def getset(repo, subset, x): | ||
if not x: | ||||
|
r11383 | raise error.ParseError(_("missing argument")) | ||
|
r20527 | s = methods[x[0]](repo, subset, *x[1:]) | ||
|
r22884 | if util.safehasattr(s, 'isascending'): | ||
|
r20527 | return s | ||
return baseset(s) | ||||
|
r11275 | |||
|
r17003 | def _getrevsource(repo, r): | ||
extra = repo[r].extra() | ||||
for label in ('source', 'transplant_source', 'rebase_source'): | ||||
if label in extra: | ||||
try: | ||||
return repo[extra[label]].rev() | ||||
except error.RepoLookupError: | ||||
pass | ||||
return None | ||||
|
r11275 | # operator methods | ||
def stringset(repo, subset, x): | ||||
x = repo[x].rev() | ||||
|
r11282 | if x == -1 and len(subset) == len(repo): | ||
|
r20364 | return baseset([-1]) | ||
|
r23724 | if x in subset: | ||
|
r20364 | return baseset([x]) | ||
|
r22802 | return baseset() | ||
|
r11275 | |||
def symbolset(repo, subset, x): | ||||
if x in symbols: | ||||
|
r11383 | raise error.ParseError(_("can't use %s here") % x) | ||
|
r11275 | return stringset(repo, subset, x) | ||
def rangeset(repo, subset, x, y): | ||||
|
r23162 | m = getset(repo, fullreposet(repo), x) | ||
n = getset(repo, fullreposet(repo), y) | ||||
|
r11456 | |||
if not m or not n: | ||||
|
r22802 | return baseset() | ||
|
r22817 | m, n = m.first(), n.last() | ||
|
r11456 | |||
|
r11275 | if m < n: | ||
|
r20526 | r = spanset(repo, m, n + 1) | ||
|
r11456 | else: | ||
|
r20526 | r = spanset(repo, m, n - 1) | ||
return r & subset | ||||
|
r11275 | |||
|
r16860 | def dagrange(repo, subset, x, y): | ||
|
r20526 | r = spanset(repo) | ||
|
r18991 | xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) | ||
|
r22866 | return xs & subset | ||
|
r16860 | |||
|
r11275 | def andset(repo, subset, x, y): | ||
return getset(repo, getset(repo, subset, x), y) | ||||
def orset(repo, subset, x, y): | ||||
|
r13932 | xl = getset(repo, subset, x) | ||
|
r20366 | yl = getset(repo, subset - xl, y) | ||
|
r13932 | return xl + yl | ||
|
r11275 | |||
def notset(repo, subset, x): | ||||
|
r20366 | return subset - getset(repo, subset, x) | ||
|
r11275 | |||
def listset(repo, subset, a, b): | ||||
|
r11383 | raise error.ParseError(_("can't use a list in this context")) | ||
|
r11275 | |||
def func(repo, subset, a, b): | ||||
if a[0] == 'symbol' and a[1] in symbols: | ||||
return symbols[a[1]](repo, subset, b) | ||||
|
r11383 | raise error.ParseError(_("not a function: %s") % a[1]) | ||
|
r11275 | |||
# functions | ||||
|
r13915 | def adds(repo, subset, x): | ||
"""``adds(pattern)`` | ||||
Changesets that add a file matching pattern. | ||||
|
r20289 | |||
The pattern without explicit kind like ``glob:`` is expected to be | ||||
relative to the current directory and match against a file or a | ||||
directory. | ||||
|
r13915 | """ | ||
# i18n: "adds" is a keyword | ||||
pat = getstring(x, _("adds requires a pattern")) | ||||
return checkstatus(repo, subset, pat, 1) | ||||
def ancestor(repo, subset, x): | ||||
|
r18536 | """``ancestor(*changeset)`` | ||
|
r20991 | A greatest common ancestor of the changesets. | ||
|
r18536 | |||
Accepts 0 or more changesets. | ||||
Will return empty list when passed no args. | ||||
Greatest common ancestor of a single changeset is that changeset. | ||||
|
r13915 | """ | ||
# i18n: "ancestor" is a keyword | ||||
|
r18536 | l = getlist(x) | ||
|
r20526 | rl = spanset(repo) | ||
|
r18536 | anc = None | ||
|
r13915 | |||
|
r18536 | # (getset(repo, rl, i) for i in l) generates a list of lists | ||
for revs in (getset(repo, rl, i) for i in l): | ||||
for r in revs: | ||||
if anc is None: | ||||
|
r20991 | anc = repo[r] | ||
|
r18536 | else: | ||
|
r20991 | anc = anc.ancestor(repo[r]) | ||
if anc is not None and anc.rev() in subset: | ||||
return baseset([anc.rev()]) | ||||
|
r22802 | return baseset() | ||
|
r13915 | |||
|
r16409 | def _ancestors(repo, subset, x, followfirst=False): | ||
|
r22944 | heads = getset(repo, spanset(repo), x) | ||
if not heads: | ||||
|
r22802 | return baseset() | ||
|
r22944 | s = _revancestors(repo, heads, followfirst) | ||
|
r23003 | return subset & s | ||
|
r16409 | |||
|
r13915 | def ancestors(repo, subset, x): | ||
"""``ancestors(set)`` | ||||
Changesets that are ancestors of a changeset in set. | ||||
""" | ||||
|
r16409 | return _ancestors(repo, subset, x) | ||
def _firstancestors(repo, subset, x): | ||||
# ``_firstancestors(set)`` | ||||
# Like ``ancestors(set)`` but follows only the first parents. | ||||
return _ancestors(repo, subset, x, followfirst=True) | ||||
|
r13915 | |||
|
r14070 | def ancestorspec(repo, subset, x, n): | ||
"""``set~n`` | ||||
|
r16683 | Changesets that are the Nth ancestor (first parents only) of a changeset | ||
in set. | ||||
|
r14070 | """ | ||
try: | ||||
n = int(n[1]) | ||||
|
r14851 | except (TypeError, ValueError): | ||
|
r14070 | raise error.ParseError(_("~ expects a number")) | ||
ps = set() | ||||
cl = repo.changelog | ||||
|
r23163 | for r in getset(repo, fullreposet(repo), x): | ||
|
r14070 | for i in range(n): | ||
r = cl.parentrevs(r)[0] | ||||
ps.add(r) | ||||
|
r22531 | return subset & ps | ||
|
r14070 | |||
|
r13915 | def author(repo, subset, x): | ||
"""``author(string)`` | ||||
Alias for ``user(string)``. | ||||
""" | ||||
# i18n: "author" is a keyword | ||||
|
r15726 | n = encoding.lower(getstring(x, _("author requires a string"))) | ||
|
r16823 | kind, pattern, matcher = _substringmatcher(n) | ||
|
r20611 | return subset.filter(lambda x: matcher(encoding.lower(repo[x].user()))) | ||
|
r13915 | |||
|
r15134 | def bisect(repo, subset, x): | ||
"""``bisect(string)`` | ||||
|
r15153 | Changesets marked in the specified bisect status: | ||
|
r15136 | |||
|
r15153 | - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip | ||
|
r17424 | - ``goods``, ``bads`` : csets topologically good/bad | ||
|
r15153 | - ``range`` : csets taking part in the bisection | ||
- ``pruned`` : csets that are goods, bads or skipped | ||||
- ``untested`` : csets whose fate is yet unknown | ||||
- ``ignored`` : csets ignored due to DAG topology | ||||
|
r16647 | - ``current`` : the cset currently being bisected | ||
|
r13915 | """ | ||
|
r17259 | # i18n: "bisect" is a keyword | ||
|
r15135 | status = getstring(x, _("bisect requires a string")).lower() | ||
|
r16467 | state = set(hbisect.get(repo, status)) | ||
|
r22532 | return subset & state | ||
|
r13915 | |||
|
r15134 | # Backward-compatibility | ||
# - no help entry so that we do not advertise it any more | ||||
def bisected(repo, subset, x): | ||||
return bisect(repo, subset, x) | ||||
|
r13915 | def bookmark(repo, subset, x): | ||
"""``bookmark([name])`` | ||||
The named bookmark or all bookmarks. | ||||
|
r16822 | |||
If `name` starts with `re:`, the remainder of the name is treated as | ||||
a regular expression. To match a bookmark that actually starts with `re:`, | ||||
use the prefix `literal:`. | ||||
|
r13915 | """ | ||
# i18n: "bookmark" is a keyword | ||||
args = getargs(x, 0, 1, _('bookmark takes one or no arguments')) | ||||
if args: | ||||
bm = getstring(args[0], | ||||
# i18n: "bookmark" is a keyword | ||||
_('the argument to bookmark must be a string')) | ||||
|
r16822 | kind, pattern, matcher = _stringmatcher(bm) | ||
|
r22499 | bms = set() | ||
|
r16822 | if kind == 'literal': | ||
|
r22105 | bmrev = repo._bookmarks.get(pattern, None) | ||
|
r16822 | if not bmrev: | ||
|
r23978 | raise error.RepoLookupError(_("bookmark '%s' does not exist") | ||
% bm) | ||||
|
r22499 | bms.add(repo[bmrev].rev()) | ||
|
r16822 | else: | ||
matchrevs = set() | ||||
|
r18495 | for name, bmrev in repo._bookmarks.iteritems(): | ||
|
r16822 | if matcher(name): | ||
matchrevs.add(bmrev) | ||||
if not matchrevs: | ||||
|
r23978 | raise error.RepoLookupError(_("no bookmarks exist" | ||
" that match '%s'") % pattern) | ||||
|
r16822 | for bmrev in matchrevs: | ||
|
r22499 | bms.add(repo[bmrev].rev()) | ||
else: | ||||
bms = set([repo[r].rev() | ||||
for r in repo._bookmarks.values()]) | ||||
|
r22500 | bms -= set([node.nullrev]) | ||
|
r22530 | return subset & bms | ||
|
r13915 | |||
def branch(repo, subset, x): | ||||
"""``branch(string or set)`` | ||||
All changesets belonging to the given branch or the branches of the given | ||||
changesets. | ||||
|
r16821 | |||
If `string` starts with `re:`, the remainder of the name is treated as | ||||
a regular expression. To match a branch that actually starts with `re:`, | ||||
use the prefix `literal:`. | ||||
|
r13915 | """ | ||
|
r23787 | import branchmap | ||
urepo = repo.unfiltered() | ||||
ucl = urepo.changelog | ||||
getbi = branchmap.revbranchcache(urepo).branchinfo | ||||
|
r13915 | try: | ||
b = getstring(x, '') | ||||
except error.ParseError: | ||||
# not a string, but another revspec, e.g. tip() | ||||
pass | ||||
|
r16821 | else: | ||
kind, pattern, matcher = _stringmatcher(b) | ||||
if kind == 'literal': | ||||
# note: falls through to the revspec case if no branch with | ||||
# this name exists | ||||
if pattern in repo.branchmap(): | ||||
|
r23787 | return subset.filter(lambda r: matcher(getbi(ucl, r)[0])) | ||
|
r16821 | else: | ||
|
r23787 | return subset.filter(lambda r: matcher(getbi(ucl, r)[0])) | ||
|
r13915 | |||
|
r20526 | s = getset(repo, spanset(repo), x) | ||
|
r13915 | b = set() | ||
for r in s: | ||||
|
r23787 | b.add(getbi(ucl, r)[0]) | ||
|
r22867 | c = s.__contains__ | ||
|
r23787 | return subset.filter(lambda r: c(r) or getbi(ucl, r)[0] in b) | ||
|
r13915 | |||
|
r17829 | def bumped(repo, subset, x): | ||
"""``bumped()`` | ||||
Mutable changesets marked as successors of public changesets. | ||||
Only non-public and non-obsolete changesets can be `bumped`. | ||||
""" | ||||
# i18n: "bumped" is a keyword | ||||
getargs(x, 0, 0, _("bumped takes no arguments")) | ||||
bumped = obsmod.getrevs(repo, 'bumped') | ||||
|
r20367 | return subset & bumped | ||
|
r17829 | |||
|
r17913 | def bundle(repo, subset, x): | ||
"""``bundle()`` | ||||
Changesets in the bundle. | ||||
Bundle must be specified by the -R option.""" | ||||
try: | ||||
|
r18411 | bundlerevs = repo.changelog.bundlerevs | ||
|
r17913 | except AttributeError: | ||
raise util.Abort(_("no bundle provided - specify with -R")) | ||||
|
r20367 | return subset & bundlerevs | ||
|
r17913 | |||
|
r13915 | def checkstatus(repo, subset, pat, field): | ||
|
r16521 | hasset = matchmod.patkind(pat) == 'set' | ||
|
r20457 | |||
|
r23115 | mcache = [None] | ||
|
r20457 | def matches(x): | ||
c = repo[x] | ||||
|
r23115 | if not mcache[0] or hasset: | ||
mcache[0] = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) | ||||
m = mcache[0] | ||||
fname = None | ||||
if not m.anypats() and len(m.files()) == 1: | ||||
fname = m.files()[0] | ||||
|
r16521 | if fname is not None: | ||
if fname not in c.files(): | ||||
|
r20457 | return False | ||
|
r13915 | else: | ||
for f in c.files(): | ||||
if m(f): | ||||
break | ||||
else: | ||||
|
r20457 | return False | ||
|
r13915 | files = repo.status(c.p1().node(), c.node())[field] | ||
|
r16521 | if fname is not None: | ||
if fname in files: | ||||
|
r20457 | return True | ||
|
r13915 | else: | ||
for f in files: | ||||
if m(f): | ||||
|
r20457 | return True | ||
|
r20611 | return subset.filter(matches) | ||
|
r13915 | |||
|
r16396 | def _children(repo, narrow, parentset): | ||
|
r15899 | cs = set() | ||
|
r18063 | if not parentset: | ||
|
r20709 | return baseset(cs) | ||
|
r15899 | pr = repo.changelog.parentrevs | ||
|
r18063 | minrev = min(parentset) | ||
|
r16394 | for r in narrow: | ||
|
r18063 | if r <= minrev: | ||
continue | ||||
|
r15899 | for p in pr(r): | ||
|
r16396 | if p in parentset: | ||
|
r15899 | cs.add(r) | ||
|
r20709 | return baseset(cs) | ||
|
r15899 | |||
|
r13915 | def children(repo, subset, x): | ||
"""``children(set)`` | ||||
Child changesets of changesets in set. | ||||
""" | ||||
|
r23164 | s = getset(repo, fullreposet(repo), x) | ||
|
r15899 | cs = _children(repo, subset, s) | ||
|
r20367 | return subset & cs | ||
|
r13915 | |||
def closed(repo, subset, x): | ||||
"""``closed()`` | ||||
Changeset is closed. | ||||
""" | ||||
# i18n: "closed" is a keyword | ||||
getargs(x, 0, 0, _("closed takes no arguments")) | ||||
|
r20611 | return subset.filter(lambda r: repo[r].closesbranch()) | ||
|
r13915 | |||
def contains(repo, subset, x): | ||||
"""``contains(pattern)`` | ||||
|
r21199 | The revision's manifest contains a file matching pattern (but might not | ||
modify it). See :hg:`help patterns` for information about file patterns. | ||||
|
r20289 | |||
The pattern without explicit kind like ``glob:`` is expected to be | ||||
relative to the current directory and match against a file exactly | ||||
for efficiency. | ||||
|
r13915 | """ | ||
# i18n: "contains" is a keyword | ||||
pat = getstring(x, _("contains requires a pattern")) | ||||
|
r20461 | |||
def matches(x): | ||||
if not matchmod.patkind(pat): | ||||
pats = pathutil.canonpath(repo.root, repo.getcwd(), pat) | ||||
if pats in repo[x]: | ||||
return True | ||||
else: | ||||
c = repo[x] | ||||
m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c) | ||||
|
r15964 | for f in c.manifest(): | ||
|
r13915 | if m(f): | ||
|
r20461 | return True | ||
return False | ||||
|
r20611 | return subset.filter(matches) | ||
|
r13915 | |||
|
r17002 | def converted(repo, subset, x): | ||
"""``converted([id])`` | ||||
Changesets converted from the given identifier in the old repository if | ||||
present, or all converted changesets if no identifier is specified. | ||||
""" | ||||
# There is exactly no chance of resolving the revision, so do a simple | ||||
# string compare and hope for the best | ||||
|
r17259 | rev = None | ||
|
r17002 | # i18n: "converted" is a keyword | ||
l = getargs(x, 0, 1, _('converted takes one or no arguments')) | ||||
if l: | ||||
|
r17259 | # i18n: "converted" is a keyword | ||
|
r17002 | rev = getstring(l[0], _('converted requires a revision')) | ||
def _matchvalue(r): | ||||
source = repo[r].extra().get('convert_revision', None) | ||||
return source is not None and (rev is None or source.startswith(rev)) | ||||
|
r20611 | return subset.filter(lambda r: _matchvalue(r)) | ||
|
r17002 | |||
|
r13915 | def date(repo, subset, x): | ||
"""``date(interval)`` | ||||
Changesets within the interval, see :hg:`help dates`. | ||||
""" | ||||
# i18n: "date" is a keyword | ||||
ds = getstring(x, _("date requires a string")) | ||||
dm = util.matchdate(ds) | ||||
|
r20611 | return subset.filter(lambda x: dm(repo[x].date()[0])) | ||
|
r13915 | |||
|
r14650 | def desc(repo, subset, x): | ||
"""``desc(string)`` | ||||
Search commit message for string. The match is case-insensitive. | ||||
""" | ||||
# i18n: "desc" is a keyword | ||||
|
r15726 | ds = encoding.lower(getstring(x, _("desc requires a string"))) | ||
|
r20452 | |||
def matches(x): | ||||
c = repo[x] | ||||
return ds in encoding.lower(c.description()) | ||||
|
r20611 | return subset.filter(matches) | ||
|
r14650 | |||
|
r16409 | def _descendants(repo, subset, x, followfirst=False): | ||
|
r22944 | roots = getset(repo, spanset(repo), x) | ||
if not roots: | ||||
|
r22802 | return baseset() | ||
|
r22944 | s = _revdescendants(repo, roots, followfirst) | ||
|
r20894 | |||
# Both sets need to be ascending in order to lazily return the union | ||||
# in the correct order. | ||||
|
r22944 | base = subset & roots | ||
|
r22860 | desc = subset & s | ||
result = base + desc | ||||
if subset.isascending(): | ||||
result.sort() | ||||
elif subset.isdescending(): | ||||
result.sort(reverse=True) | ||||
else: | ||||
result = subset & result | ||||
|
r22830 | return result | ||
|
r16409 | |||
|
r13915 | def descendants(repo, subset, x): | ||
"""``descendants(set)`` | ||||
Changesets which are descendants of changesets in set. | ||||
""" | ||||
|
r16409 | return _descendants(repo, subset, x) | ||
def _firstdescendants(repo, subset, x): | ||||
# ``_firstdescendants(set)`` | ||||
# Like ``descendants(set)`` but follows only the first parents. | ||||
return _descendants(repo, subset, x, followfirst=True) | ||||
|
r13915 | |||
|
r17186 | def destination(repo, subset, x): | ||
"""``destination([set])`` | ||||
Changesets that were created by a graft, transplant or rebase operation, | ||||
with the given revisions specified as the source. Omitting the optional set | ||||
is the same as passing all(). | ||||
""" | ||||
if x is not None: | ||||
|
r22944 | sources = getset(repo, spanset(repo), x) | ||
|
r17186 | else: | ||
|
r22944 | sources = getall(repo, spanset(repo), x) | ||
|
r17186 | |||
dests = set() | ||||
# subset contains all of the possible destinations that can be returned, so | ||||
|
r22944 | # iterate over them and see if their source(s) were provided in the arg set. | ||
# Even if the immediate src of r is not in the arg set, src's source (or | ||||
|
r17186 | # further back) may be. Scanning back further than the immediate src allows | ||
# transitive transplants and rebases to yield the same results as transitive | ||||
# grafts. | ||||
for r in subset: | ||||
src = _getrevsource(repo, r) | ||||
lineage = None | ||||
while src is not None: | ||||
if lineage is None: | ||||
lineage = list() | ||||
lineage.append(r) | ||||
# The visited lineage is a match if the current source is in the arg | ||||
# set. Since every candidate dest is visited by way of iterating | ||||
|
r17494 | # subset, any dests further back in the lineage will be tested by a | ||
|
r17186 | # different iteration over subset. Likewise, if the src was already | ||
# selected, the current lineage can be selected without going back | ||||
# further. | ||||
|
r22944 | if src in sources or src in dests: | ||
|
r17186 | dests.update(lineage) | ||
break | ||||
r = src | ||||
src = _getrevsource(repo, r) | ||||
|
r21217 | return subset.filter(dests.__contains__) | ||
|
r17186 | |||
|
r18071 | def divergent(repo, subset, x): | ||
"""``divergent()`` | ||||
Final successors of changesets with an alternative set of final successors. | ||||
""" | ||||
# i18n: "divergent" is a keyword | ||||
getargs(x, 0, 0, _("divergent takes no arguments")) | ||||
divergent = obsmod.getrevs(repo, 'divergent') | ||||
|
r22533 | return subset & divergent | ||
|
r18071 | |||
|
r15819 | def draft(repo, subset, x): | ||
"""``draft()`` | ||||
Changeset in draft phase.""" | ||||
|
r17259 | # i18n: "draft" is a keyword | ||
|
r15819 | getargs(x, 0, 0, _("draft takes no arguments")) | ||
|
r23019 | phase = repo._phasecache.phase | ||
target = phases.draft | ||||
condition = lambda r: phase(repo, r) == target | ||||
|
r23018 | return subset.filter(condition, cache=False) | ||
|
r15819 | |||
|
r17173 | def extinct(repo, subset, x): | ||
"""``extinct()`` | ||||
|
r17291 | Obsolete changesets with obsolete descendants only. | ||
""" | ||||
|
r17259 | # i18n: "extinct" is a keyword | ||
|
r17258 | getargs(x, 0, 0, _("extinct takes no arguments")) | ||
|
r17825 | extincts = obsmod.getrevs(repo, 'extinct') | ||
|
r20367 | return subset & extincts | ||
|
r17173 | |||
|
r16661 | def extra(repo, subset, x): | ||
"""``extra(label, [value])`` | ||||
Changesets with the given label in the extra metadata, with the given | ||||
|
r16824 | optional value. | ||
If `value` starts with `re:`, the remainder of the value is treated as | ||||
a regular expression. To match a value that actually starts with `re:`, | ||||
use the prefix `literal:`. | ||||
""" | ||||
|
r16661 | |||
|
r17259 | # i18n: "extra" is a keyword | ||
|
r16661 | l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments')) | ||
|
r17259 | # i18n: "extra" is a keyword | ||
|
r16661 | label = getstring(l[0], _('first argument to extra must be a string')) | ||
value = None | ||||
if len(l) > 1: | ||||
|
r17259 | # i18n: "extra" is a keyword | ||
|
r16661 | value = getstring(l[1], _('second argument to extra must be a string')) | ||
|
r16824 | kind, value, matcher = _stringmatcher(value) | ||
|
r16661 | |||
def _matchvalue(r): | ||||
extra = repo[r].extra() | ||||
|
r16824 | return label in extra and (value is None or matcher(extra[label])) | ||
|
r16661 | |||
|
r20611 | return subset.filter(lambda r: _matchvalue(r)) | ||
|
r15819 | |||
|
r14342 | def filelog(repo, subset, x): | ||
"""``filelog(pattern)`` | ||||
Changesets connected to the specified filelog. | ||||
|
r17244 | |||
|
r21199 | For performance reasons, visits only revisions mentioned in the file-level | ||
filelog, rather than filtering through all changesets (much faster, but | ||||
doesn't include deletes or duplicate changes). For a slower, more accurate | ||||
result, use ``file()``. | ||||
|
r20289 | |||
The pattern without explicit kind like ``glob:`` is expected to be | ||||
relative to the current directory and match against a file exactly | ||||
for efficiency. | ||||
|
r23719 | |||
If some linkrev points to revisions filtered by the current repoview, we'll | ||||
work around it to return a non-filtered value. | ||||
|
r14342 | """ | ||
|
r17259 | # i18n: "filelog" is a keyword | ||
|
r14342 | pat = getstring(x, _("filelog requires a pattern")) | ||
s = set() | ||||
|
r23719 | cl = repo.changelog | ||
|
r14342 | |||
|
r15964 | if not matchmod.patkind(pat): | ||
|
r20288 | f = pathutil.canonpath(repo.root, repo.getcwd(), pat) | ||
|
r23719 | files = [f] | ||
|
r14342 | else: | ||
|
r20288 | m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None]) | ||
|
r23719 | files = (f for f in repo[None] if m(f)) | ||
for f in files: | ||||
|
r23822 | backrevref = {} # final value for: filerev -> changerev | ||
|
r23719 | lowestchild = {} # lowest known filerev child of a filerev | ||
delayed = [] # filerev with filtered linkrev, for post-processing | ||||
|
r23720 | lowesthead = None # cache for manifest content of all head revisions | ||
|
r23719 | fl = repo.file(f) | ||
for fr in list(fl): | ||||
|
r23820 | rev = fl.linkrev(fr) | ||
|
r23719 | if rev not in cl: | ||
# changerev pointed in linkrev is filtered | ||||
# record it for post processing. | ||||
delayed.append((fr, rev)) | ||||
|
r23821 | continue | ||
|
r23719 | for p in fl.parentrevs(fr): | ||
if 0 <= p and p not in lowestchild: | ||||
lowestchild[p] = fr | ||||
backrevref[fr] = rev | ||||
s.add(rev) | ||||
# Post-processing of all filerevs we skipped because they were | ||||
# filtered. If such filerevs have known and unfiltered children, this | ||||
# means they have an unfiltered appearance out there. We'll use linkrev | ||||
# adjustment to find one of these appearances. The lowest known child | ||||
# will be used as a starting point because it is the best upper-bound we | ||||
# have. | ||||
# | ||||
# This approach will fail when an unfiltered but linkrev-shadowed | ||||
# appearance exists in a head changeset without unfiltered filerev | ||||
# children anywhere. | ||||
while delayed: | ||||
# must be a descending iteration. To slowly fill lowest child | ||||
# information that is of potential use by the next item. | ||||
fr, rev = delayed.pop() | ||||
lkr = rev | ||||
child = lowestchild.get(fr) | ||||
if child is None: | ||||
|
r23720 | # search for existence of this file revision in a head revision. | ||
# There are three possibilities: | ||||
# - the revision exists in a head and we can find an | ||||
# introduction from there, | ||||
# - the revision does not exist in a head because it has been | ||||
# changed since its introduction: we would have found a child | ||||
# and be in the other 'else' clause, | ||||
# - all versions of the revision are hidden. | ||||
if lowesthead is None: | ||||
lowesthead = {} | ||||
for h in repo.heads(): | ||||
|
r23729 | fnode = repo[h].manifest().get(f) | ||
if fnode is not None: | ||||
lowesthead[fl.rev(fnode)] = h | ||||
|
r23720 | headrev = lowesthead.get(fr) | ||
if headrev is None: | ||||
# content is nowhere unfiltered | ||||
continue | ||||
rev = repo[headrev][f].introrev() | ||||
|
r23719 | else: | ||
# the lowest known child is a good upper bound | ||||
childcrev = backrevref[child] | ||||
# XXX this does not guarantee returning the lowest | ||||
# introduction of this revision, but this gives a | ||||
# result which is a good start and will fit in most | ||||
# cases. We probably need to fix the multiple | ||||
# introductions case properly (report each | ||||
# introduction, even for identical file revisions) | ||||
# once and for all at some point anyway. | ||||
for p in repo[childcrev][f].parents(): | ||||
if p.filerev() == fr: | ||||
rev = p.rev() | ||||
break | ||||
if rev == lkr: # no shadowed entry found | ||||
# XXX This should never happen unless some manifest points | ||||
# to biggish file revisions (like a revision that uses a | ||||
# parent that never appears in the manifest ancestors) | ||||
continue | ||||
# Fill the data for the next iteration. | ||||
for p in fl.parentrevs(fr): | ||||
if 0 <= p and p not in lowestchild: | ||||
lowestchild[p] = fr | ||||
backrevref[fr] = rev | ||||
s.add(rev) | ||||
|
r14342 | |||
|
r22534 | return subset & s | ||
|
r14342 | |||
|
r15117 | def first(repo, subset, x): | ||
"""``first(set, [n])`` | ||||
An alias for limit(). | ||||
""" | ||||
return limit(repo, subset, x) | ||||
|
r16185 | def _follow(repo, subset, x, name, followfirst=False): | ||
l = getargs(x, 0, 1, _("%s takes no arguments or a filename") % name) | ||||
c = repo['.'] | ||||
if l: | ||||
x = getstring(l[0], _("%s expected a filename") % name) | ||||
if x in c: | ||||
cx = c[x] | ||||
s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst)) | ||||
# include the revision responsible for the most recent version | ||||
|
r23704 | s.add(cx.introrev()) | ||
|
r16185 | else: | ||
|
r22802 | return baseset() | ||
|
r16185 | else: | ||
|
r20690 | s = _revancestors(repo, baseset([c.rev()]), followfirst) | ||
|
r16185 | |||
|
r22535 | return subset & s | ||
|
r16185 | |||
|
r13915 | def follow(repo, subset, x): | ||
|
r14343 | """``follow([file])`` | ||
An alias for ``::.`` (ancestors of the working copy's first parent). | ||||
If a filename is specified, the history of the given file is followed, | ||||
including copies. | ||||
""" | ||||
|
r16185 | return _follow(repo, subset, x, 'follow') | ||
|
r14343 | |||
|
r16174 | def _followfirst(repo, subset, x): | ||
# ``followfirst([file])`` | ||||
# Like ``follow([file])`` but follows only the first parent of | ||||
# every revision or file revision. | ||||
|
r16185 | return _follow(repo, subset, x, '_followfirst', followfirst=True) | ||
|
r14343 | |||
|
r13915 | def getall(repo, subset, x): | ||
"""``all()`` | ||||
All changesets, the same as ``0:tip``. | ||||
""" | ||||
# i18n: "all" is a keyword | ||||
getargs(x, 0, 0, _("all takes no arguments")) | ||||
return subset | ||||
def grep(repo, subset, x): | ||||
"""``grep(regex)`` | ||||
Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')`` | ||||
|
r14357 | to ensure special escape characters are handled correctly. Unlike | ||
``keyword(string)``, the match is case-sensitive. | ||||
|
r13915 | """ | ||
try: | ||||
# i18n: "grep" is a keyword | ||||
gr = re.compile(getstring(x, _("grep requires a string"))) | ||||
except re.error, e: | ||||
raise error.ParseError(_('invalid match pattern: %s') % e) | ||||
|
r20453 | |||
def matches(x): | ||||
c = repo[x] | ||||
|
r13915 | for e in c.files() + [c.user(), c.description()]: | ||
if gr.search(e): | ||||
|
r20453 | return True | ||
return False | ||||
|
r20611 | return subset.filter(matches) | ||
|
r13915 | |||
|
r16161 | def _matchfiles(repo, subset, x): | ||
# _matchfiles takes a revset list of prefixed arguments: | ||||
# | ||||
# [p:foo, i:bar, x:baz] | ||||
# | ||||
# builds a match object from them and filters subset. Allowed | ||||
# prefixes are 'p:' for regular patterns, 'i:' for include | ||||
|
r16181 | # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass | ||
# a revision identifier, or the empty string to reference the | ||||
# working directory, from which the match object is | ||||
|
r16411 | # initialized. Use 'd:' to set the default matching mode, default | ||
# to 'glob'. At most one 'r:' and 'd:' argument can be passed. | ||||
|
r16161 | |||
# i18n: "_matchfiles" is a keyword | ||||
l = getargs(x, 1, -1, _("_matchfiles requires at least one argument")) | ||||
pats, inc, exc = [], [], [] | ||||
|
r16411 | rev, default = None, None | ||
|
r16161 | for arg in l: | ||
|
r17259 | # i18n: "_matchfiles" is a keyword | ||
|
r16161 | 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) | ||||
|
r16181 | elif prefix == 'r:': | ||
if rev is not None: | ||||
|
r17259 | # i18n: "_matchfiles" is a keyword | ||
|
r16181 | raise error.ParseError(_('_matchfiles expected at most one ' | ||
'revision')) | ||||
|
r23950 | if value != '': # empty means working directory; leave rev as None | ||
rev = value | ||||
|
r16411 | elif prefix == 'd:': | ||
if default is not None: | ||||
|
r17259 | # i18n: "_matchfiles" is a keyword | ||
|
r16411 | raise error.ParseError(_('_matchfiles expected at most one ' | ||
'default mode')) | ||||
default = value | ||||
|
r16161 | else: | ||
|
r17259 | # i18n: "_matchfiles" is a keyword | ||
|
r16161 | raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix) | ||
|
r16411 | if not default: | ||
default = 'glob' | ||||
|
r20458 | |||
|
r23061 | m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc, | ||
exclude=exc, ctx=repo[rev], default=default) | ||||
|
r20458 | def matches(x): | ||
|
r23061 | for f in repo[x].files(): | ||
|
r16161 | if m(f): | ||
|
r20458 | return True | ||
return False | ||||
|
r20611 | return subset.filter(matches) | ||
|
r16161 | |||
|
r13915 | def hasfile(repo, subset, x): | ||
"""``file(pattern)`` | ||||
Changesets affecting files matched by pattern. | ||||
|
r17244 | |||
|
r17265 | For a faster but less accurate result, consider using ``filelog()`` | ||
instead. | ||||
|
r20289 | |||
This predicate uses ``glob:`` as the default kind of pattern. | ||||
|
r13915 | """ | ||
# i18n: "file" is a keyword | ||||
pat = getstring(x, _("file requires a pattern")) | ||||
|
r16161 | return _matchfiles(repo, subset, ('string', 'p:' + pat)) | ||
|
r13915 | |||
def head(repo, subset, x): | ||||
"""``head()`` | ||||
Changeset is a named branch head. | ||||
""" | ||||
# i18n: "head" is a keyword | ||||
getargs(x, 0, 0, _("head takes no arguments")) | ||||
hs = set() | ||||
for b, ls in repo.branchmap().iteritems(): | ||||
hs.update(repo[h].rev() for h in ls) | ||||
|
r20713 | return baseset(hs).filter(subset.__contains__) | ||
|
r13915 | |||
def heads(repo, subset, x): | ||||
"""``heads(set)`` | ||||
Members of set with no children in set. | ||||
""" | ||||
s = getset(repo, subset, x) | ||||
|
r20366 | ps = parents(repo, subset, x) | ||
return s - ps | ||||
|
r13915 | |||
|
r17390 | def hidden(repo, subset, x): | ||
"""``hidden()`` | ||||
Hidden changesets. | ||||
""" | ||||
# i18n: "hidden" is a keyword | ||||
getargs(x, 0, 0, _("hidden takes no arguments")) | ||||
|
r18382 | hiddenrevs = repoview.filterrevs(repo, 'visible') | ||
|
r20367 | return subset & hiddenrevs | ||
|
r17390 | |||
|
r13915 | def keyword(repo, subset, x): | ||
"""``keyword(string)`` | ||||
Search commit message, user name, and names of changed files for | ||||
|
r14357 | string. The match is case-insensitive. | ||
|
r13915 | """ | ||
# i18n: "keyword" is a keyword | ||||
|
r15726 | kw = encoding.lower(getstring(x, _("keyword requires a string"))) | ||
|
r20447 | |||
def matches(r): | ||||
|
r13915 | c = repo[r] | ||
|
r20447 | return util.any(kw in encoding.lower(t) for t in c.files() + [c.user(), | ||
c.description()]) | ||||
|
r20611 | return subset.filter(matches) | ||
|
r13915 | |||
def limit(repo, subset, x): | ||||
|
r15116 | """``limit(set, [n])`` | ||
First n members of set, defaulting to 1. | ||||
|
r13915 | """ | ||
# i18n: "limit" is a keyword | ||||
|
r15116 | l = getargs(x, 1, 2, _("limit requires one or two arguments")) | ||
|
r13915 | try: | ||
|
r15116 | lim = 1 | ||
if len(l) == 2: | ||||
# i18n: "limit" is a keyword | ||||
lim = int(getstring(l[1], _("limit requires a number"))) | ||||
|
r14851 | except (TypeError, ValueError): | ||
|
r13915 | # i18n: "limit" is a keyword | ||
raise error.ParseError(_("limit expects a number")) | ||||
|
r22870 | ss = subset | ||
|
r20526 | os = getset(repo, spanset(repo), l[0]) | ||
|
r22804 | result = [] | ||
|
r20446 | it = iter(os) | ||
for x in xrange(lim): | ||||
try: | ||||
y = it.next() | ||||
if y in ss: | ||||
|
r22804 | result.append(y) | ||
|
r20446 | except (StopIteration): | ||
break | ||||
|
r22804 | return baseset(result) | ||
|
r13915 | |||
|
r14061 | def last(repo, subset, x): | ||
|
r15116 | """``last(set, [n])`` | ||
Last n members of set, defaulting to 1. | ||||
|
r14061 | """ | ||
# i18n: "last" is a keyword | ||||
|
r15116 | l = getargs(x, 1, 2, _("last requires one or two arguments")) | ||
|
r14061 | try: | ||
|
r15116 | lim = 1 | ||
if len(l) == 2: | ||||
# i18n: "last" is a keyword | ||||
lim = int(getstring(l[1], _("last requires a number"))) | ||||
|
r14851 | except (TypeError, ValueError): | ||
|
r14061 | # i18n: "last" is a keyword | ||
raise error.ParseError(_("last expects a number")) | ||||
|
r22871 | ss = subset | ||
|
r20534 | os = getset(repo, spanset(repo), l[0]) | ||
os.reverse() | ||||
|
r22805 | result = [] | ||
|
r20534 | it = iter(os) | ||
for x in xrange(lim): | ||||
try: | ||||
y = it.next() | ||||
if y in ss: | ||||
|
r22805 | result.append(y) | ||
|
r20534 | except (StopIteration): | ||
break | ||||
|
r22805 | return baseset(result) | ||
|
r14061 | |||
|
r13915 | def maxrev(repo, subset, x): | ||
"""``max(set)`` | ||||
Changeset with highest revision number in set. | ||||
""" | ||||
|
r20526 | os = getset(repo, spanset(repo), x) | ||
|
r14153 | if os: | ||
|
r20754 | m = os.max() | ||
|
r13915 | if m in subset: | ||
|
r20364 | return baseset([m]) | ||
|
r22802 | return baseset() | ||
|
r13915 | |||
def merge(repo, subset, x): | ||||
"""``merge()`` | ||||
Changeset is a merge changeset. | ||||
""" | ||||
# i18n: "merge" is a keyword | ||||
getargs(x, 0, 0, _("merge takes no arguments")) | ||||
cl = repo.changelog | ||||
|
r20611 | return subset.filter(lambda r: cl.parentrevs(r)[1] != -1) | ||
|
r13915 | |||
|
r17753 | def branchpoint(repo, subset, x): | ||
"""``branchpoint()`` | ||||
Changesets with more than one child. | ||||
""" | ||||
# i18n: "branchpoint" is a keyword | ||||
getargs(x, 0, 0, _("branchpoint takes no arguments")) | ||||
cl = repo.changelog | ||||
if not subset: | ||||
|
r22802 | return baseset() | ||
|
r17753 | baserev = min(subset) | ||
parentscount = [0]*(len(repo) - baserev) | ||||
|
r17785 | for r in cl.revs(start=baserev + 1): | ||
|
r17753 | for p in cl.parentrevs(r): | ||
if p >= baserev: | ||||
parentscount[p - baserev] += 1 | ||||
|
r20611 | return subset.filter(lambda r: parentscount[r - baserev] > 1) | ||
|
r17753 | |||
|
r13915 | def minrev(repo, subset, x): | ||
"""``min(set)`` | ||||
Changeset with lowest revision number in set. | ||||
""" | ||||
|
r20526 | os = getset(repo, spanset(repo), x) | ||
|
r14153 | if os: | ||
|
r20754 | m = os.min() | ||
|
r13915 | if m in subset: | ||
|
r20364 | return baseset([m]) | ||
|
r22802 | return baseset() | ||
|
r13915 | |||
def modifies(repo, subset, x): | ||||
"""``modifies(pattern)`` | ||||
Changesets modifying files matched by pattern. | ||||
|
r20289 | |||
The pattern without explicit kind like ``glob:`` is expected to be | ||||
relative to the current directory and match against a file or a | ||||
directory. | ||||
|
r13915 | """ | ||
# i18n: "modifies" is a keyword | ||||
pat = getstring(x, _("modifies requires a pattern")) | ||||
return checkstatus(repo, subset, pat, 0) | ||||
|
r23836 | def named(repo, subset, x): | ||
"""``named(namespace)`` | ||||
The changesets in a given namespace. | ||||
If `namespace` starts with `re:`, the remainder of the string is treated as | ||||
a regular expression. To match a namespace that actually starts with `re:`, | ||||
use the prefix `literal:`. | ||||
""" | ||||
# i18n: "named" is a keyword | ||||
args = getargs(x, 1, 1, _('named requires a namespace argument')) | ||||
ns = getstring(args[0], | ||||
# i18n: "named" is a keyword | ||||
_('the argument to named must be a string')) | ||||
kind, pattern, matcher = _stringmatcher(ns) | ||||
namespaces = set() | ||||
if kind == 'literal': | ||||
if pattern not in repo.names: | ||||
|
r23978 | raise error.RepoLookupError(_("namespace '%s' does not exist") | ||
% ns) | ||||
|
r23836 | namespaces.add(repo.names[pattern]) | ||
else: | ||||
for name, ns in repo.names.iteritems(): | ||||
if matcher(name): | ||||
namespaces.add(ns) | ||||
if not namespaces: | ||||
|
r23978 | raise error.RepoLookupError(_("no namespace exists" | ||
" that match '%s'") % pattern) | ||||
|
r23836 | |||
names = set() | ||||
for ns in namespaces: | ||||
for name in ns.listnames(repo): | ||||
|
r24008 | names.update(repo[n].rev() for n in ns.nodes(repo, name)) | ||
|
r23836 | |||
names -= set([node.nullrev]) | ||||
return subset & names | ||||
|
r16417 | def node_(repo, subset, x): | ||
|
r12821 | """``id(string)`` | ||
|
r12859 | Revision non-ambiguously specified by the given hex string prefix. | ||
|
r12821 | """ | ||
|
r12815 | # i18n: "id" is a keyword | ||
|
r12736 | l = getargs(x, 1, 1, _("id requires one argument")) | ||
|
r12815 | # i18n: "id" is a keyword | ||
|
r12736 | n = getstring(l[0], _("id requires a string")) | ||
|
r12716 | if len(n) == 40: | ||
rn = repo[n].rev() | ||||
else: | ||||
|
r16735 | rn = None | ||
pm = repo.changelog._partialmatch(n) | ||||
if pm is not None: | ||||
rn = repo.changelog.rev(pm) | ||||
|
r23005 | if rn is None: | ||
return baseset() | ||||
result = baseset([rn]) | ||||
return result & subset | ||||
|
r12716 | |||
|
r17170 | def obsolete(repo, subset, x): | ||
"""``obsolete()`` | ||||
Mutable changeset with a newer version.""" | ||||
|
r17259 | # i18n: "obsolete" is a keyword | ||
|
r17170 | getargs(x, 0, 0, _("obsolete takes no arguments")) | ||
|
r17825 | obsoletes = obsmod.getrevs(repo, 'obsolete') | ||
|
r20367 | return subset & obsoletes | ||
|
r17170 | |||
|
r23466 | def only(repo, subset, x): | ||
"""``only(set, [set])`` | ||||
Changesets that are ancestors of the first set that are not ancestors | ||||
of any other head in the repo. If a second set is specified, the result | ||||
is ancestors of the first set that are not ancestors of the second set | ||||
(i.e. ::<set1> - ::<set2>). | ||||
""" | ||||
cl = repo.changelog | ||||
# i18n: "only" is a keyword | ||||
args = getargs(x, 1, 2, _('only takes one or two arguments')) | ||||
include = getset(repo, spanset(repo), args[0]) | ||||
if len(args) == 1: | ||||
if not include: | ||||
return baseset() | ||||
descendants = set(_revdescendants(repo, include, False)) | ||||
exclude = [rev for rev in cl.headrevs() | ||||
if not rev in descendants and not rev in include] | ||||
else: | ||||
exclude = getset(repo, spanset(repo), args[1]) | ||||
results = set(cl.findmissingrevs(common=exclude, heads=include)) | ||||
return subset & results | ||||
|
r17185 | def origin(repo, subset, x): | ||
"""``origin([set])`` | ||||
Changesets that were specified as a source for the grafts, transplants or | ||||
rebases that created the given revisions. Omitting the optional set is the | ||||
same as passing all(). If a changeset created by these operations is itself | ||||
specified as a source for one of these operations, only the source changeset | ||||
for the first operation is selected. | ||||
""" | ||||
if x is not None: | ||||
|
r22944 | dests = getset(repo, spanset(repo), x) | ||
|
r17185 | else: | ||
|
r22944 | dests = getall(repo, spanset(repo), x) | ||
|
r17185 | |||
def _firstsrc(rev): | ||||
src = _getrevsource(repo, rev) | ||||
if src is None: | ||||
return None | ||||
while True: | ||||
prev = _getrevsource(repo, src) | ||||
if prev is None: | ||||
return src | ||||
src = prev | ||||
|
r22944 | o = set([_firstsrc(r) for r in dests]) | ||
|
r22498 | o -= set([None]) | ||
|
r22536 | return subset & o | ||
|
r17185 | |||
|
r13915 | def outgoing(repo, subset, x): | ||
"""``outgoing([path])`` | ||||
Changesets not found in the specified destination repository, or the | ||||
default push location. | ||||
|
r12821 | """ | ||
|
r13915 | import hg # avoid start-up nasties | ||
# i18n: "outgoing" is a keyword | ||||
|
r14717 | l = getargs(x, 0, 1, _("outgoing takes one or no arguments")) | ||
|
r13915 | # i18n: "outgoing" is a keyword | ||
dest = l and getstring(l[0], _("outgoing requires a repository path")) or '' | ||||
dest = repo.ui.expandpath(dest or 'default-push', dest or 'default') | ||||
dest, branches = hg.parseurl(dest) | ||||
revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | ||||
if revs: | ||||
revs = [repo.lookup(rev) for rev in revs] | ||||
|
r14556 | other = hg.peer(repo, {}, dest) | ||
|
r13915 | repo.ui.pushbuffer() | ||
|
r15837 | outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs) | ||
|
r13915 | repo.ui.popbuffer() | ||
cl = repo.changelog | ||||
|
r15837 | o = set([cl.rev(r) for r in outgoing.missing]) | ||
|
r22529 | return subset & o | ||
|
r12716 | |||
|
r11275 | def p1(repo, subset, x): | ||
|
r12928 | """``p1([set])`` | ||
First parent of changesets in set, or the working directory. | ||||
|
r12821 | """ | ||
|
r12928 | if x is None: | ||
|
r13878 | p = repo[x].p1().rev() | ||
|
r22538 | if p >= 0: | ||
return subset & baseset([p]) | ||||
|
r22802 | return baseset() | ||
|
r12928 | |||
|
r11275 | ps = set() | ||
cl = repo.changelog | ||||
|
r20526 | for r in getset(repo, spanset(repo), x): | ||
|
r11275 | ps.add(cl.parentrevs(r)[0]) | ||
|
r22495 | ps -= set([node.nullrev]) | ||
|
r20367 | return subset & ps | ||
|
r11275 | |||
def p2(repo, subset, x): | ||||
|
r12928 | """``p2([set])`` | ||
Second parent of changesets in set, or the working directory. | ||||
|
r12821 | """ | ||
|
r12928 | if x is None: | ||
ps = repo[x].parents() | ||||
try: | ||||
|
r12935 | p = ps[1].rev() | ||
|
r22539 | if p >= 0: | ||
return subset & baseset([p]) | ||||
|
r22802 | return baseset() | ||
|
r12928 | except IndexError: | ||
|
r22802 | return baseset() | ||
|
r12928 | |||
|
r11275 | ps = set() | ||
cl = repo.changelog | ||||
|
r20526 | for r in getset(repo, spanset(repo), x): | ||
|
r11275 | ps.add(cl.parentrevs(r)[1]) | ||
|
r22495 | ps -= set([node.nullrev]) | ||
|
r20367 | return subset & ps | ||
|
r11275 | |||
def parents(repo, subset, x): | ||||
|
r12929 | """``parents([set])`` | ||
The set of all parents for all changesets in set, or the working directory. | ||||
|
r12821 | """ | ||
|
r12929 | if x is None: | ||
|
r22496 | ps = set(p.rev() for p in repo[x].parents()) | ||
else: | ||||
ps = set() | ||||
cl = repo.changelog | ||||
for r in getset(repo, spanset(repo), x): | ||||
ps.update(cl.parentrevs(r)) | ||||
|
r22497 | ps -= set([node.nullrev]) | ||
|
r22712 | return subset & ps | ||
|
r11275 | |||
|
r14070 | def parentspec(repo, subset, x, n): | ||
"""``set^0`` | ||||
The set. | ||||
``set^1`` (or ``set^``), ``set^2`` | ||||
First or second parent, respectively, of all changesets in set. | ||||
|
r12821 | """ | ||
|
r12320 | try: | ||
|
r14070 | n = int(n[1]) | ||
|
r14072 | if n not in (0, 1, 2): | ||
|
r14070 | raise ValueError | ||
|
r14851 | except (TypeError, ValueError): | ||
|
r14070 | raise error.ParseError(_("^ expects a number 0, 1, or 2")) | ||
ps = set() | ||||
|
r11275 | cl = repo.changelog | ||
|
r23165 | for r in getset(repo, fullreposet(repo), x): | ||
|
r14070 | if n == 0: | ||
ps.add(r) | ||||
elif n == 1: | ||||
ps.add(cl.parentrevs(r)[0]) | ||||
elif n == 2: | ||||
parents = cl.parentrevs(r) | ||||
if len(parents) > 1: | ||||
ps.add(parents[1]) | ||||
|
r20367 | return subset & ps | ||
|
r11275 | |||
|
r11944 | def present(repo, subset, x): | ||
|
r12821 | """``present(set)`` | ||
An empty set, if any revision in set isn't found; otherwise, | ||||
all revisions in set. | ||||
|
r16748 | |||
If any of specified revisions is not present in the local repository, | ||||
the query is normally aborted. But this predicate allows the query | ||||
to continue even in such cases. | ||||
|
r12821 | """ | ||
|
r11944 | try: | ||
return getset(repo, subset, x) | ||||
except error.RepoLookupError: | ||||
|
r22802 | return baseset() | ||
|
r11944 | |||
|
r15819 | def public(repo, subset, x): | ||
"""``public()`` | ||||
Changeset in public phase.""" | ||||
|
r17259 | # i18n: "public" is a keyword | ||
|
r15819 | getargs(x, 0, 0, _("public takes no arguments")) | ||
|
r23019 | phase = repo._phasecache.phase | ||
target = phases.public | ||||
condition = lambda r: phase(repo, r) == target | ||||
|
r23018 | return subset.filter(condition, cache=False) | ||
|
r15819 | |||
|
r15936 | def remote(repo, subset, x): | ||
|
r16007 | """``remote([id [,path]])`` | ||
|
r15936 | Local revision that corresponds to the given identifier in a | ||
remote repository, if present. Here, the '.' identifier is a | ||||
synonym for the current local branch. | ||||
""" | ||||
import hg # avoid start-up nasties | ||||
# i18n: "remote" is a keyword | ||||
|
r16007 | l = getargs(x, 0, 2, _("remote takes one, two or no arguments")) | ||
|
r15936 | |||
q = '.' | ||||
if len(l) > 0: | ||||
# i18n: "remote" is a keyword | ||||
q = getstring(l[0], _("remote requires a string id")) | ||||
if q == '.': | ||||
q = repo['.'].branch() | ||||
dest = '' | ||||
if len(l) > 1: | ||||
# i18n: "remote" is a keyword | ||||
dest = getstring(l[1], _("remote requires a repository path")) | ||||
dest = repo.ui.expandpath(dest or 'default') | ||||
dest, branches = hg.parseurl(dest) | ||||
revs, checkout = hg.addbranchrevs(repo, repo, branches, []) | ||||
if revs: | ||||
revs = [repo.lookup(rev) for rev in revs] | ||||
other = hg.peer(repo, {}, dest) | ||||
n = other.lookup(q) | ||||
if n in repo: | ||||
r = repo[n].rev() | ||||
|
r16006 | if r in subset: | ||
|
r20364 | return baseset([r]) | ||
|
r22802 | return baseset() | ||
|
r15936 | |||
|
r11275 | def removes(repo, subset, x): | ||
|
r12821 | """``removes(pattern)`` | ||
Changesets which remove files matching pattern. | ||||
|
r20289 | |||
The pattern without explicit kind like ``glob:`` is expected to be | ||||
relative to the current directory and match against a file or a | ||||
directory. | ||||
|
r12821 | """ | ||
|
r12815 | # i18n: "removes" is a keyword | ||
|
r12736 | pat = getstring(x, _("removes requires a pattern")) | ||
|
r11275 | return checkstatus(repo, subset, pat, 2) | ||
|
r13915 | def rev(repo, subset, x): | ||
"""``rev(number)`` | ||||
Revision with the given numeric identifier. | ||||
|
r12821 | """ | ||
|
r13915 | # i18n: "rev" is a keyword | ||
l = getargs(x, 1, 1, _("rev requires one argument")) | ||||
try: | ||||
# i18n: "rev" is a keyword | ||||
l = int(getstring(l[0], _("rev requires a number"))) | ||||
|
r14851 | except (TypeError, ValueError): | ||
|
r13915 | # i18n: "rev" is a keyword | ||
raise error.ParseError(_("rev expects a number")) | ||||
|
r23954 | if l not in fullreposet(repo) and l != node.nullrev: | ||
|
r23062 | return baseset() | ||
|
r22537 | return subset & baseset([l]) | ||
|
r11275 | |||
|
r16402 | def matching(repo, subset, x): | ||
"""``matching(revision [, field])`` | ||||
Changesets in which a given set of fields match the set of fields in the | ||||
selected revision or set. | ||||
|
r16528 | |||
|
r16402 | To match more than one field pass the list of fields to match separated | ||
|
r16528 | by spaces (e.g. ``author description``). | ||
Valid fields are most regular revision fields and some special fields. | ||||
Regular revision fields are ``description``, ``author``, ``branch``, | ||||
|
r17102 | ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user`` | ||
and ``diff``. | ||||
Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the | ||||
contents of the revision. Two revisions matching their ``diff`` will | ||||
also match their ``files``. | ||||
|
r16528 | |||
Special fields are ``summary`` and ``metadata``: | ||||
``summary`` matches the first line of the description. | ||||
|
r16639 | ``metadata`` is equivalent to matching ``description user date`` | ||
|
r16528 | (i.e. it matches the main metadata fields). | ||
``metadata`` is the default field which is used when no fields are | ||||
specified. You can match more than one field at a time. | ||||
|
r16402 | """ | ||
|
r17259 | # i18n: "matching" is a keyword | ||
|
r16402 | l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments")) | ||
|
r23166 | revs = getset(repo, fullreposet(repo), l[0]) | ||
|
r16402 | |||
fieldlist = ['metadata'] | ||||
if len(l) > 1: | ||||
fieldlist = getstring(l[1], | ||||
|
r17259 | # i18n: "matching" is a keyword | ||
|
r16402 | _("matching requires a string " | ||
"as its second argument")).split() | ||||
|
r17102 | # Make sure that there are no repeated fields, | ||
# expand the 'special' 'metadata' field type | ||||
# and check the 'files' whenever we check the 'diff' | ||||
|
r16402 | fields = [] | ||
for field in fieldlist: | ||||
if field == 'metadata': | ||||
fields += ['user', 'description', 'date'] | ||||
|
r17102 | elif field == 'diff': | ||
# a revision matching the diff must also match the files | ||||
# since matching the diff is very costly, make sure to | ||||
# also match the files first | ||||
fields += ['files', 'diff'] | ||||
|
r16402 | else: | ||
if field == 'author': | ||||
field = 'user' | ||||
fields.append(field) | ||||
fields = set(fields) | ||||
|
r16444 | if 'summary' in fields and 'description' in fields: | ||
# If a revision matches its description it also matches its summary | ||||
fields.discard('summary') | ||||
|
r16402 | |||
# We may want to match more than one field | ||||
|
r16446 | # Not all fields take the same amount of time to be matched | ||
# Sort the selected fields in order of increasing matching cost | ||||
|
r16453 | fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary', | ||
|
r17102 | 'files', 'description', 'substate', 'diff'] | ||
|
r16446 | def fieldkeyfunc(f): | ||
try: | ||||
return fieldorder.index(f) | ||||
except ValueError: | ||||
# assume an unknown field is very costly | ||||
return len(fieldorder) | ||||
fields = list(fields) | ||||
fields.sort(key=fieldkeyfunc) | ||||
|
r16402 | # Each field will be matched with its own "getfield" function | ||
# which will be added to the getfieldfuncs array of functions | ||||
getfieldfuncs = [] | ||||
_funcs = { | ||||
'user': lambda r: repo[r].user(), | ||||
'branch': lambda r: repo[r].branch(), | ||||
'date': lambda r: repo[r].date(), | ||||
'description': lambda r: repo[r].description(), | ||||
'files': lambda r: repo[r].files(), | ||||
'parents': lambda r: repo[r].parents(), | ||||
'phase': lambda r: repo[r].phase(), | ||||
'substate': lambda r: repo[r].substate, | ||||
'summary': lambda r: repo[r].description().splitlines()[0], | ||||
|
r17102 | 'diff': lambda r: list(repo[r].diff(git=True),) | ||
|
r16402 | } | ||
for info in fields: | ||||
getfield = _funcs.get(info, None) | ||||
if getfield is None: | ||||
raise error.ParseError( | ||||
|
r17259 | # i18n: "matching" is a keyword | ||
|
r16402 | _("unexpected field name passed to matching: %s") % info) | ||
getfieldfuncs.append(getfield) | ||||
# convert the getfield array of functions into a "getinfo" function | ||||
# which returns an array of field values (or a single value if there | ||||
# is only one field to match) | ||||
|
r16445 | getinfo = lambda r: [f(r) for f in getfieldfuncs] | ||
|
r16402 | |||
|
r20459 | def matches(x): | ||
for rev in revs: | ||||
target = getinfo(rev) | ||||
|
r16445 | match = True | ||
for n, f in enumerate(getfieldfuncs): | ||||
|
r20459 | if target[n] != f(x): | ||
|
r16445 | match = False | ||
if match: | ||||
|
r20459 | return True | ||
return False | ||||
|
r20611 | return subset.filter(matches) | ||
|
r16402 | |||
|
r11275 | def reverse(repo, subset, x): | ||
|
r12821 | """``reverse(set)`` | ||
Reverse order of set. | ||||
""" | ||||
|
r11275 | l = getset(repo, subset, x) | ||
l.reverse() | ||||
return l | ||||
|
r13915 | def roots(repo, subset, x): | ||
"""``roots(set)`` | ||||
|
r16394 | Changesets in set with no parent changeset in set. | ||
|
r12821 | """ | ||
|
r22874 | s = getset(repo, spanset(repo), x) | ||
subset = baseset([r for r in s if r in subset]) | ||||
|
r16394 | cs = _children(repo, subset, s) | ||
|
r20366 | return subset - cs | ||
|
r11944 | |||
|
r15819 | def secret(repo, subset, x): | ||
"""``secret()`` | ||||
Changeset in secret phase.""" | ||||
|
r17259 | # i18n: "secret" is a keyword | ||
|
r15819 | getargs(x, 0, 0, _("secret takes no arguments")) | ||
|
r23019 | phase = repo._phasecache.phase | ||
target = phases.secret | ||||
condition = lambda r: phase(repo, r) == target | ||||
|
r23018 | return subset.filter(condition, cache=False) | ||
|
r15819 | |||
|
r11275 | def sort(repo, subset, x): | ||
|
r12821 | """``sort(set[, [-]key...])`` | ||
Sort set by keys. The default sort order is ascending, specify a key | ||||
as ``-key`` to sort in descending order. | ||||
The keys can be: | ||||
- ``rev`` for the revision number, | ||||
- ``branch`` for the branch name, | ||||
- ``desc`` for the commit message (description), | ||||
- ``user`` for user name (``author`` can be used as an alias), | ||||
- ``date`` for the commit date | ||||
""" | ||||
|
r12815 | # i18n: "sort" is a keyword | ||
|
r12736 | l = getargs(x, 1, 2, _("sort requires one or two arguments")) | ||
|
r11275 | keys = "rev" | ||
if len(l) == 2: | ||||
|
r17259 | # i18n: "sort" is a keyword | ||
|
r11383 | keys = getstring(l[1], _("sort spec must be a string")) | ||
|
r11275 | |||
s = l[0] | ||||
keys = keys.split() | ||||
l = [] | ||||
def invert(s): | ||||
return "".join(chr(255 - ord(c)) for c in s) | ||||
|
r20719 | revs = getset(repo, subset, s) | ||
if keys == ["rev"]: | ||||
revs.sort() | ||||
return revs | ||||
elif keys == ["-rev"]: | ||||
revs.sort(reverse=True) | ||||
return revs | ||||
for r in revs: | ||||
|
r11275 | c = repo[r] | ||
e = [] | ||||
for k in keys: | ||||
if k == 'rev': | ||||
e.append(r) | ||||
elif k == '-rev': | ||||
e.append(-r) | ||||
elif k == 'branch': | ||||
e.append(c.branch()) | ||||
elif k == '-branch': | ||||
e.append(invert(c.branch())) | ||||
elif k == 'desc': | ||||
e.append(c.description()) | ||||
elif k == '-desc': | ||||
e.append(invert(c.description())) | ||||
elif k in 'user author': | ||||
e.append(c.user()) | ||||
elif k in '-user -author': | ||||
e.append(invert(c.user())) | ||||
elif k == 'date': | ||||
e.append(c.date()[0]) | ||||
elif k == '-date': | ||||
e.append(-c.date()[0]) | ||||
else: | ||||
|
r11383 | raise error.ParseError(_("unknown sort key %r") % k) | ||
|
r11275 | e.append(r) | ||
l.append(e) | ||||
l.sort() | ||||
|
r20364 | return baseset([e[-1] for e in l]) | ||
|
r11275 | |||
|
r16819 | def _stringmatcher(pattern): | ||
""" | ||||
accepts a string, possibly starting with 're:' or 'literal:' prefix. | ||||
returns the matcher name, pattern, and matcher function. | ||||
missing or unknown prefixes are treated as literal matches. | ||||
helper for tests: | ||||
>>> def test(pattern, *tests): | ||||
... kind, pattern, matcher = _stringmatcher(pattern) | ||||
... return (kind, pattern, [bool(matcher(t)) for t in tests]) | ||||
exact matching (no prefix): | ||||
>>> test('abcdefg', 'abc', 'def', 'abcdefg') | ||||
('literal', 'abcdefg', [False, False, True]) | ||||
regex matching ('re:' prefix) | ||||
>>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar') | ||||
('re', 'a.+b', [False, False, True]) | ||||
force exact matches ('literal:' prefix) | ||||
>>> test('literal:re:foobar', 'foobar', 're:foobar') | ||||
('literal', 're:foobar', [False, True]) | ||||
unknown prefixes are ignored and treated as literals | ||||
>>> test('foo:bar', 'foo', 'bar', 'foo:bar') | ||||
('literal', 'foo:bar', [False, False, True]) | ||||
""" | ||||
if pattern.startswith('re:'): | ||||
pattern = pattern[3:] | ||||
try: | ||||
regex = re.compile(pattern) | ||||
except re.error, e: | ||||
raise error.ParseError(_('invalid regular expression: %s') | ||||
% e) | ||||
return 're', pattern, regex.search | ||||
elif pattern.startswith('literal:'): | ||||
pattern = pattern[8:] | ||||
return 'literal', pattern, pattern.__eq__ | ||||
|
r16823 | def _substringmatcher(pattern): | ||
kind, pattern, matcher = _stringmatcher(pattern) | ||||
if kind == 'literal': | ||||
matcher = lambda s: pattern in s | ||||
return kind, pattern, matcher | ||||
|
r16819 | |||
|
r12715 | def tag(repo, subset, x): | ||
|
r14356 | """``tag([name])`` | ||
|
r12821 | The specified tag by name, or all tagged revisions if no name is given. | ||
|
r20824 | |||
If `name` starts with `re:`, the remainder of the name is treated as | ||||
a regular expression. To match a tag that actually starts with `re:`, | ||||
use the prefix `literal:`. | ||||
|
r12821 | """ | ||
|
r12815 | # i18n: "tag" is a keyword | ||
|
r12715 | args = getargs(x, 0, 1, _("tag takes one or no arguments")) | ||
|
r11280 | cl = repo.changelog | ||
|
r12715 | if args: | ||
|
r16820 | pattern = getstring(args[0], | ||
# i18n: "tag" is a keyword | ||||
_('the argument to tag must be a string')) | ||||
kind, pattern, matcher = _stringmatcher(pattern) | ||||
if kind == 'literal': | ||||
|
r16825 | # avoid resolving all tags | ||
tn = repo._tagscache.tags.get(pattern, None) | ||||
if tn is None: | ||||
|
r23978 | raise error.RepoLookupError(_("tag '%s' does not exist") | ||
% pattern) | ||||
|
r16825 | s = set([repo[tn].rev()]) | ||
|
r16820 | else: | ||
s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)]) | ||||
|
r12715 | else: | ||
s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip']) | ||||
|
r20367 | return subset & s | ||
|
r11280 | |||
|
r12821 | def tagged(repo, subset, x): | ||
return tag(repo, subset, x) | ||||
|
r17171 | def unstable(repo, subset, x): | ||
"""``unstable()`` | ||||
|
r17291 | Non-obsolete changesets with obsolete ancestors. | ||
""" | ||||
|
r17259 | # i18n: "unstable" is a keyword | ||
|
r17258 | getargs(x, 0, 0, _("unstable takes no arguments")) | ||
|
r17825 | unstables = obsmod.getrevs(repo, 'unstable') | ||
|
r20367 | return subset & unstables | ||
|
r17171 | |||
|
r13915 | def user(repo, subset, x): | ||
"""``user(string)`` | ||||
|
r14357 | User name contains string. The match is case-insensitive. | ||
|
r16823 | |||
If `string` starts with `re:`, the remainder of the string is treated as | ||||
a regular expression. To match a user that actually contains `re:`, use | ||||
the prefix `literal:`. | ||||
|
r13359 | """ | ||
|
r13915 | return author(repo, subset, x) | ||
|
r13359 | |||
|
r15898 | # for internal use | ||
def _list(repo, subset, x): | ||||
s = getstring(x, "internal error") | ||||
if not s: | ||||
|
r22802 | return baseset() | ||
|
r15898 | ls = [repo[r].rev() for r in s.split('\0')] | ||
|
r22875 | s = subset | ||
|
r20365 | return baseset([r for r in ls if r in s]) | ||
|
r15898 | |||
|
r20566 | # for internal use | ||
def _intlist(repo, subset, x): | ||||
s = getstring(x, "internal error") | ||||
if not s: | ||||
|
r22802 | return baseset() | ||
|
r20566 | ls = [int(r) for r in s.split('\0')] | ||
|
r22876 | s = subset | ||
|
r20566 | return baseset([r for r in ls if r in s]) | ||
|
r20569 | # for internal use | ||
def _hexlist(repo, subset, x): | ||||
s = getstring(x, "internal error") | ||||
if not s: | ||||
|
r22802 | return baseset() | ||
|
r20569 | cl = repo.changelog | ||
ls = [cl.rev(node.bin(r)) for r in s.split('\0')] | ||||
|
r22877 | s = subset | ||
|
r20569 | return baseset([r for r in ls if r in s]) | ||
|
r15898 | |||
|
r11275 | symbols = { | ||
|
r11284 | "adds": adds, | ||
"all": getall, | ||||
|
r11275 | "ancestor": ancestor, | ||
"ancestors": ancestors, | ||||
|
r16409 | "_firstancestors": _firstancestors, | ||
|
r11284 | "author": author, | ||
|
r15134 | "bisect": bisect, | ||
|
r13602 | "bisected": bisected, | ||
|
r13359 | "bookmark": bookmark, | ||
|
r11275 | "branch": branch, | ||
|
r17753 | "branchpoint": branchpoint, | ||
|
r17829 | "bumped": bumped, | ||
|
r17913 | "bundle": bundle, | ||
|
r11284 | "children": children, | ||
"closed": closed, | ||||
"contains": contains, | ||||
|
r17002 | "converted": converted, | ||
|
r11284 | "date": date, | ||
|
r14650 | "desc": desc, | ||
|
r11284 | "descendants": descendants, | ||
|
r16409 | "_firstdescendants": _firstdescendants, | ||
|
r17186 | "destination": destination, | ||
|
r18071 | "divergent": divergent, | ||
|
r15819 | "draft": draft, | ||
|
r17173 | "extinct": extinct, | ||
|
r16661 | "extra": extra, | ||
|
r11284 | "file": hasfile, | ||
|
r14342 | "filelog": filelog, | ||
|
r15117 | "first": first, | ||
|
r11284 | "follow": follow, | ||
|
r16174 | "_followfirst": _followfirst, | ||
|
r11284 | "grep": grep, | ||
"head": head, | ||||
"heads": heads, | ||||
|
r17390 | "hidden": hidden, | ||
|
r16417 | "id": node_, | ||
|
r11275 | "keyword": keyword, | ||
|
r14061 | "last": last, | ||
|
r11284 | "limit": limit, | ||
|
r16161 | "_matchfiles": _matchfiles, | ||
|
r11284 | "max": maxrev, | ||
|
r14649 | "merge": merge, | ||
|
r11708 | "min": minrev, | ||
|
r11284 | "modifies": modifies, | ||
|
r23836 | "named": named, | ||
|
r17170 | "obsolete": obsolete, | ||
|
r23466 | "only": only, | ||
|
r17185 | "origin": origin, | ||
|
r11284 | "outgoing": outgoing, | ||
|
r11275 | "p1": p1, | ||
"p2": p2, | ||||
"parents": parents, | ||||
|
r11944 | "present": present, | ||
|
r15819 | "public": public, | ||
|
r15936 | "remote": remote, | ||
|
r11284 | "removes": removes, | ||
|
r14649 | "rev": rev, | ||
|
r11284 | "reverse": reverse, | ||
|
r11275 | "roots": roots, | ||
|
r11284 | "sort": sort, | ||
|
r15819 | "secret": secret, | ||
|
r16402 | "matching": matching, | ||
|
r12715 | "tag": tag, | ||
|
r12821 | "tagged": tagged, | ||
"user": user, | ||||
|
r17171 | "unstable": unstable, | ||
|
r15898 | "_list": _list, | ||
|
r20566 | "_intlist": _intlist, | ||
|
r20569 | "_hexlist": _hexlist, | ||
|
r11275 | } | ||
|
r19721 | # symbols which can't be used for a DoS attack for any given input | ||
# (e.g. those which accept regexes as plain strings shouldn't be included) | ||||
# functions that just return a lot of changesets (like all) don't count here | ||||
safesymbols = set([ | ||||
"adds", | ||||
"all", | ||||
"ancestor", | ||||
"ancestors", | ||||
"_firstancestors", | ||||
"author", | ||||
"bisect", | ||||
"bisected", | ||||
"bookmark", | ||||
"branch", | ||||
"branchpoint", | ||||
"bumped", | ||||
"bundle", | ||||
"children", | ||||
"closed", | ||||
"converted", | ||||
"date", | ||||
"desc", | ||||
"descendants", | ||||
"_firstdescendants", | ||||
"destination", | ||||
"divergent", | ||||
"draft", | ||||
"extinct", | ||||
"extra", | ||||
"file", | ||||
"filelog", | ||||
"first", | ||||
"follow", | ||||
"_followfirst", | ||||
"head", | ||||
"heads", | ||||
"hidden", | ||||
"id", | ||||
"keyword", | ||||
"last", | ||||
"limit", | ||||
"_matchfiles", | ||||
"max", | ||||
"merge", | ||||
"min", | ||||
"modifies", | ||||
"obsolete", | ||||
|
r23467 | "only", | ||
|
r19721 | "origin", | ||
"outgoing", | ||||
"p1", | ||||
"p2", | ||||
"parents", | ||||
"present", | ||||
"public", | ||||
"remote", | ||||
"removes", | ||||
"rev", | ||||
"reverse", | ||||
"roots", | ||||
"sort", | ||||
"secret", | ||||
"matching", | ||||
"tag", | ||||
"tagged", | ||||
"user", | ||||
"unstable", | ||||
"_list", | ||||
|
r20566 | "_intlist", | ||
|
r20569 | "_hexlist", | ||
|
r19721 | ]) | ||
|
r11275 | methods = { | ||
"range": rangeset, | ||||
|
r16860 | "dagrange": dagrange, | ||
|
r11275 | "string": stringset, | ||
"symbol": symbolset, | ||||
"and": andset, | ||||
"or": orset, | ||||
"not": notset, | ||||
"list": listset, | ||||
"func": func, | ||||
|
r14070 | "ancestor": ancestorspec, | ||
"parent": parentspec, | ||||
"parentpost": p1, | ||||
|
r23765 | "only": only, | ||
"onlypost": only, | ||||
|
r11275 | } | ||
|
r11279 | def optimize(x, small): | ||
|
r13031 | if x is None: | ||
|
r11279 | return 0, x | ||
|
r11275 | smallbonus = 1 | ||
if small: | ||||
smallbonus = .5 | ||||
op = x[0] | ||||
|
r11283 | if op == 'minus': | ||
|
r11279 | return optimize(('and', x[1], ('not', x[2])), small) | ||
|
r23765 | elif op == 'only': | ||
return optimize(('func', ('symbol', 'only'), | ||||
('list', x[1], x[2])), small) | ||||
|
r11279 | elif op == 'dagrangepre': | ||
return optimize(('func', ('symbol', 'ancestors'), x[1]), small) | ||||
elif op == 'dagrangepost': | ||||
return optimize(('func', ('symbol', 'descendants'), x[1]), small) | ||||
elif op == 'rangepre': | ||||
return optimize(('range', ('string', '0'), x[1]), small) | ||||
elif op == 'rangepost': | ||||
return optimize(('range', x[1], ('string', 'tip')), small) | ||||
|
r11467 | elif op == 'negate': | ||
return optimize(('string', | ||||
'-' + getstring(x[1], _("can't negate that"))), small) | ||||
|
r11279 | elif op in 'string symbol negate': | ||
return smallbonus, x # single revisions are small | ||||
|
r16859 | elif op == 'and': | ||
|
r11279 | wa, ta = optimize(x[1], True) | ||
wb, tb = optimize(x[2], True) | ||||
|
r20499 | |||
# (::x and not ::y)/(not ::y and ::x) have a fast path | ||||
|
r21893 | def isonly(revs, bases): | ||
|
r20499 | return ( | ||
revs[0] == 'func' | ||||
and getstring(revs[1], _('not a symbol')) == 'ancestors' | ||||
and bases[0] == 'not' | ||||
and bases[1][0] == 'func' | ||||
and getstring(bases[1][1], _('not a symbol')) == 'ancestors') | ||||
|
r11279 | w = min(wa, wb) | ||
|
r21893 | if isonly(ta, tb): | ||
return w, ('func', ('symbol', 'only'), ('list', ta[2], tb[1][2])) | ||||
if isonly(tb, ta): | ||||
return w, ('func', ('symbol', 'only'), ('list', tb[2], ta[1][2])) | ||||
|
r20499 | |||
|
r11279 | if wa > wb: | ||
return w, (op, tb, ta) | ||||
return w, (op, ta, tb) | ||||
elif op == 'or': | ||||
wa, ta = optimize(x[1], False) | ||||
wb, tb = optimize(x[2], False) | ||||
if wb < wa: | ||||
wb, wa = wa, wb | ||||
return max(wa, wb), (op, ta, tb) | ||||
|
r11275 | elif op == 'not': | ||
|
r11279 | o = optimize(x[1], not small) | ||
return o[0], (op, o[1]) | ||||
|
r14070 | elif op == 'parentpost': | ||
o = optimize(x[1], small) | ||||
return o[0], (op, o[1]) | ||||
|
r11275 | elif op == 'group': | ||
|
r11279 | return optimize(x[1], small) | ||
|
r16860 | elif op in 'dagrange range list parent ancestorspec': | ||
|
r14842 | if op == 'parent': | ||
# x^:y means (x^) : y, not x ^ (:y) | ||||
post = ('parentpost', x[1]) | ||||
if x[2][0] == 'dagrangepre': | ||||
return optimize(('dagrange', post, x[2][1]), small) | ||||
elif x[2][0] == 'rangepre': | ||||
return optimize(('range', post, x[2][1]), small) | ||||
|
r11279 | wa, ta = optimize(x[1], small) | ||
wb, tb = optimize(x[2], small) | ||||
return wa + wb, (op, ta, tb) | ||||
|
r11275 | elif op == 'func': | ||
|
r11383 | f = getstring(x[1], _("not a symbol")) | ||
|
r11279 | wa, ta = optimize(x[2], small) | ||
|
r14650 | if f in ("author branch closed date desc file grep keyword " | ||
"outgoing user"): | ||||
|
r11279 | w = 10 # slow | ||
|
r12351 | elif f in "modifies adds removes": | ||
|
r11279 | w = 30 # slower | ||
|
r11275 | elif f == "contains": | ||
|
r11279 | w = 100 # very slow | ||
|
r11275 | elif f == "ancestor": | ||
|
r11279 | w = 1 * smallbonus | ||
|
r22451 | elif f in "reverse limit first _intlist": | ||
|
r11279 | w = 0 | ||
|
r11275 | elif f in "sort": | ||
|
r11279 | w = 10 # assume most sorts look at changelog | ||
|
r11275 | else: | ||
|
r11279 | w = 1 | ||
return w + wa, (op, x[1], ta) | ||||
return 1, x | ||||
|
r11275 | |||
|
r16771 | _aliasarg = ('func', ('symbol', '_aliasarg')) | ||
def _getaliasarg(tree): | ||||
"""If tree matches ('func', ('symbol', '_aliasarg'), ('string', X)) | ||||
return X, None otherwise. | ||||
""" | ||||
if (len(tree) == 3 and tree[:2] == _aliasarg | ||||
and tree[2][0] == 'string'): | ||||
return tree[2][1] | ||||
return None | ||||
def _checkaliasarg(tree, known=None): | ||||
"""Check tree contains no _aliasarg construct or only ones which | ||||
value is in known. Used to avoid alias placeholders injection. | ||||
""" | ||||
if isinstance(tree, tuple): | ||||
arg = _getaliasarg(tree) | ||||
if arg is not None and (not known or arg not in known): | ||||
raise error.ParseError(_("not a function: %s") % '_aliasarg') | ||||
for t in tree: | ||||
_checkaliasarg(t, known) | ||||
|
r23845 | # the set of valid characters for the initial letter of symbols in | ||
# alias declarations and definitions | ||||
_aliassyminitletters = set(c for c in [chr(i) for i in xrange(256)] | ||||
if c.isalnum() or c in '._@$' or ord(c) > 127) | ||||
def _tokenizealias(program, lookup=None): | ||||
"""Parse alias declaration/definition into a stream of tokens | ||||
This allows symbol names to use also ``$`` as an initial letter | ||||
(for backward compatibility), and callers of this function should | ||||
examine whether ``$`` is used also for unexpected symbols or not. | ||||
""" | ||||
return tokenize(program, lookup=lookup, | ||||
syminitletters=_aliassyminitletters) | ||||
def _parsealiasdecl(decl): | ||||
"""Parse alias declaration ``decl`` | ||||
This returns ``(name, tree, args, errorstr)`` tuple: | ||||
- ``name``: of declared alias (may be ``decl`` itself at error) | ||||
- ``tree``: parse result (or ``None`` at error) | ||||
- ``args``: list of alias argument names (or None for symbol declaration) | ||||
- ``errorstr``: detail about detected error (or None) | ||||
>>> _parsealiasdecl('foo') | ||||
('foo', ('symbol', 'foo'), None, None) | ||||
>>> _parsealiasdecl('$foo') | ||||
('$foo', None, None, "'$' not for alias arguments") | ||||
>>> _parsealiasdecl('foo::bar') | ||||
('foo::bar', None, None, 'invalid format') | ||||
>>> _parsealiasdecl('foo bar') | ||||
('foo bar', None, None, 'at 4: invalid token') | ||||
>>> _parsealiasdecl('foo()') | ||||
('foo', ('func', ('symbol', 'foo')), [], None) | ||||
>>> _parsealiasdecl('$foo()') | ||||
('$foo()', None, None, "'$' not for alias arguments") | ||||
>>> _parsealiasdecl('foo($1, $2)') | ||||
('foo', ('func', ('symbol', 'foo')), ['$1', '$2'], None) | ||||
>>> _parsealiasdecl('foo(bar_bar, baz.baz)') | ||||
('foo', ('func', ('symbol', 'foo')), ['bar_bar', 'baz.baz'], None) | ||||
>>> _parsealiasdecl('foo($1, $2, nested($1, $2))') | ||||
('foo($1, $2, nested($1, $2))', None, None, 'invalid argument list') | ||||
>>> _parsealiasdecl('foo(bar($1, $2))') | ||||
('foo(bar($1, $2))', None, None, 'invalid argument list') | ||||
>>> _parsealiasdecl('foo("string")') | ||||
('foo("string")', None, None, 'invalid argument list') | ||||
>>> _parsealiasdecl('foo($1, $2') | ||||
('foo($1, $2', None, None, 'at 10: unexpected token: end') | ||||
>>> _parsealiasdecl('foo("string') | ||||
('foo("string', None, None, 'at 5: unterminated string') | ||||
|
r23847 | >>> _parsealiasdecl('foo($1, $2, $1)') | ||
('foo', None, None, 'argument names collide with each other') | ||||
|
r23845 | """ | ||
p = parser.parser(_tokenizealias, elements) | ||||
try: | ||||
tree, pos = p.parse(decl) | ||||
if (pos != len(decl)): | ||||
raise error.ParseError(_('invalid token'), pos) | ||||
if isvalidsymbol(tree): | ||||
# "name = ...." style | ||||
name = getsymbol(tree) | ||||
if name.startswith('$'): | ||||
return (decl, None, None, _("'$' not for alias arguments")) | ||||
return (name, ('symbol', name), None, None) | ||||
if isvalidfunc(tree): | ||||
# "name(arg, ....) = ...." style | ||||
name = getfuncname(tree) | ||||
if name.startswith('$'): | ||||
return (decl, None, None, _("'$' not for alias arguments")) | ||||
args = [] | ||||
for arg in getfuncargs(tree): | ||||
if not isvalidsymbol(arg): | ||||
return (decl, None, None, _("invalid argument list")) | ||||
args.append(getsymbol(arg)) | ||||
|
r23847 | if len(args) != len(set(args)): | ||
return (name, None, None, | ||||
_("argument names collide with each other")) | ||||
|
r23845 | return (name, ('func', ('symbol', name)), args, None) | ||
return (decl, None, None, _("invalid format")) | ||||
except error.ParseError, inst: | ||||
return (decl, None, None, parseerrordetail(inst)) | ||||
|
r23993 | def _parsealiasdefn(defn, args): | ||
"""Parse alias definition ``defn`` | ||||
This function also replaces alias argument references in the | ||||
specified definition by ``_aliasarg(ARGNAME)``. | ||||
``args`` is a list of alias argument names, or None if the alias | ||||
is declared as a symbol. | ||||
This returns "tree" as parsing result. | ||||
>>> args = ['$1', '$2', 'foo'] | ||||
>>> print prettyformat(_parsealiasdefn('$1 or foo', args)) | ||||
(or | ||||
(func | ||||
('symbol', '_aliasarg') | ||||
('string', '$1')) | ||||
(func | ||||
('symbol', '_aliasarg') | ||||
('string', 'foo'))) | ||||
>>> try: | ||||
... _parsealiasdefn('$1 or $bar', args) | ||||
... except error.ParseError, inst: | ||||
... print parseerrordetail(inst) | ||||
at 6: '$' not for alias arguments | ||||
>>> args = ['$1', '$10', 'foo'] | ||||
>>> print prettyformat(_parsealiasdefn('$10 or foobar', args)) | ||||
(or | ||||
(func | ||||
('symbol', '_aliasarg') | ||||
('string', '$10')) | ||||
('symbol', 'foobar')) | ||||
>>> print prettyformat(_parsealiasdefn('"$1" or "foo"', args)) | ||||
(or | ||||
('string', '$1') | ||||
('string', 'foo')) | ||||
""" | ||||
def tokenizedefn(program, lookup=None): | ||||
if args: | ||||
argset = set(args) | ||||
else: | ||||
argset = set() | ||||
for t, value, pos in _tokenizealias(program, lookup=lookup): | ||||
if t == 'symbol': | ||||
if value in argset: | ||||
# emulate tokenization of "_aliasarg('ARGNAME')": | ||||
# "_aliasarg()" is an unknown symbol only used separate | ||||
# alias argument placeholders from regular strings. | ||||
yield ('symbol', '_aliasarg', pos) | ||||
yield ('(', None, pos) | ||||
yield ('string', value, pos) | ||||
yield (')', None, pos) | ||||
continue | ||||
elif value.startswith('$'): | ||||
raise error.ParseError(_("'$' not for alias arguments"), | ||||
pos) | ||||
yield (t, value, pos) | ||||
p = parser.parser(tokenizedefn, elements) | ||||
tree, pos = p.parse(defn) | ||||
if pos != len(defn): | ||||
raise error.ParseError(_('invalid token'), pos) | ||||
return tree | ||||
|
r14098 | class revsetalias(object): | ||
|
r23725 | # whether own `error` information is already shown or not. | ||
# this avoids showing same warning multiple times at each `findaliases`. | ||||
warned = False | ||||
|
r14723 | def __init__(self, name, value): | ||
|
r14098 | '''Aliases like: | ||
h = heads(default) | ||||
b($1) = ancestors($1) - ancestors(default) | ||||
''' | ||||
|
r23846 | self.name, self.tree, self.args, self.error = _parsealiasdecl(name) | ||
if self.error: | ||||
self.error = _('failed to parse the declaration of revset alias' | ||||
' "%s": %s') % (self.name, self.error) | ||||
return | ||||
|
r23725 | try: | ||
|
r23994 | self.replacement = _parsealiasdefn(value, self.args) | ||
|
r23725 | # Check for placeholder injection | ||
_checkaliasarg(self.replacement, self.args) | ||||
except error.ParseError, inst: | ||||
|
r23844 | self.error = _('failed to parse the definition of revset alias' | ||
' "%s": %s') % (self.name, parseerrordetail(inst)) | ||||
|
r14098 | |||
|
r16096 | def _getalias(aliases, tree): | ||
"""If tree looks like an unexpanded alias, return it. Return None | ||||
otherwise. | ||||
""" | ||||
if isinstance(tree, tuple) and tree: | ||||
if tree[0] == 'symbol' and len(tree) == 2: | ||||
name = tree[1] | ||||
alias = aliases.get(name) | ||||
if alias and alias.args is None and alias.tree == tree: | ||||
return alias | ||||
if tree[0] == 'func' and len(tree) > 1: | ||||
if tree[1][0] == 'symbol' and len(tree[1]) == 2: | ||||
name = tree[1][1] | ||||
alias = aliases.get(name) | ||||
if alias and alias.args is not None and alias.tree == tree[:2]: | ||||
return alias | ||||
return None | ||||
|
r14098 | |||
|
r16096 | def _expandargs(tree, args): | ||
|
r16771 | """Replace _aliasarg instances with the substitution value of the | ||
same name in args, recursively. | ||||
|
r16096 | """ | ||
|
r16771 | if not tree or not isinstance(tree, tuple): | ||
|
r16096 | return tree | ||
|
r16771 | arg = _getaliasarg(tree) | ||
if arg is not None: | ||||
return args[arg] | ||||
|
r16096 | return tuple(_expandargs(t, args) for t in tree) | ||
|
r16838 | def _expandaliases(aliases, tree, expanding, cache): | ||
|
r16096 | """Expand aliases in tree, recursively. | ||
'aliases' is a dictionary mapping user defined aliases to | ||||
revsetalias objects. | ||||
""" | ||||
if not isinstance(tree, tuple): | ||||
# Do not expand raw strings | ||||
|
r14098 | return tree | ||
|
r16096 | alias = _getalias(aliases, tree) | ||
if alias is not None: | ||||
|
r23725 | if alias.error: | ||
|
r23844 | raise util.Abort(alias.error) | ||
|
r16096 | if alias in expanding: | ||
raise error.ParseError(_('infinite expansion of revset alias "%s" ' | ||||
'detected') % alias.name) | ||||
expanding.append(alias) | ||||
|
r16838 | if alias.name not in cache: | ||
cache[alias.name] = _expandaliases(aliases, alias.replacement, | ||||
expanding, cache) | ||||
result = cache[alias.name] | ||||
|
r16772 | expanding.pop() | ||
|
r16096 | if alias.args is not None: | ||
l = getlist(tree[2]) | ||||
if len(l) != len(alias.args): | ||||
raise error.ParseError( | ||||
_('invalid number of arguments: %s') % len(l)) | ||||
|
r16838 | l = [_expandaliases(aliases, a, [], cache) for a in l] | ||
|
r16096 | result = _expandargs(result, dict(zip(alias.args, l))) | ||
else: | ||||
|
r16838 | result = tuple(_expandaliases(aliases, t, expanding, cache) | ||
|
r16096 | for t in tree) | ||
return result | ||||
|
r14098 | |||
|
r23725 | def findaliases(ui, tree, showwarning=None): | ||
|
r16771 | _checkaliasarg(tree) | ||
|
r16096 | aliases = {} | ||
|
r14098 | for k, v in ui.configitems('revsetalias'): | ||
alias = revsetalias(k, v) | ||||
|
r16096 | aliases[alias.name] = alias | ||
|
r23725 | tree = _expandaliases(aliases, tree, [], {}) | ||
if showwarning: | ||||
# warn about problematic (but not referred) aliases | ||||
for name, alias in sorted(aliases.iteritems()): | ||||
if alias.error and not alias.warned: | ||||
|
r23844 | showwarning(_('warning: %s\n') % (alias.error)) | ||
|
r23725 | alias.warned = True | ||
return tree | ||||
|
r14098 | |||
|
r23742 | def foldconcat(tree): | ||
"""Fold elements to be concatenated by `##` | ||||
""" | ||||
if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): | ||||
return tree | ||||
if tree[0] == '_concat': | ||||
pending = [tree] | ||||
l = [] | ||||
while pending: | ||||
e = pending.pop() | ||||
if e[0] == '_concat': | ||||
pending.extend(reversed(e[1:])) | ||||
elif e[0] in ('string', 'symbol'): | ||||
l.append(e[1]) | ||||
else: | ||||
msg = _("\"##\" can't concatenate \"%s\" element") % (e[0]) | ||||
raise error.ParseError(msg) | ||||
return ('string', ''.join(l)) | ||||
else: | ||||
return tuple(foldconcat(t) for t in tree) | ||||
|
r14098 | |||
|
r20779 | def parse(spec, lookup=None): | ||
|
r20208 | p = parser.parser(tokenize, elements) | ||
|
r20779 | return p.parse(spec, lookup=lookup) | ||
def match(ui, spec, repo=None): | ||||
|
r11385 | if not spec: | ||
raise error.ParseError(_("empty query")) | ||||
|
r20779 | lookup = None | ||
if repo: | ||||
lookup = repo.__contains__ | ||||
tree, pos = parse(spec, lookup) | ||||
|
r14496 | if (pos != len(spec)): | ||
|
r14701 | raise error.ParseError(_("invalid token"), pos) | ||
|
r14900 | if ui: | ||
|
r23725 | tree = findaliases(ui, tree, showwarning=ui.warn) | ||
|
r23742 | tree = foldconcat(tree) | ||
|
r11279 | weight, tree = optimize(tree, True) | ||
|
r11275 | def mfunc(repo, subset): | ||
|
r22885 | if util.safehasattr(subset, 'isascending'): | ||
|
r22686 | result = getset(repo, subset, tree) | ||
else: | ||||
result = getset(repo, baseset(subset), tree) | ||||
return result | ||||
|
r11275 | return mfunc | ||
|
r12821 | |||
|
r14901 | def formatspec(expr, *args): | ||
''' | ||||
This is a convenience function for using revsets internally, and | ||||
escapes arguments appropriately. Aliases are intentionally ignored | ||||
so that intended expression behavior isn't accidentally subverted. | ||||
Supported arguments: | ||||
|
r15266 | %r = revset expression, parenthesized | ||
|
r14901 | %d = int(arg), no quoting | ||
%s = string(arg), escaped and single-quoted | ||||
%b = arg.branch(), escaped and single-quoted | ||||
%n = hex(arg), single-quoted | ||||
%% = a literal '%' | ||||
|
r15266 | Prefixing the type with 'l' specifies a parenthesized list of that type. | ||
|
r15140 | |||
|
r15268 | >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()")) | ||
'(10 or 11):: and ((this()) or (that()))' | ||||
|
r14901 | >>> formatspec('%d:: and not %d::', 10, 20) | ||
'10:: and not 20::' | ||||
|
r15325 | >>> formatspec('%ld or %ld', [], [1]) | ||
|
r15898 | "_list('') or 1" | ||
|
r14901 | >>> formatspec('keyword(%s)', 'foo\\xe9') | ||
"keyword('foo\\\\xe9')" | ||||
>>> b = lambda: 'default' | ||||
>>> b.branch = b | ||||
>>> formatspec('branch(%b)', b) | ||||
"branch('default')" | ||||
|
r15140 | >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd']) | ||
|
r15898 | "root(_list('a\\x00b\\x00c\\x00d'))" | ||
|
r14901 | ''' | ||
def quote(s): | ||||
return repr(str(s)) | ||||
|
r15140 | def argtype(c, arg): | ||
if c == 'd': | ||||
return str(int(arg)) | ||||
elif c == 's': | ||||
return quote(arg) | ||||
|
r15266 | elif c == 'r': | ||
parse(arg) # make sure syntax errors are confined | ||||
return '(%s)' % arg | ||||
|
r15140 | elif c == 'n': | ||
|
r16417 | return quote(node.hex(arg)) | ||
|
r15140 | elif c == 'b': | ||
return quote(arg.branch()) | ||||
|
r15595 | def listexp(s, t): | ||
l = len(s) | ||||
if l == 0: | ||||
|
r15898 | return "_list('')" | ||
elif l == 1: | ||||
|
r15595 | return argtype(t, s[0]) | ||
|
r15898 | elif t == 'd': | ||
|
r20566 | return "_intlist('%s')" % "\0".join(str(int(a)) for a in s) | ||
|
r15898 | elif t == 's': | ||
return "_list('%s')" % "\0".join(s) | ||||
elif t == 'n': | ||||
|
r20569 | return "_hexlist('%s')" % "\0".join(node.hex(a) for a in s) | ||
|
r15898 | elif t == 'b': | ||
return "_list('%s')" % "\0".join(a.branch() for a in s) | ||||
|
r15791 | m = l // 2 | ||
|
r15595 | return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t)) | ||
|
r14901 | ret = '' | ||
pos = 0 | ||||
arg = 0 | ||||
while pos < len(expr): | ||||
c = expr[pos] | ||||
if c == '%': | ||||
pos += 1 | ||||
d = expr[pos] | ||||
if d == '%': | ||||
ret += d | ||||
|
r15268 | elif d in 'dsnbr': | ||
|
r15140 | ret += argtype(d, args[arg]) | ||
|
r14901 | arg += 1 | ||
|
r15140 | elif d == 'l': | ||
# a list of some type | ||||
pos += 1 | ||||
d = expr[pos] | ||||
|
r15596 | ret += listexp(list(args[arg]), d) | ||
|
r14901 | arg += 1 | ||
else: | ||||
raise util.Abort('unexpected revspec format character %s' % d) | ||||
else: | ||||
ret += c | ||||
pos += 1 | ||||
return ret | ||||
|
r16218 | def prettyformat(tree): | ||
def _prettyformat(tree, level, lines): | ||||
if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): | ||||
lines.append((level, str(tree))) | ||||
else: | ||||
lines.append((level, '(%s' % tree[0])) | ||||
for s in tree[1:]: | ||||
_prettyformat(s, level + 1, lines) | ||||
lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] | ||||
lines = [] | ||||
_prettyformat(tree, 0, lines) | ||||
output = '\n'.join((' '*l + s) for l, s in lines) | ||||
return output | ||||
|
r19719 | def depth(tree): | ||
if isinstance(tree, tuple): | ||||
return max(map(depth, tree)) + 1 | ||||
else: | ||||
return 0 | ||||
|
r19720 | def funcsused(tree): | ||
if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'): | ||||
return set() | ||||
else: | ||||
funcs = set() | ||||
for s in tree[1:]: | ||||
funcs |= funcsused(s) | ||||
if tree[0] == 'func': | ||||
funcs.add(tree[1][1]) | ||||
return funcs | ||||
|
r22692 | class abstractsmartset(object): | ||
def __nonzero__(self): | ||||
"""True if the smartset is not empty""" | ||||
raise NotImplementedError() | ||||
def __contains__(self, rev): | ||||
"""provide fast membership testing""" | ||||
raise NotImplementedError() | ||||
def __iter__(self): | ||||
"""iterate the set in the order it is supposed to be iterated""" | ||||
raise NotImplementedError() | ||||
|
r22716 | # Attributes containing a function to perform a fast iteration in a given | ||
# direction. A smartset can have none, one, or both defined. | ||||
# | ||||
# Default value is None instead of a function returning None to avoid | ||||
# initializing an iterator just for testing if a fast method exists. | ||||
fastasc = None | ||||
fastdesc = None | ||||
|
r22692 | def isascending(self): | ||
"""True if the set will iterate in ascending order""" | ||||
raise NotImplementedError() | ||||
def isdescending(self): | ||||
"""True if the set will iterate in descending order""" | ||||
raise NotImplementedError() | ||||
def min(self): | ||||
"""return the minimum element in the set""" | ||||
|
r22722 | if self.fastasc is not None: | ||
for r in self.fastasc(): | ||||
return r | ||||
raise ValueError('arg is an empty sequence') | ||||
return min(self) | ||||
|
r22692 | |||
def max(self): | ||||
"""return the maximum element in the set""" | ||||
|
r22722 | if self.fastdesc is not None: | ||
for r in self.fastdesc(): | ||||
return r | ||||
raise ValueError('arg is an empty sequence') | ||||
return max(self) | ||||
|
r22692 | |||
|
r22808 | def first(self): | ||
"""return the first element in the set (user iteration perspective) | ||||
Return None if the set is empty""" | ||||
raise NotImplementedError() | ||||
def last(self): | ||||
"""return the last element in the set (user iteration perspective) | ||||
Return None if the set is empty""" | ||||
raise NotImplementedError() | ||||
|
r22995 | def __len__(self): | ||
"""return the length of the smartsets | ||||
This can be expensive on smartset that could be lazy otherwise.""" | ||||
raise NotImplementedError() | ||||
|
r22692 | def reverse(self): | ||
"""reverse the expected iteration order""" | ||||
raise NotImplementedError() | ||||
def sort(self, reverse=True): | ||||
"""get the set to iterate in an ascending or descending order""" | ||||
raise NotImplementedError() | ||||
def __and__(self, other): | ||||
"""Returns a new object with the intersection of the two collections. | ||||
This is part of the mandatory API for smartset.""" | ||||
|
r22864 | return self.filter(other.__contains__, cache=False) | ||
|
r22692 | |||
def __add__(self, other): | ||||
"""Returns a new object with the union of the two collections. | ||||
This is part of the mandatory API for smartset.""" | ||||
|
r22861 | return addset(self, other) | ||
|
r22692 | |||
def __sub__(self, other): | ||||
"""Returns a new object with the substraction of the two collections. | ||||
This is part of the mandatory API for smartset.""" | ||||
|
r22730 | c = other.__contains__ | ||
|
r22864 | return self.filter(lambda r: not c(r), cache=False) | ||
def filter(self, condition, cache=True): | ||||
|
r22692 | """Returns this smartset filtered by condition as a new smartset. | ||
`condition` is a callable which takes a revision number and returns a | ||||
boolean. | ||||
This is part of the mandatory API for smartset.""" | ||||
|
r22864 | # builtin cannot be cached. but do not needs to | ||
if cache and util.safehasattr(condition, 'func_code'): | ||||
condition = util.cachefunc(condition) | ||||
|
r22862 | return filteredset(self, condition) | ||
|
r22692 | |||
|
r22825 | class baseset(abstractsmartset): | ||
|
r20416 | """Basic data structure that represents a revset and contains the basic | ||
operation that it should be able to perform. | ||||
|
r20727 | |||
Every method in this class should be implemented by any smartset class. | ||||
|
r20416 | """ | ||
|
r20752 | def __init__(self, data=()): | ||
|
r22825 | if not isinstance(data, list): | ||
data = list(data) | ||||
self._list = data | ||||
|
r22827 | self._ascending = None | ||
|
r20365 | |||
|
r22826 | @util.propertycache | ||
|
r22879 | def _set(self): | ||
return set(self._list) | ||||
@util.propertycache | ||||
|
r22826 | def _asclist(self): | ||
asclist = self._list[:] | ||||
asclist.sort() | ||||
return asclist | ||||
|
r22827 | def __iter__(self): | ||
if self._ascending is None: | ||||
return iter(self._list) | ||||
elif self._ascending: | ||||
return iter(self._asclist) | ||||
else: | ||||
return reversed(self._asclist) | ||||
|
r22826 | def fastasc(self): | ||
return iter(self._asclist) | ||||
def fastdesc(self): | ||||
return reversed(self._asclist) | ||||
|
r22503 | @util.propertycache | ||
def __contains__(self): | ||||
|
r22880 | return self._set.__contains__ | ||
|
r22503 | |||
|
r22691 | def __nonzero__(self): | ||
|
r22825 | return bool(self._list) | ||
def sort(self, reverse=False): | ||||
|
r22829 | self._ascending = not bool(reverse) | ||
|
r22825 | |||
def reverse(self): | ||||
|
r22829 | if self._ascending is None: | ||
self._list.reverse() | ||||
else: | ||||
self._ascending = not self._ascending | ||||
|
r22825 | |||
def __len__(self): | ||||
return len(self._list) | ||||
|
r22691 | |||
|
r20725 | def isascending(self): | ||
|
r20727 | """Returns True if the collection is ascending order, False if not. | ||
This is part of the mandatory API for smartset.""" | ||||
|
r22863 | if len(self) <= 1: | ||
return True | ||||
|
r22828 | return self._ascending is not None and self._ascending | ||
|
r20725 | |||
def isdescending(self): | ||||
|
r20727 | """Returns True if the collection is descending order, False if not. | ||
This is part of the mandatory API for smartset.""" | ||||
|
r22863 | if len(self) <= 1: | ||
return True | ||||
|
r22828 | return self._ascending is not None and not self._ascending | ||
|
r20725 | |||
|
r22812 | def first(self): | ||
if self: | ||||
|
r22829 | if self._ascending is None: | ||
return self._list[0] | ||||
elif self._ascending: | ||||
return self._asclist[0] | ||||
else: | ||||
return self._asclist[-1] | ||||
|
r22812 | return None | ||
def last(self): | ||||
if self: | ||||
|
r22829 | if self._ascending is None: | ||
return self._list[-1] | ||||
elif self._ascending: | ||||
return self._asclist[-1] | ||||
else: | ||||
return self._asclist[0] | ||||
|
r22812 | return None | ||
|
r22726 | class filteredset(abstractsmartset): | ||
|
r20427 | """Duck type for baseset class which iterates lazily over the revisions in | ||
the subset and contains a function which tests for membership in the | ||||
revset | ||||
""" | ||||
|
r22862 | def __init__(self, subset, condition=lambda x: True): | ||
|
r20738 | """ | ||
condition: a function that decide whether a revision in the subset | ||||
belongs to the revset or not. | ||||
""" | ||||
|
r20427 | self._subset = subset | ||
self._condition = condition | ||||
|
r20512 | self._cache = {} | ||
|
r20427 | |||
def __contains__(self, x): | ||||
|
r20512 | c = self._cache | ||
if x not in c: | ||||
|
r22527 | v = c[x] = x in self._subset and self._condition(x) | ||
return v | ||||
|
r20512 | return c[x] | ||
|
r20427 | |||
def __iter__(self): | ||||
|
r22719 | return self._iterfilter(self._subset) | ||
def _iterfilter(self, it): | ||||
|
r20427 | cond = self._condition | ||
|
r22719 | for x in it: | ||
|
r20427 | if cond(x): | ||
yield x | ||||
|
r22720 | @property | ||
def fastasc(self): | ||||
it = self._subset.fastasc | ||||
if it is None: | ||||
return None | ||||
return lambda: self._iterfilter(it()) | ||||
@property | ||||
def fastdesc(self): | ||||
it = self._subset.fastdesc | ||||
if it is None: | ||||
return None | ||||
return lambda: self._iterfilter(it()) | ||||
|
r20552 | def __nonzero__(self): | ||
for r in self: | ||||
return True | ||||
return False | ||||
|
r20429 | def __len__(self): | ||
# Basic implementation to be changed in future patches. | ||||
l = baseset([r for r in self]) | ||||
return len(l) | ||||
def sort(self, reverse=False): | ||||
|
r22862 | self._subset.sort(reverse=reverse) | ||
|
r20429 | |||
def reverse(self): | ||||
self._subset.reverse() | ||||
|
r20725 | def isascending(self): | ||
|
r22862 | return self._subset.isascending() | ||
|
r20725 | |||
def isdescending(self): | ||||
|
r22862 | return self._subset.isdescending() | ||
|
r20725 | |||
|
r22813 | def first(self): | ||
for x in self: | ||||
return x | ||||
return None | ||||
def last(self): | ||||
it = None | ||||
|
r22862 | if self._subset.isascending: | ||
it = self.fastdesc | ||||
elif self._subset.isdescending: | ||||
it = self.fastdesc | ||||
|
r22813 | if it is None: | ||
# slowly consume everything. This needs improvement | ||||
it = lambda: reversed(list(self)) | ||||
for x in it(): | ||||
return x | ||||
return None | ||||
|
r22793 | class addset(abstractsmartset): | ||
|
r20708 | """Represent the addition of two sets | ||
Wrapper structure for lazily adding two structures without losing much | ||||
|
r20694 | performance on the __contains__ method | ||
|
r20708 | |||
|
r20712 | If the ascending attribute is set, that means the two structures are | ||
ordered in either an ascending or descending way. Therefore, we can add | ||||
|
r21024 | them maintaining the order by iterating over both at the same time | ||
|
r20694 | """ | ||
|
r20712 | def __init__(self, revs1, revs2, ascending=None): | ||
|
r20694 | self._r1 = revs1 | ||
self._r2 = revs2 | ||||
self._iter = None | ||||
|
r20712 | self._ascending = ascending | ||
|
r20720 | self._genlist = None | ||
|
r22859 | self._asclist = None | ||
|
r20720 | |||
|
r20845 | def __len__(self): | ||
return len(self._list) | ||||
|
r22743 | def __nonzero__(self): | ||
|
r23100 | return bool(self._r1) or bool(self._r2) | ||
|
r22743 | |||
|
r20720 | @util.propertycache | ||
def _list(self): | ||||
if not self._genlist: | ||||
self._genlist = baseset(self._iterator()) | ||||
return self._genlist | ||||
|
r20694 | |||
def _iterator(self): | ||||
|
r20722 | """Iterate over both collections without repeating elements | ||
If the ascending attribute is not set, iterate over the first one and | ||||
then over the second one checking for membership on the first one so we | ||||
dont yield any duplicates. | ||||
If the ascending attribute is set, iterate over both collections at the | ||||
same time, yielding only one value at a time in the given order. | ||||
""" | ||||
|
r22799 | if self._ascending is None: | ||
def gen(): | ||||
for r in self._r1: | ||||
yield r | ||||
|
r22881 | inr1 = self._r1.__contains__ | ||
|
r22799 | for r in self._r2: | ||
|
r22881 | if not inr1(r): | ||
|
r20694 | yield r | ||
|
r22799 | gen = gen() | ||
else: | ||||
iter1 = iter(self._r1) | ||||
iter2 = iter(self._r2) | ||||
gen = self._iterordered(self._ascending, iter1, iter2) | ||||
return gen | ||||
|
r20694 | |||
def __iter__(self): | ||||
|
r22859 | if self._ascending is None: | ||
if self._genlist: | ||||
return iter(self._genlist) | ||||
return iter(self._iterator()) | ||||
self._trysetasclist() | ||||
if self._ascending: | ||||
it = self.fastasc | ||||
else: | ||||
it = self.fastdesc | ||||
if it is None: | ||||
# consume the gen and try again | ||||
self._list | ||||
return iter(self) | ||||
return it() | ||||
def _trysetasclist(self): | ||||
|
r23139 | """populate the _asclist attribute if possible and necessary""" | ||
|
r22859 | if self._genlist is not None and self._asclist is None: | ||
self._asclist = sorted(self._genlist) | ||||
|
r20694 | |||
|
r22742 | @property | ||
def fastasc(self): | ||||
|
r22859 | self._trysetasclist() | ||
if self._asclist is not None: | ||||
return self._asclist.__iter__ | ||||
|
r22742 | iter1 = self._r1.fastasc | ||
iter2 = self._r2.fastasc | ||||
if None in (iter1, iter2): | ||||
return None | ||||
return lambda: self._iterordered(True, iter1(), iter2()) | ||||
@property | ||||
def fastdesc(self): | ||||
|
r22859 | self._trysetasclist() | ||
if self._asclist is not None: | ||||
return self._asclist.__reversed__ | ||||
|
r22742 | iter1 = self._r1.fastdesc | ||
iter2 = self._r2.fastdesc | ||||
if None in (iter1, iter2): | ||||
return None | ||||
return lambda: self._iterordered(False, iter1(), iter2()) | ||||
|
r22741 | def _iterordered(self, ascending, iter1, iter2): | ||
"""produce an ordered iteration from two iterators with the same order | ||||
The ascending is used to indicated the iteration direction. | ||||
""" | ||||
choice = max | ||||
if ascending: | ||||
choice = min | ||||
val1 = None | ||||
val2 = None | ||||
choice = max | ||||
|
r22791 | if ascending: | ||
|
r22741 | choice = min | ||
try: | ||||
# Consume both iterators in an ordered way until one is | ||||
# empty | ||||
while True: | ||||
if val1 is None: | ||||
val1 = iter1.next() | ||||
if val2 is None: | ||||
val2 = iter2.next() | ||||
next = choice(val1, val2) | ||||
yield next | ||||
if val1 == next: | ||||
val1 = None | ||||
if val2 == next: | ||||
val2 = None | ||||
except StopIteration: | ||||
# Flush any remaining values and consume the other one | ||||
it = iter2 | ||||
if val1 is not None: | ||||
yield val1 | ||||
it = iter1 | ||||
elif val2 is not None: | ||||
# might have been equality and both are empty | ||||
yield val2 | ||||
for val in it: | ||||
yield val | ||||
|
r20694 | def __contains__(self, x): | ||
return x in self._r1 or x in self._r2 | ||||
|
r20724 | def sort(self, reverse=False): | ||
"""Sort the added set | ||||
For this we use the cached list with all the generated values and if we | ||||
know they are ascending or descending we can sort them in a smart way. | ||||
""" | ||||
|
r22859 | self._ascending = not reverse | ||
|
r20724 | |||
|
r20733 | def isascending(self): | ||
return self._ascending is not None and self._ascending | ||||
def isdescending(self): | ||||
return self._ascending is not None and not self._ascending | ||||
|
r20723 | def reverse(self): | ||
|
r22859 | if self._ascending is None: | ||
self._list.reverse() | ||||
else: | ||||
|
r20723 | self._ascending = not self._ascending | ||
|
r22810 | def first(self): | ||
|
r23127 | for x in self: | ||
return x | ||||
|
r22810 | return None | ||
def last(self): | ||||
|
r23127 | self.reverse() | ||
val = self.first() | ||||
self.reverse() | ||||
return val | ||||
|
r22810 | |||
|
r22795 | class generatorset(abstractsmartset): | ||
|
r20705 | """Wrap a generator for lazy iteration | ||
Wrapper structure for generators that provides lazy membership and can | ||||
|
r20540 | be iterated more than once. | ||
When asked for membership it generates values until either it finds the | ||||
requested one or has gone through all the elements in the generator | ||||
""" | ||||
|
r22755 | def __init__(self, gen, iterasc=None): | ||
|
r20739 | """ | ||
gen: a generator producing the values for the generatorset. | ||||
""" | ||||
|
r20536 | self._gen = gen | ||
|
r22798 | self._asclist = None | ||
|
r20536 | self._cache = {} | ||
|
r22796 | self._genlist = [] | ||
|
r20703 | self._finished = False | ||
|
r22800 | self._ascending = True | ||
|
r22755 | if iterasc is not None: | ||
if iterasc: | ||||
|
r22797 | self.fastasc = self._iterator | ||
|
r22757 | self.__contains__ = self._asccontains | ||
|
r22755 | else: | ||
|
r22797 | self.fastdesc = self._iterator | ||
|
r22757 | self.__contains__ = self._desccontains | ||
|
r20540 | |||
|
r22739 | def __nonzero__(self): | ||
for r in self: | ||||
return True | ||||
return False | ||||
|
r20536 | def __contains__(self, x): | ||
if x in self._cache: | ||||
return self._cache[x] | ||||
|
r20828 | # Use new values only, as existing values would be cached. | ||
for l in self._consumegen(): | ||||
|
r20634 | if l == x: | ||
return True | ||||
|
r20536 | |||
self._cache[x] = False | ||||
return False | ||||
|
r22757 | def _asccontains(self, x): | ||
"""version of contains optimised for ascending generator""" | ||||
if x in self._cache: | ||||
return self._cache[x] | ||||
# Use new values only, as existing values would be cached. | ||||
for l in self._consumegen(): | ||||
if l == x: | ||||
return True | ||||
if l > x: | ||||
break | ||||
self._cache[x] = False | ||||
return False | ||||
def _desccontains(self, x): | ||||
"""version of contains optimised for descending generator""" | ||||
if x in self._cache: | ||||
return self._cache[x] | ||||
# Use new values only, as existing values would be cached. | ||||
for l in self._consumegen(): | ||||
if l == x: | ||||
return True | ||||
if l < x: | ||||
break | ||||
self._cache[x] = False | ||||
return False | ||||
|
r20536 | def __iter__(self): | ||
|
r22800 | if self._ascending: | ||
it = self.fastasc | ||||
else: | ||||
it = self.fastdesc | ||||
if it is not None: | ||||
return it() | ||||
# we need to consume the iterator | ||||
for x in self._consumegen(): | ||||
pass | ||||
# recall the same code | ||||
return iter(self) | ||||
|
r22797 | |||
def _iterator(self): | ||||
|
r20833 | if self._finished: | ||
|
r22670 | return iter(self._genlist) | ||
|
r20833 | |||
|
r22494 | # We have to use this complex iteration strategy to allow multiple | ||
# iterations at the same time. We need to be able to catch revision | ||||
|
r23139 | # removed from _consumegen and added to genlist in another instance. | ||
|
r22494 | # | ||
# Getting rid of it would provide an about 15% speed up on this | ||||
# iteration. | ||||
|
r20833 | genlist = self._genlist | ||
|
r22669 | nextrev = self._consumegen().next | ||
_len = len # cache global lookup | ||||
|
r22670 | def gen(): | ||
i = 0 | ||||
while True: | ||||
if i < _len(genlist): | ||||
yield genlist[i] | ||||
else: | ||||
yield nextrev() | ||||
i += 1 | ||||
return gen() | ||||
|
r20828 | |||
def _consumegen(self): | ||||
|
r22528 | cache = self._cache | ||
genlist = self._genlist.append | ||||
|
r20634 | for item in self._gen: | ||
|
r22528 | cache[item] = True | ||
genlist(item) | ||||
|
r20634 | yield item | ||
|
r22798 | if not self._finished: | ||
self._finished = True | ||||
asc = self._genlist[:] | ||||
asc.sort() | ||||
self._asclist = asc | ||||
self.fastasc = asc.__iter__ | ||||
self.fastdesc = asc.__reversed__ | ||||
|
r20703 | |||
|
r22996 | def __len__(self): | ||
for x in self._consumegen(): | ||||
pass | ||||
return len(self._genlist) | ||||
|
r20703 | def sort(self, reverse=False): | ||
|
r22800 | self._ascending = not reverse | ||
def reverse(self): | ||||
self._ascending = not self._ascending | ||||
|
r20703 | |||
|
r22801 | def isascending(self): | ||
return self._ascending | ||||
def isdescending(self): | ||||
return not self._ascending | ||||
|
r22811 | def first(self): | ||
if self._ascending: | ||||
it = self.fastasc | ||||
else: | ||||
it = self.fastdesc | ||||
if it is None: | ||||
# we need to consume all and try again | ||||
for x in self._consumegen(): | ||||
pass | ||||
return self.first() | ||||
if self: | ||||
|
r23413 | return it().next() | ||
|
r22811 | return None | ||
def last(self): | ||||
if self._ascending: | ||||
it = self.fastdesc | ||||
else: | ||||
it = self.fastasc | ||||
if it is None: | ||||
# we need to consume all and try again | ||||
for x in self._consumegen(): | ||||
pass | ||||
return self.first() | ||||
if self: | ||||
|
r23413 | return it().next() | ||
|
r22811 | return None | ||
|
r22509 | def spanset(repo, start=None, end=None): | ||
"""factory function to dispatch between fullreposet and actual spanset | ||||
Feel free to update all spanset call sites and kill this function at some | ||||
point. | ||||
""" | ||||
if start is None and end is None: | ||||
return fullreposet(repo) | ||||
return _spanset(repo, start, end) | ||||
|
r22752 | class _spanset(abstractsmartset): | ||
|
r20482 | """Duck type for baseset class which represents a range of revisions and | ||
can work lazily and without having all the range in memory | ||||
|
r20737 | |||
Note that spanset(x, y) behave almost like xrange(x, y) except for two | ||||
notable points: | ||||
- when x < y it will be automatically descending, | ||||
- revision filtered with this repoview will be skipped. | ||||
|
r20482 | """ | ||
|
r20525 | def __init__(self, repo, start=0, end=None): | ||
|
r20737 | """ | ||
start: first revision included the set | ||||
(default to 0) | ||||
end: first revision excluded (last+1) | ||||
(default to len(repo) | ||||
Spanset will be descending if `end` < `start`. | ||||
""" | ||||
|
r22717 | if end is None: | ||
end = len(repo) | ||||
self._ascending = start <= end | ||||
if not self._ascending: | ||||
start, end = end + 1, start +1 | ||||
|
r20482 | self._start = start | ||
|
r22717 | self._end = end | ||
|
r20525 | self._hiddenrevs = repo.changelog.filteredrevs | ||
|
r20521 | |||
|
r22717 | def sort(self, reverse=False): | ||
self._ascending = not reverse | ||||
def reverse(self): | ||||
self._ascending = not self._ascending | ||||
def _iterfilter(self, iterrange): | ||||
s = self._hiddenrevs | ||||
for r in iterrange: | ||||
if r not in s: | ||||
yield r | ||||
|
r20482 | def __iter__(self): | ||
|
r22717 | if self._ascending: | ||
return self.fastasc() | ||||
|
r20482 | else: | ||
|
r22717 | return self.fastdesc() | ||
def fastasc(self): | ||||
iterrange = xrange(self._start, self._end) | ||||
|
r20521 | if self._hiddenrevs: | ||
|
r22717 | return self._iterfilter(iterrange) | ||
return iter(iterrange) | ||||
def fastdesc(self): | ||||
iterrange = xrange(self._end - 1, self._start - 1, -1) | ||||
if self._hiddenrevs: | ||||
return self._iterfilter(iterrange) | ||||
return iter(iterrange) | ||||
|
r20482 | |||
|
r21201 | def __contains__(self, rev): | ||
|
r22526 | hidden = self._hiddenrevs | ||
|
r22718 | return ((self._start <= rev < self._end) | ||
|
r22526 | and not (hidden and rev in hidden)) | ||
|
r20482 | |||
|
r20716 | def __nonzero__(self): | ||
for r in self: | ||||
return True | ||||
return False | ||||
|
r20484 | def __len__(self): | ||
|
r20521 | if not self._hiddenrevs: | ||
return abs(self._end - self._start) | ||||
else: | ||||
count = 0 | ||||
|
r21205 | start = self._start | ||
end = self._end | ||||
|
r20521 | for rev in self._hiddenrevs: | ||
|
r21284 | if (end < rev <= start) or (start <= rev < end): | ||
|
r20521 | count += 1 | ||
return abs(self._end - self._start) - count | ||||
|
r20484 | |||
|
r20725 | def isascending(self): | ||
|
r23826 | return self._ascending | ||
|
r20725 | |||
def isdescending(self): | ||||
|
r23826 | return not self._ascending | ||
|
r20725 | |||
|
r22809 | def first(self): | ||
if self._ascending: | ||||
it = self.fastasc | ||||
else: | ||||
it = self.fastdesc | ||||
for x in it(): | ||||
return x | ||||
return None | ||||
def last(self): | ||||
if self._ascending: | ||||
it = self.fastdesc | ||||
else: | ||||
it = self.fastasc | ||||
for x in it(): | ||||
return x | ||||
return None | ||||
|
r22509 | class fullreposet(_spanset): | ||
|
r22508 | """a set containing all revisions in the repo | ||
|
r23139 | This class exists to host special optimization. | ||
|
r22508 | """ | ||
def __init__(self, repo): | ||||
super(fullreposet, self).__init__(repo) | ||||
|
r22510 | def __and__(self, other): | ||
|
r23139 | """As self contains the whole repo, all of the other set should also be | ||
in self. Therefore `self & other = other`. | ||||
|
r22510 | |||
This boldly assumes the other contains valid revs only. | ||||
""" | ||||
# other not a smartset, make is so | ||||
|
r22883 | if not util.safehasattr(other, 'isascending'): | ||
|
r22510 | # filter out hidden revision | ||
# (this boldly assumes all smartset are pure) | ||||
# | ||||
# `other` was used with "&", let's assume this is a set like | ||||
# object. | ||||
other = baseset(other - self._hiddenrevs) | ||||
|
r23827 | other.sort(reverse=self.isdescending()) | ||
|
r22510 | return other | ||
|
r12823 | # tell hggettext to extract docstrings from these functions: | ||
i18nfunctions = symbols.values() | ||||