mercurial-source: mercurial/revset.py annotate

author	Martin von Zweigbergk <martinvonz@google.com>
date	Wed, 21 Jan 2015 15:23:13 -0800 (2015-01-21)
parents	71402bb8d8b2
children	310222feb9a8

rev	line source
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # revset.py - revision set queries for mercurial
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2010 Matt Mackall <mpm@selenic.com>
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	7
16834 cafd8a8fb713 util: subclass deque for Python 2.4 backwards compatibility Bryan O'Sullivan <bryano@fb.com> parents: 16825 diff changeset	8 import re
15819 33ca11b010e2 phases: implements simple revset symbol Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15791 diff changeset	9 import parser, util, error, discovery, hbisect, phases
16417 b4b0c6931e11 revset: avoid demandimport bug Matt Mackall <mpm@selenic.com> parents: 16415 diff changeset	10 import node
20690 13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	11 import heapq
12085 6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing Martin Geisler <mg@aragost.com> parents: 11944 diff changeset	12 import match as matchmod
13593 cc4721ed7a2a help: extract items doc generation function Patrick Mezard <pmezard@gmail.com> parents: 13506 diff changeset	13 from i18n import _
15726 9b822edecb4c i18n: use "encoding.lower()" to normalize specified string for revset FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15596 diff changeset	14 import encoding
17469 fb72eec7efd8 obsolete: introduce caches for all meaningful sets Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17407 diff changeset	15 import obsolete as obsmod
20286 760151697a4f revset: make default kind of pattern for "contains()" rooted at cwd FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20285 diff changeset	16 import pathutil
18251 a6483f827512 revset: retrieve hidden from filteredrevs Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	17 import repoview
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	18
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	19 def _revancestors(repo, revs, followfirst):
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	20 """Like revlog.ancestors(), but supports followfirst."""
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	21 cut = followfirst and 1 or None
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	22 cl = repo.changelog
20690 13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	23
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	24 def iterate():
20691 c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	25 revqueue, revsnode = None, None
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	26 h = []
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	27
22832 2f1d2a42f040 revancestors: replace `descending` with `sort(reverse=False)` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22831 diff changeset	28 revs.sort(reverse=True)
20691 c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	29 revqueue = util.deque(revs)
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	30 if revqueue:
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	31 revsnode = revqueue.popleft()
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	32 heapq.heappush(h, -revsnode)
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	33
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	34 seen = set([node.nullrev])
20690 13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	35 while h:
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	36 current = -heapq.heappop(h)
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	37 if current not in seen:
20691 c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	38 if revsnode and current == revsnode:
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	39 if revqueue:
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	40 revsnode = revqueue.popleft()
c1f666e27345 revset: optimized _revancestors method based on order of revisions Lucas Moscovicz <lmoscovicz@fb.com> parents: 20690 diff changeset	41 heapq.heappush(h, -revsnode)
20690 13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	42 seen.add(current)
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	43 yield current
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	44 for parent in cl.parentrevs(current)[:cut]:
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	45 if parent != node.nullrev:
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	46 heapq.heappush(h, -parent)
13c0327eeb6f revset: changed ancestors revset to return lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20659 diff changeset	47
22795 c21342159fad generatorset: drop the leading underscore in the class name Pierre-Yves David <pierre-yves.david@fb.com> parents: 22794 diff changeset	48 return generatorset(iterate(), iterasc=False)
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	49
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	50 def _revdescendants(repo, revs, followfirst):
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	51 """Like revlog.descendants() but supports followfirst."""
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	52 cut = followfirst and 1 or None
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	53
20692 7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	54 def iterate():
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	55 cl = repo.changelog
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	56 first = min(revs)
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	57 nullrev = node.nullrev
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	58 if first == nullrev:
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	59 # Are there nodes with a null first parent and a non-null
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	60 # second one? Maybe. Do we care? Probably not.
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	61 for i in cl:
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	62 yield i
20692 7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	63 else:
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	64 seen = set(revs)
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	65 for i in cl.revs(first + 1):
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	66 for x in cl.parentrevs(i)[:cut]:
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	67 if x != nullrev and x in seen:
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	68 seen.add(i)
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	69 yield i
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	70 break
7af341082b76 revset: changed descendants revset to use lazy generators Lucas Moscovicz <lmoscovicz@fb.com> parents: 20691 diff changeset	71
22795 c21342159fad generatorset: drop the leading underscore in the class name Pierre-Yves David <pierre-yves.david@fb.com> parents: 22794 diff changeset	72 return generatorset(iterate(), iterasc=True)
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	73
16863 b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	74 def _revsbetween(repo, roots, heads):
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	75 """Return all paths between roots and heads, inclusive of both endpoint
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	76 sets."""
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	77 if not roots:
22802 1fcd361efaf4 baseset: use default value instead of [] when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22801 diff changeset	78 return baseset()
16863 b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	79 parentrevs = repo.changelog.parentrevs
22487 e40bb83d0989 revset: stop using a baseset instead of a plain list in _revsbetween Pierre-Yves David <pierre-yves.david@fb.com> parents: 22483 diff changeset	80 visit = list(heads)
16863 b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	81 reachable = set()
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	82 seen = {}
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	83 minroot = min(roots)
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	84 roots = set(roots)
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	85 # open-code the post-order traversal due to the tiny size of
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	86 # sys.getrecursionlimit()
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	87 while visit:
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	88 rev = visit.pop()
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	89 if rev in roots:
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	90 reachable.add(rev)
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	91 parents = parentrevs(rev)
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	92 seen[rev] = parents
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	93 for parent in parents:
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	94 if parent >= minroot and parent not in seen:
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	95 visit.append(parent)
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	96 if not reachable:
22802 1fcd361efaf4 baseset: use default value instead of [] when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22801 diff changeset	97 return baseset()
16863 b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	98 for rev in sorted(seen):
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	99 for parent in seen[rev]:
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	100 if parent in reachable:
b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	101 reachable.add(rev)
20364 a6cf48b2880d revset: added baseset class (still empty) to improve revset performance Lucas Moscovicz <lmoscovicz@fb.com> parents: 20289 diff changeset	102 return baseset(sorted(reachable))
16863 b6efeb27e733 revset: introduce and use _revsbetween Bryan O'Sullivan <bryano@fb.com> parents: 16862 diff changeset	103
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	104 elements = {
23754 3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23741 diff changeset	105 "(": (21, ("group", 1, ")"), ("func", 1, ")")),
3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23741 diff changeset	106 "##": (20, None, ("_concat", 20)),
14070 305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	107 "~": (18, None, ("ancestor", 18)),
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	108 "^": (18, None, ("parent", 18), ("parentpost", 18)),
12616 e797fdf91df4 revset: lower precedence of minus infix (issue2361) Matt Mackall <mpm@selenic.com> parents: 12615 diff changeset	109 "-": (5, ("negate", 19), ("minus", 5)),
11278 7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	110 "::": (17, ("dagrangepre", 17), ("dagrange", 17),
7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	111 ("dagrangepost", 17)),
7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	112 "..": (17, ("dagrangepre", 17), ("dagrange", 17),
7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	113 ("dagrangepost", 17)),
7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	114 ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)),
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	115 "not": (10, ("not", 10)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	116 "!": (10, ("not", 10)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	117 "and": (5, None, ("and", 5)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	118 "&": (5, None, ("and", 5)),
23777 537a2669a113 revset: use '%' as an operator for 'only' Sean Farley <sean.michael.farley@gmail.com> parents: 23754 diff changeset	119 "%": (5, None, ("only", 5), ("onlypost", 5)),
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	120 "or": (4, None, ("or", 4)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	121 "\|": (4, None, ("or", 4)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	122 "+": (4, None, ("or", 4)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	123 ",": (2, None, ("list", 2)),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	124 ")": (0, None, None),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	125 "symbol": (0, ("symbol",), None),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	126 "string": (0, ("string",), None),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	127 "end": (0, None, None),
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	128 }
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	129
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	130 keywords = set(['and', 'or', 'not'])
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	131
23854 91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	132 # default set of valid characters for the initial letter of symbols
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	133 _syminitletters = set(c for c in [chr(i) for i in xrange(256)]
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	134 if c.isalnum() or c in '._@' or ord(c) > 127)
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	135
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	136 # default set of valid characters for non-initial letters of symbols
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	137 _symletters = set(c for c in [chr(i) for i in xrange(256)]
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	138 if c.isalnum() or c in '-._/@' or ord(c) > 127)
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	139
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	140 def tokenize(program, lookup=None, syminitletters=None, symletters=None):
17886 d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	141 '''
d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	142 Parse a revset statement into a stream of tokens
d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	143
23854 91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	144 ``syminitletters`` is the set of valid characters for the initial
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	145 letter of symbols.
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	146
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	147 By default, character ``c`` is recognized as valid for initial
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	148 letter of symbols, if ``c.isalnum() or c in '._@' or ord(c) > 127``.
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	149
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	150 ``symletters`` is the set of valid characters for non-initial
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	151 letters of symbols.
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	152
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	153 By default, character ``c`` is recognized as valid for non-initial
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	154 letters of symbols, if ``c.isalnum() or c in '-._/@' or ord(c) > 127``.
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	155
17886 d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	156 Check that @ is a valid unquoted token character (issue3686):
d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	157 >>> list(tokenize("@::"))
d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	158 [('symbol', '@', 0), ('::', None, 1), ('end', None, 3)]
d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	159
d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	160 '''
23854 91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	161 if syminitletters is None:
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	162 syminitletters = _syminitletters
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	163 if symletters is None:
91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	164 symletters = _symletters
17886 d8905e2c1301 revset: accept @ in unquoted symbols (issue3686) Matt Mackall <mpm@selenic.com> parents: 17829 diff changeset	165
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	166 pos, l = 0, len(program)
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	167 while pos < l:
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	168 c = program[pos]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	169 if c.isspace(): # skip inter-token whitespace
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	170 pass
11278 7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	171 elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	172 yield ('::', None, pos)
11278 7df88cdf47fd revset: add support for prefix and suffix versions of : and :: Matt Mackall <mpm@selenic.com> parents: 11275 diff changeset	173 pos += 1 # skip ahead
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	174 elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	175 yield ('..', None, pos)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	176 pos += 1 # skip ahead
23754 3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23741 diff changeset	177 elif c == '#' and program[pos:pos + 2] == '##': # look ahead carefully
3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23741 diff changeset	178 yield ('##', None, pos)
3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23741 diff changeset	179 pos += 1 # skip ahead
23777 537a2669a113 revset: use '%' as an operator for 'only' Sean Farley <sean.michael.farley@gmail.com> parents: 23754 diff changeset	180 elif c in "():,-\|&+!~^%": # handle simple operators
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	181 yield (c, None, pos)
12408 78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	182 elif (c in '"\'' or c == 'r' and
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	183 program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	184 if c == 'r':
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	185 pos += 1
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	186 c = program[pos]
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	187 decode = lambda x: x
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	188 else:
78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	189 decode = lambda x: x.decode('string-escape')
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	190 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	191 s = pos
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	192 while pos < l: # find closing quote
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	193 d = program[pos]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	194 if d == '\\': # skip over escaped characters
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	195 pos += 2
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	196 continue
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	197 if d == c:
12408 78a97859b90d revset: support raw string literals Brodie Rao <brodie@bitheap.org> parents: 12401 diff changeset	198 yield ('string', decode(program[s:pos]), s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	199 break
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	200 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	201 else:
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	202 raise error.ParseError(_("unterminated string"), s)
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16669 diff changeset	203 # gather up a symbol/keyword
23854 91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	204 elif c in syminitletters:
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	205 s = pos
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	206 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	207 while pos < l: # find end of symbol
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	208 d = program[pos]
23854 91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23848 diff changeset	209 if d not in symletters:
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	210 break
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	211 if d == '.' and program[pos - 1] == '.': # special case for ..
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	212 pos -= 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	213 break
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	214 pos += 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	215 sym = program[s:pos]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	216 if sym in keywords: # operator keywords
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	217 yield (sym, None, s)
20780 403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	218 elif '-' in sym:
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	219 # some jerk gave us foo-bar-baz, try to check if it's a symbol
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	220 if lookup and lookup(sym):
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	221 # looks like a real symbol
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	222 yield ('symbol', sym, s)
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	223 else:
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	224 # looks like an expression
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	225 parts = sym.split('-')
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	226 for p in parts[:-1]:
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	227 if p: # possible consecutive -
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	228 yield ('symbol', p, s)
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	229 s += len(p)
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	230 yield ('-', None, pos)
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	231 s += 1
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	232 if parts[-1]: # possible trailing -
403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available Matt Mackall <mpm@selenic.com> parents: 20779 diff changeset	233 yield ('symbol', parts[-1], s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	234 else:
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	235 yield ('symbol', sym, s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	236 pos -= 1
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	237 else:
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	238 raise error.ParseError(_("syntax error"), pos)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	239 pos += 1
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	240 yield ('end', None, pos)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	241
23855 c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	242 def parseerrordetail(inst):
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	243 """Compose error message from specified ParseError object
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	244 """
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	245 if len(inst.args) > 1:
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	246 return _('at %s: %s') % (inst.args[1], inst.args[0])
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	247 else:
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	248 return inst.args[0]
c4d0c3d05721 revset: factor out composing error message for ParseError to reuse FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23854 diff changeset	249
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	250 # helpers
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	251
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	252 def getstring(x, err):
11406 42408cd43f55 revset: fix up contains/getstring when no args passed Matt Mackall <mpm@selenic.com> parents: 11404 diff changeset	253 if x and (x[0] == 'string' or x[0] == 'symbol'):
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	254 return x[1]
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	255 raise error.ParseError(err)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	256
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	257 def getlist(x):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	258 if not x:
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	259 return []
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	260 if x[0] == 'list':
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	261 return getlist(x[1]) + [x[2]]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	262 return [x]
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	263
11339 744d5b73f776 revset: improve filter argument handling Matt Mackall <mpm@selenic.com> parents: 11304 diff changeset	264 def getargs(x, min, max, err):
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	265 l = getlist(x)
16161 5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset Patrick Mezard <patrick@mezard.eu> parents: 16096 diff changeset	266 if len(l) < min or (max >= 0 and len(l) > max):
11289 4215ce511134 revset: raise ParseError exceptions Matt Mackall <mpm@selenic.com> parents: 11284 diff changeset	267 raise error.ParseError(err)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	268 return l
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	269
23857 0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	270 def isvalidsymbol(tree):
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	271 """Examine whether specified ``tree`` is valid ``symbol`` or not
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	272 """
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	273 return tree[0] == 'symbol' and len(tree) > 1
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	274
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	275 def getsymbol(tree):
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	276 """Get symbol name from valid ``symbol`` in ``tree``
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	277
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	278 This assumes that ``tree`` is already examined by ``isvalidsymbol``.
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	279 """
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	280 return tree[1]
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	281
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	282 def isvalidfunc(tree):
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	283 """Examine whether specified ``tree`` is valid ``func`` or not
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	284 """
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	285 return tree[0] == 'func' and len(tree) > 1 and isvalidsymbol(tree[1])
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	286
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	287 def getfuncname(tree):
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	288 """Get function name from valid ``func`` in ``tree``
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	289
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	290 This assumes that ``tree`` is already examined by ``isvalidfunc``.
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	291 """
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	292 return getsymbol(tree[1])
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	293
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	294 def getfuncargs(tree):
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	295 """Get list of function arguments from valid ``func`` in ``tree``
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	296
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	297 This assumes that ``tree`` is already examined by ``isvalidfunc``.
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	298 """
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	299 if len(tree) > 2:
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	300 return getlist(tree[2])
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	301 else:
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	302 return []
0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 23856 diff changeset	303
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	304 def getset(repo, subset, x):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	305 if not x:
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	306 raise error.ParseError(_("missing argument"))
20527 bde426f18e0a revset: changed mfunc and getset to work with old style revset methods Lucas Moscovicz <lmoscovicz@fb.com> parents: 20526 diff changeset	307 s = methods[x[0]](repo, subset, *x[1:])
22884 4584eec9aead getset: check if an object is a baseset using `isascending` instead of `set` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22883 diff changeset	308 if util.safehasattr(s, 'isascending'):
20527 bde426f18e0a revset: changed mfunc and getset to work with old style revset methods Lucas Moscovicz <lmoscovicz@fb.com> parents: 20526 diff changeset	309 return s
bde426f18e0a revset: changed mfunc and getset to work with old style revset methods Lucas Moscovicz <lmoscovicz@fb.com> parents: 20526 diff changeset	310 return baseset(s)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	311
17017 42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	312 def _getrevsource(repo, r):
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	313 extra = repo[r].extra()
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	314 for label in ('source', 'transplant_source', 'rebase_source'):
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	315 if label in extra:
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	316 try:
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	317 return repo[extra[label]].rev()
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	318 except error.RepoLookupError:
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	319 pass
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	320 return None
42c472877825 revset: add a utility for obtaining the source of a given rev Matt Harbison <matt_harbison@yahoo.com> parents: 17016 diff changeset	321
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	322 # operator methods
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	323
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	324 def stringset(repo, subset, x):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	325 x = repo[x].rev()
11282 e581f3acc338 revset: fix up tests Matt Mackall <mpm@selenic.com> parents: 11280 diff changeset	326 if x == -1 and len(subset) == len(repo):
20364 a6cf48b2880d revset: added baseset class (still empty) to improve revset performance Lucas Moscovicz <lmoscovicz@fb.com> parents: 20289 diff changeset	327 return baseset([-1])
23736 aafeaba22826 revset: drop pre-lazyset optimization for stringset of subset == entire repo Yuya Nishihara <yuya@tcha.org> parents: 23413 diff changeset	328 if x in subset:
20364 a6cf48b2880d revset: added baseset class (still empty) to improve revset performance Lucas Moscovicz <lmoscovicz@fb.com> parents: 20289 diff changeset	329 return baseset([x])
22802 1fcd361efaf4 baseset: use default value instead of [] when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22801 diff changeset	330 return baseset()
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	331
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	332 def symbolset(repo, subset, x):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	333 if x in symbols:
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	334 raise error.ParseError(_("can't use %s here") % x)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	335 return stringset(repo, subset, x)
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	336
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	337 def rangeset(repo, subset, x, y):
23162 69524a05a7fa revset-rangeset: call 'getset' on a 'fullreposet' Pierre-Yves David <pierre-yves.david@fb.com> parents: 23139 diff changeset	338 m = getset(repo, fullreposet(repo), x)
69524a05a7fa revset-rangeset: call 'getset' on a 'fullreposet' Pierre-Yves David <pierre-yves.david@fb.com> parents: 23139 diff changeset	339 n = getset(repo, fullreposet(repo), y)
11456 88abbb046e66 revset: deal with empty sets in range endpoints Matt Mackall <mpm@selenic.com> parents: 11446 diff changeset	340
88abbb046e66 revset: deal with empty sets in range endpoints Matt Mackall <mpm@selenic.com> parents: 11446 diff changeset	341 if not m or not n:
22802 1fcd361efaf4 baseset: use default value instead of [] when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22801 diff changeset	342 return baseset()
22817 e4eb4bfc3616 rangeset: use `first` and `last` instead of direct indexing Pierre-Yves David <pierre-yves.david@fb.com> parents: 22813 diff changeset	343 m, n = m.first(), n.last()
11456 88abbb046e66 revset: deal with empty sets in range endpoints Matt Mackall <mpm@selenic.com> parents: 11446 diff changeset	344
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	345 if m < n:
20526 9ad6dae67845 revset: changed revsets to use spanset Lucas Moscovicz <lmoscovicz@fb.com> parents: 20525 diff changeset	346 r = spanset(repo, m, n + 1)
11456 88abbb046e66 revset: deal with empty sets in range endpoints Matt Mackall <mpm@selenic.com> parents: 11446 diff changeset	347 else:
20526 9ad6dae67845 revset: changed revsets to use spanset Lucas Moscovicz <lmoscovicz@fb.com> parents: 20525 diff changeset	348 r = spanset(repo, m, n - 1)
9ad6dae67845 revset: changed revsets to use spanset Lucas Moscovicz <lmoscovicz@fb.com> parents: 20525 diff changeset	349 return r & subset
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	350
16861 e1aa1ed30030 revset: turn dagrange into a function Bryan O'Sullivan <bryano@fb.com> parents: 16860 diff changeset	351 def dagrange(repo, subset, x, y):
20526 9ad6dae67845 revset: changed revsets to use spanset Lucas Moscovicz <lmoscovicz@fb.com> parents: 20525 diff changeset	352 r = spanset(repo)
18991 c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18777 diff changeset	353 xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y))
22866 6e739356f9bf revset-rangeset: remove usage of `set()` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22865 diff changeset	354 return xs & subset
16861 e1aa1ed30030 revset: turn dagrange into a function Bryan O'Sullivan <bryano@fb.com> parents: 16860 diff changeset	355
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	356 def andset(repo, subset, x, y):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	357 return getset(repo, getset(repo, subset, x), y)
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	358
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	359 def orset(repo, subset, x, y):
13932 34f577007ffe revsets: preserve ordering with the or operator Augie Fackler <durin42@gmail.com> parents: 13915 diff changeset	360 xl = getset(repo, subset, x)
20366 5ec6321f49a9 revset: added substraction to baseset class Lucas Moscovicz <lmoscovicz@fb.com> parents: 20365 diff changeset	361 yl = getset(repo, subset - xl, y)
13932 34f577007ffe revsets: preserve ordering with the or operator Augie Fackler <durin42@gmail.com> parents: 13915 diff changeset	362 return xl + yl
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	363
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	364 def notset(repo, subset, x):
20366 5ec6321f49a9 revset: added substraction to baseset class Lucas Moscovicz <lmoscovicz@fb.com> parents: 20365 diff changeset	365 return subset - getset(repo, subset, x)
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	366
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	367 def listset(repo, subset, a, b):
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	368 raise error.ParseError(_("can't use a list in this context"))
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	369
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	370 def func(repo, subset, a, b):
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	371 if a[0] == 'symbol' and a[1] in symbols:
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	372 return symbols[a[1]](repo, subset, b)
11383 de544774ebea revset: all your error messages are belong to _ Martin Geisler <mg@lazybytes.net> parents: 11349 diff changeset	373 raise error.ParseError(_("not a function: %s") % a[1])
11275 c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	374
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	375 # functions
c9ce8ecd6ca1 revset: introduce revset core Matt Mackall <mpm@selenic.com> parents: diff changeset	376
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	377 def adds(repo, subset, x):
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	378 """``adds(pattern)``
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	379 Changesets that add a file matching pattern.
20289 96be25f1da45 revset: add explanation about the pattern without explicit kind FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20288 diff changeset	380
96be25f1da45 revset: add explanation about the pattern without explicit kind FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20288 diff changeset	381 The pattern without explicit kind like ``glob:`` is expected to be
96be25f1da45 revset: add explanation about the pattern without explicit kind FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20288 diff changeset	382 relative to the current directory and match against a file or a
96be25f1da45 revset: add explanation about the pattern without explicit kind FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20288 diff changeset	383 directory.
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	384 """
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	385 # i18n: "adds" is a keyword
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	386 pat = getstring(x, _("adds requires a pattern"))
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	387 return checkstatus(repo, subset, pat, 1)
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	388
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	389 def ancestor(repo, subset, x):
18536 ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	390 """``ancestor(*changeset)``
20991 a05d694599f9 revlog: use context ancestor instead of changelog ancestor Mads Kiilerich <madski@unity3d.com> parents: 20895 diff changeset	391 A greatest common ancestor of the changesets.
18536 ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	392
ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	393 Accepts 0 or more changesets.
ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	394 Will return empty list when passed no args.
ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	395 Greatest common ancestor of a single changeset is that changeset.
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	396 """
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	397 # i18n: "ancestor" is a keyword
18536 ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	398 l = getlist(x)
20526 9ad6dae67845 revset: changed revsets to use spanset Lucas Moscovicz <lmoscovicz@fb.com> parents: 20525 diff changeset	399 rl = spanset(repo)
18536 ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	400 anc = None
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	401
18536 ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	402 # (getset(repo, rl, i) for i in l) generates a list of lists
ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	403 for revs in (getset(repo, rl, i) for i in l):
ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	404 for r in revs:
ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	405 if anc is None:
20991 a05d694599f9 revlog: use context ancestor instead of changelog ancestor Mads Kiilerich <madski@unity3d.com> parents: 20895 diff changeset	406 anc = repo[r]
18536 ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750) Paul Cavallaro <ptc@fb.com> parents: 18495 diff changeset	407 else:
20991 a05d694599f9 revlog: use context ancestor instead of changelog ancestor Mads Kiilerich <madski@unity3d.com> parents: 20895 diff changeset	408 anc = anc.ancestor(repo[r])
a05d694599f9 revlog: use context ancestor instead of changelog ancestor Mads Kiilerich <madski@unity3d.com> parents: 20895 diff changeset	409
a05d694599f9 revlog: use context ancestor instead of changelog ancestor Mads Kiilerich <madski@unity3d.com> parents: 20895 diff changeset	410 if anc is not None and anc.rev() in subset:
a05d694599f9 revlog: use context ancestor instead of changelog ancestor Mads Kiilerich <madski@unity3d.com> parents: 20895 diff changeset	411 return baseset([anc.rev()])
22802 1fcd361efaf4 baseset: use default value instead of [] when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22801 diff changeset	412 return baseset()
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	413
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	414 def _ancestors(repo, subset, x, followfirst=False):
22944 5aae3dea8044 revset: better naming of variables containing the value of a single argument Mads Kiilerich <madski@unity3d.com> parents: 22891 diff changeset	415 heads = getset(repo, spanset(repo), x)
5aae3dea8044 revset: better naming of variables containing the value of a single argument Mads Kiilerich <madski@unity3d.com> parents: 22891 diff changeset	416 if not heads:
22802 1fcd361efaf4 baseset: use default value instead of [] when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22801 diff changeset	417 return baseset()
22944 5aae3dea8044 revset: better naming of variables containing the value of a single argument Mads Kiilerich <madski@unity3d.com> parents: 22891 diff changeset	418 s = _revancestors(repo, heads, followfirst)
23003 62d19ce9d7b6 revset-_ancestor: use & instead of filter Pierre-Yves David <pierre-yves.david@fb.com> parents: 22999 diff changeset	419 return subset & s
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	420
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	421 def ancestors(repo, subset, x):
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	422 """``ancestors(set)``
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	423 Changesets that are ancestors of a changeset in set.
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	424 """
16409 2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	425 return _ancestors(repo, subset, x)
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	426
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	427 def _firstancestors(repo, subset, x):
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	428 # ``_firstancestors(set)``
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	429 # Like ``ancestors(set)`` but follows only the first parents.
2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations Patrick Mezard <patrick@mezard.eu> parents: 16402 diff changeset	430 return _ancestors(repo, subset, x, followfirst=True)
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	431
14070 305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	432 def ancestorspec(repo, subset, x, n):
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	433 """``set~n``
16683 525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16669 diff changeset	434 Changesets that are the Nth ancestor (first parents only) of a changeset
525fdb738975 cleanup: eradicate long lines Brodie Rao <brodie@sf.io> parents: 16669 diff changeset	435 in set.
14070 305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	436 """
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	437 try:
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	438 n = int(n[1])
14856 f96c354493d7 revsets: actually catch type error on tip^p1(tip) (issue2884) Matt Mackall <mpm@selenic.com> parents: 14842 diff changeset	439 except (TypeError, ValueError):
14070 305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	440 raise error.ParseError(_("~ expects a number"))
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	441 ps = set()
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	442 cl = repo.changelog
23163 6f1b8b3f12fd revset-ancestorspec: call 'getset' on a 'fullreposet' Pierre-Yves David <pierre-yves.david@fb.com> parents: 23162 diff changeset	443 for r in getset(repo, fullreposet(repo), x):
14070 305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	444 for i in range(n):
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	445 r = cl.parentrevs(r)[0]
305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	446 ps.add(r)
22531 22ba2c0825da revset: use `subset &` in `ancestorspec` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22530 diff changeset	447 return subset & ps
14070 305c97670d7a revset: add ^ and ~ operators from parentrevspec extension Kevin Gessner <kevin@kevingessner.com> parents: 14061 diff changeset	448
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	449 def author(repo, subset, x):
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	450 """``author(string)``
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	451 Alias for ``user(string)``.
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	452 """
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	453 # i18n: "author" is a keyword
15726 9b822edecb4c i18n: use "encoding.lower()" to normalize specified string for revset FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15596 diff changeset	454 n = encoding.lower(getstring(x, _("author requires a string")))
16823 b23bacb230c9 revset: add pattern matching to the 'user' revset expression Simon King <simon@simonking.org.uk> parents: 16822 diff changeset	455 kind, pattern, matcher = _substringmatcher(n)
20612 6490f8385391 revset: changed revset code to use filter method Lucas Moscovicz <lmoscovicz@fb.com> parents: 20611 diff changeset	456 return subset.filter(lambda x: matcher(encoding.lower(repo[x].user())))
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	457
15134 81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	458 def bisect(repo, subset, x):
81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	459 """``bisect(string)``
15154 fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads' "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15147 diff changeset	460 Changesets marked in the specified bisect status:
15136 18219c0789ae revset.bisect: add new 'range' set to the bisect keyword "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15135 diff changeset	461
15154 fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads' "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15147 diff changeset	462 - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
17407 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 17390 diff changeset	463 - ``goods``, ``bads`` : csets topologically good/bad
15154 fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads' "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15147 diff changeset	464 - ``range`` : csets taking part in the bisection
fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads' "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15147 diff changeset	465 - ``pruned`` : csets that are goods, bads or skipped
fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads' "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15147 diff changeset	466 - ``untested`` : csets whose fate is yet unknown
fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads' "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15147 diff changeset	467 - ``ignored`` : csets ignored due to DAG topology
16655 14913fcb30c6 bisect: track the current changeset (issue3382) Bryan O'Sullivan <bryano@fb.com> parents: 16648 diff changeset	468 - ``current`` : the cset currently being bisected
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	469 """
17260 e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17259 diff changeset	470 # i18n: "bisect" is a keyword
15135 f19de58af225 revset.bisect: move bisect() code to hbisect.py "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15134 diff changeset	471 status = getstring(x, _("bisect requires a string")).lower()
16467 7f59900e3f8b revset: fix O(n*2) behaviour of bisect() (issue3381) Bryan O'Sullivan <bryano@fb.com>* parents: 16453 diff changeset	472 state = set(hbisect.get(repo, status))
22532 0cf46b8298fe revset: use `subset &` in `bisect` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22531 diff changeset	473 return subset & state
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	474
15134 81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	475 # Backward-compatibility
81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	476 # - no help entry so that we do not advertise it any more
81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	477 def bisected(repo, subset, x):
81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	478 return bisect(repo, subset, x)
81adf7777f8f revset: rename bisected() to bisect() "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> parents: 15133 diff changeset	479
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	480 def bookmark(repo, subset, x):
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	481 """``bookmark([name])``
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	482 The named bookmark or all bookmarks.
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	483
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	484 If `name` starts with `re:`, the remainder of the name is treated as
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	485 a regular expression. To match a bookmark that actually starts with `re:`,
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	486 use the prefix `literal:`.
13915 8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	487 """
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	488 # i18n: "bookmark" is a keyword
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	489 args = getargs(x, 0, 1, _('bookmark takes one or no arguments'))
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	490 if args:
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	491 bm = getstring(args[0],
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	492 # i18n: "bookmark" is a keyword
8f81d6f4047f revset: rearrange code so functions are sorted alphabetically Idan Kamara <idankk86@gmail.com> parents: 13914 diff changeset	493 _('the argument to bookmark must be a string'))
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	494 kind, pattern, matcher = _stringmatcher(bm)
22499 8c9f9e346acc revset: unify code flow in `bookmark` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22498 diff changeset	495 bms = set()
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	496 if kind == 'literal':
22105 3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329) Michael O'Connor <mkoconnor@gmail.com> parents: 21939 diff changeset	497 bmrev = repo._bookmarks.get(pattern, None)
16822 da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	498 if not bmrev:
da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression Simon King <simon@simonking.org.uk> parents: 16821 diff changeset	499 raise util.Abort(_("bookmark '%s' does not exist") % bm)
22499 8c9f9e346acc revset: unify code flow in `bookmark` Pierre-Yves David <pierre-yves.david@fb.com> parents: 22498 diff changeset	500 bms.add(repo[bmrev].rev())

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1 # revset.py - revision set queries for mercurial

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2 #

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

4 #

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

5 # This software may be used and distributed according to the terms of the

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

6 # GNU General Public License version 2 or any later version.

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

7

16834

cafd8a8fb713 util: subclass deque for Python 2.4 backwards compatibility

Bryan O'Sullivan <bryano@fb.com>

parents: 16825

diff changeset

8 import re

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

9 import parser, util, error, discovery, hbisect, phases

16417

b4b0c6931e11 revset: avoid demandimport bug

Matt Mackall <mpm@selenic.com>

parents: 16415

diff changeset

10 import node

20690

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

11 import heapq

12085

6f833fc3ccab Consistently import foo as foomod when foo to avoid shadowing

Martin Geisler <mg@aragost.com>

parents: 11944

diff changeset

12 import match as matchmod

13593

cc4721ed7a2a help: extract items doc generation function

Patrick Mezard <pmezard@gmail.com>

parents: 13506

diff changeset

13 from i18n import _

15726

9b822edecb4c i18n: use "encoding.lower()" to normalize specified string for revset

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 15596

diff changeset

14 import encoding

17469

fb72eec7efd8 obsolete: introduce caches for all meaningful sets

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17407

diff changeset

15 import obsolete as obsmod

20286

760151697a4f revset: make default kind of pattern for "contains()" rooted at cwd

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20285

diff changeset

16 import pathutil

18251

a6483f827512 revset: retrieve hidden from filteredrevs

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 18071

diff changeset

17 import repoview

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

18

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

19 def _revancestors(repo, revs, followfirst):

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

20 """Like revlog.ancestors(), but supports followfirst."""

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

21 cut = followfirst and 1 or None

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

22 cl = repo.changelog

20690

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

23

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

24 def iterate():

20691

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

25 revqueue, revsnode = None, None

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

26 h = []

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

27

22832

2f1d2a42f040 revancestors: replace `descending` with `sort(reverse=False)`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22831

diff changeset

28 revs.sort(reverse=True)

20691

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

29 revqueue = util.deque(revs)

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

30 if revqueue:

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

31 revsnode = revqueue.popleft()

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

32 heapq.heappush(h, -revsnode)

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

33

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

34 seen = set([node.nullrev])

20690

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

35 while h:

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

36 current = -heapq.heappop(h)

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

37 if current not in seen:

20691

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

38 if revsnode and current == revsnode:

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

39 if revqueue:

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

40 revsnode = revqueue.popleft()

c1f666e27345 revset: optimized _revancestors method based on order of revisions

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20690

diff changeset

41 heapq.heappush(h, -revsnode)

20690

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

42 seen.add(current)

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

43 yield current

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

44 for parent in cl.parentrevs(current)[:cut]:

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

45 if parent != node.nullrev:

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

46 heapq.heappush(h, -parent)

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

47

22795

c21342159fad generatorset: drop the leading underscore in the class name

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22794

diff changeset

48 return generatorset(iterate(), iterasc=False)

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

49

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

50 def _revdescendants(repo, revs, followfirst):

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

51 """Like revlog.descendants() but supports followfirst."""

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

52 cut = followfirst and 1 or None

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

53

20692

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

54 def iterate():

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

55 cl = repo.changelog

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

56 first = min(revs)

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

57 nullrev = node.nullrev

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

58 if first == nullrev:

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

59 # Are there nodes with a null first parent and a non-null

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

60 # second one? Maybe. Do we care? Probably not.

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

61 for i in cl:

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

62 yield i

20692

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

63 else:

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

64 seen = set(revs)

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

65 for i in cl.revs(first + 1):

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

66 for x in cl.parentrevs(i)[:cut]:

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

67 if x != nullrev and x in seen:

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

68 seen.add(i)

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

69 yield i

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

70 break

7af341082b76 revset: changed descendants revset to use lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20691

diff changeset

71

22795

c21342159fad generatorset: drop the leading underscore in the class name

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22794

diff changeset

72 return generatorset(iterate(), iterasc=True)

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

73

16863

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

74 def _revsbetween(repo, roots, heads):

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

75 """Return all paths between roots and heads, inclusive of both endpoint

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

76 sets."""

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

77 if not roots:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

78 return baseset()

16863

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

79 parentrevs = repo.changelog.parentrevs

22487

e40bb83d0989 revset: stop using a baseset instead of a plain list in _revsbetween

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22483

diff changeset

80 visit = list(heads)

16863

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

81 reachable = set()

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

82 seen = {}

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

83 minroot = min(roots)

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

84 roots = set(roots)

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

85 # open-code the post-order traversal due to the tiny size of

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

86 # sys.getrecursionlimit()

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

87 while visit:

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

88 rev = visit.pop()

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

89 if rev in roots:

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

90 reachable.add(rev)

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

91 parents = parentrevs(rev)

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

92 seen[rev] = parents

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

93 for parent in parents:

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

94 if parent >= minroot and parent not in seen:

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

95 visit.append(parent)

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

96 if not reachable:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

97 return baseset()

16863

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

98 for rev in sorted(seen):

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

99 for parent in seen[rev]:

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

100 if parent in reachable:

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

101 reachable.add(rev)

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

102 return baseset(sorted(reachable))

16863

b6efeb27e733 revset: introduce and use _revsbetween

Bryan O'Sullivan <bryano@fb.com>

parents: 16862

diff changeset

103

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

104 elements = {

23754

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

105 "(": (21, ("group", 1, ")"), ("func", 1, ")")),

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

106 "##": (20, None, ("_concat", 20)),

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

107 "~": (18, None, ("ancestor", 18)),

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

108 "^": (18, None, ("parent", 18), ("parentpost", 18)),

12616

e797fdf91df4 revset: lower precedence of minus infix (issue2361)

Matt Mackall <mpm@selenic.com>

parents: 12615

diff changeset

109 "-": (5, ("negate", 19), ("minus", 5)),

11278

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

110 "::": (17, ("dagrangepre", 17), ("dagrange", 17),

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

111 ("dagrangepost", 17)),

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

112 "..": (17, ("dagrangepre", 17), ("dagrange", 17),

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

113 ("dagrangepost", 17)),

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

114 ":": (15, ("rangepre", 15), ("range", 15), ("rangepost", 15)),

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

115 "not": (10, ("not", 10)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

116 "!": (10, ("not", 10)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

117 "and": (5, None, ("and", 5)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

118 "&": (5, None, ("and", 5)),

23777

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

119 "%": (5, None, ("only", 5), ("onlypost", 5)),

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

120 "or": (4, None, ("or", 4)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

121 "|": (4, None, ("or", 4)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

122 "+": (4, None, ("or", 4)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

123 ",": (2, None, ("list", 2)),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

124 ")": (0, None, None),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

125 "symbol": (0, ("symbol",), None),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

126 "string": (0, ("string",), None),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

127 "end": (0, None, None),

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

128 }

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

129

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

130 keywords = set(['and', 'or', 'not'])

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

131

23854

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

132 # default set of valid characters for the initial letter of symbols

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

133 _syminitletters = set(c for c in [chr(i) for i in xrange(256)]

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

134 if c.isalnum() or c in '._@' or ord(c) > 127)

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

135

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

136 # default set of valid characters for non-initial letters of symbols

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

137 _symletters = set(c for c in [chr(i) for i in xrange(256)]

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

138 if c.isalnum() or c in '-._/@' or ord(c) > 127)

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

139

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

140 def tokenize(program, lookup=None, syminitletters=None, symletters=None):

17886

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

141 '''

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

142 Parse a revset statement into a stream of tokens

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

143

23854

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

144 ``syminitletters`` is the set of valid characters for the initial

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

145 letter of symbols.

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

146

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

147 By default, character ``c`` is recognized as valid for initial

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

148 letter of symbols, if ``c.isalnum() or c in '._@' or ord(c) > 127``.

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

149

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

150 ``symletters`` is the set of valid characters for non-initial

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

151 letters of symbols.

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

152

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

153 By default, character ``c`` is recognized as valid for non-initial

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

154 letters of symbols, if ``c.isalnum() or c in '-._/@' or ord(c) > 127``.

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

155

17886

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

156 Check that @ is a valid unquoted token character (issue3686):

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

157 >>> list(tokenize("@::"))

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

158 [('symbol', '@', 0), ('::', None, 1), ('end', None, 3)]

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

159

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

160 '''

23854

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

161 if syminitletters is None:

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

162 syminitletters = _syminitletters

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

163 if symletters is None:

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

164 symletters = _symletters

17886

d8905e2c1301 revset: accept @ in unquoted symbols (issue3686)

Matt Mackall <mpm@selenic.com>

parents: 17829

diff changeset

165

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

166 pos, l = 0, len(program)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

167 while pos < l:

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

168 c = program[pos]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

169 if c.isspace(): # skip inter-token whitespace

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

170 pass

11278

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

171 elif c == ':' and program[pos:pos + 2] == '::': # look ahead carefully

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

172 yield ('::', None, pos)

11278

7df88cdf47fd revset: add support for prefix and suffix versions of : and ::

Matt Mackall <mpm@selenic.com>

parents: 11275

diff changeset

173 pos += 1 # skip ahead

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

174 elif c == '.' and program[pos:pos + 2] == '..': # look ahead carefully

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

175 yield ('..', None, pos)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

176 pos += 1 # skip ahead

23754

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

177 elif c == '#' and program[pos:pos + 2] == '##': # look ahead carefully

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

178 yield ('##', None, pos)

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

179 pos += 1 # skip ahead

23777

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

180 elif c in "():,-|&+!~^%": # handle simple operators

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

181 yield (c, None, pos)

12408

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

182 elif (c in '"\'' or c == 'r' and

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

183 program[pos:pos + 2] in ("r'", 'r"')): # handle quoted strings

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

184 if c == 'r':

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

185 pos += 1

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

186 c = program[pos]

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

187 decode = lambda x: x

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

188 else:

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

189 decode = lambda x: x.decode('string-escape')

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

190 pos += 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

191 s = pos

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

192 while pos < l: # find closing quote

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

193 d = program[pos]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

194 if d == '\\': # skip over escaped characters

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

195 pos += 2

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

196 continue

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

197 if d == c:

12408

78a97859b90d revset: support raw string literals

Brodie Rao <brodie@bitheap.org>

parents: 12401

diff changeset

198 yield ('string', decode(program[s:pos]), s)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

199 break

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

200 pos += 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

201 else:

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

202 raise error.ParseError(_("unterminated string"), s)

16683

525fdb738975 cleanup: eradicate long lines

Brodie Rao <brodie@sf.io>

parents: 16669

diff changeset

203 # gather up a symbol/keyword

23854

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

204 elif c in syminitletters:

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

205 s = pos

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

206 pos += 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

207 while pos < l: # find end of symbol

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

208 d = program[pos]

23854

91dbb98b3513 revset: make tokenize extensible to parse alias declarations and definitions

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23848

diff changeset

209 if d not in symletters:

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

210 break

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

211 if d == '.' and program[pos - 1] == '.': # special case for ..

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

212 pos -= 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

213 break

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

214 pos += 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

215 sym = program[s:pos]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

216 if sym in keywords: # operator keywords

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

217 yield (sym, None, s)

20780

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

218 elif '-' in sym:

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

219 # some jerk gave us foo-bar-baz, try to check if it's a symbol

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

220 if lookup and lookup(sym):

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

221 # looks like a real symbol

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

222 yield ('symbol', sym, s)

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

223 else:

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

224 # looks like an expression

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

225 parts = sym.split('-')

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

226 for p in parts[:-1]:

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

227 if p: # possible consecutive -

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

228 yield ('symbol', p, s)

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

229 s += len(p)

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

230 yield ('-', None, pos)

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

231 s += 1

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

232 if parts[-1]: # possible trailing -

403f1f73d30f revset: try to handle hyphenated symbols if lookup callback is available

Matt Mackall <mpm@selenic.com>

parents: 20779

diff changeset

233 yield ('symbol', parts[-1], s)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

234 else:

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

235 yield ('symbol', sym, s)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

236 pos -= 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

237 else:

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

238 raise error.ParseError(_("syntax error"), pos)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

239 pos += 1

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

240 yield ('end', None, pos)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

241

23855

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

242 def parseerrordetail(inst):

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

243 """Compose error message from specified ParseError object

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

244 """

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

245 if len(inst.args) > 1:

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

246 return _('at %s: %s') % (inst.args[1], inst.args[0])

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

247 else:

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

248 return inst.args[0]

c4d0c3d05721 revset: factor out composing error message for ParseError to reuse

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23854

diff changeset

249

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

250 # helpers

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

251

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

252 def getstring(x, err):

11406

42408cd43f55 revset: fix up contains/getstring when no args passed

Matt Mackall <mpm@selenic.com>

parents: 11404

diff changeset

253 if x and (x[0] == 'string' or x[0] == 'symbol'):

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

254 return x[1]

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

255 raise error.ParseError(err)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

256

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

257 def getlist(x):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

258 if not x:

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

259 return []

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

260 if x[0] == 'list':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

261 return getlist(x[1]) + [x[2]]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

262 return [x]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

263

11339

744d5b73f776 revset: improve filter argument handling

Matt Mackall <mpm@selenic.com>

parents: 11304

diff changeset

264 def getargs(x, min, max, err):

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

265 l = getlist(x)

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

266 if len(l) < min or (max >= 0 and len(l) > max):

11289

4215ce511134 revset: raise ParseError exceptions

Matt Mackall <mpm@selenic.com>

parents: 11284

diff changeset

267 raise error.ParseError(err)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

268 return l

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

269

23857

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

270 def isvalidsymbol(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

271 """Examine whether specified ``tree`` is valid ``symbol`` or not

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

272 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

273 return tree[0] == 'symbol' and len(tree) > 1

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

274

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

275 def getsymbol(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

276 """Get symbol name from valid ``symbol`` in ``tree``

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

277

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

278 This assumes that ``tree`` is already examined by ``isvalidsymbol``.

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

279 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

280 return tree[1]

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

281

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

282 def isvalidfunc(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

283 """Examine whether specified ``tree`` is valid ``func`` or not

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

284 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

285 return tree[0] == 'func' and len(tree) > 1 and isvalidsymbol(tree[1])

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

286

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

287 def getfuncname(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

288 """Get function name from valid ``func`` in ``tree``

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

289

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

290 This assumes that ``tree`` is already examined by ``isvalidfunc``.

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

291 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

292 return getsymbol(tree[1])

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

293

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

294 def getfuncargs(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

295 """Get list of function arguments from valid ``func`` in ``tree``

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

296

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

297 This assumes that ``tree`` is already examined by ``isvalidfunc``.

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

298 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

299 if len(tree) > 2:

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

300 return getlist(tree[2])

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

301 else:

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

302 return []

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

303

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

304 def getset(repo, subset, x):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

305 if not x:

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

306 raise error.ParseError(_("missing argument"))

20527

bde426f18e0a revset: changed mfunc and getset to work with old style revset methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20526

diff changeset

307 s = methods[x[0]](repo, subset, *x[1:])

22884

4584eec9aead getset: check if an object is a baseset using `isascending` instead of `set`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22883

diff changeset

308 if util.safehasattr(s, 'isascending'):

20527

bde426f18e0a revset: changed mfunc and getset to work with old style revset methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20526

diff changeset

309 return s

bde426f18e0a revset: changed mfunc and getset to work with old style revset methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20526

diff changeset

310 return baseset(s)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

311

17017

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

312 def _getrevsource(repo, r):

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

313 extra = repo[r].extra()

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

314 for label in ('source', 'transplant_source', 'rebase_source'):

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

315 if label in extra:

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

316 try:

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

317 return repo[extra[label]].rev()

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

318 except error.RepoLookupError:

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

319 pass

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

320 return None

42c472877825 revset: add a utility for obtaining the source of a given rev

Matt Harbison <matt_harbison@yahoo.com>

parents: 17016

diff changeset

321

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

322 # operator methods

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

323

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

324 def stringset(repo, subset, x):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

325 x = repo[x].rev()

11282

e581f3acc338 revset: fix up tests

Matt Mackall <mpm@selenic.com>

parents: 11280

diff changeset

326 if x == -1 and len(subset) == len(repo):

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

327 return baseset([-1])

23736

aafeaba22826 revset: drop pre-lazyset optimization for stringset of subset == entire repo

Yuya Nishihara <yuya@tcha.org>

parents: 23413

diff changeset

328 if x in subset:

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

329 return baseset([x])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

330 return baseset()

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

331

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

332 def symbolset(repo, subset, x):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

333 if x in symbols:

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

334 raise error.ParseError(_("can't use %s here") % x)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

335 return stringset(repo, subset, x)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

336

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

337 def rangeset(repo, subset, x, y):

23162

69524a05a7fa revset-rangeset: call 'getset' on a 'fullreposet'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23139

diff changeset

338 m = getset(repo, fullreposet(repo), x)

69524a05a7fa revset-rangeset: call 'getset' on a 'fullreposet'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23139

diff changeset

339 n = getset(repo, fullreposet(repo), y)

11456

88abbb046e66 revset: deal with empty sets in range endpoints

Matt Mackall <mpm@selenic.com>

parents: 11446

diff changeset

340

88abbb046e66 revset: deal with empty sets in range endpoints

Matt Mackall <mpm@selenic.com>

parents: 11446

diff changeset

341 if not m or not n:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

342 return baseset()

22817

e4eb4bfc3616 rangeset: use `first` and `last` instead of direct indexing

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22813

diff changeset

343 m, n = m.first(), n.last()

11456

88abbb046e66 revset: deal with empty sets in range endpoints

Matt Mackall <mpm@selenic.com>

parents: 11446

diff changeset

344

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

345 if m < n:

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

346 r = spanset(repo, m, n + 1)

11456

88abbb046e66 revset: deal with empty sets in range endpoints

Matt Mackall <mpm@selenic.com>

parents: 11446

diff changeset

347 else:

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

348 r = spanset(repo, m, n - 1)

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

349 return r & subset

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

350

16861

e1aa1ed30030 revset: turn dagrange into a function

Bryan O'Sullivan <bryano@fb.com>

parents: 16860

diff changeset

351 def dagrange(repo, subset, x, y):

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

352 r = spanset(repo)

18991

c1af1fb314bc log: fix behavior with empty repositories (issue3497)

Alexander Plavin <me@aplavin.ru>

parents: 18777

diff changeset

353 xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y))

22866

6e739356f9bf revset-rangeset: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22865

diff changeset

354 return xs & subset

16861

e1aa1ed30030 revset: turn dagrange into a function

Bryan O'Sullivan <bryano@fb.com>

parents: 16860

diff changeset

355

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

356 def andset(repo, subset, x, y):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

357 return getset(repo, getset(repo, subset, x), y)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

358

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

359 def orset(repo, subset, x, y):

13932

34f577007ffe revsets: preserve ordering with the or operator

Augie Fackler <durin42@gmail.com>

parents: 13915

diff changeset

360 xl = getset(repo, subset, x)

20366

5ec6321f49a9 revset: added substraction to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20365

diff changeset

361 yl = getset(repo, subset - xl, y)

13932

34f577007ffe revsets: preserve ordering with the or operator

Augie Fackler <durin42@gmail.com>

parents: 13915

diff changeset

362 return xl + yl

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

363

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

364 def notset(repo, subset, x):

20366

5ec6321f49a9 revset: added substraction to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20365

diff changeset

365 return subset - getset(repo, subset, x)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

366

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

367 def listset(repo, subset, a, b):

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

368 raise error.ParseError(_("can't use a list in this context"))

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

369

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

370 def func(repo, subset, a, b):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

371 if a[0] == 'symbol' and a[1] in symbols:

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

372 return symbols[a[1]](repo, subset, b)

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

373 raise error.ParseError(_("not a function: %s") % a[1])

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

374

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

375 # functions

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

376

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

377 def adds(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

378 """``adds(pattern)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

379 Changesets that add a file matching pattern.

20289

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

380

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

381 The pattern without explicit kind like ``glob:`` is expected to be

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

382 relative to the current directory and match against a file or a

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

383 directory.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

384 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

385 # i18n: "adds" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

386 pat = getstring(x, _("adds requires a pattern"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

387 return checkstatus(repo, subset, pat, 1)

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

388

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

389 def ancestor(repo, subset, x):

18536

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

390 """``ancestor(*changeset)``

20991

a05d694599f9 revlog: use context ancestor instead of changelog ancestor

Mads Kiilerich <madski@unity3d.com>

parents: 20895

diff changeset

391 A greatest common ancestor of the changesets.

18536

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

392

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

393 Accepts 0 or more changesets.

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

394 Will return empty list when passed no args.

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

395 Greatest common ancestor of a single changeset is that changeset.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

396 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

397 # i18n: "ancestor" is a keyword

18536

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

398 l = getlist(x)

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

399 rl = spanset(repo)

18536

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

400 anc = None

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

401

18536

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

402 # (getset(repo, rl, i) for i in l) generates a list of lists

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

403 for revs in (getset(repo, rl, i) for i in l):

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

404 for r in revs:

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

405 if anc is None:

20991

a05d694599f9 revlog: use context ancestor instead of changelog ancestor

Mads Kiilerich <madski@unity3d.com>

parents: 20895

diff changeset

406 anc = repo[r]

18536

ae645d4f084c revset: change ancestor to accept 0 or more arguments (issue3750)

Paul Cavallaro <ptc@fb.com>

parents: 18495

diff changeset

407 else:

20991

a05d694599f9 revlog: use context ancestor instead of changelog ancestor

Mads Kiilerich <madski@unity3d.com>

parents: 20895

diff changeset

408 anc = anc.ancestor(repo[r])

a05d694599f9 revlog: use context ancestor instead of changelog ancestor

Mads Kiilerich <madski@unity3d.com>

parents: 20895

diff changeset

409

a05d694599f9 revlog: use context ancestor instead of changelog ancestor

Mads Kiilerich <madski@unity3d.com>

parents: 20895

diff changeset

410 if anc is not None and anc.rev() in subset:

a05d694599f9 revlog: use context ancestor instead of changelog ancestor

Mads Kiilerich <madski@unity3d.com>

parents: 20895

diff changeset

411 return baseset([anc.rev()])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

412 return baseset()

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

413

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

414 def _ancestors(repo, subset, x, followfirst=False):

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

415 heads = getset(repo, spanset(repo), x)

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

416 if not heads:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

417 return baseset()

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

418 s = _revancestors(repo, heads, followfirst)

23003

62d19ce9d7b6 revset-_ancestor: use & instead of filter

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22999

diff changeset

419 return subset & s

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

420

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

421 def ancestors(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

422 """``ancestors(set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

423 Changesets that are ancestors of a changeset in set.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

424 """

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

425 return _ancestors(repo, subset, x)

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

426

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

427 def _firstancestors(repo, subset, x):

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

428 # ``_firstancestors(set)``

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

429 # Like ``ancestors(set)`` but follows only the first parents.

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

430 return _ancestors(repo, subset, x, followfirst=True)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

431

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

432 def ancestorspec(repo, subset, x, n):

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

433 """``set~n``

16683

525fdb738975 cleanup: eradicate long lines

Brodie Rao <brodie@sf.io>

parents: 16669

diff changeset

434 Changesets that are the Nth ancestor (first parents only) of a changeset

525fdb738975 cleanup: eradicate long lines

Brodie Rao <brodie@sf.io>

parents: 16669

diff changeset

435 in set.

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

436 """

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

437 try:

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

438 n = int(n[1])

14856

f96c354493d7 revsets: actually catch type error on tip^p1(tip) (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14842

diff changeset

439 except (TypeError, ValueError):

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

440 raise error.ParseError(_("~ expects a number"))

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

441 ps = set()

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

442 cl = repo.changelog

23163

6f1b8b3f12fd revset-ancestorspec: call 'getset' on a 'fullreposet'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23162

diff changeset

443 for r in getset(repo, fullreposet(repo), x):

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

444 for i in range(n):

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

445 r = cl.parentrevs(r)[0]

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

446 ps.add(r)

22531

22ba2c0825da revset: use `subset &` in `ancestorspec`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22530

diff changeset

447 return subset & ps

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

448

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

449 def author(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

450 """``author(string)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

451 Alias for ``user(string)``.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

452 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

453 # i18n: "author" is a keyword

15726

9b822edecb4c i18n: use "encoding.lower()" to normalize specified string for revset

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 15596

diff changeset

454 n = encoding.lower(getstring(x, _("author requires a string")))

16823

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

455 kind, pattern, matcher = _substringmatcher(n)

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

456 return subset.filter(lambda x: matcher(encoding.lower(repo[x].user())))

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

457

15134

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

458 def bisect(repo, subset, x):

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

459 """``bisect(string)``

15154

fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads'

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15147

diff changeset

460 Changesets marked in the specified bisect status:

15136

18219c0789ae revset.bisect: add new 'range' set to the bisect keyword

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15135

diff changeset

461

15154

fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads'

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15147

diff changeset

462 - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip

17407

e7cfe3587ea4 fix trivial spelling errors

Mads Kiilerich <mads@kiilerich.com>

parents: 17390

diff changeset

463 - ``goods``, ``bads`` : csets topologically good/bad

15154

fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads'

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15147

diff changeset

464 - ``range`` : csets taking part in the bisection

fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads'

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15147

diff changeset

465 - ``pruned`` : csets that are goods, bads or skipped

fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads'

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15147

diff changeset

466 - ``untested`` : csets whose fate is yet unknown

fa0a464e4ca5 hbisect: add two new revset descriptions: 'goods' and 'bads'

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15147

diff changeset

467 - ``ignored`` : csets ignored due to DAG topology

16655

14913fcb30c6 bisect: track the current changeset (issue3382)

Bryan O'Sullivan <bryano@fb.com>

parents: 16648

diff changeset

468 - ``current`` : the cset currently being bisected

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

469 """

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

470 # i18n: "bisect" is a keyword

15135

f19de58af225 revset.bisect: move bisect() code to hbisect.py

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15134

diff changeset

471 status = getstring(x, _("bisect requires a string")).lower()

16467

7f59900e3f8b revset: fix O(n**2) behaviour of bisect() (issue3381)

Bryan O'Sullivan <bryano@fb.com>

parents: 16453

diff changeset

472 state = set(hbisect.get(repo, status))

22532

0cf46b8298fe revset: use `subset &` in `bisect`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22531

diff changeset

473 return subset & state

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

474

15134

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

475 # Backward-compatibility

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

476 # - no help entry so that we do not advertise it any more

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

477 def bisected(repo, subset, x):

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

478 return bisect(repo, subset, x)

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

479

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

480 def bookmark(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

481 """``bookmark([name])``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

482 The named bookmark or all bookmarks.

16822

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

483

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

484 If `name` starts with `re:`, the remainder of the name is treated as

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

485 a regular expression. To match a bookmark that actually starts with `re:`,

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

486 use the prefix `literal:`.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

487 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

488 # i18n: "bookmark" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

489 args = getargs(x, 0, 1, _('bookmark takes one or no arguments'))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

490 if args:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

491 bm = getstring(args[0],

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

492 # i18n: "bookmark" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

493 _('the argument to bookmark must be a string'))

16822

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

494 kind, pattern, matcher = _stringmatcher(bm)

22499

8c9f9e346acc revset: unify code flow in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22498

diff changeset

495 bms = set()

16822

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

496 if kind == 'literal':

22105

3efe3c2609e0 revset: bookmark revset interprets 'literal:' prefix correctly (issue4329)

Michael O'Connor <mkoconnor@gmail.com>

parents: 21939

diff changeset

497 bmrev = repo._bookmarks.get(pattern, None)

16822

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

498 if not bmrev:

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

499 raise util.Abort(_("bookmark '%s' does not exist") % bm)

22499

8c9f9e346acc revset: unify code flow in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22498

diff changeset

500 bms.add(repo[bmrev].rev())

16822

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

501 else:

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

502 matchrevs = set()

18495

8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations

Kevin Bullock <kbullock@ringworld.org>

parents: 18473

diff changeset

503 for name, bmrev in repo._bookmarks.iteritems():

16822

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

504 if matcher(name):

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

505 matchrevs.add(bmrev)

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

506 if not matchrevs:

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

507 raise util.Abort(_("no bookmarks exist that match '%s'")

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

508 % pattern)

da55d8a77390 revset: add pattern matching to 'bookmarks' revset expression

Simon King <simon@simonking.org.uk>

parents: 16821

diff changeset

509 for bmrev in matchrevs:

22499

8c9f9e346acc revset: unify code flow in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22498

diff changeset

510 bms.add(repo[bmrev].rev())

8c9f9e346acc revset: unify code flow in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22498

diff changeset

511 else:

8c9f9e346acc revset: unify code flow in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22498

diff changeset

512 bms = set([repo[r].rev()

8c9f9e346acc revset: unify code flow in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22498

diff changeset

513 for r in repo._bookmarks.values()])

22500

171015d3b30c revset: remove nullrev from the bookmark computation

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22499

diff changeset

514 bms -= set([node.nullrev])

22530

faf4f63533ff revset: use `subset &` in `bookmark`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22529

diff changeset

515 return subset & bms

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

516

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

517 def branch(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

518 """``branch(string or set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

519 All changesets belonging to the given branch or the branches of the given

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

520 changesets.

16821

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

521

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

522 If `string` starts with `re:`, the remainder of the name is treated as

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

523 a regular expression. To match a branch that actually starts with `re:`,

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

524 use the prefix `literal:`.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

525 """

23799

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

526 import branchmap

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

527 urepo = repo.unfiltered()

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

528 ucl = urepo.changelog

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

529 getbi = branchmap.revbranchcache(urepo).branchinfo

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

530

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

531 try:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

532 b = getstring(x, '')

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

533 except error.ParseError:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

534 # not a string, but another revspec, e.g. tip()

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

535 pass

16821

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

536 else:

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

537 kind, pattern, matcher = _stringmatcher(b)

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

538 if kind == 'literal':

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

539 # note: falls through to the revspec case if no branch with

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

540 # this name exists

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

541 if pattern in repo.branchmap():

23799

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

542 return subset.filter(lambda r: matcher(getbi(ucl, r)[0]))

16821

0946502fd3d5 revset: add pattern matching to 'branch' revset expression

Simon King <simon@simonking.org.uk>

parents: 16820

diff changeset

543 else:

23799

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

544 return subset.filter(lambda r: matcher(getbi(ucl, r)[0]))

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

545

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

546 s = getset(repo, spanset(repo), x)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

547 b = set()

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

548 for r in s:

23799

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

549 b.add(getbi(ucl, r)[0])

22867

5ee9b78ce805 revset-branch: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22866

diff changeset

550 c = s.__contains__

23799

678f53865c68 revset: use localrepo revbranchcache for branch name filtering

Mads Kiilerich <madski@unity3d.com>

parents: 23777

diff changeset

551 return subset.filter(lambda r: c(r) or getbi(ucl, r)[0] in b)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

552

17829

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

553 def bumped(repo, subset, x):

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

554 """``bumped()``

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

555 Mutable changesets marked as successors of public changesets.

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

556

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

557 Only non-public and non-obsolete changesets can be `bumped`.

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

558 """

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

559 # i18n: "bumped" is a keyword

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

560 getargs(x, 0, 0, _("bumped takes no arguments"))

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

561 bumped = obsmod.getrevs(repo, 'bumped')

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

562 return subset & bumped

17829

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

563

17913

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

564 def bundle(repo, subset, x):

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

565 """``bundle()``

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

566 Changesets in the bundle.

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

567

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

568 Bundle must be specified by the -R option."""

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

569

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

570 try:

18411

8b0f0dd56cec bundlerepo: improve performance for bundle() revset expression

Mads Kiilerich <madski@unity3d.com>

parents: 18382

diff changeset

571 bundlerevs = repo.changelog.bundlerevs

17913

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

572 except AttributeError:

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

573 raise util.Abort(_("no bundle provided - specify with -R"))

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

574 return subset & bundlerevs

17913

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

575

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

576 def checkstatus(repo, subset, pat, field):

16521

592701c8eac6 revset: fix adds/modifies/removes and patterns (issue3403)

Patrick Mezard <patrick@mezard.eu>

parents: 16467

diff changeset

577 hasset = matchmod.patkind(pat) == 'set'

20457

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

578

23115

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

579 mcache = [None]

20457

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

580 def matches(x):

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

581 c = repo[x]

23115

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

582 if not mcache[0] or hasset:

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

583 mcache[0] = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

584 m = mcache[0]

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

585 fname = None

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

586 if not m.anypats() and len(m.files()) == 1:

c23c03605c59 revset: don't recreate matcher for every revision

Martin von Zweigbergk <martinvonz@google.com>

parents: 23100

diff changeset

587 fname = m.files()[0]

16521

592701c8eac6 revset: fix adds/modifies/removes and patterns (issue3403)

Patrick Mezard <patrick@mezard.eu>

parents: 16467

diff changeset

588 if fname is not None:

592701c8eac6 revset: fix adds/modifies/removes and patterns (issue3403)

Patrick Mezard <patrick@mezard.eu>

parents: 16467

diff changeset

589 if fname not in c.files():

20457

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

590 return False

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

591 else:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

592 for f in c.files():

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

593 if m(f):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

594 break

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

595 else:

20457

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

596 return False

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

597 files = repo.status(c.p1().node(), c.node())[field]

16521

592701c8eac6 revset: fix adds/modifies/removes and patterns (issue3403)

Patrick Mezard <patrick@mezard.eu>

parents: 16467

diff changeset

598 if fname is not None:

592701c8eac6 revset: fix adds/modifies/removes and patterns (issue3403)

Patrick Mezard <patrick@mezard.eu>

parents: 16467

diff changeset

599 if fname in files:

20457

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

600 return True

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

601 else:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

602 for f in files:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

603 if m(f):

20457

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

604 return True

ed7b674824a3 revset: added lazyset implementation to checkstatus

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20456

diff changeset

605

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

606 return subset.filter(matches)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

607

16396

03e408a122c4 revset: avoid set duplication in roots()

Patrick Mezard <patrick@mezard.eu>

parents: 16395

diff changeset

608 def _children(repo, narrow, parentset):

15899

476a981fdf34 revset: optimize roots and children

Matt Mackall <mpm@selenic.com>

parents: 15898

diff changeset

609 cs = set()

18063

34a1a639d835 revset.children: ignore rev numbers that are too low

Siddharth Agarwal <sid0@fb.com>

parents: 17980

diff changeset

610 if not parentset:

20709

71df845d86cf revsets: backout d04aac468bf4 due to performance regressions

Matt Mackall <mpm@selenic.com>

parents: 20708

diff changeset

611 return baseset(cs)

15899

476a981fdf34 revset: optimize roots and children

Matt Mackall <mpm@selenic.com>

parents: 15898

diff changeset

612 pr = repo.changelog.parentrevs

18063

34a1a639d835 revset.children: ignore rev numbers that are too low

Siddharth Agarwal <sid0@fb.com>

parents: 17980

diff changeset

613 minrev = min(parentset)

16394

f3df7d34791e revset: do not ignore input revisions in roots()

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

614 for r in narrow:

18063

34a1a639d835 revset.children: ignore rev numbers that are too low

Siddharth Agarwal <sid0@fb.com>

parents: 17980

diff changeset

615 if r <= minrev:

34a1a639d835 revset.children: ignore rev numbers that are too low

Siddharth Agarwal <sid0@fb.com>

parents: 17980

diff changeset

616 continue

15899

476a981fdf34 revset: optimize roots and children

Matt Mackall <mpm@selenic.com>

parents: 15898

diff changeset

617 for p in pr(r):

16396

03e408a122c4 revset: avoid set duplication in roots()

Patrick Mezard <patrick@mezard.eu>

parents: 16395

diff changeset

618 if p in parentset:

15899

476a981fdf34 revset: optimize roots and children

Matt Mackall <mpm@selenic.com>

parents: 15898

diff changeset

619 cs.add(r)

20709

71df845d86cf revsets: backout d04aac468bf4 due to performance regressions

Matt Mackall <mpm@selenic.com>

parents: 20708

diff changeset

620 return baseset(cs)

15899

476a981fdf34 revset: optimize roots and children

Matt Mackall <mpm@selenic.com>

parents: 15898

diff changeset

621

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

622 def children(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

623 """``children(set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

624 Child changesets of changesets in set.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

625 """

23164

7a42e5d4c418 revset-children: call 'getset' on a 'fullreposet'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23163

diff changeset

626 s = getset(repo, fullreposet(repo), x)

15899

476a981fdf34 revset: optimize roots and children

Matt Mackall <mpm@selenic.com>

parents: 15898

diff changeset

627 cs = _children(repo, subset, s)

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

628 return subset & cs

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

629

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

630 def closed(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

631 """``closed()``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

632 Changeset is closed.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

633 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

634 # i18n: "closed" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

635 getargs(x, 0, 0, _("closed takes no arguments"))

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

636 return subset.filter(lambda r: repo[r].closesbranch())

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

637

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

638 def contains(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

639 """``contains(pattern)``

21199

e9c2f76be74b help: clarify distinction among `contains`/`file`/`filelog`

Greg Hurrell <glh@fb.com>

parents: 21173

diff changeset

640 The revision's manifest contains a file matching pattern (but might not

e9c2f76be74b help: clarify distinction among `contains`/`file`/`filelog`

Greg Hurrell <glh@fb.com>

parents: 21173

diff changeset

641 modify it). See :hg:`help patterns` for information about file patterns.

20289

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

642

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

643 The pattern without explicit kind like ``glob:`` is expected to be

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

644 relative to the current directory and match against a file exactly

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

645 for efficiency.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

646 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

647 # i18n: "contains" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

648 pat = getstring(x, _("contains requires a pattern"))

20461

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

649

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

650 def matches(x):

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

651 if not matchmod.patkind(pat):

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

652 pats = pathutil.canonpath(repo.root, repo.getcwd(), pat)

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

653 if pats in repo[x]:

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

654 return True

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

655 else:

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

656 c = repo[x]

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

657 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)

15964

6e37b8282aa2 revsets: provide contexts for filesets

Matt Mackall <mpm@selenic.com>

parents: 15949

diff changeset

658 for f in c.manifest():

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

659 if m(f):

20461

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

660 return True

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

661 return False

abd8e56a1038 revset: added lazyset implementation to contains revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20460

diff changeset

662

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

663 return subset.filter(matches)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

664

17016

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

665 def converted(repo, subset, x):

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

666 """``converted([id])``

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

667 Changesets converted from the given identifier in the old repository if

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

668 present, or all converted changesets if no identifier is specified.

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

669 """

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

670

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

671 # There is exactly no chance of resolving the revision, so do a simple

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

672 # string compare and hope for the best

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

673

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

674 rev = None

17016

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

675 # i18n: "converted" is a keyword

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

676 l = getargs(x, 0, 1, _('converted takes one or no arguments'))

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

677 if l:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

678 # i18n: "converted" is a keyword

17016

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

679 rev = getstring(l[0], _('converted requires a revision'))

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

680

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

681 def _matchvalue(r):

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

682 source = repo[r].extra().get('convert_revision', None)

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

683 return source is not None and (rev is None or source.startswith(rev))

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

684

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

685 return subset.filter(lambda r: _matchvalue(r))

17016

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

686

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

687 def date(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

688 """``date(interval)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

689 Changesets within the interval, see :hg:`help dates`.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

690 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

691 # i18n: "date" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

692 ds = getstring(x, _("date requires a string"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

693 dm = util.matchdate(ds)

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

694 return subset.filter(lambda x: dm(repo[x].date()[0]))

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

695

14650

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

696 def desc(repo, subset, x):

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

697 """``desc(string)``

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

698 Search commit message for string. The match is case-insensitive.

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

699 """

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

700 # i18n: "desc" is a keyword

15726

9b822edecb4c i18n: use "encoding.lower()" to normalize specified string for revset

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 15596

diff changeset

701 ds = encoding.lower(getstring(x, _("desc requires a string")))

20452

a685d9870eb5 revset: added lazyset implementation to desc revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20451

diff changeset

702

a685d9870eb5 revset: added lazyset implementation to desc revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20451

diff changeset

703 def matches(x):

a685d9870eb5 revset: added lazyset implementation to desc revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20451

diff changeset

704 c = repo[x]

a685d9870eb5 revset: added lazyset implementation to desc revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20451

diff changeset

705 return ds in encoding.lower(c.description())

a685d9870eb5 revset: added lazyset implementation to desc revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20451

diff changeset

706

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

707 return subset.filter(matches)

14650

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

708

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

709 def _descendants(repo, subset, x, followfirst=False):

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

710 roots = getset(repo, spanset(repo), x)

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

711 if not roots:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

712 return baseset()

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

713 s = _revdescendants(repo, roots, followfirst)

20894

04e1596d5dbd revset: improve _descendants performance

Durham Goode <durham@fb.com>

parents: 20863

diff changeset

714

04e1596d5dbd revset: improve _descendants performance

Durham Goode <durham@fb.com>

parents: 20863

diff changeset

715 # Both sets need to be ascending in order to lazily return the union

04e1596d5dbd revset: improve _descendants performance

Durham Goode <durham@fb.com>

parents: 20863

diff changeset

716 # in the correct order.

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

717 base = subset & roots

22860

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

718 desc = subset & s

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

719 result = base + desc

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

720 if subset.isascending():

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

721 result.sort()

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

722 elif subset.isdescending():

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

723 result.sort(reverse=True)

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

724 else:

1dd178277cf5 revset-_descendant: rework the whole sorting and combining logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22859

diff changeset

725 result = subset & result

22830

1d1da8abe130 _descendants: directly use smartset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22829

diff changeset

726 return result

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

727

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

728 def descendants(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

729 """``descendants(set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

730 Changesets which are descendants of changesets in set.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

731 """

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

732 return _descendants(repo, subset, x)

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

733

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

734 def _firstdescendants(repo, subset, x):

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

735 # ``_firstdescendants(set)``

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

736 # Like ``descendants(set)`` but follows only the first parents.

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

737 return _descendants(repo, subset, x, followfirst=True)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

738

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

739 def destination(repo, subset, x):

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

740 """``destination([set])``

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

741 Changesets that were created by a graft, transplant or rebase operation,

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

742 with the given revisions specified as the source. Omitting the optional set

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

743 is the same as passing all().

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

744 """

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

745 if x is not None:

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

746 sources = getset(repo, spanset(repo), x)

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

747 else:

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

748 sources = getall(repo, spanset(repo), x)

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

749

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

750 dests = set()

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

751

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

752 # subset contains all of the possible destinations that can be returned, so

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

753 # iterate over them and see if their source(s) were provided in the arg set.

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

754 # Even if the immediate src of r is not in the arg set, src's source (or

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

755 # further back) may be. Scanning back further than the immediate src allows

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

756 # transitive transplants and rebases to yield the same results as transitive

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

757 # grafts.

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

758 for r in subset:

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

759 src = _getrevsource(repo, r)

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

760 lineage = None

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

761

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

762 while src is not None:

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

763 if lineage is None:

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

764 lineage = list()

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

765

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

766 lineage.append(r)

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

767

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

768 # The visited lineage is a match if the current source is in the arg

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

769 # set. Since every candidate dest is visited by way of iterating

17494

74801685aaa2 spelling: further

timeless@mozdev.org

parents: 17291

diff changeset

770 # subset, any dests further back in the lineage will be tested by a

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

771 # different iteration over subset. Likewise, if the src was already

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

772 # selected, the current lineage can be selected without going back

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

773 # further.

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

774 if src in sources or src in dests:

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

775 dests.update(lineage)

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

776 break

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

777

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

778 r = src

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

779 src = _getrevsource(repo, r)

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

780

21217

2195ac506c6a revset: directly use __contains__ instead of a lambda

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 21215

diff changeset

781 return subset.filter(dests.__contains__)

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

782

18071

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

783 def divergent(repo, subset, x):

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

784 """``divergent()``

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

785 Final successors of changesets with an alternative set of final successors.

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

786 """

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

787 # i18n: "divergent" is a keyword

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

788 getargs(x, 0, 0, _("divergent takes no arguments"))

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

789 divergent = obsmod.getrevs(repo, 'divergent')

22533

5b65429721d5 revset: use `subset &` in `divergent`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22532

diff changeset

790 return subset & divergent

18071

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

791

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

792 def draft(repo, subset, x):

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

793 """``draft()``

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

794 Changeset in draft phase."""

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

795 # i18n: "draft" is a keyword

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

796 getargs(x, 0, 0, _("draft takes no arguments"))

23019

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

797 phase = repo._phasecache.phase

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

798 target = phases.draft

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

799 condition = lambda r: phase(repo, r) == target

23018

73d9d5548dfe revset-phases: do not cache phase-related filters

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23005

diff changeset

800 return subset.filter(condition, cache=False)

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

801

17173

c621f84dbb35 obsolete: compute extinct changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17171

diff changeset

802 def extinct(repo, subset, x):

c621f84dbb35 obsolete: compute extinct changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17171

diff changeset

803 """``extinct()``

17291

2d6bbf87f7b4 revset: minor doc fixes on obsolete related revsets

Patrick Mezard <patrick@mezard.eu>

parents: 17272

diff changeset

804 Obsolete changesets with obsolete descendants only.

2d6bbf87f7b4 revset: minor doc fixes on obsolete related revsets

Patrick Mezard <patrick@mezard.eu>

parents: 17272

diff changeset

805 """

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

806 # i18n: "extinct" is a keyword

17259

5822345e9e46 revset: use appropriate predicate name in error messages

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17244

diff changeset

807 getargs(x, 0, 0, _("extinct takes no arguments"))

17825

3cc06457f15e obsolete: rename `getobscache` into `getrevs`

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17804

diff changeset

808 extincts = obsmod.getrevs(repo, 'extinct')

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

809 return subset & extincts

17173

c621f84dbb35 obsolete: compute extinct changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17171

diff changeset

810

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

811 def extra(repo, subset, x):

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

812 """``extra(label, [value])``

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

813 Changesets with the given label in the extra metadata, with the given

16824

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

814 optional value.

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

815

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

816 If `value` starts with `re:`, the remainder of the value is treated as

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

817 a regular expression. To match a value that actually starts with `re:`,

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

818 use the prefix `literal:`.

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

819 """

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

820

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

821 # i18n: "extra" is a keyword

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

822 l = getargs(x, 1, 2, _('extra takes at least 1 and at most 2 arguments'))

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

823 # i18n: "extra" is a keyword

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

824 label = getstring(l[0], _('first argument to extra must be a string'))

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

825 value = None

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

826

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

827 if len(l) > 1:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

828 # i18n: "extra" is a keyword

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

829 value = getstring(l[1], _('second argument to extra must be a string'))

16824

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

830 kind, value, matcher = _stringmatcher(value)

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

831

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

832 def _matchvalue(r):

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

833 extra = repo[r].extra()

16824

f3b8c82a559c revset: add pattern matching to 'extra' revset expression

Simon King <simon@simonking.org.uk>

parents: 16823

diff changeset

834 return label in extra and (value is None or matcher(extra[label]))

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

835

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

836 return subset.filter(lambda r: _matchvalue(r))

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

837

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

838 def filelog(repo, subset, x):

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

839 """``filelog(pattern)``

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

840 Changesets connected to the specified filelog.

17244

483aa765f6c4 revset: add explanation about difference between 'filelog()' and 'file()'

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17186

diff changeset

841

21199

e9c2f76be74b help: clarify distinction among `contains`/`file`/`filelog`

Greg Hurrell <glh@fb.com>

parents: 21173

diff changeset

842 For performance reasons, visits only revisions mentioned in the file-level

e9c2f76be74b help: clarify distinction among `contains`/`file`/`filelog`

Greg Hurrell <glh@fb.com>

parents: 21173

diff changeset

843 filelog, rather than filtering through all changesets (much faster, but

e9c2f76be74b help: clarify distinction among `contains`/`file`/`filelog`

Greg Hurrell <glh@fb.com>

parents: 21173

diff changeset

844 doesn't include deletes or duplicate changes). For a slower, more accurate

e9c2f76be74b help: clarify distinction among `contains`/`file`/`filelog`

Greg Hurrell <glh@fb.com>

parents: 21173

diff changeset

845 result, use ``file()``.

20289

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

846

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

847 The pattern without explicit kind like ``glob:`` is expected to be

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

848 relative to the current directory and match against a file exactly

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

849 for efficiency.

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

850

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

851 If some linkrev points to revisions filtered by the current repoview, we'll

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

852 work around it to return a non-filtered value.

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

853 """

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

854

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

855 # i18n: "filelog" is a keyword

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

856 pat = getstring(x, _("filelog requires a pattern"))

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

857 s = set()

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

858 cl = repo.changelog

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

859

15964

6e37b8282aa2 revsets: provide contexts for filesets

Matt Mackall <mpm@selenic.com>

parents: 15949

diff changeset

860 if not matchmod.patkind(pat):

20288

b61ad01c4e73 revset: use "canonpath()" for "filelog()" pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20287

diff changeset

861 f = pathutil.canonpath(repo.root, repo.getcwd(), pat)

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

862 files = [f]

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

863 else:

20288

b61ad01c4e73 revset: use "canonpath()" for "filelog()" pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20287

diff changeset

864 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None])

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

865 files = (f for f in repo[None] if m(f))

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

866

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

867 for f in files:

23834

02f4560b69b7 filelog: fix backwards comment for 'backrevref'

Martin von Zweigbergk <martinvonz@google.com>

parents: 23833

diff changeset

868 backrevref = {} # final value for: filerev -> changerev

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

869 lowestchild = {} # lowest known filerev child of a filerev

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

870 delayed = [] # filerev with filtered linkrev, for post-processing

23732

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

871 lowesthead = None # cache for manifest content of all head revisions

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

872 fl = repo.file(f)

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

873 for fr in list(fl):

23832

60178888be05 filelog: remove unused variable 'lkr'

Martin von Zweigbergk <martinvonz@google.com>

parents: 23799

diff changeset

874 rev = fl.linkrev(fr)

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

875 if rev not in cl:

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

876 # changerev pointed in linkrev is filtered

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

877 # record it for post processing.

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

878 delayed.append((fr, rev))

23833

7a7f437ab63d filelog: remove trailing "form feed" character

Martin von Zweigbergk <martinvonz@google.com>

parents: 23832

diff changeset

879 continue

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

880 for p in fl.parentrevs(fr):

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

881 if 0 <= p and p not in lowestchild:

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

882 lowestchild[p] = fr

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

883 backrevref[fr] = rev

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

884 s.add(rev)

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

885

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

886 # Post-processing of all filerevs we skipped because they were

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

887 # filtered. If such filerevs have known and unfiltered children, this

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

888 # means they have an unfiltered appearance out there. We'll use linkrev

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

889 # adjustment to find one of these appearances. The lowest known child

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

890 # will be used as a starting point because it is the best upper-bound we

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

891 # have.

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

892 #

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

893 # This approach will fail when an unfiltered but linkrev-shadowed

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

894 # appearance exists in a head changeset without unfiltered filerev

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

895 # children anywhere.

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

896 while delayed:

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

897 # must be a descending iteration. To slowly fill lowest child

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

898 # information that is of potential use by the next item.

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

899 fr, rev = delayed.pop()

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

900 lkr = rev

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

901

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

902 child = lowestchild.get(fr)

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

903

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

904 if child is None:

23732

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

905 # search for existence of this file revision in a head revision.

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

906 # There are three possibilities:

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

907 # - the revision exists in a head and we can find an

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

908 # introduction from there,

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

909 # - the revision does not exist in a head because it has been

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

910 # changed since its introduction: we would have found a child

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

911 # and be in the other 'else' clause,

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

912 # - all versions of the revision are hidden.

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

913 if lowesthead is None:

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

914 lowesthead = {}

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

915 for h in repo.heads():

23741

07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23738

diff changeset

916 fnode = repo[h].manifest().get(f)

07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23738

diff changeset

917 if fnode is not None:

07a6faf939dc revset-filelog: handle hidden linkrev for file missing for head (issue4490)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23738

diff changeset

918 lowesthead[fl.rev(fnode)] = h

23732

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

919 headrev = lowesthead.get(fr)

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

920 if headrev is None:

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

921 # content is nowhere unfiltered

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

922 continue

8ec03e0ef51a linkrev-filelog: handle filtered linkrev with no visible children (issue4307)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23731

diff changeset

923 rev = repo[headrev][f].introrev()

23731

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

924 else:

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

925 # the lowest known child is a good upper bound

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

926 childcrev = backrevref[child]

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

927 # XXX this does not guarantee returning the lowest

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

928 # introduction of this revision, but this gives a

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

929 # result which is a good start and will fit in most

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

930 # cases. We probably need to fix the multiple

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

931 # introductions case properly (report each

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

932 # introduction, even for identical file revisions)

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

933 # once and for all at some point anyway.

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

934 for p in repo[childcrev][f].parents():

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

935 if p.filerev() == fr:

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

936 rev = p.rev()

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

937 break

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

938 if rev == lkr: # no shadowed entry found

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

939 # XXX This should never happen unless some manifest points

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

940 # to biggish file revisions (like a revision that uses a

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

941 # parent that never appears in the manifest ancestors)

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

942 continue

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

943

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

944 # Fill the data for the next iteration.

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

945 for p in fl.parentrevs(fr):

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

946 if 0 <= p and p not in lowestchild:

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

947 lowestchild[p] = fr

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

948 backrevref[fr] = rev

34364a4b25eb linkrev: work around linkrev to filtered entry in 'filelog' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23716

diff changeset

949 s.add(rev)

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

950

22534

6261b9c549a2 revset: use `subset &` in `filelog`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22533

diff changeset

951 return subset & s

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

952

15117

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

953 def first(repo, subset, x):

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

954 """``first(set, [n])``

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

955 An alias for limit().

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

956 """

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

957 return limit(repo, subset, x)

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

958

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

959 def _follow(repo, subset, x, name, followfirst=False):

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

960 l = getargs(x, 0, 1, _("%s takes no arguments or a filename") % name)

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

961 c = repo['.']

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

962 if l:

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

963 x = getstring(l[0], _("%s expected a filename") % name)

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

964 if x in c:

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

965 cx = c[x]

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

966 s = set(ctx.rev() for ctx in cx.ancestors(followfirst=followfirst))

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

967 # include the revision responsible for the most recent version

23716

c624fb2c4239 linkrev: also adjust linkrev when bootstrapping 'follow' revset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23467

diff changeset

968 s.add(cx.introrev())

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

969 else:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

970 return baseset()

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

971 else:

20690

13c0327eeb6f revset: changed ancestors revset to return lazy generators

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20659

diff changeset

972 s = _revancestors(repo, baseset([c.rev()]), followfirst)

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

973

22535

44f471102f3a revset: use `subset &` in `follow`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22534

diff changeset

974 return subset & s

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

975

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

976 def follow(repo, subset, x):

14343

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

977 """``follow([file])``

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

978 An alias for ``::.`` (ancestors of the working copy's first parent).

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

979 If a filename is specified, the history of the given file is followed,

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

980 including copies.

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

981 """

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

982 return _follow(repo, subset, x, 'follow')

14343

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

983

16174

0a73c4bd9f47 graphlog: implement --follow-first

Patrick Mezard <patrick@mezard.eu>

parents: 16161

diff changeset

984 def _followfirst(repo, subset, x):

0a73c4bd9f47 graphlog: implement --follow-first

Patrick Mezard <patrick@mezard.eu>

parents: 16161

diff changeset

985 # ``followfirst([file])``

0a73c4bd9f47 graphlog: implement --follow-first

Patrick Mezard <patrick@mezard.eu>

parents: 16161

diff changeset

986 # Like ``follow([file])`` but follows only the first parent of

0a73c4bd9f47 graphlog: implement --follow-first

Patrick Mezard <patrick@mezard.eu>

parents: 16161

diff changeset

987 # every revision or file revision.

16185

352053e6cd8e context: add followfirst arg to filectx and workingfilectx

Patrick Mezard <patrick@mezard.eu>

parents: 16181

diff changeset

988 return _follow(repo, subset, x, '_followfirst', followfirst=True)

14343

9ed227f79e47 revset: add follow(filename) to follow a filename's history across copies

Matt Mackall <mpm@selenic.com>

parents: 14342

diff changeset

989

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

990 def getall(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

991 """``all()``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

992 All changesets, the same as ``0:tip``.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

993 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

994 # i18n: "all" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

995 getargs(x, 0, 0, _("all takes no arguments"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

996 return subset

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

997

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

998 def grep(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

999 """``grep(regex)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1000 Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``

14357

cb4ff8ef466b merge with stable

Martin Geisler <mg@aragost.com>

parents: 14343 14356

diff changeset

1001 to ensure special escape characters are handled correctly. Unlike

cb4ff8ef466b merge with stable

Martin Geisler <mg@aragost.com>

parents: 14343 14356

diff changeset

1002 ``keyword(string)``, the match is case-sensitive.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1003 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1004 try:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1005 # i18n: "grep" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1006 gr = re.compile(getstring(x, _("grep requires a string")))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1007 except re.error, e:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1008 raise error.ParseError(_('invalid match pattern: %s') % e)

20453

6aa7dcae6bd8 revset: added lazyset implementation to grep revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20452

diff changeset

1009

6aa7dcae6bd8 revset: added lazyset implementation to grep revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20452

diff changeset

1010 def matches(x):

6aa7dcae6bd8 revset: added lazyset implementation to grep revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20452

diff changeset

1011 c = repo[x]

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1012 for e in c.files() + [c.user(), c.description()]:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1013 if gr.search(e):

20453

6aa7dcae6bd8 revset: added lazyset implementation to grep revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20452

diff changeset

1014 return True

6aa7dcae6bd8 revset: added lazyset implementation to grep revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20452

diff changeset

1015 return False

6aa7dcae6bd8 revset: added lazyset implementation to grep revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20452

diff changeset

1016

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

1017 return subset.filter(matches)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1018

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1019 def _matchfiles(repo, subset, x):

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1020 # _matchfiles takes a revset list of prefixed arguments:

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1021 #

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1022 # [p:foo, i:bar, x:baz]

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1023 #

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1024 # builds a match object from them and filters subset. Allowed

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1025 # prefixes are 'p:' for regular patterns, 'i:' for include

16181

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1026 # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1027 # a revision identifier, or the empty string to reference the

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1028 # working directory, from which the match object is

16411

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1029 # initialized. Use 'd:' to set the default matching mode, default

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1030 # to 'glob'. At most one 'r:' and 'd:' argument can be passed.

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1031

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1032 # i18n: "_matchfiles" is a keyword

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1033 l = getargs(x, 1, -1, _("_matchfiles requires at least one argument"))

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1034 pats, inc, exc = [], [], []

16411

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1035 rev, default = None, None

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1036 for arg in l:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1037 # i18n: "_matchfiles" is a keyword

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1038 s = getstring(arg, _("_matchfiles requires string arguments"))

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1039 prefix, value = s[:2], s[2:]

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1040 if prefix == 'p:':

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1041 pats.append(value)

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1042 elif prefix == 'i:':

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1043 inc.append(value)

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1044 elif prefix == 'x:':

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1045 exc.append(value)

16181

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1046 elif prefix == 'r:':

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1047 if rev is not None:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1048 # i18n: "_matchfiles" is a keyword

16181

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1049 raise error.ParseError(_('_matchfiles expected at most one '

1fd352aa08fc graphlog: evaluate FILE/-I/-X filesets on the working dir

Patrick Mezard <patrick@mezard.eu>

parents: 16174

diff changeset

1050 'revision'))

16411

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1053 elif prefix == 'd:':

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1054 if default is not None:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1055 # i18n: "_matchfiles" is a keyword

16411

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1056 raise error.ParseError(_('_matchfiles expected at most one '

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1057 'default mode'))

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1058 default = value

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1059 else:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1060 # i18n: "_matchfiles" is a keyword

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1061 raise error.ParseError(_('invalid _matchfiles prefix: %s') % prefix)

16411

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1062 if not default:

4c2edcd84175 graphlog: correctly handle calls in subdirectories

Patrick Mezard <patrick@mezard.eu>

parents: 16409

diff changeset

1063 default = 'glob'

20458

8dabcc889e33 revset: added lazyset implementation to _matchfiles

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20457

diff changeset

1064

23061

f2aeff8a87b6 revset: avoid recalculating filesets

Matt Mackall <mpm@selenic.com>

parents: 23019

diff changeset

1065 m = matchmod.match(repo.root, repo.getcwd(), pats, include=inc,

f2aeff8a87b6 revset: avoid recalculating filesets

Matt Mackall <mpm@selenic.com>

parents: 23019

diff changeset

1066 exclude=exc, ctx=repo[rev], default=default)

f2aeff8a87b6 revset: avoid recalculating filesets

Matt Mackall <mpm@selenic.com>

parents: 23019

diff changeset

1067

20458

8dabcc889e33 revset: added lazyset implementation to _matchfiles

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20457

diff changeset

1068 def matches(x):

23061

f2aeff8a87b6 revset: avoid recalculating filesets

Matt Mackall <mpm@selenic.com>

parents: 23019

diff changeset

1069 for f in repo[x].files():

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1070 if m(f):

20458

8dabcc889e33 revset: added lazyset implementation to _matchfiles

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20457

diff changeset

1071 return True

8dabcc889e33 revset: added lazyset implementation to _matchfiles

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20457

diff changeset

1072 return False

8dabcc889e33 revset: added lazyset implementation to _matchfiles

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20457

diff changeset

1073

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

1074 return subset.filter(matches)

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1075

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1076 def hasfile(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1077 """``file(pattern)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1078 Changesets affecting files matched by pattern.

17244

483aa765f6c4 revset: add explanation about difference between 'filelog()' and 'file()'

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17186

diff changeset

1079

17265

c30307eeec4b revset: polish explanation of the difference between file() and filelog()

Greg Ward <greg@gerg.ca>

parents: 17260

diff changeset

1080 For a faster but less accurate result, consider using ``filelog()``

c30307eeec4b revset: polish explanation of the difference between file() and filelog()

Greg Ward <greg@gerg.ca>

parents: 17260

diff changeset

1081 instead.

20289

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1082

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1083 This predicate uses ``glob:`` as the default kind of pattern.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1084 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1085 # i18n: "file" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1086 pat = getstring(x, _("file requires a pattern"))

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1087 return _matchfiles(repo, subset, ('string', 'p:' + pat))

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1088

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1089 def head(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1090 """``head()``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1091 Changeset is a named branch head.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1092 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1093 # i18n: "head" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1094 getargs(x, 0, 0, _("head takes no arguments"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1095 hs = set()

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1096 for b, ls in repo.branchmap().iteritems():

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1097 hs.update(repo[h].rev() for h in ls)

20714

6a1a4c212d50 revset: improve head revset performance

Durham Goode <durham@fb.com>

parents: 20712

diff changeset

1098 return baseset(hs).filter(subset.__contains__)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1099

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1100 def heads(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1101 """``heads(set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1102 Members of set with no children in set.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1103 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1104 s = getset(repo, subset, x)

20366

5ec6321f49a9 revset: added substraction to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20365

diff changeset

1105 ps = parents(repo, subset, x)

5ec6321f49a9 revset: added substraction to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20365

diff changeset

1106 return s - ps

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1107

17390

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1108 def hidden(repo, subset, x):

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1109 """``hidden()``

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1110 Hidden changesets.

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1111 """

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1112 # i18n: "hidden" is a keyword

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1113 getargs(x, 0, 0, _("hidden takes no arguments"))

18382

f3b21beb9802 filtering: rename filters to their antonyms

Kevin Bullock <kbullock@ringworld.org>

parents: 18251

diff changeset

1114 hiddenrevs = repoview.filterrevs(repo, 'visible')

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1115 return subset & hiddenrevs

17390

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1116

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1117 def keyword(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1118 """``keyword(string)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1119 Search commit message, user name, and names of changed files for

14357

cb4ff8ef466b merge with stable

Martin Geisler <mg@aragost.com>

parents: 14343 14356

diff changeset

1120 string. The match is case-insensitive.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1121 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1122 # i18n: "keyword" is a keyword

15726

9b822edecb4c i18n: use "encoding.lower()" to normalize specified string for revset

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 15596

diff changeset

1123 kw = encoding.lower(getstring(x, _("keyword requires a string")))

20447

abb91b74f758 revset: added lazyset implementation to keyword revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20446

diff changeset

1124

abb91b74f758 revset: added lazyset implementation to keyword revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20446

diff changeset

1125 def matches(r):

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1126 c = repo[r]

20447

abb91b74f758 revset: added lazyset implementation to keyword revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20446

diff changeset

1127 return util.any(kw in encoding.lower(t) for t in c.files() + [c.user(),

abb91b74f758 revset: added lazyset implementation to keyword revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20446

diff changeset

1128 c.description()])

abb91b74f758 revset: added lazyset implementation to keyword revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20446

diff changeset

1129

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

1130 return subset.filter(matches)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1131

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1132 def limit(repo, subset, x):

15116

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1133 """``limit(set, [n])``

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1134 First n members of set, defaulting to 1.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1135 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1136 # i18n: "limit" is a keyword

15116

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1137 l = getargs(x, 1, 2, _("limit requires one or two arguments"))

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1138 try:

15116

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1139 lim = 1

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1140 if len(l) == 2:

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1141 # i18n: "limit" is a keyword

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1142 lim = int(getstring(l[1], _("limit requires a number")))

14856

f96c354493d7 revsets: actually catch type error on tip^p1(tip) (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14842

diff changeset

1143 except (TypeError, ValueError):

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1144 # i18n: "limit" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1145 raise error.ParseError(_("limit expects a number"))

22870

970d78f3f47c revset-limit: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22869

diff changeset

1146 ss = subset

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

1147 os = getset(repo, spanset(repo), l[0])

22804

5385314e0b14 revset-limit: remove user of baseset.append

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22802

diff changeset

1148 result = []

20446

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1149 it = iter(os)

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1150 for x in xrange(lim):

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1151 try:

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1152 y = it.next()

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1153 if y in ss:

22804

5385314e0b14 revset-limit: remove user of baseset.append

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22802

diff changeset

1154 result.append(y)

20446

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1155 except (StopIteration):

d258486604f4 revset: changed limit revset implementation to work with lazy revsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20445

diff changeset

1156 break

22804

5385314e0b14 revset-limit: remove user of baseset.append

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22802

diff changeset

1157 return baseset(result)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1158

14061

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1159 def last(repo, subset, x):

15116

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1160 """``last(set, [n])``

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1161 Last n members of set, defaulting to 1.

14061

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1162 """

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1163 # i18n: "last" is a keyword

15116

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1164 l = getargs(x, 1, 2, _("last requires one or two arguments"))

14061

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1165 try:

15116

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1166 lim = 1

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1167 if len(l) == 2:

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1168 # i18n: "last" is a keyword

d8501bcbb221 revset: add default of 1 to limit and last functions

Matt Mackall <mpm@selenic.com>

parents: 14901

diff changeset

1169 lim = int(getstring(l[1], _("last requires a number")))

14856

f96c354493d7 revsets: actually catch type error on tip^p1(tip) (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14842

diff changeset

1170 except (TypeError, ValueError):

14061

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1171 # i18n: "last" is a keyword

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1172 raise error.ParseError(_("last expects a number"))

22871

9b73ab9bcbfb revset-last: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22870

diff changeset

1173 ss = subset

20534

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1174 os = getset(repo, spanset(repo), l[0])

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1175 os.reverse()

22805

e74245b79901 revset-last: remove user of baseset.append

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22804

diff changeset

1176 result = []

20534

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1177 it = iter(os)

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1178 for x in xrange(lim):

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1179 try:

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1180 y = it.next()

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1181 if y in ss:

22805

e74245b79901 revset-last: remove user of baseset.append

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22804

diff changeset

1182 result.append(y)

20534

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1183 except (StopIteration):

4849f574aa24 revset: changed last implementation to use lazy classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20527

diff changeset

1184 break

22805

e74245b79901 revset-last: remove user of baseset.append

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22804

diff changeset

1185 return baseset(result)

14061

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1186

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1187 def maxrev(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1188 """``max(set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1189 Changeset with highest revision number in set.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1190 """

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

1191 os = getset(repo, spanset(repo), x)

14142

f8047a059ca0 revset: avoid over-aggresive optimizations of non-filtering functions (issue2549)

Mads Kiilerich <mads@kiilerich.com>

parents: 14098

diff changeset

1192 if os:

20754

f15ff553b762 revset: changed minrev and maxrev implementations to use ordered sets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20753

diff changeset

1193 m = os.max()

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1194 if m in subset:

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

1195 return baseset([m])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1196 return baseset()

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1197

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1198 def merge(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1199 """``merge()``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1200 Changeset is a merge changeset.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1201 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1202 # i18n: "merge" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1203 getargs(x, 0, 0, _("merge takes no arguments"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1204 cl = repo.changelog

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

1205 return subset.filter(lambda r: cl.parentrevs(r)[1] != -1)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1206

17753

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1207 def branchpoint(repo, subset, x):

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1208 """``branchpoint()``

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1209 Changesets with more than one child.

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1210 """

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1211 # i18n: "branchpoint" is a keyword

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1212 getargs(x, 0, 0, _("branchpoint takes no arguments"))

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1213 cl = repo.changelog

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1214 if not subset:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1215 return baseset()

17753

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1216 baserev = min(subset)

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1217 parentscount = [0]*(len(repo) - baserev)

17785

ac5c9c8046f7 clfilter: use changelog to iterate over the repo in branchpoint

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17753

diff changeset

1218 for r in cl.revs(start=baserev + 1):

17753

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1219 for p in cl.parentrevs(r):

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1220 if p >= baserev:

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1221 parentscount[p - baserev] += 1

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

1222 return subset.filter(lambda r: parentscount[r - baserev] > 1)

17753

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1223

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1224 def minrev(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1225 """``min(set)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1226 Changeset with lowest revision number in set.

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1227 """

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

1228 os = getset(repo, spanset(repo), x)

14142

f8047a059ca0 revset: avoid over-aggresive optimizations of non-filtering functions (issue2549)

Mads Kiilerich <mads@kiilerich.com>

parents: 14098

diff changeset

1229 if os:

20754

f15ff553b762 revset: changed minrev and maxrev implementations to use ordered sets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20753

diff changeset

1230 m = os.min()

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1231 if m in subset:

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

1232 return baseset([m])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1233 return baseset()

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1234

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1235 def modifies(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1236 """``modifies(pattern)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1237 Changesets modifying files matched by pattern.

20289

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1238

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1239 The pattern without explicit kind like ``glob:`` is expected to be

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1240 relative to the current directory and match against a file or a

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1241 directory.

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1242 """

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1243 # i18n: "modifies" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1244 pat = getstring(x, _("modifies requires a pattern"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1245 return checkstatus(repo, subset, pat, 0)

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1246

23848

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1247 def named(repo, subset, x):

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1248 """``named(namespace)``

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1249 The changesets in a given namespace.

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1250

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1251 If `namespace` starts with `re:`, the remainder of the string is treated as

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1252 a regular expression. To match a namespace that actually starts with `re:`,

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1253 use the prefix `literal:`.

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1254 """

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1255 # i18n: "named" is a keyword

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1256 args = getargs(x, 1, 1, _('named requires a namespace argument'))

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1257

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1258 ns = getstring(args[0],

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1259 # i18n: "named" is a keyword

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1260 _('the argument to named must be a string'))

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1261 kind, pattern, matcher = _stringmatcher(ns)

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1262 namespaces = set()

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1263 if kind == 'literal':

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1264 if pattern not in repo.names:

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1265 raise util.Abort(_("namespace '%s' does not exist") % ns)

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1266 namespaces.add(repo.names[pattern])

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1267 else:

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1268 for name, ns in repo.names.iteritems():

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1269 if matcher(name):

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1270 namespaces.add(ns)

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1271 if not namespaces:

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1272 raise util.Abort(_("no namespace exists that match '%s'")

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1273 % pattern)

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1274

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1275 names = set()

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1276 for ns in namespaces:

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1277 for name in ns.listnames(repo):

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1278 names.update(ns.nodes(repo, name))

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1279

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1280 names -= set([node.nullrev])

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1281 return subset & names

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1282

16417

b4b0c6931e11 revset: avoid demandimport bug

Matt Mackall <mpm@selenic.com>

parents: 16415

diff changeset

1283 def node_(repo, subset, x):

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1284 """``id(string)``

12859

76066903ae08 revset: fix missing dot in docstring

Wagner Bruna <wbruna@yahoo.com>

parents: 12855

diff changeset

1285 Revision non-ambiguously specified by the given hex string prefix.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1286 """

12815

079a618ea89d revset: add translator comments to i18n strings

Martin Geisler <mg@lazybytes.net>

parents: 12787

diff changeset

1287 # i18n: "id" is a keyword

12736

7e14e67e6622 revset: use 'requires' instead of 'wants' in error message

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 12733

diff changeset

1288 l = getargs(x, 1, 1, _("id requires one argument"))

12815

079a618ea89d revset: add translator comments to i18n strings

Martin Geisler <mg@lazybytes.net>

parents: 12787

diff changeset

1289 # i18n: "id" is a keyword

12736

7e14e67e6622 revset: use 'requires' instead of 'wants' in error message

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 12733

diff changeset

1290 n = getstring(l[0], _("id requires a string"))

12717

c7e619e30ba3 revset: add id() and rev() to allow explicitly referring to changes by hash or rev

Augie Fackler <durin42@gmail.com>

parents: 12716

diff changeset

1291 if len(n) == 40:

c7e619e30ba3 revset: add id() and rev() to allow explicitly referring to changes by hash or rev

Augie Fackler <durin42@gmail.com>

parents: 12716

diff changeset

1292 rn = repo[n].rev()

c7e619e30ba3 revset: add id() and rev() to allow explicitly referring to changes by hash or rev

Augie Fackler <durin42@gmail.com>

parents: 12716

diff changeset

1293 else:

16735

47b8ec0eb7fb revset: fix traceback for bogus revisions in id(rev)

Matt Harbison <matt_harbison@yahoo.com>

parents: 16648

diff changeset

1294 rn = None

47b8ec0eb7fb revset: fix traceback for bogus revisions in id(rev)

Matt Harbison <matt_harbison@yahoo.com>

parents: 16648

diff changeset

1295 pm = repo.changelog._partialmatch(n)

47b8ec0eb7fb revset: fix traceback for bogus revisions in id(rev)

Matt Harbison <matt_harbison@yahoo.com>

parents: 16648

diff changeset

1296 if pm is not None:

47b8ec0eb7fb revset: fix traceback for bogus revisions in id(rev)

Matt Harbison <matt_harbison@yahoo.com>

parents: 16648

diff changeset

1297 rn = repo.changelog.rev(pm)

47b8ec0eb7fb revset: fix traceback for bogus revisions in id(rev)

Matt Harbison <matt_harbison@yahoo.com>

parents: 16648

diff changeset

1298

23005

9bfe68357c01 revset-node: speedup by a few hundred fold

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23004

diff changeset

1299 if rn is None:

9bfe68357c01 revset-node: speedup by a few hundred fold

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23004

diff changeset

1300 return baseset()

9bfe68357c01 revset-node: speedup by a few hundred fold

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23004

diff changeset

1301 result = baseset([rn])

9bfe68357c01 revset-node: speedup by a few hundred fold

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23004

diff changeset

1302 return result & subset

12717

c7e619e30ba3 revset: add id() and rev() to allow explicitly referring to changes by hash or rev

Augie Fackler <durin42@gmail.com>

parents: 12716

diff changeset

1303

17170

63a4a3871607 revset: add an `obsolete` symbol

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17102

diff changeset

1304 def obsolete(repo, subset, x):

63a4a3871607 revset: add an `obsolete` symbol

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17102

diff changeset

1305 """``obsolete()``

63a4a3871607 revset: add an `obsolete` symbol

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17102

diff changeset

1306 Mutable changeset with a newer version."""

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1307 # i18n: "obsolete" is a keyword

17170

63a4a3871607 revset: add an `obsolete` symbol

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17102

diff changeset

1308 getargs(x, 0, 0, _("obsolete takes no arguments"))

17825

3cc06457f15e obsolete: rename `getobscache` into `getrevs`

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17804

diff changeset

1309 obsoletes = obsmod.getrevs(repo, 'obsolete')

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1310 return subset & obsoletes

17170

63a4a3871607 revset: add an `obsolete` symbol

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17102

diff changeset

1311

23466

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1312 def only(repo, subset, x):

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1313 """``only(set, [set])``

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1314 Changesets that are ancestors of the first set that are not ancestors

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1315 of any other head in the repo. If a second set is specified, the result

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1316 is ancestors of the first set that are not ancestors of the second set

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1317 (i.e. ::<set1> - ::<set2>).

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1318 """

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1319 cl = repo.changelog

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1320 # i18n: "only" is a keyword

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1321 args = getargs(x, 1, 2, _('only takes one or two arguments'))

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1322 include = getset(repo, spanset(repo), args[0])

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1323 if len(args) == 1:

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1324 if not include:

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1325 return baseset()

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1326

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1327 descendants = set(_revdescendants(repo, include, False))

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1328 exclude = [rev for rev in cl.headrevs()

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1329 if not rev in descendants and not rev in include]

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1330 else:

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1331 exclude = getset(repo, spanset(repo), args[1])

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1332

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1333 results = set(cl.findmissingrevs(common=exclude, heads=include))

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1334 return subset & results

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1335

17185

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1336 def origin(repo, subset, x):

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1337 """``origin([set])``

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1338 Changesets that were specified as a source for the grafts, transplants or

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1339 rebases that created the given revisions. Omitting the optional set is the

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1340 same as passing all(). If a changeset created by these operations is itself

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1341 specified as a source for one of these operations, only the source changeset

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1342 for the first operation is selected.

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1343 """

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1344 if x is not None:

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

1345 dests = getset(repo, spanset(repo), x)

17185

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1346 else:

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

1347 dests = getall(repo, spanset(repo), x)

17185

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1348

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1349 def _firstsrc(rev):

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1350 src = _getrevsource(repo, rev)

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1351 if src is None:

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1352 return None

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1353

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1354 while True:

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1355 prev = _getrevsource(repo, src)

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1356

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1357 if prev is None:

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1358 return src

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1359 src = prev

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1360

22944

5aae3dea8044 revset: better naming of variables containing the value of a single argument

Mads Kiilerich <madski@unity3d.com>

parents: 22891

diff changeset

1361 o = set([_firstsrc(r) for r in dests])

22498

64673dc48931 revset: remove invalid value in the origin set

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22497

diff changeset

1362 o -= set([None])

22536

8040a44aab1c revset: use `subset &` in `origin`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22535

diff changeset

1363 return subset & o

17185

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1364

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1365 def outgoing(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1366 """``outgoing([path])``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1367 Changesets not found in the specified destination repository, or the

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1368 default push location.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1369 """

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1370 import hg # avoid start-up nasties

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1371 # i18n: "outgoing" is a keyword

14717

c8ee2729e89f revset and fileset: fix typos in parser error messages

Mads Kiilerich <mads@kiilerich.com>

parents: 14715

diff changeset

1372 l = getargs(x, 0, 1, _("outgoing takes one or no arguments"))

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1373 # i18n: "outgoing" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1374 dest = l and getstring(l[0], _("outgoing requires a repository path")) or ''

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1375 dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1376 dest, branches = hg.parseurl(dest)

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1377 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1378 if revs:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1379 revs = [repo.lookup(rev) for rev in revs]

14556

517e1d88bf7e hg: change various repository() users to use peer() where appropriate

Matt Mackall <mpm@selenic.com>

parents: 14509

diff changeset

1380 other = hg.peer(repo, {}, dest)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1381 repo.ui.pushbuffer()

15837

cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15819

diff changeset

1382 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1383 repo.ui.popbuffer()

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1384 cl = repo.changelog

15837

cd956049fc14 discovery: introduce outgoing object for result of findcommonoutgoing

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15819

diff changeset

1385 o = set([cl.rev(r) for r in outgoing.missing])

22529

5c53d7888aef revset: use `subset &` in `outgoing`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22528

diff changeset

1386 return subset & o

12717

c7e619e30ba3 revset: add id() and rev() to allow explicitly referring to changes by hash or rev

Augie Fackler <durin42@gmail.com>

parents: 12716

diff changeset

1387

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1388 def p1(repo, subset, x):

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1389 """``p1([set])``

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1390 First parent of changesets in set, or the working directory.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1391 """

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1392 if x is None:

13878

a8d13ee0ce68 misc: replace .parents()[0] with p1()

Matt Mackall <mpm@selenic.com>

parents: 13873

diff changeset

1393 p = repo[x].p1().rev()

22538

a428db9ab61d revset: use `subset &` in bare `p1()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22537

diff changeset

1394 if p >= 0:

a428db9ab61d revset: use `subset &` in bare `p1()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22537

diff changeset

1395 return subset & baseset([p])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1396 return baseset()

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1397

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1398 ps = set()

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1399 cl = repo.changelog

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

1400 for r in getset(repo, spanset(repo), x):

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1401 ps.add(cl.parentrevs(r)[0])

22495

668b26d32bf6 revset: remove nullrev from set computed in p1() and p2()

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22494

diff changeset

1402 ps -= set([node.nullrev])

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1403 return subset & ps

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1404

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1405 def p2(repo, subset, x):

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1406 """``p2([set])``

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1407 Second parent of changesets in set, or the working directory.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1408 """

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1409 if x is None:

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1410 ps = repo[x].parents()

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1411 try:

12935

98b79c892768 revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)

Patrick Mezard <pmezard@gmail.com>

parents: 12929

diff changeset

1412 p = ps[1].rev()

22539

6f434ef54222 revset: use `subset &` in bare `p2()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22538

diff changeset

1413 if p >= 0:

6f434ef54222 revset: use `subset &` in bare `p2()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22538

diff changeset

1414 return subset & baseset([p])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1415 return baseset()

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1416 except IndexError:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1417 return baseset()

12928

a5f7f1e9340e revsets: let p1() and p2() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12859

diff changeset

1418

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1419 ps = set()

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1420 cl = repo.changelog

20526

9ad6dae67845 revset: changed revsets to use spanset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20525

diff changeset

1421 for r in getset(repo, spanset(repo), x):

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1422 ps.add(cl.parentrevs(r)[1])

22495

668b26d32bf6 revset: remove nullrev from set computed in p1() and p2()

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22494

diff changeset

1423 ps -= set([node.nullrev])

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1424 return subset & ps

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1425

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1426 def parents(repo, subset, x):

12929

515c2786e1cf revsets: let parents() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12928

diff changeset

1427 """``parents([set])``

515c2786e1cf revsets: let parents() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12928

diff changeset

1428 The set of all parents for all changesets in set, or the working directory.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1429 """

12929

515c2786e1cf revsets: let parents() return parents of working dir

Kevin Bullock <kbullock@ringworld.org>

parents: 12928

diff changeset

1430 if x is None:

22496

35af9361a049 revset: refactor parents() into a single return point

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22495

diff changeset

1431 ps = set(p.rev() for p in repo[x].parents())

35af9361a049 revset: refactor parents() into a single return point

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22495

diff changeset

1432 else:

35af9361a049 revset: refactor parents() into a single return point

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22495

diff changeset

1433 ps = set()

35af9361a049 revset: refactor parents() into a single return point

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22495

diff changeset

1434 cl = repo.changelog

35af9361a049 revset: refactor parents() into a single return point

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22495

diff changeset

1435 for r in getset(repo, spanset(repo), x):

35af9361a049 revset: refactor parents() into a single return point

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22495

diff changeset

1436 ps.update(cl.parentrevs(r))

22497

8ea3f47bcaff revset: remove nullrev from set computed in parents()

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22496

diff changeset

1437 ps -= set([node.nullrev])

22712

093df3b77f27 revert: bring back usage of `subset & ps` in `parents`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22692

diff changeset

1438 return subset & ps

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1439

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1440 def parentspec(repo, subset, x, n):

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1441 """``set^0``

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1442 The set.

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1443 ``set^1`` (or ``set^``), ``set^2``

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1444 First or second parent, respectively, of all changesets in set.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1445 """

12320

40c40c6f20b8 revset: handle re.compile() errors in grep()

Brodie Rao <brodie@bitheap.org>

parents: 11882

diff changeset

1446 try:

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1447 n = int(n[1])

14072

2e4d79dcc0a0 revset: add missing whitespace

Kevin Gessner <kevin@kevingessner.com>

parents: 14070

diff changeset

1448 if n not in (0, 1, 2):

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1449 raise ValueError

14856

f96c354493d7 revsets: actually catch type error on tip^p1(tip) (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14842

diff changeset

1450 except (TypeError, ValueError):

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1451 raise error.ParseError(_("^ expects a number 0, 1, or 2"))

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1452 ps = set()

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1453 cl = repo.changelog

23165

7e8737e6ab08 revset-parentspec: call 'getset' on a 'fullreposet'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23164

diff changeset

1454 for r in getset(repo, fullreposet(repo), x):

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1455 if n == 0:

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1456 ps.add(r)

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1457 elif n == 1:

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1458 ps.add(cl.parentrevs(r)[0])

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1459 elif n == 2:

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1460 parents = cl.parentrevs(r)

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1461 if len(parents) > 1:

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

1462 ps.add(parents[1])

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1463 return subset & ps

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1464

11944

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1465 def present(repo, subset, x):

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1466 """``present(set)``

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1467 An empty set, if any revision in set isn't found; otherwise,

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1468 all revisions in set.

16748

0a730d3c5aae doc: add detail explanation for 'present()' predicate of revsets

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16735

diff changeset

1469

0a730d3c5aae doc: add detail explanation for 'present()' predicate of revsets

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16735

diff changeset

1470 If any of specified revisions is not present in the local repository,

0a730d3c5aae doc: add detail explanation for 'present()' predicate of revsets

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16735

diff changeset

1471 the query is normally aborted. But this predicate allows the query

0a730d3c5aae doc: add detail explanation for 'present()' predicate of revsets

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16735

diff changeset

1472 to continue even in such cases.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1473 """

11944

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1474 try:

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1475 return getset(repo, subset, x)

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1476 except error.RepoLookupError:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1477 return baseset()

11944

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1478

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1479 def public(repo, subset, x):

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1480 """``public()``

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1481 Changeset in public phase."""

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1482 # i18n: "public" is a keyword

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1483 getargs(x, 0, 0, _("public takes no arguments"))

23019

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

1484 phase = repo._phasecache.phase

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

1485 target = phases.public

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

1486 condition = lambda r: phase(repo, r) == target

23018

73d9d5548dfe revset-phases: do not cache phase-related filters

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23005

diff changeset

1487 return subset.filter(condition, cache=False)

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1488

15936

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1489 def remote(repo, subset, x):

16010

f06c53ca59a9 revset: fix documentation for 'remote()' predicate

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16009

diff changeset

1490 """``remote([id [,path]])``

15936

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1491 Local revision that corresponds to the given identifier in a

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1492 remote repository, if present. Here, the '.' identifier is a

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1493 synonym for the current local branch.

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1494 """

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1495

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1496 import hg # avoid start-up nasties

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1497 # i18n: "remote" is a keyword

16010

f06c53ca59a9 revset: fix documentation for 'remote()' predicate

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16009

diff changeset

1498 l = getargs(x, 0, 2, _("remote takes one, two or no arguments"))

15936

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1499

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1500 q = '.'

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1501 if len(l) > 0:

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1502 # i18n: "remote" is a keyword

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1503 q = getstring(l[0], _("remote requires a string id"))

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1504 if q == '.':

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1505 q = repo['.'].branch()

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1506

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1507 dest = ''

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1508 if len(l) > 1:

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1509 # i18n: "remote" is a keyword

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1510 dest = getstring(l[1], _("remote requires a repository path"))

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1511 dest = repo.ui.expandpath(dest or 'default')

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1512 dest, branches = hg.parseurl(dest)

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1513 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1514 if revs:

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1515 revs = [repo.lookup(rev) for rev in revs]

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1516 other = hg.peer(repo, {}, dest)

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1517 n = other.lookup(q)

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1518 if n in repo:

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1519 r = repo[n].rev()

16009

39e60576ac98 revset: fix 'remote()' failure when remote repo has more revs than local

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 15966

diff changeset

1520 if r in subset:

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

1521 return baseset([r])

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1522 return baseset()

15936

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1523

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1524 def removes(repo, subset, x):

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1525 """``removes(pattern)``

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1526 Changesets which remove files matching pattern.

20289

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1527

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1528 The pattern without explicit kind like ``glob:`` is expected to be

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1529 relative to the current directory and match against a file or a

96be25f1da45 revset: add explanation about the pattern without explicit kind

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 20288

diff changeset

1530 directory.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1531 """

12815

079a618ea89d revset: add translator comments to i18n strings

Martin Geisler <mg@lazybytes.net>

parents: 12787

diff changeset

1532 # i18n: "removes" is a keyword

12736

7e14e67e6622 revset: use 'requires' instead of 'wants' in error message

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 12733

diff changeset

1533 pat = getstring(x, _("removes requires a pattern"))

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1534 return checkstatus(repo, subset, pat, 2)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1535

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1536 def rev(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1537 """``rev(number)``

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1538 Revision with the given numeric identifier.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1539 """

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1540 # i18n: "rev" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1541 l = getargs(x, 1, 1, _("rev requires one argument"))

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1542 try:

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1543 # i18n: "rev" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1544 l = int(getstring(l[0], _("rev requires a number")))

14856

f96c354493d7 revsets: actually catch type error on tip^p1(tip) (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14842

diff changeset

1545 except (TypeError, ValueError):

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1546 # i18n: "rev" is a keyword

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1547 raise error.ParseError(_("rev expects a number"))

23078

eb763217152a revset: avoid O(n) lookup of invalid revision in rev()

Yuya Nishihara <yuya@tcha.org>

parents: 23062

diff changeset

1548 if l not in fullreposet(repo):

23062

ba89f7b542c9 revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)

Yuya Nishihara <yuya@tcha.org>

parents: 23061

diff changeset

1549 return baseset()

22537

bbf4f3dfd700 revset: use `subset &` in `rev`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22536

diff changeset

1550 return subset & baseset([l])

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1551

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1552 def matching(repo, subset, x):

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1553 """``matching(revision [, field])``

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1554 Changesets in which a given set of fields match the set of fields in the

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1555 selected revision or set.

16528

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1556

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1557 To match more than one field pass the list of fields to match separated

16528

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1558 by spaces (e.g. ``author description``).

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1559

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1560 Valid fields are most regular revision fields and some special fields.

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1561

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1562 Regular revision fields are ``description``, ``author``, ``branch``,

17102

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1563 ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1564 and ``diff``.

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1565 Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1566 contents of the revision. Two revisions matching their ``diff`` will

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1567 also match their ``files``.

16528

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1568

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1569 Special fields are ``summary`` and ``metadata``:

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1570 ``summary`` matches the first line of the description.

16647

00290bd359fe revset: documentation typo "metatadata"

Jesse Glick <jesse.glick@oracle.com>

parents: 16528

diff changeset

1571 ``metadata`` is equivalent to matching ``description user date``

16528

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1572 (i.e. it matches the main metadata fields).

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1573

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1574 ``metadata`` is the default field which is used when no fields are

5d803620ca05 doc: flatten description of 'matching()' predicate to be formatted well

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 16521

diff changeset

1575 specified. You can match more than one field at a time.

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1576 """

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1577 # i18n: "matching" is a keyword

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1578 l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments"))

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1579

23166

30e0dcd7c5ff revset-matching: call 'getset' on a 'fullreposet'

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23165

diff changeset

1580 revs = getset(repo, fullreposet(repo), l[0])

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1581

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1582 fieldlist = ['metadata']

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1583 if len(l) > 1:

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1584 fieldlist = getstring(l[1],

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1585 # i18n: "matching" is a keyword

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1586 _("matching requires a string "

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1587 "as its second argument")).split()

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1588

17102

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1589 # Make sure that there are no repeated fields,

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1590 # expand the 'special' 'metadata' field type

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1591 # and check the 'files' whenever we check the 'diff'

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1592 fields = []

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1593 for field in fieldlist:

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1594 if field == 'metadata':

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1595 fields += ['user', 'description', 'date']

17102

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1596 elif field == 'diff':

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1597 # a revision matching the diff must also match the files

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1598 # since matching the diff is very costly, make sure to

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1599 # also match the files first

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1600 fields += ['files', 'diff']

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1601 else:

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1602 if field == 'author':

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1603 field = 'user'

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1604 fields.append(field)

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1605 fields = set(fields)

16444

432f198600c6 revset: make matching keyword not match summary when matching for description

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16417

diff changeset

1606 if 'summary' in fields and 'description' in fields:

432f198600c6 revset: make matching keyword not match summary when matching for description

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16417

diff changeset

1607 # If a revision matches its description it also matches its summary

432f198600c6 revset: make matching keyword not match summary when matching for description

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16417

diff changeset

1608 fields.discard('summary')

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1609

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1610 # We may want to match more than one field

16446

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1611 # Not all fields take the same amount of time to be matched

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1612 # Sort the selected fields in order of increasing matching cost

16453

d2a865d4b963 revset: make matching() work on python 2.4

Patrick Mezard <patrick@mezard.eu>

parents: 16452

diff changeset

1613 fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary',

17102

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1614 'files', 'description', 'substate', 'diff']

16446

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1615 def fieldkeyfunc(f):

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1616 try:

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1617 return fieldorder.index(f)

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1618 except ValueError:

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1619 # assume an unknown field is very costly

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1620 return len(fieldorder)

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1621 fields = list(fields)

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1622 fields.sort(key=fieldkeyfunc)

984e0412e82b revset: speedup matching() by first matching fields that take less time to

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16445

diff changeset

1623

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1624 # Each field will be matched with its own "getfield" function

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1625 # which will be added to the getfieldfuncs array of functions

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1626 getfieldfuncs = []

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1627 _funcs = {

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1628 'user': lambda r: repo[r].user(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1629 'branch': lambda r: repo[r].branch(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1630 'date': lambda r: repo[r].date(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1631 'description': lambda r: repo[r].description(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1632 'files': lambda r: repo[r].files(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1633 'parents': lambda r: repo[r].parents(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1634 'phase': lambda r: repo[r].phase(),

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1635 'substate': lambda r: repo[r].substate,

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1636 'summary': lambda r: repo[r].description().splitlines()[0],

17102

d9a046ae4d8e revset: add "diff" field to "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 17100

diff changeset

1637 'diff': lambda r: list(repo[r].diff(git=True),)

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1638 }

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1639 for info in fields:

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1640 getfield = _funcs.get(info, None)

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1641 if getfield is None:

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1642 raise error.ParseError(

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1643 # i18n: "matching" is a keyword

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1644 _("unexpected field name passed to matching: %s") % info)

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1645 getfieldfuncs.append(getfield)

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1646 # convert the getfield array of functions into a "getinfo" function

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1647 # which returns an array of field values (or a single value if there

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1648 # is only one field to match)

16445

453c8670566c revset: speedup matching() by stopping the match early if a field does not match

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16444

diff changeset

1649 getinfo = lambda r: [f(r) for f in getfieldfuncs]

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1650

20459

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1651 def matches(x):

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1652 for rev in revs:

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1653 target = getinfo(rev)

16445

453c8670566c revset: speedup matching() by stopping the match early if a field does not match

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16444

diff changeset

1654 match = True

453c8670566c revset: speedup matching() by stopping the match early if a field does not match

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16444

diff changeset

1655 for n, f in enumerate(getfieldfuncs):

20459

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1656 if target[n] != f(x):

16445

453c8670566c revset: speedup matching() by stopping the match early if a field does not match

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16444

diff changeset

1657 match = False

453c8670566c revset: speedup matching() by stopping the match early if a field does not match

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16444

diff changeset

1658 if match:

20459

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1659 return True

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1660 return False

51890507c6b3 revset: added lazyset implementation to matching revset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20458

diff changeset

1661

20612

6490f8385391 revset: changed revset code to use filter method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20611

diff changeset

1662 return subset.filter(matches)

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1663

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1664 def reverse(repo, subset, x):

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1665 """``reverse(set)``

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1666 Reverse order of set.

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1667 """

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1668 l = getset(repo, subset, x)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1669 l.reverse()

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1670 return l

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1671

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1672 def roots(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1673 """``roots(set)``

16394

f3df7d34791e revset: do not ignore input revisions in roots()

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

1674 Changesets in set with no parent changeset in set.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1675 """

22874

e15027cc4cd8 revset-roots: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22872

diff changeset

1676 s = getset(repo, spanset(repo), x)

e15027cc4cd8 revset-roots: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22872

diff changeset

1677 subset = baseset([r for r in s if r in subset])

16394

f3df7d34791e revset: do not ignore input revisions in roots()

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

1678 cs = _children(repo, subset, s)

20366

5ec6321f49a9 revset: added substraction to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20365

diff changeset

1679 return subset - cs

11944

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1680

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1681 def secret(repo, subset, x):

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1682 """``secret()``

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1683 Changeset in secret phase."""

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1684 # i18n: "secret" is a keyword

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1685 getargs(x, 0, 0, _("secret takes no arguments"))

23019

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

1686 phase = repo._phasecache.phase

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

1687 target = phases.secret

c8f32accd00a revset-phases: prefetch attributes in phasesrelated revsets

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23018

diff changeset

1688 condition = lambda r: phase(repo, r) == target

23018

73d9d5548dfe revset-phases: do not cache phase-related filters

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23005

diff changeset

1689 return subset.filter(condition, cache=False)

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1690

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1691 def sort(repo, subset, x):

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1692 """``sort(set[, [-]key...])``

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1693 Sort set by keys. The default sort order is ascending, specify a key

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1694 as ``-key`` to sort in descending order.

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1695

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1696 The keys can be:

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1697

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1698 - ``rev`` for the revision number,

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1699 - ``branch`` for the branch name,

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1700 - ``desc`` for the commit message (description),

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1701 - ``user`` for user name (``author`` can be used as an alias),

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1702 - ``date`` for the commit date

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1703 """

12815

079a618ea89d revset: add translator comments to i18n strings

Martin Geisler <mg@lazybytes.net>

parents: 12787

diff changeset

1704 # i18n: "sort" is a keyword

12736

7e14e67e6622 revset: use 'requires' instead of 'wants' in error message

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 12733

diff changeset

1705 l = getargs(x, 1, 2, _("sort requires one or two arguments"))

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1706 keys = "rev"

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1707 if len(l) == 2:

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1708 # i18n: "sort" is a keyword

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

1709 keys = getstring(l[1], _("sort spec must be a string"))

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1710

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1711 s = l[0]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1712 keys = keys.split()

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1713 l = []

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1714 def invert(s):

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1715 return "".join(chr(255 - ord(c)) for c in s)

20719

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1716 revs = getset(repo, subset, s)

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1717 if keys == ["rev"]:

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1718 revs.sort()

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1719 return revs

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1720 elif keys == ["-rev"]:

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1721 revs.sort(reverse=True)

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1722 return revs

cce8fbedc82a revset: changed sort method to use native sort implementation of smartsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20718

diff changeset

1723 for r in revs:

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1724 c = repo[r]

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1725 e = []

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1726 for k in keys:

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1727 if k == 'rev':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1728 e.append(r)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1729 elif k == '-rev':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1730 e.append(-r)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1731 elif k == 'branch':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1732 e.append(c.branch())

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1733 elif k == '-branch':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1734 e.append(invert(c.branch()))

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1735 elif k == 'desc':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1736 e.append(c.description())

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1737 elif k == '-desc':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1738 e.append(invert(c.description()))

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1739 elif k in 'user author':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1740 e.append(c.user())

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1741 elif k in '-user -author':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1742 e.append(invert(c.user()))

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1743 elif k == 'date':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1744 e.append(c.date()[0])

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1745 elif k == '-date':

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1746 e.append(-c.date()[0])

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1747 else:

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

1748 raise error.ParseError(_("unknown sort key %r") % k)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1749 e.append(r)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1750 l.append(e)

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1751 l.sort()

20364

a6cf48b2880d revset: added baseset class (still empty) to improve revset performance

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20289

diff changeset

1752 return baseset([e[-1] for e in l])

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1753

16819

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1754 def _stringmatcher(pattern):

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1755 """

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1756 accepts a string, possibly starting with 're:' or 'literal:' prefix.

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1757 returns the matcher name, pattern, and matcher function.

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1758 missing or unknown prefixes are treated as literal matches.

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1759

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1760 helper for tests:

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1761 >>> def test(pattern, *tests):

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1762 ... kind, pattern, matcher = _stringmatcher(pattern)

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1763 ... return (kind, pattern, [bool(matcher(t)) for t in tests])

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1764

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1765 exact matching (no prefix):

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1766 >>> test('abcdefg', 'abc', 'def', 'abcdefg')

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1767 ('literal', 'abcdefg', [False, False, True])

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1768

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1769 regex matching ('re:' prefix)

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1770 >>> test('re:a.+b', 'nomatch', 'fooadef', 'fooadefbar')

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1771 ('re', 'a.+b', [False, False, True])

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1772

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1773 force exact matches ('literal:' prefix)

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1774 >>> test('literal:re:foobar', 'foobar', 're:foobar')

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1775 ('literal', 're:foobar', [False, True])

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1776

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1777 unknown prefixes are ignored and treated as literals

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1778 >>> test('foo:bar', 'foo', 'bar', 'foo:bar')

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1779 ('literal', 'foo:bar', [False, False, True])

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1780 """

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1781 if pattern.startswith('re:'):

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1782 pattern = pattern[3:]

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1783 try:

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1784 regex = re.compile(pattern)

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1785 except re.error, e:

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1786 raise error.ParseError(_('invalid regular expression: %s')

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1787 % e)

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1788 return 're', pattern, regex.search

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1789 elif pattern.startswith('literal:'):

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1790 pattern = pattern[8:]

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1791 return 'literal', pattern, pattern.__eq__

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1792

16823

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1793 def _substringmatcher(pattern):

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1794 kind, pattern, matcher = _stringmatcher(pattern)

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1795 if kind == 'literal':

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1796 matcher = lambda s: pattern in s

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1797 return kind, pattern, matcher

16819

5260a9e93113 revset: add helper function for matching strings to patterns

Simon King <simon@simonking.org.uk>

parents: 16803

diff changeset

1798

12716

33820dccbea4 revset: rename tagged() to tag() and allow it to take an optional tag name

Augie Fackler <durin42@gmail.com>

parents: 12616

diff changeset

1799 def tag(repo, subset, x):

14356

02a5bebd0dc4 revset: the name is optional for the tag predicate

Martin Geisler <mg@aragost.com>

parents: 14355

diff changeset

1800 """``tag([name])``

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1801 The specified tag by name, or all tagged revisions if no name is given.

20826

c57c9cece645 revset: document the regular expression support for tag(name)

Matt Harbison <matt_harbison@yahoo.com>

parents: 20289

diff changeset

1802

c57c9cece645 revset: document the regular expression support for tag(name)

Matt Harbison <matt_harbison@yahoo.com>

parents: 20289

diff changeset

1803 If `name` starts with `re:`, the remainder of the name is treated as

c57c9cece645 revset: document the regular expression support for tag(name)

Matt Harbison <matt_harbison@yahoo.com>

parents: 20289

diff changeset

1804 a regular expression. To match a tag that actually starts with `re:`,

c57c9cece645 revset: document the regular expression support for tag(name)

Matt Harbison <matt_harbison@yahoo.com>

parents: 20289

diff changeset

1805 use the prefix `literal:`.

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1806 """

12815

079a618ea89d revset: add translator comments to i18n strings

Martin Geisler <mg@lazybytes.net>

parents: 12787

diff changeset

1807 # i18n: "tag" is a keyword

12716

33820dccbea4 revset: rename tagged() to tag() and allow it to take an optional tag name

Augie Fackler <durin42@gmail.com>

parents: 12616

diff changeset

1808 args = getargs(x, 0, 1, _("tag takes one or no arguments"))

11280

a5eb0bf7e158 revset: add tagged predicate

Matt Mackall <mpm@selenic.com>

parents: 11279

diff changeset

1809 cl = repo.changelog

12716

33820dccbea4 revset: rename tagged() to tag() and allow it to take an optional tag name

Augie Fackler <durin42@gmail.com>

parents: 12616

diff changeset

1810 if args:

16820

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1811 pattern = getstring(args[0],

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1812 # i18n: "tag" is a keyword

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1813 _('the argument to tag must be a string'))

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1814 kind, pattern, matcher = _stringmatcher(pattern)

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1815 if kind == 'literal':

16825

b6ef1395d77f revset: avoid validating all tag nodes for tag(x)

Matt Mackall <mpm@selenic.com>

parents: 16824

diff changeset

1816 # avoid resolving all tags

b6ef1395d77f revset: avoid validating all tag nodes for tag(x)

Matt Mackall <mpm@selenic.com>

parents: 16824

diff changeset

1817 tn = repo._tagscache.tags.get(pattern, None)

b6ef1395d77f revset: avoid validating all tag nodes for tag(x)

Matt Mackall <mpm@selenic.com>

parents: 16824

diff changeset

1818 if tn is None:

16820

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1819 raise util.Abort(_("tag '%s' does not exist") % pattern)

16825

b6ef1395d77f revset: avoid validating all tag nodes for tag(x)

Matt Mackall <mpm@selenic.com>

parents: 16824

diff changeset

1820 s = set([repo[tn].rev()])

16820

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1821 else:

20f55613fb2a revset: add pattern matching to 'tag' revset expression

Simon King <simon@simonking.org.uk>

parents: 16819

diff changeset

1822 s = set([cl.rev(n) for t, n in repo.tagslist() if matcher(t)])

12716

33820dccbea4 revset: rename tagged() to tag() and allow it to take an optional tag name

Augie Fackler <durin42@gmail.com>

parents: 12616

diff changeset

1823 else:

33820dccbea4 revset: rename tagged() to tag() and allow it to take an optional tag name

Augie Fackler <durin42@gmail.com>

parents: 12616

diff changeset

1824 s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1825 return subset & s

11280

a5eb0bf7e158 revset: add tagged predicate

Matt Mackall <mpm@selenic.com>

parents: 11279

diff changeset

1826

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1827 def tagged(repo, subset, x):

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1828 return tag(repo, subset, x)

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1829

17171

9c750c3e4fac obsolete: compute unstable changeset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17170

diff changeset

1830 def unstable(repo, subset, x):

9c750c3e4fac obsolete: compute unstable changeset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17170

diff changeset

1831 """``unstable()``

17291

2d6bbf87f7b4 revset: minor doc fixes on obsolete related revsets

Patrick Mezard <patrick@mezard.eu>

parents: 17272

diff changeset

1832 Non-obsolete changesets with obsolete ancestors.

2d6bbf87f7b4 revset: minor doc fixes on obsolete related revsets

Patrick Mezard <patrick@mezard.eu>

parents: 17272

diff changeset

1833 """

17260

e96ad092fb18 i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17259

diff changeset

1834 # i18n: "unstable" is a keyword

17259

5822345e9e46 revset: use appropriate predicate name in error messages

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 17244

diff changeset

1835 getargs(x, 0, 0, _("unstable takes no arguments"))

17825

3cc06457f15e obsolete: rename `getobscache` into `getrevs`

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17804

diff changeset

1836 unstables = obsmod.getrevs(repo, 'unstable')

20367

2ac278aab2b4 revset: added intersection to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20366

diff changeset

1837 return subset & unstables

17171

9c750c3e4fac obsolete: compute unstable changeset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17170

diff changeset

1838

9c750c3e4fac obsolete: compute unstable changeset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17170

diff changeset

1839

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1840 def user(repo, subset, x):

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1841 """``user(string)``

14357

cb4ff8ef466b merge with stable

Martin Geisler <mg@aragost.com>

parents: 14343 14356

diff changeset

1842 User name contains string. The match is case-insensitive.

16823

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1843

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1844 If `string` starts with `re:`, the remainder of the string is treated as

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1845 a regular expression. To match a user that actually contains `re:`, use

b23bacb230c9 revset: add pattern matching to the 'user' revset expression

Simon King <simon@simonking.org.uk>

parents: 16822

diff changeset

1846 the prefix `literal:`.

13359

87f248e78173 bookmarks: move revset support to core

Matt Mackall <mpm@selenic.com>

parents: 13031

diff changeset

1847 """

13915

8f81d6f4047f revset: rearrange code so functions are sorted alphabetically

Idan Kamara <idankk86@gmail.com>

parents: 13914

diff changeset

1848 return author(repo, subset, x)

13359

87f248e78173 bookmarks: move revset support to core

Matt Mackall <mpm@selenic.com>

parents: 13031

diff changeset

1849

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1850 # for internal use

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1851 def _list(repo, subset, x):

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1852 s = getstring(x, "internal error")

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1853 if not s:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1854 return baseset()

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1855 ls = [repo[r].rev() for r in s.split('\0')]

22875

eed95fe914c5 revset-_list: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22874

diff changeset

1856 s = subset

20365

bc770ee6a351 revset: implemented set caching for revset evaluation

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20364

diff changeset

1857 return baseset([r for r in ls if r in s])

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1858

20566

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1859 # for internal use

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1860 def _intlist(repo, subset, x):

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1861 s = getstring(x, "internal error")

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1862 if not s:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1863 return baseset()

20566

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1864 ls = [int(r) for r in s.split('\0')]

22876

d52ca940c665 revset-_intlist: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22875

diff changeset

1865 s = subset

20566

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1866 return baseset([r for r in ls if r in s])

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1867

20569

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1868 # for internal use

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1869 def _hexlist(repo, subset, x):

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1870 s = getstring(x, "internal error")

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1871 if not s:

22802

1fcd361efaf4 baseset: use default value instead of [] when possible

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22801

diff changeset

1872 return baseset()

20569

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1873 cl = repo.changelog

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1874 ls = [cl.rev(node.bin(r)) for r in s.split('\0')]

22877

489d2f3688c9 revset-_hexlist: remove usage of `set()`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22876

diff changeset

1875 s = subset

20569

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1876 return baseset([r for r in ls if r in s])

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1877

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1878 symbols = {

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1879 "adds": adds,

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1880 "all": getall,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1881 "ancestor": ancestor,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1882 "ancestors": ancestors,

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

1883 "_firstancestors": _firstancestors,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1884 "author": author,

15134

81adf7777f8f revset: rename bisected() to bisect()

"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

parents: 15133

diff changeset

1885 "bisect": bisect,

13602

54b198fe9768 revset: add a revset command to get bisect state.

Benoit Boissinot <benoit.boissinot@ens-lyon.org>

parents: 13593

diff changeset

1886 "bisected": bisected,

13359

87f248e78173 bookmarks: move revset support to core

Matt Mackall <mpm@selenic.com>

parents: 13031

diff changeset

1887 "bookmark": bookmark,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1888 "branch": branch,

17753

69d5078d760d revsets: add branchpoint() function

Ivan Andrus <darthandrus@gmail.com>

parents: 17675

diff changeset

1889 "branchpoint": branchpoint,

17829

c73f7a28953c revset: add a bumped revset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17825

diff changeset

1890 "bumped": bumped,

17913

03e552aaae67 bundle: add revset expression to show bundle contents (issue3487)

Tomasz Kleczek <tkleczek@fb.com>

parents: 17886

diff changeset

1891 "bundle": bundle,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1892 "children": children,

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1893 "closed": closed,

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1894 "contains": contains,

17016

0eb522625eb2 revset: add a predicate for finding converted changesets

Matt Harbison <matt_harbison@yahoo.com>

parents: 16863

diff changeset

1895 "converted": converted,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1896 "date": date,

14650

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

1897 "desc": desc,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1898 "descendants": descendants,

16409

2cbd7dd0cc1f graphlog: fix --follow-first --rev combinations

Patrick Mezard <patrick@mezard.eu>

parents: 16402

diff changeset

1899 "_firstdescendants": _firstdescendants,

17186

a3da6f298592 revset: add destination() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17185

diff changeset

1900 "destination": destination,

18071

bea754715961 obsolete: add revset and test for divergent changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 18063

diff changeset

1901 "divergent": divergent,

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1902 "draft": draft,

17173

c621f84dbb35 obsolete: compute extinct changesets

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 17171

diff changeset

1903 "extinct": extinct,

16669

de4b42daf396 revset: add function for matching extra data (issue2767)

Henrik Stuart <hg@hstuart.dk>

parents: 16665

diff changeset

1904 "extra": extra,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1905 "file": hasfile,

14342

c0b6a734b4f3 revset: introduce filelog() to emulate log's fast path

Matt Mackall <mpm@selenic.com>

parents: 14318

diff changeset

1906 "filelog": filelog,

15117

0ab1c3a1f3b2 revsets: add first alias for last

Matt Mackall <mpm@selenic.com>

parents: 15116

diff changeset

1907 "first": first,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1908 "follow": follow,

16174

0a73c4bd9f47 graphlog: implement --follow-first

Patrick Mezard <patrick@mezard.eu>

parents: 16161

diff changeset

1909 "_followfirst": _followfirst,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1910 "grep": grep,

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1911 "head": head,

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1912 "heads": heads,

17390

74b44f25b4b1 revset: add hidden() revset

Patrick Mezard <patrick@mezard.eu>

parents: 17291

diff changeset

1913 "hidden": hidden,

16417

b4b0c6931e11 revset: avoid demandimport bug

Matt Mackall <mpm@selenic.com>

parents: 16415

diff changeset

1914 "id": node_,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1915 "keyword": keyword,

14061

611d2f8a4ba2 revsets: add a last function

Matt Mackall <mpm@selenic.com>

parents: 14055

diff changeset

1916 "last": last,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1917 "limit": limit,

16161

5a627b49b4d9 graphlog: paths/-I/-X handling requires a new revset

Patrick Mezard <patrick@mezard.eu>

parents: 16096

diff changeset

1918 "_matchfiles": _matchfiles,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1919 "max": maxrev,

14649

a6a8809c6e33 revset: update sorting of symbols

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14556

diff changeset

1920 "merge": merge,

11687

ba65d61f3158 revset: add min function

Nicolas Dumazet <nicdumz.commits@gmail.com>

parents: 11650

diff changeset

1921 "min": minrev,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1922 "modifies": modifies,

23848

3fb61fcbc4e4 namespaces: add revset for 'named(namespace)'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23845

diff changeset

1923 "named": named,

17170

63a4a3871607 revset: add an `obsolete` symbol

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17102

diff changeset

1924 "obsolete": obsolete,

23466

d5b1a452cc32 revset: move 'only' so that functions are sorted alphabetically

Yuya Nishihara <yuya@tcha.org>

parents: 23426

diff changeset

1925 "only": only,

17185

2c7c4824969e revset: add origin() predicate

Matt Harbison <matt_harbison@yahoo.com>

parents: 17173

diff changeset

1926 "origin": origin,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1927 "outgoing": outgoing,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1928 "p1": p1,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1929 "p2": p2,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1930 "parents": parents,

11944

df52ff0980fe revset: predicate to avoid lookup errors

Wagner Bruna <wbruna@softwareexpress.com.br>

parents: 11886

diff changeset

1931 "present": present,

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1932 "public": public,

15936

878bc4a62a73 revset: add remote() predicate to lookup remote revisions

Matt Mackall <mpm@selenic.com>

parents: 15903

diff changeset

1933 "remote": remote,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1934 "removes": removes,

14649

a6a8809c6e33 revset: update sorting of symbols

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14556

diff changeset

1935 "rev": rev,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1936 "reverse": reverse,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1937 "roots": roots,

11284

0b5c2e82aeb5 revset: sort the predicate list

Matt Mackall <mpm@selenic.com>

parents: 11283

diff changeset

1938 "sort": sort,

15819

33ca11b010e2 phases: implements simple revset symbol

Pierre-Yves David <pierre-yves.david@ens-lyon.org>

parents: 15791

diff changeset

1939 "secret": secret,

16402

1fb2f1400ea8 revset: add "matching" keyword

Angel Ezquerra <angel.ezquerra@gmail.com>

parents: 16218

diff changeset

1940 "matching": matching,

12716

33820dccbea4 revset: rename tagged() to tag() and allow it to take an optional tag name

Augie Fackler <durin42@gmail.com>

parents: 12616

diff changeset

1941 "tag": tag,

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1942 "tagged": tagged,

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

1943 "user": user,

17171

9c750c3e4fac obsolete: compute unstable changeset

Pierre-Yves David <pierre-yves.david@logilab.fr>

parents: 17170

diff changeset

1944 "unstable": unstable,

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

1945 "_list": _list,

20566

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

1946 "_intlist": _intlist,

20569

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

1947 "_hexlist": _hexlist,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1948 }

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

1949

19721

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1950 # symbols which can't be used for a DoS attack for any given input

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1951 # (e.g. those which accept regexes as plain strings shouldn't be included)

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1952 # functions that just return a lot of changesets (like all) don't count here

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1953 safesymbols = set([

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1954 "adds",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1955 "all",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1956 "ancestor",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1957 "ancestors",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1958 "_firstancestors",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1959 "author",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1960 "bisect",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1961 "bisected",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1962 "bookmark",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1963 "branch",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1964 "branchpoint",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1965 "bumped",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1966 "bundle",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1967 "children",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1968 "closed",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1969 "converted",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1970 "date",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1971 "desc",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1972 "descendants",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1973 "_firstdescendants",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1974 "destination",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1975 "divergent",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1976 "draft",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1977 "extinct",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1978 "extra",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1979 "file",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1980 "filelog",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1981 "first",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1982 "follow",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1983 "_followfirst",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1984 "head",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1985 "heads",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1986 "hidden",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1987 "id",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1988 "keyword",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1989 "last",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1990 "limit",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1991 "_matchfiles",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1992 "max",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1993 "merge",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1994 "min",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1995 "modifies",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1996 "obsolete",

23467

c237499a7fba revset: add 'only' to DoS-safe symbols

Yuya Nishihara <yuya@tcha.org>

parents: 23466

diff changeset

1997 "only",

19721

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1998 "origin",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

1999 "outgoing",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2000 "p1",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2001 "p2",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2002 "parents",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2003 "present",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2004 "public",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2005 "remote",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2006 "removes",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2007 "rev",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2008 "reverse",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2009 "roots",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2010 "sort",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2011 "secret",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2012 "matching",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2013 "tag",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2014 "tagged",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2015 "user",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2016 "unstable",

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2017 "_list",

20566

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

2018 "_intlist",

20569

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

2019 "_hexlist",

19721

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2020 ])

d8ca6d965230 revset: add a whitelist of DoS-safe symbols

Alexander Plavin <alexander@plav.in>

parents: 19720

diff changeset

2021

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2022 methods = {

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2023 "range": rangeset,

16861

e1aa1ed30030 revset: turn dagrange into a function

Bryan O'Sullivan <bryano@fb.com>

parents: 16860

diff changeset

2024 "dagrange": dagrange,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2025 "string": stringset,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2026 "symbol": symbolset,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2027 "and": andset,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2028 "or": orset,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2029 "not": notset,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2030 "list": listset,

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2031 "func": func,

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

2032 "ancestor": ancestorspec,

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

2033 "parent": parentspec,

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

2034 "parentpost": p1,

23777

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

2035 "only": only,

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

2036 "onlypost": only,

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2037 }

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2038

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2039 def optimize(x, small):

13031

3da456d0c885 code style: prefer 'is' and 'is not' tests with singletons

Martin Geisler <mg@aragost.com>

parents: 12936

diff changeset

2040 if x is None:

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2041 return 0, x

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2042

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2043 smallbonus = 1

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2044 if small:

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2045 smallbonus = .5

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2046

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2047 op = x[0]

11283

a6356b2695a3 revset: fix - handling in the optimizer

Matt Mackall <mpm@selenic.com>

parents: 11282

diff changeset

2048 if op == 'minus':

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2049 return optimize(('and', x[1], ('not', x[2])), small)

23777

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

2050 elif op == 'only':

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

2051 return optimize(('func', ('symbol', 'only'),

537a2669a113 revset: use '%' as an operator for 'only'

Sean Farley <sean.michael.farley@gmail.com>

parents: 23754

diff changeset

2052 ('list', x[1], x[2])), small)

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2053 elif op == 'dagrangepre':

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2054 return optimize(('func', ('symbol', 'ancestors'), x[1]), small)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2055 elif op == 'dagrangepost':

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2056 return optimize(('func', ('symbol', 'descendants'), x[1]), small)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2057 elif op == 'rangepre':

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2058 return optimize(('range', ('string', '0'), x[1]), small)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2059 elif op == 'rangepost':

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2060 return optimize(('range', x[1], ('string', 'tip')), small)

11467

6b836d5c8c9e revset: make negate work for sort specs

Matt Mackall <mpm@selenic.com>

parents: 11456

diff changeset

2061 elif op == 'negate':

6b836d5c8c9e revset: make negate work for sort specs

Matt Mackall <mpm@selenic.com>

parents: 11456

diff changeset

2062 return optimize(('string',

6b836d5c8c9e revset: make negate work for sort specs

Matt Mackall <mpm@selenic.com>

parents: 11456

diff changeset

2063 '-' + getstring(x[1], _("can't negate that"))), small)

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2064 elif op in 'string symbol negate':

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2065 return smallbonus, x # single revisions are small

16860

eeb464ed7275 revset: drop unreachable code

Bryan O'Sullivan <bryano@fb.com>

parents: 16838

diff changeset

2066 elif op == 'and':

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2067 wa, ta = optimize(x[1], True)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2068 wb, tb = optimize(x[2], True)

20499

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2069

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2070 # (::x and not ::y)/(not ::y and ::x) have a fast path

21893

e967c3b08705 revset: replace _missingancestors optimization with only revset

Siddharth Agarwal <sid0@fb.com>

parents: 21870

diff changeset

2071 def isonly(revs, bases):

20499

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2072 return (

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2073 revs[0] == 'func'

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2074 and getstring(revs[1], _('not a symbol')) == 'ancestors'

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2075 and bases[0] == 'not'

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2076 and bases[1][0] == 'func'

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2077 and getstring(bases[1][1], _('not a symbol')) == 'ancestors')

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2078

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2079 w = min(wa, wb)

21893

e967c3b08705 revset: replace _missingancestors optimization with only revset

Siddharth Agarwal <sid0@fb.com>

parents: 21870

diff changeset

2080 if isonly(ta, tb):

e967c3b08705 revset: replace _missingancestors optimization with only revset

Siddharth Agarwal <sid0@fb.com>

parents: 21870

diff changeset

2081 return w, ('func', ('symbol', 'only'), ('list', ta[2], tb[1][2]))

e967c3b08705 revset: replace _missingancestors optimization with only revset

Siddharth Agarwal <sid0@fb.com>

parents: 21870

diff changeset

2082 if isonly(tb, ta):

e967c3b08705 revset: replace _missingancestors optimization with only revset

Siddharth Agarwal <sid0@fb.com>

parents: 21870

diff changeset

2083 return w, ('func', ('symbol', 'only'), ('list', tb[2], ta[1][2]))

20499

2efd608473fb revset: optimize missing ancestor expressions

Siddharth Agarwal <sid0@fb.com>

parents: 20498

diff changeset

2084

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2085 if wa > wb:

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2086 return w, (op, tb, ta)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2087 return w, (op, ta, tb)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2088 elif op == 'or':

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2089 wa, ta = optimize(x[1], False)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2090 wb, tb = optimize(x[2], False)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2091 if wb < wa:

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2092 wb, wa = wa, wb

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2093 return max(wa, wb), (op, ta, tb)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2094 elif op == 'not':

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2095 o = optimize(x[1], not small)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2096 return o[0], (op, o[1])

14070

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

2097 elif op == 'parentpost':

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

2098 o = optimize(x[1], small)

305c97670d7a revset: add ^ and ~ operators from parentrevspec extension

Kevin Gessner <kevin@kevingessner.com>

parents: 14061

diff changeset

2099 return o[0], (op, o[1])

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2100 elif op == 'group':

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2101 return optimize(x[1], small)

16861

e1aa1ed30030 revset: turn dagrange into a function

Bryan O'Sullivan <bryano@fb.com>

parents: 16860

diff changeset

2102 elif op in 'dagrange range list parent ancestorspec':

14842

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2103 if op == 'parent':

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2104 # x^:y means (x^) : y, not x ^ (:y)

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2105 post = ('parentpost', x[1])

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2106 if x[2][0] == 'dagrangepre':

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2107 return optimize(('dagrange', post, x[2][1]), small)

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2108 elif x[2][0] == 'rangepre':

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2109 return optimize(('range', post, x[2][1]), small)

805651777188 revsets: do the right thing with x^:y (issue2884)

Matt Mackall <mpm@selenic.com>

parents: 14723

diff changeset

2110

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2111 wa, ta = optimize(x[1], small)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2112 wb, tb = optimize(x[2], small)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2113 return wa + wb, (op, ta, tb)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2114 elif op == 'func':

11383

de544774ebea revset: all your error messages are belong to _

Martin Geisler <mg@lazybytes.net>

parents: 11349

diff changeset

2115 f = getstring(x[1], _("not a symbol"))

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2116 wa, ta = optimize(x[2], small)

14650

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

2117 if f in ("author branch closed date desc file grep keyword "

93731b3efd0d revset: add desc(string) to search in commit messages

Thomas Arendsen Hein <thomas@intevation.de>

parents: 14649

diff changeset

2118 "outgoing user"):

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2119 w = 10 # slow

12353

b913232d13c1 revsets: reduce cost of outgoing in the optimizer

Matt Mackall <mpm@selenic.com>

parents: 12321

diff changeset

2120 elif f in "modifies adds removes":

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2121 w = 30 # slower

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2122 elif f == "contains":

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2123 w = 100 # very slow

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2124 elif f == "ancestor":

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2125 w = 1 * smallbonus

22451

186fd06283b4 revset: lower weight for _intlist function

Durham Goode <durham@fb.com>

parents: 22450

diff changeset

2126 elif f in "reverse limit first _intlist":

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2127 w = 0

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2128 elif f in "sort":

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2129 w = 10 # assume most sorts look at changelog

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2130 else:

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2131 w = 1

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2132 return w + wa, (op, x[1], ta)

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2133 return 1, x

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2134

16771

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2135 _aliasarg = ('func', ('symbol', '_aliasarg'))

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2136 def _getaliasarg(tree):

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2137 """If tree matches ('func', ('symbol', '_aliasarg'), ('string', X))

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2138 return X, None otherwise.

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2139 """

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2140 if (len(tree) == 3 and tree[:2] == _aliasarg

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2141 and tree[2][0] == 'string'):

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2142 return tree[2][1]

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2143 return None

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2144

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2145 def _checkaliasarg(tree, known=None):

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2146 """Check tree contains no _aliasarg construct or only ones which

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2147 value is in known. Used to avoid alias placeholders injection.

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2148 """

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2149 if isinstance(tree, tuple):

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2150 arg = _getaliasarg(tree)

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2151 if arg is not None and (not known or arg not in known):

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2152 raise error.ParseError(_("not a function: %s") % '_aliasarg')

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2153 for t in tree:

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2154 _checkaliasarg(t, known)

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2155

23857

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2156 # the set of valid characters for the initial letter of symbols in

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2157 # alias declarations and definitions

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2158 _aliassyminitletters = set(c for c in [chr(i) for i in xrange(256)]

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2159 if c.isalnum() or c in '._@$' or ord(c) > 127)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2160

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2161 def _tokenizealias(program, lookup=None):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2162 """Parse alias declaration/definition into a stream of tokens

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2163

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2164 This allows symbol names to use also ``$`` as an initial letter

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2165 (for backward compatibility), and callers of this function should

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2166 examine whether ``$`` is used also for unexpected symbols or not.

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2167 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2168 return tokenize(program, lookup=lookup,

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2169 syminitletters=_aliassyminitletters)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2170

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2171 def _parsealiasdecl(decl):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2172 """Parse alias declaration ``decl``

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2173

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2174 This returns ``(name, tree, args, errorstr)`` tuple:

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2175

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2176 - ``name``: of declared alias (may be ``decl`` itself at error)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2177 - ``tree``: parse result (or ``None`` at error)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2178 - ``args``: list of alias argument names (or None for symbol declaration)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2179 - ``errorstr``: detail about detected error (or None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2180

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2181 >>> _parsealiasdecl('foo')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2182 ('foo', ('symbol', 'foo'), None, None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2183 >>> _parsealiasdecl('$foo')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2184 ('$foo', None, None, "'$' not for alias arguments")

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2185 >>> _parsealiasdecl('foo::bar')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2186 ('foo::bar', None, None, 'invalid format')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2187 >>> _parsealiasdecl('foo bar')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2188 ('foo bar', None, None, 'at 4: invalid token')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2189 >>> _parsealiasdecl('foo()')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2190 ('foo', ('func', ('symbol', 'foo')), [], None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2191 >>> _parsealiasdecl('$foo()')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2192 ('$foo()', None, None, "'$' not for alias arguments")

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2193 >>> _parsealiasdecl('foo($1, $2)')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2194 ('foo', ('func', ('symbol', 'foo')), ['$1', '$2'], None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2195 >>> _parsealiasdecl('foo(bar_bar, baz.baz)')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2196 ('foo', ('func', ('symbol', 'foo')), ['bar_bar', 'baz.baz'], None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2197 >>> _parsealiasdecl('foo($1, $2, nested($1, $2))')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2198 ('foo($1, $2, nested($1, $2))', None, None, 'invalid argument list')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2199 >>> _parsealiasdecl('foo(bar($1, $2))')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2200 ('foo(bar($1, $2))', None, None, 'invalid argument list')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2201 >>> _parsealiasdecl('foo("string")')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2202 ('foo("string")', None, None, 'invalid argument list')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2203 >>> _parsealiasdecl('foo($1, $2')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2204 ('foo($1, $2', None, None, 'at 10: unexpected token: end')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2205 >>> _parsealiasdecl('foo("string')

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2206 ('foo("string', None, None, 'at 5: unterminated string')

23859

71402bb8d8b2 revset: check for collisions between alias argument names in the declaration

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23858

diff changeset

2207 >>> _parsealiasdecl('foo($1, $2, $1)')

71402bb8d8b2 revset: check for collisions between alias argument names in the declaration

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23858

diff changeset

2208 ('foo', None, None, 'argument names collide with each other')

23857

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2209 """

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2210 p = parser.parser(_tokenizealias, elements)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2211 try:

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2212 tree, pos = p.parse(decl)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2213 if (pos != len(decl)):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2214 raise error.ParseError(_('invalid token'), pos)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2215

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2216 if isvalidsymbol(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2217 # "name = ...." style

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2218 name = getsymbol(tree)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2219 if name.startswith('$'):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2220 return (decl, None, None, _("'$' not for alias arguments"))

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2221 return (name, ('symbol', name), None, None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2222

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2223 if isvalidfunc(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2224 # "name(arg, ....) = ...." style

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2225 name = getfuncname(tree)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2226 if name.startswith('$'):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2227 return (decl, None, None, _("'$' not for alias arguments"))

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2228 args = []

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2229 for arg in getfuncargs(tree):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2230 if not isvalidsymbol(arg):

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2231 return (decl, None, None, _("invalid argument list"))

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2232 args.append(getsymbol(arg))

23859

71402bb8d8b2 revset: check for collisions between alias argument names in the declaration

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23858

diff changeset

2233 if len(args) != len(set(args)):

71402bb8d8b2 revset: check for collisions between alias argument names in the declaration

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23858

diff changeset

2234 return (name, None, None,

71402bb8d8b2 revset: check for collisions between alias argument names in the declaration

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23858

diff changeset

2235 _("argument names collide with each other"))

23857

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2236 return (name, ('func', ('symbol', name)), args, None)

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2237

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2238 return (decl, None, None, _("invalid format"))

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2239 except error.ParseError, inst:

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2240 return (decl, None, None, parseerrordetail(inst))

0a7fd54d4e60 revset: introduce "_parsealiasdecl" to parse alias declarations strictly

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23856

diff changeset

2241

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2242 class revsetalias(object):

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2243 # whether own `error` information is already shown or not.

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2244 # this avoids showing same warning multiple times at each `findaliases`.

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2245 warned = False

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2246

14723

b9faf94ee196 revset: fix aliases with 0 or more than 2 parameters

Mads Kiilerich <mads@kiilerich.com>

parents: 14717

diff changeset

2247 def __init__(self, name, value):

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2248 '''Aliases like:

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2249

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2250 h = heads(default)

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2251 b($1) = ancestors($1) - ancestors(default)

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2252 '''

23858

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2253 self.name, self.tree, self.args, self.error = _parsealiasdecl(name)

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2254 if self.error:

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2255 self.error = _('failed to parse the declaration of revset alias'

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2256 ' "%s": %s') % (self.name, self.error)

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2257 return

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2258

aac4a1a7920e revset: parse alias declaration strictly by _parsealiasdecl

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23857

diff changeset

2259 if self.args:

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2260 for arg in self.args:

16771

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2261 # _aliasarg() is an unknown symbol only used separate

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2262 # alias argument placeholders from regular strings.

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2263 value = value.replace(arg, '_aliasarg(%r)' % (arg,))

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2264

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2265 try:

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2266 self.replacement, pos = parse(value)

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2267 if pos != len(value):

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2268 raise error.ParseError(_('invalid token'), pos)

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2269 # Check for placeholder injection

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2270 _checkaliasarg(self.replacement, self.args)

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2271 except error.ParseError, inst:

23856

ddf2172e901d revset: store full detail into revsetalias.error for error source distinction

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23855

diff changeset

2272 self.error = _('failed to parse the definition of revset alias'

ddf2172e901d revset: store full detail into revsetalias.error for error source distinction

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23855

diff changeset

2273 ' "%s": %s') % (self.name, parseerrordetail(inst))

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2274

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2275 def _getalias(aliases, tree):

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2276 """If tree looks like an unexpanded alias, return it. Return None

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2277 otherwise.

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2278 """

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2279 if isinstance(tree, tuple) and tree:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2280 if tree[0] == 'symbol' and len(tree) == 2:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2281 name = tree[1]

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2282 alias = aliases.get(name)

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2283 if alias and alias.args is None and alias.tree == tree:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2284 return alias

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2285 if tree[0] == 'func' and len(tree) > 1:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2286 if tree[1][0] == 'symbol' and len(tree[1]) == 2:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2287 name = tree[1][1]

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2288 alias = aliases.get(name)

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2289 if alias and alias.args is not None and alias.tree == tree[:2]:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2290 return alias

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2291 return None

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2292

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2293 def _expandargs(tree, args):

16771

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2294 """Replace _aliasarg instances with the substitution value of the

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2295 same name in args, recursively.

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2296 """

16771

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2297 if not tree or not isinstance(tree, tuple):

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2298 return tree

16771

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2299 arg = _getaliasarg(tree)

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2300 if arg is not None:

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2301 return args[arg]

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2302 return tuple(_expandargs(t, args) for t in tree)

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2303

16838

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2304 def _expandaliases(aliases, tree, expanding, cache):

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2305 """Expand aliases in tree, recursively.

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2306

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2307 'aliases' is a dictionary mapping user defined aliases to

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2308 revsetalias objects.

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2309 """

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2310 if not isinstance(tree, tuple):

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2311 # Do not expand raw strings

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2312 return tree

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2313 alias = _getalias(aliases, tree)

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2314 if alias is not None:

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2315 if alias.error:

23856

ddf2172e901d revset: store full detail into revsetalias.error for error source distinction

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23855

diff changeset

2316 raise util.Abort(alias.error)

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2317 if alias in expanding:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2318 raise error.ParseError(_('infinite expansion of revset alias "%s" '

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2319 'detected') % alias.name)

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2320 expanding.append(alias)

16838

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2321 if alias.name not in cache:

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2322 cache[alias.name] = _expandaliases(aliases, alias.replacement,

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2323 expanding, cache)

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2324 result = cache[alias.name]

16772

30e46d7138de revset: fix infinite alias expansion detection

Patrick Mezard <patrick@mezard.eu>

parents: 16771

diff changeset

2325 expanding.pop()

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2326 if alias.args is not None:

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2327 l = getlist(tree[2])

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2328 if len(l) != len(alias.args):

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2329 raise error.ParseError(

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2330 _('invalid number of arguments: %s') % len(l))

16838

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2331 l = [_expandaliases(aliases, a, [], cache) for a in l]

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2332 result = _expandargs(result, dict(zip(alias.args, l)))

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2333 else:

16838

d37d221334be revset: cache alias expansions

Patrick Mezard <patrick@mezard.eu>

parents: 16834

diff changeset

2334 result = tuple(_expandaliases(aliases, t, expanding, cache)

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2335 for t in tree)

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2336 return result

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2337

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2338 def findaliases(ui, tree, showwarning=None):

16771

2f3317d53d51 revset: explicitely tag alias arguments for expansion

Patrick Mezard <patrick@mezard.eu>

parents: 16748

diff changeset

2339 _checkaliasarg(tree)

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2340 aliases = {}

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2341 for k, v in ui.configitems('revsetalias'):

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2342 alias = revsetalias(k, v)

16096

b8be450638f6 revset: fix alias substitution recursion (issue3240)

Patrick Mezard <patrick@mezard.eu>

parents: 16010

diff changeset

2343 aliases[alias.name] = alias

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2344 tree = _expandaliases(aliases, tree, [], {})

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2345 if showwarning:

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2346 # warn about problematic (but not referred) aliases

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2347 for name, alias in sorted(aliases.iteritems()):

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2348 if alias.error and not alias.warned:

23856

ddf2172e901d revset: store full detail into revsetalias.error for error source distinction

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23855

diff changeset

2349 showwarning(_('warning: %s\n') % (alias.error))

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2350 alias.warned = True

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2351 return tree

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2352

23754

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2353 def foldconcat(tree):

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2354 """Fold elements to be concatenated by `##`

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2355 """

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2356 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2357 return tree

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2358 if tree[0] == '_concat':

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2359 pending = [tree]

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2360 l = []

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2361 while pending:

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2362 e = pending.pop()

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2363 if e[0] == '_concat':

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2364 pending.extend(reversed(e[1:]))

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2365 elif e[0] in ('string', 'symbol'):

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2366 l.append(e[1])

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2367 else:

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2368 msg = _("\"##\" can't concatenate \"%s\" element") % (e[0])

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2369 raise error.ParseError(msg)

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2370 return ('string', ''.join(l))

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2371 else:

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2372 return tuple(foldconcat(t) for t in tree)

14098

9f5a0acb0056 revset aliases

Alexander Solovyov <alexander@solovyov.net>

parents: 14073

diff changeset

2373

20779

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2374 def parse(spec, lookup=None):

20208

61a47fd64f30 fileset, revset: do not use global parser object for thread safety

Yuya Nishihara <yuya@tcha.org>

parents: 19721

diff changeset

2375 p = parser.parser(tokenize, elements)

20779

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2376 return p.parse(spec, lookup=lookup)

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2377

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2378 def match(ui, spec, repo=None):

11385

e5a2134c083b revset: nicer exception for empty queries

Matt Mackall <mpm@selenic.com>

parents: 11383

diff changeset

2379 if not spec:

e5a2134c083b revset: nicer exception for empty queries

Matt Mackall <mpm@selenic.com>

parents: 11383

diff changeset

2380 raise error.ParseError(_("empty query"))

20779

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2381 lookup = None

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2382 if repo:

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2383 lookup = repo.__contains__

ffc2295c6b80 revset: pass a lookup function to the tokenizer

Matt Mackall <mpm@selenic.com>

parents: 20754

diff changeset

2384 tree, pos = parse(spec, lookup)

14496

ffcb7e4d719f revset: report a parse error if a revset is not parsed completely (issue2654)

Bernhard Leiner <bleiner@gmail.com>

parents: 14356

diff changeset

2385 if (pos != len(spec)):

14701

4b93bd041772 parsers: fix localization markup of parser errors

Mads Kiilerich <mads@kiilerich.com>

parents: 14650

diff changeset

2386 raise error.ParseError(_("invalid token"), pos)

14900

fc3d6f300d7d revset: allow bypassing alias expansion

Matt Mackall <mpm@selenic.com>

parents: 14856

diff changeset

2387 if ui:

23737

6a81f88758aa revset: delay showing parse error for the revset alias until it is referred

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23732

diff changeset

2388 tree = findaliases(ui, tree, showwarning=ui.warn)

23754

3a4d8a6ce432 revset: introduce new operator "##" to concatenate strings/symbols at runtime

FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

parents: 23741

diff changeset

2389 tree = foldconcat(tree)

11279

62ccf4cd6e7f revset: optimize the parse tree directly

Matt Mackall <mpm@selenic.com>

parents: 11278

diff changeset

2390 weight, tree = optimize(tree, True)

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2391 def mfunc(repo, subset):

22885

e02b16f496f2 match: check if an object is a baseset using `isascending` instead of `set`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22884

diff changeset

2392 if util.safehasattr(subset, 'isascending'):

22686

2717dcff7be1 revset: use a single return statement in matcher function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22670

diff changeset

2393 result = getset(repo, subset, tree)

2717dcff7be1 revset: use a single return statement in matcher function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22670

diff changeset

2394 else:

2717dcff7be1 revset: use a single return statement in matcher function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22670

diff changeset

2395 result = getset(repo, baseset(subset), tree)

2717dcff7be1 revset: use a single return statement in matcher function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22670

diff changeset

2396 return result

11275

c9ce8ecd6ca1 revset: introduce revset core

Matt Mackall <mpm@selenic.com>

parents:

diff changeset

2397 return mfunc

12821

165079e564f0 revsets: generate predicate help dynamically

Patrick Mezard <pmezard@gmail.com>

parents: 12815

diff changeset

2398

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2399 def formatspec(expr, *args):

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2400 '''

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2401 This is a convenience function for using revsets internally, and

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2402 escapes arguments appropriately. Aliases are intentionally ignored

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2403 so that intended expression behavior isn't accidentally subverted.

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2404

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2405 Supported arguments:

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2406

15266

8bea39ca9acb revset: add %r for embedded revset support to formatspec

Matt Mackall <mpm@selenic.com>

parents: 15154

diff changeset

2407 %r = revset expression, parenthesized

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2408 %d = int(arg), no quoting

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2409 %s = string(arg), escaped and single-quoted

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2410 %b = arg.branch(), escaped and single-quoted

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2411 %n = hex(arg), single-quoted

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2412 %% = a literal '%'

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2413

15266

8bea39ca9acb revset: add %r for embedded revset support to formatspec

Matt Mackall <mpm@selenic.com>

parents: 15154

diff changeset

2414 Prefixing the type with 'l' specifies a parenthesized list of that type.

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2415

15268

bd5103819c2e revset: fix %r handling in formatspec

Matt Mackall <mpm@selenic.com>

parents: 15266

diff changeset

2416 >>> formatspec('%r:: and %lr', '10 or 11', ("this()", "that()"))

bd5103819c2e revset: fix %r handling in formatspec

Matt Mackall <mpm@selenic.com>

parents: 15266

diff changeset

2417 '(10 or 11):: and ((this()) or (that()))'

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2418 >>> formatspec('%d:: and not %d::', 10, 20)

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2419 '10:: and not 20::'

15325

cdf1daa3b83f revset: deal with empty lists in formatspec

Matt Mackall <mpm@selenic.com>

parents: 15268

diff changeset

2420 >>> formatspec('%ld or %ld', [], [1])

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2421 "_list('') or 1"

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2422 >>> formatspec('keyword(%s)', 'foo\\xe9')

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2423 "keyword('foo\\\\xe9')"

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2424 >>> b = lambda: 'default'

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2425 >>> b.branch = b

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2426 >>> formatspec('branch(%b)', b)

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2427 "branch('default')"

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2428 >>> formatspec('root(%ls)', ['a', 'b', 'c', 'd'])

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2429 "root(_list('a\\x00b\\x00c\\x00d'))"

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2430 '''

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2431

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2432 def quote(s):

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2433 return repr(str(s))

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2434

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2435 def argtype(c, arg):

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2436 if c == 'd':

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2437 return str(int(arg))

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2438 elif c == 's':

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2439 return quote(arg)

15266

8bea39ca9acb revset: add %r for embedded revset support to formatspec

Matt Mackall <mpm@selenic.com>

parents: 15154

diff changeset

2440 elif c == 'r':

8bea39ca9acb revset: add %r for embedded revset support to formatspec

Matt Mackall <mpm@selenic.com>

parents: 15154

diff changeset

2441 parse(arg) # make sure syntax errors are confined

8bea39ca9acb revset: add %r for embedded revset support to formatspec

Matt Mackall <mpm@selenic.com>

parents: 15154

diff changeset

2442 return '(%s)' % arg

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2443 elif c == 'n':

16417

b4b0c6931e11 revset: avoid demandimport bug

Matt Mackall <mpm@selenic.com>

parents: 16415

diff changeset

2444 return quote(node.hex(arg))

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2445 elif c == 'b':

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2446 return quote(arg.branch())

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2447

15595

a585d78e7b2f revset: balance %l or-expressions (issue3129)

Matt Mackall <mpm@selenic.com>

parents: 15532

diff changeset

2448 def listexp(s, t):

a585d78e7b2f revset: balance %l or-expressions (issue3129)

Matt Mackall <mpm@selenic.com>

parents: 15532

diff changeset

2449 l = len(s)

a585d78e7b2f revset: balance %l or-expressions (issue3129)

Matt Mackall <mpm@selenic.com>

parents: 15532

diff changeset

2450 if l == 0:

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2451 return "_list('')"

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2452 elif l == 1:

15595

a585d78e7b2f revset: balance %l or-expressions (issue3129)

Matt Mackall <mpm@selenic.com>

parents: 15532

diff changeset

2453 return argtype(t, s[0])

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2454 elif t == 'd':

20566

98024950ade0 revset: added _intlist method to replace _list for %ld

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20552

diff changeset

2455 return "_intlist('%s')" % "\0".join(str(int(a)) for a in s)

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2456 elif t == 's':

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2457 return "_list('%s')" % "\0".join(s)

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2458 elif t == 'n':

20569

0d4be103c734 revset: added _hexlist method to replace _list for %ln

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20566

diff changeset

2459 return "_hexlist('%s')" % "\0".join(node.hex(a) for a in s)

15898

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2460 elif t == 'b':

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2461 return "_list('%s')" % "\0".join(a.branch() for a in s)

6902e13ddd03 revset: optimize building large lists in formatrevspec

Matt Mackall <mpm@selenic.com>

parents: 15837

diff changeset

2462

15791

a814f8fcc65a Use explicit integer division

Martin Geisler <mg@aragost.com>

parents: 15726

diff changeset

2463 m = l // 2

15595

a585d78e7b2f revset: balance %l or-expressions (issue3129)

Matt Mackall <mpm@selenic.com>

parents: 15532

diff changeset

2464 return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t))

a585d78e7b2f revset: balance %l or-expressions (issue3129)

Matt Mackall <mpm@selenic.com>

parents: 15532

diff changeset

2465

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2466 ret = ''

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2467 pos = 0

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2468 arg = 0

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2469 while pos < len(expr):

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2470 c = expr[pos]

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2471 if c == '%':

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2472 pos += 1

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2473 d = expr[pos]

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2474 if d == '%':

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2475 ret += d

15268

bd5103819c2e revset: fix %r handling in formatspec

Matt Mackall <mpm@selenic.com>

parents: 15266

diff changeset

2476 elif d in 'dsnbr':

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2477 ret += argtype(d, args[arg])

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2478 arg += 1

15140

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2479 elif d == 'l':

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2480 # a list of some type

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2481 pos += 1

353a1ba928f6 revset: add 'l' flag to formatspec for args

Matt Mackall <mpm@selenic.com>

parents: 15138

diff changeset

2482 d = expr[pos]

15596

2555f441a32f merge with stable

Matt Mackall <mpm@selenic.com>

parents: 15595

diff changeset

2483 ret += listexp(list(args[arg]), d)

14901

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2484 arg += 1

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2485 else:

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2486 raise util.Abort('unexpected revspec format character %s' % d)

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2487 else:

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2488 ret += c

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2489 pos += 1

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2490

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2491 return ret

a773119f30ba revset: add formatspec convenience query builder

Matt Mackall <mpm@selenic.com>

parents: 14900

diff changeset

2492

16218

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2493 def prettyformat(tree):

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2494 def _prettyformat(tree, level, lines):

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2495 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2496 lines.append((level, str(tree)))

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2497 else:

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2498 lines.append((level, '(%s' % tree[0]))

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2499 for s in tree[1:]:

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2500 _prettyformat(s, level + 1, lines)

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2501 lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')]

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2502

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2503 lines = []

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2504 _prettyformat(tree, 0, lines)

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2505 output = '\n'.join((' '*l + s) for l, s in lines)

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2506 return output

81a1a00f5738 debugrevspec: pretty print output

Patrick Mezard <patrick@mezard.eu>

parents: 16185

diff changeset

2507

19719

2f9d5c5256ea revset: add helper function to get revset parse tree depth

Alexander Plavin <alexander@plav.in>

parents: 19706

diff changeset

2508 def depth(tree):

2f9d5c5256ea revset: add helper function to get revset parse tree depth

Alexander Plavin <alexander@plav.in>

parents: 19706

diff changeset

2509 if isinstance(tree, tuple):

2f9d5c5256ea revset: add helper function to get revset parse tree depth

Alexander Plavin <alexander@plav.in>

parents: 19706

diff changeset

2510 return max(map(depth, tree)) + 1

2f9d5c5256ea revset: add helper function to get revset parse tree depth

Alexander Plavin <alexander@plav.in>

parents: 19706

diff changeset

2511 else:

2f9d5c5256ea revset: add helper function to get revset parse tree depth

Alexander Plavin <alexander@plav.in>

parents: 19706

diff changeset

2512 return 0

2f9d5c5256ea revset: add helper function to get revset parse tree depth

Alexander Plavin <alexander@plav.in>

parents: 19706

diff changeset

2513

19720

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2514 def funcsused(tree):

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2515 if not isinstance(tree, tuple) or tree[0] in ('string', 'symbol'):

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2516 return set()

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2517 else:

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2518 funcs = set()

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2519 for s in tree[1:]:

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2520 funcs |= funcsused(s)

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2521 if tree[0] == 'func':

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2522 funcs.add(tree[1][1])

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2523 return funcs

f0b992a9be9c revset: add helper function to get functions used in a revset parse tree

Alexander Plavin <alexander@plav.in>

parents: 19719

diff changeset

2524

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2525 class abstractsmartset(object):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2526

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2527 def __nonzero__(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2528 """True if the smartset is not empty"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2529 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2530

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2531 def __contains__(self, rev):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2532 """provide fast membership testing"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2533 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2534

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2535 def __iter__(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2536 """iterate the set in the order it is supposed to be iterated"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2537 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2538

22716

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2539 # Attributes containing a function to perform a fast iteration in a given

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2540 # direction. A smartset can have none, one, or both defined.

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2541 #

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2542 # Default value is None instead of a function returning None to avoid

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2543 # initializing an iterator just for testing if a fast method exists.

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2544 fastasc = None

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2545 fastdesc = None

6877ba8d85ff abstractsmartset: document the `fastasc` and `fastdesc` attributes/methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22715

diff changeset

2546

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2547 def isascending(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2548 """True if the set will iterate in ascending order"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2549 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2550

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2551 def isdescending(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2552 """True if the set will iterate in descending order"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2553 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2554

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2555 def min(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2556 """return the minimum element in the set"""

22722

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2557 if self.fastasc is not None:

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2558 for r in self.fastasc():

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2559 return r

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2560 raise ValueError('arg is an empty sequence')

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2561 return min(self)

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2562

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2563 def max(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2564 """return the maximum element in the set"""

22722

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2565 if self.fastdesc is not None:

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2566 for r in self.fastdesc():

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2567 return r

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2568 raise ValueError('arg is an empty sequence')

e8832cf1abf6 abstractsmartset: add a default implementation for min and max

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22721

diff changeset

2569 return max(self)

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2570

22808

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2571 def first(self):

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2572 """return the first element in the set (user iteration perspective)

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2573

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2574 Return None if the set is empty"""

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2575 raise NotImplementedError()

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2576

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2577 def last(self):

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2578 """return the last element in the set (user iteration perspective)

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2579

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2580 Return None if the set is empty"""

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2581 raise NotImplementedError()

228b0aafb1ce smartset: add first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22805

diff changeset

2582

22995

2587631c5f8a revset: make __len__ part of the offical API

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22944

diff changeset

2583 def __len__(self):

2587631c5f8a revset: make __len__ part of the offical API

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22944

diff changeset

2584 """return the length of the smartsets

2587631c5f8a revset: make __len__ part of the offical API

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22944

diff changeset

2585

2587631c5f8a revset: make __len__ part of the offical API

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22944

diff changeset

2586 This can be expensive on smartset that could be lazy otherwise."""

2587631c5f8a revset: make __len__ part of the offical API

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22944

diff changeset

2587 raise NotImplementedError()

2587631c5f8a revset: make __len__ part of the offical API

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22944

diff changeset

2588

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2589 def reverse(self):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2590 """reverse the expected iteration order"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2591 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2592

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2593 def sort(self, reverse=True):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2594 """get the set to iterate in an ascending or descending order"""

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2595 raise NotImplementedError()

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2596

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2597 def __and__(self, other):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2598 """Returns a new object with the intersection of the two collections.

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2599

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2600 This is part of the mandatory API for smartset."""

22864

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2601 return self.filter(other.__contains__, cache=False)

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2602

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2603 def __add__(self, other):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2604 """Returns a new object with the union of the two collections.

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2605

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2606 This is part of the mandatory API for smartset."""

22861

546fa6576815 revset: restore order of `or` operation as in Mercurial 2.9

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22860

diff changeset

2607 return addset(self, other)

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2608

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2609 def __sub__(self, other):

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2610 """Returns a new object with the substraction of the two collections.

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2611

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2612 This is part of the mandatory API for smartset."""

22730

aeacc2055f0d abstractsmartset: add default implementation for __sub__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22729

diff changeset

2613 c = other.__contains__

22864

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2614 return self.filter(lambda r: not c(r), cache=False)

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2615

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2616 def filter(self, condition, cache=True):

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2617 """Returns this smartset filtered by condition as a new smartset.

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2618

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2619 `condition` is a callable which takes a revision number and returns a

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2620 boolean.

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2621

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2622 This is part of the mandatory API for smartset."""

22864

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2623 # builtin cannot be cached. but do not needs to

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2624 if cache and util.safehasattr(condition, 'func_code'):

96b6b3d78697 revset: cache most conditions used in `filter`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22863

diff changeset

2625 condition = util.cachefunc(condition)

22862

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2626 return filteredset(self, condition)

22692

78c916f24dd9 revset: introduce an abstractsmartset class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22691

diff changeset

2627

22825

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2628 class baseset(abstractsmartset):

20416

e72bcc245ecb revset: added docstring to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20393

diff changeset

2629 """Basic data structure that represents a revset and contains the basic

e72bcc245ecb revset: added docstring to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20393

diff changeset

2630 operation that it should be able to perform.

20727

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2631

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2632 Every method in this class should be implemented by any smartset class.

20416

e72bcc245ecb revset: added docstring to baseset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20393

diff changeset

2633 """

20752

6744f4621434 revset: add a default argument for baseset.__init__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20751

diff changeset

2634 def __init__(self, data=()):

22825

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2635 if not isinstance(data, list):

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2636 data = list(data)

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2637 self._list = data

22827

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2638 self._ascending = None

20365

bc770ee6a351 revset: implemented set caching for revset evaluation

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20364

diff changeset

2639

22826

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2640 @util.propertycache

22879

efe5062145c1 baseset: make `_set` a property cache

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22877

diff changeset

2641 def _set(self):

efe5062145c1 baseset: make `_set` a property cache

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22877

diff changeset

2642 return set(self._list)

efe5062145c1 baseset: make `_set` a property cache

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22877

diff changeset

2643

efe5062145c1 baseset: make `_set` a property cache

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22877

diff changeset

2644 @util.propertycache

22826

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2645 def _asclist(self):

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2646 asclist = self._list[:]

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2647 asclist.sort()

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2648 return asclist

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2649

22827

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2650 def __iter__(self):

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2651 if self._ascending is None:

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2652 return iter(self._list)

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2653 elif self._ascending:

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2654 return iter(self._asclist)

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2655 else:

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2656 return reversed(self._asclist)

c1107cb21df2 baseset: prepare lazy ordering in __iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22826

diff changeset

2657

22826

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2658 def fastasc(self):

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2659 return iter(self._asclist)

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2660

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2661 def fastdesc(self):

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2662 return reversed(self._asclist)

4ffb327e4719 baseset: implement a fastasc and fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22825

diff changeset

2663

22503

300e07582e9b revset: add an optimised baseset.__contains__ (issue4371)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22105

diff changeset

2664 @util.propertycache

300e07582e9b revset: add an optimised baseset.__contains__ (issue4371)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22105

diff changeset

2665 def __contains__(self):

22880

5b635b44af14 baseset: access `_set` directly for containment check

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22879

diff changeset

2666 return self._set.__contains__

22503

300e07582e9b revset: add an optimised baseset.__contains__ (issue4371)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22105

diff changeset

2667

22691

d8a08b68f754 revset: add a `__nonzero__` to baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22690

diff changeset

2668 def __nonzero__(self):

22825

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2669 return bool(self._list)

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2670

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2671 def sort(self, reverse=False):

22829

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2672 self._ascending = not bool(reverse)

22825

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2673

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2674 def reverse(self):

22829

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2675 if self._ascending is None:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2676 self._list.reverse()

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2677 else:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2678 self._ascending = not self._ascending

22825

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2679

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2680 def __len__(self):

0e8bb81b58b9 baseset: stop inheriting from built-in list class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22817

diff changeset

2681 return len(self._list)

22691

d8a08b68f754 revset: add a `__nonzero__` to baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22690

diff changeset

2682

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2683 def isascending(self):

20727

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2684 """Returns True if the collection is ascending order, False if not.

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2685

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2686 This is part of the mandatory API for smartset."""

22863

a1a02b516cca baseset: empty or one-element sets are ascending and descending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22862

diff changeset

2687 if len(self) <= 1:

a1a02b516cca baseset: empty or one-element sets are ascending and descending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22862

diff changeset

2688 return True

22828

966860f7a1a8 baseset: fix isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22827

diff changeset

2689 return self._ascending is not None and self._ascending

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2690

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2691 def isdescending(self):

20727

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2692 """Returns True if the collection is descending order, False if not.

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2693

1e59f760d850 revset: added comments to all methods needed to duck-type from baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20726

diff changeset

2694 This is part of the mandatory API for smartset."""

22863

a1a02b516cca baseset: empty or one-element sets are ascending and descending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22862

diff changeset

2695 if len(self) <= 1:

a1a02b516cca baseset: empty or one-element sets are ascending and descending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22862

diff changeset

2696 return True

22828

966860f7a1a8 baseset: fix isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22827

diff changeset

2697 return self._ascending is not None and not self._ascending

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2698

22812

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2699 def first(self):

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2700 if self:

22829

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2701 if self._ascending is None:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2702 return self._list[0]

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2703 elif self._ascending:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2704 return self._asclist[0]

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2705 else:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2706 return self._asclist[-1]

22812

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2707 return None

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2708

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2709 def last(self):

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2710 if self:

22829

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2711 if self._ascending is None:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2712 return self._list[-1]

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2713 elif self._ascending:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2714 return self._asclist[-1]

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2715 else:

36e09c25f870 baseset: explicitly track order of the baseset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22828

diff changeset

2716 return self._asclist[0]

22812

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2717 return None

fcd12b310148 baseset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22811

diff changeset

2718

22726

169aa5e74b52 lazyset: rename the class to filteredset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22725

diff changeset

2719 class filteredset(abstractsmartset):

20427

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2720 """Duck type for baseset class which iterates lazily over the revisions in

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2721 the subset and contains a function which tests for membership in the

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2722 revset

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2723 """

22862

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2724 def __init__(self, subset, condition=lambda x: True):

20738

33943add5d65 revset: add some documentation for lazyset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20737

diff changeset

2725 """

33943add5d65 revset: add some documentation for lazyset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20737

diff changeset

2726 condition: a function that decide whether a revision in the subset

33943add5d65 revset: add some documentation for lazyset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20737

diff changeset

2727 belongs to the revset or not.

33943add5d65 revset: add some documentation for lazyset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20737

diff changeset

2728 """

20427

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2729 self._subset = subset

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2730 self._condition = condition

20512

659b8d8ddf19 revset: added cache to lazysets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20499

diff changeset

2731 self._cache = {}

20427

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2732

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2733 def __contains__(self, x):

20512

659b8d8ddf19 revset: added cache to lazysets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20499

diff changeset

2734 c = self._cache

659b8d8ddf19 revset: added cache to lazysets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20499

diff changeset

2735 if x not in c:

22527

6e38b5d49977 revset: reduce dict lookup in lazyset.__contains__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22526

diff changeset

2736 v = c[x] = x in self._subset and self._condition(x)

6e38b5d49977 revset: reduce dict lookup in lazyset.__contains__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22526

diff changeset

2737 return v

20512

659b8d8ddf19 revset: added cache to lazysets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20499

diff changeset

2738 return c[x]

20427

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2739

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2740 def __iter__(self):

22719

21fda9dcd4e8 lazyset: split the iteration logic from the condition filtering logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22718

diff changeset

2741 return self._iterfilter(self._subset)

21fda9dcd4e8 lazyset: split the iteration logic from the condition filtering logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22718

diff changeset

2742

21fda9dcd4e8 lazyset: split the iteration logic from the condition filtering logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22718

diff changeset

2743 def _iterfilter(self, it):

20427

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2744 cond = self._condition

22719

21fda9dcd4e8 lazyset: split the iteration logic from the condition filtering logic

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22718

diff changeset

2745 for x in it:

20427

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2746 if cond(x):

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2747 yield x

4a9191ca848e revset: added lazyset class with basic operations

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20424

diff changeset

2748

22720

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2749 @property

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2750 def fastasc(self):

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2751 it = self._subset.fastasc

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2752 if it is None:

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2753 return None

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2754 return lambda: self._iterfilter(it())

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2755

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2756 @property

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2757 def fastdesc(self):

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2758 it = self._subset.fastdesc

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2759 if it is None:

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2760 return None

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2761 return lambda: self._iterfilter(it())

4388f99c5512 lazyset: inherit the fastasc and fastdesc method from subset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22719

diff changeset

2762

20552

0e99a66eb7bc revset: added __nonzero__ method to lazyset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20540

diff changeset

2763 def __nonzero__(self):

0e99a66eb7bc revset: added __nonzero__ method to lazyset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20540

diff changeset

2764 for r in self:

0e99a66eb7bc revset: added __nonzero__ method to lazyset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20540

diff changeset

2765 return True

0e99a66eb7bc revset: added __nonzero__ method to lazyset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20540

diff changeset

2766 return False

0e99a66eb7bc revset: added __nonzero__ method to lazyset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20540

diff changeset

2767

20429

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2768 def __len__(self):

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2769 # Basic implementation to be changed in future patches.

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2770 l = baseset([r for r in self])

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2771 return len(l)

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2772

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2773 def sort(self, reverse=False):

22862

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2774 self._subset.sort(reverse=reverse)

20429

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2775

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2776 def reverse(self):

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2777 self._subset.reverse()

f5b560c60bcd revset: added operations to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20428

diff changeset

2778

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2779 def isascending(self):

22862

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2780 return self._subset.isascending()

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2781

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2782 def isdescending(self):

22862

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2783 return self._subset.isdescending()

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

2784

22813

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2785 def first(self):

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2786 for x in self:

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2787 return x

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2788 return None

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2789

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2790 def last(self):

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2791 it = None

22862

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2792 if self._subset.isascending:

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2793 it = self.fastdesc

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2794 elif self._subset.isdescending:

9e5576f822cc filteredset: drop explicit order management

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22861

diff changeset

2795 it = self.fastdesc

22813

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2796 if it is None:

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2797 # slowly consume everything. This needs improvement

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2798 it = lambda: reversed(list(self))

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2799 for x in it():

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2800 return x

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2801 return None

5a96df266b2b filteredset: implement `first` and `last`

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22812

diff changeset

2802

22793

ff6689b47e48 addset: drop the leading underscore from the class name

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22792

diff changeset

2803 class addset(abstractsmartset):

20708

17c89e5a5627 revset: made addset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20707

diff changeset

2804 """Represent the addition of two sets

17c89e5a5627 revset: made addset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20707

diff changeset

2805

17c89e5a5627 revset: made addset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20707

diff changeset

2806 Wrapper structure for lazily adding two structures without losing much

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2807 performance on the __contains__ method

20708

17c89e5a5627 revset: made addset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20707

diff changeset

2808

20712

c152e538b85b revset: added ascending attribute to addset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20711

diff changeset

2809 If the ascending attribute is set, that means the two structures are

c152e538b85b revset: added ascending attribute to addset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20711

diff changeset

2810 ordered in either an ascending or descending way. Therefore, we can add

21024

7731a2281cf0 spelling: fixes from spell checker

Mads Kiilerich <madski@unity3d.com>

parents: 20991

diff changeset

2811 them maintaining the order by iterating over both at the same time

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2812 """

20712

c152e538b85b revset: added ascending attribute to addset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20711

diff changeset

2813 def __init__(self, revs1, revs2, ascending=None):

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2814 self._r1 = revs1

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2815 self._r2 = revs2

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2816 self._iter = None

20712

c152e538b85b revset: added ascending attribute to addset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20711

diff changeset

2817 self._ascending = ascending

20720

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2818 self._genlist = None

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2819 self._asclist = None

20720

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2820

20845

bc95143446e8 _addset: add a __len__ method

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20833

diff changeset

2821 def __len__(self):

bc95143446e8 _addset: add a __len__ method

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20833

diff changeset

2822 return len(self._list)

bc95143446e8 _addset: add a __len__ method

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20833

diff changeset

2823

22743

eccf9907b844 addset: add a __nonzero__ method

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22742

diff changeset

2824 def __nonzero__(self):

23100

ac494b087feb revset: fix O(2^n) perf regression in addset

Durham Goode <durham@fb.com>

parents: 23078

diff changeset

2825 return bool(self._r1) or bool(self._r2)

22743

eccf9907b844 addset: add a __nonzero__ method

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22742

diff changeset

2826

20720

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2827 @util.propertycache

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2828 def _list(self):

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2829 if not self._genlist:

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2830 self._genlist = baseset(self._iterator())

5f8400efca0b revset: added cached generated list to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20719

diff changeset

2831 return self._genlist

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2832

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2833 def _iterator(self):

20722

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2834 """Iterate over both collections without repeating elements

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2835

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2836 If the ascending attribute is not set, iterate over the first one and

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2837 then over the second one checking for membership on the first one so we

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2838 dont yield any duplicates.

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2839

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2840 If the ascending attribute is set, iterate over both collections at the

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2841 same time, yielding only one value at a time in the given order.

6894223ebc38 revset: changed _iterator() method on addset to work with a given order

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20721

diff changeset

2842 """

22799

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2843 if self._ascending is None:

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2844 def gen():

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2845 for r in self._r1:

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2846 yield r

22881

057ebf7714e1 addset: drop `.set()` usage during iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22880

diff changeset

2847 inr1 = self._r1.__contains__

22799

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2848 for r in self._r2:

22881

057ebf7714e1 addset: drop `.set()` usage during iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22880

diff changeset

2849 if not inr1(r):

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2850 yield r

22799

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2851 gen = gen()

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2852 else:

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2853 iter1 = iter(self._r1)

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2854 iter2 = iter(self._r2)

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2855 gen = self._iterordered(self._ascending, iter1, iter2)

bafa371d7af3 addset: drop caching through generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22798

diff changeset

2856 return gen

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2857

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2858 def __iter__(self):

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2859 if self._ascending is None:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2860 if self._genlist:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2861 return iter(self._genlist)

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2862 return iter(self._iterator())

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2863 self._trysetasclist()

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2864 if self._ascending:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2865 it = self.fastasc

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2866 else:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2867 it = self.fastdesc

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2868 if it is None:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2869 # consume the gen and try again

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2870 self._list

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2871 return iter(self)

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2872 return it()

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2873

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2874 def _trysetasclist(self):

23139

e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues

Mads Kiilerich <madski@unity3d.com>

parents: 23127

diff changeset

2875 """populate the _asclist attribute if possible and necessary"""

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2876 if self._genlist is not None and self._asclist is None:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2877 self._asclist = sorted(self._genlist)

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2878

22742

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2879 @property

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2880 def fastasc(self):

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2881 self._trysetasclist()

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2882 if self._asclist is not None:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2883 return self._asclist.__iter__

22742

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2884 iter1 = self._r1.fastasc

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2885 iter2 = self._r2.fastasc

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2886 if None in (iter1, iter2):

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2887 return None

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2888 return lambda: self._iterordered(True, iter1(), iter2())

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2889

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2890 @property

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2891 def fastdesc(self):

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2892 self._trysetasclist()

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2893 if self._asclist is not None:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2894 return self._asclist.__reversed__

22742

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2895 iter1 = self._r1.fastdesc

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2896 iter2 = self._r2.fastdesc

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2897 if None in (iter1, iter2):

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2898 return None

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2899 return lambda: self._iterordered(False, iter1(), iter2())

6bbc26adcc6a addset: offer a fastasc and fastdesc methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22741

diff changeset

2900

22741

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2901 def _iterordered(self, ascending, iter1, iter2):

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2902 """produce an ordered iteration from two iterators with the same order

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2903

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2904 The ascending is used to indicated the iteration direction.

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2905 """

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2906 choice = max

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2907 if ascending:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2908 choice = min

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2909

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2910 val1 = None

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2911 val2 = None

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2912

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2913 choice = max

22791

a074421fa4e1 addset: use the ascending argument in _iterordered

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22761

diff changeset

2914 if ascending:

22741

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2915 choice = min

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2916 try:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2917 # Consume both iterators in an ordered way until one is

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2918 # empty

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2919 while True:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2920 if val1 is None:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2921 val1 = iter1.next()

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2922 if val2 is None:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2923 val2 = iter2.next()

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2924 next = choice(val1, val2)

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2925 yield next

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2926 if val1 == next:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2927 val1 = None

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2928 if val2 == next:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2929 val2 = None

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2930 except StopIteration:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2931 # Flush any remaining values and consume the other one

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2932 it = iter2

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2933 if val1 is not None:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2934 yield val1

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2935 it = iter1

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2936 elif val2 is not None:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2937 # might have been equality and both are empty

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2938 yield val2

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2939 for val in it:

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2940 yield val

ef2c1ea8fb2c addset: split simple and ordered iteration

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22740

diff changeset

2941

20694

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2942 def __contains__(self, x):

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2943 return x in self._r1 or x in self._r2

621c94378d0d revset: added addset class with its basic methods

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20693

diff changeset

2944

20724

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2945 def sort(self, reverse=False):

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2946 """Sort the added set

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2947

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2948 For this we use the cached list with all the generated values and if we

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2949 know they are ascending or descending we can sort them in a smart way.

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2950 """

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2951 self._ascending = not reverse

20724

e9a64b3f2925 revset: added sort method in addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20723

diff changeset

2952

20733

adf4ec7e6f60 revset: added isascending and isdescending methods to _addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20732

diff changeset

2953 def isascending(self):

adf4ec7e6f60 revset: added isascending and isdescending methods to _addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20732

diff changeset

2954 return self._ascending is not None and self._ascending

adf4ec7e6f60 revset: added isascending and isdescending methods to _addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20732

diff changeset

2955

adf4ec7e6f60 revset: added isascending and isdescending methods to _addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20732

diff changeset

2956 def isdescending(self):

adf4ec7e6f60 revset: added isascending and isdescending methods to _addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20732

diff changeset

2957 return self._ascending is not None and not self._ascending

adf4ec7e6f60 revset: added isascending and isdescending methods to _addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20732

diff changeset

2958

20723

fb9852c46a42 revset: added reverse method to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20722

diff changeset

2959 def reverse(self):

22859

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2960 if self._ascending is None:

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2961 self._list.reverse()

513c0ba61db8 addset: do lazy sorting

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22857

diff changeset

2962 else:

20723

fb9852c46a42 revset: added reverse method to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20722

diff changeset

2963 self._ascending = not self._ascending

fb9852c46a42 revset: added reverse method to addset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20722

diff changeset

2964

22810

7f97cb12782f addset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22809

diff changeset

2965 def first(self):

23127

7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23115

diff changeset

2966 for x in self:

7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23115

diff changeset

2967 return x

22810

7f97cb12782f addset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22809

diff changeset

2968 return None

7f97cb12782f addset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22809

diff changeset

2969

7f97cb12782f addset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22809

diff changeset

2970 def last(self):

23127

7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23115

diff changeset

2971 self.reverse()

7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23115

diff changeset

2972 val = self.first()

7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23115

diff changeset

2973 self.reverse()

7361d8244efb addset: fix `first` and `last` on sorted addset (issue4426)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23115

diff changeset

2974 return val

22810

7f97cb12782f addset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22809

diff changeset

2975

22795

c21342159fad generatorset: drop the leading underscore in the class name

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22794

diff changeset

2976 class generatorset(abstractsmartset):

20705

9cc2249a9461 revset: made generatorset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20703

diff changeset

2977 """Wrap a generator for lazy iteration

9cc2249a9461 revset: made generatorset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20703

diff changeset

2978

9cc2249a9461 revset: made generatorset a private class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20703

diff changeset

2979 Wrapper structure for generators that provides lazy membership and can

20540

fa16c710a3d8 revset: added cached generated list on generatorset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20538

diff changeset

2980 be iterated more than once.

fa16c710a3d8 revset: added cached generated list on generatorset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20538

diff changeset

2981 When asked for membership it generates values until either it finds the

fa16c710a3d8 revset: added cached generated list on generatorset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20538

diff changeset

2982 requested one or has gone through all the elements in the generator

fa16c710a3d8 revset: added cached generated list on generatorset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20538

diff changeset

2983 """

22755

f9a825b593be generatorset: make it possible to use gen as fastasc or fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22754

diff changeset

2984 def __init__(self, gen, iterasc=None):

20739

1b4f2399f3c4 revset: add documentation and comment for _generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20738

diff changeset

2985 """

1b4f2399f3c4 revset: add documentation and comment for _generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20738

diff changeset

2986 gen: a generator producing the values for the generatorset.

1b4f2399f3c4 revset: add documentation and comment for _generatorset

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 20738

diff changeset

2987 """

20536

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

2988 self._gen = gen

22798

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

2989 self._asclist = None

20536

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

2990 self._cache = {}

22796

43f664bf2e1e generatorset: stop using a base as the _genlist

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22795

diff changeset

2991 self._genlist = []

20703

e07b1fd30805 revset: added sort methods to generatorsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20695

diff changeset

2992 self._finished = False

22800

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

2993 self._ascending = True

22755

f9a825b593be generatorset: make it possible to use gen as fastasc or fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22754

diff changeset

2994 if iterasc is not None:

f9a825b593be generatorset: make it possible to use gen as fastasc or fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22754

diff changeset

2995 if iterasc:

22797

61ecabeeadb3 generatorset: move iteration code into _iterator

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22796

diff changeset

2996 self.fastasc = self._iterator

22757

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

2997 self.__contains__ = self._asccontains

22755

f9a825b593be generatorset: make it possible to use gen as fastasc or fastdesc

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22754

diff changeset

2998 else:

22797

61ecabeeadb3 generatorset: move iteration code into _iterator

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22796

diff changeset

2999 self.fastdesc = self._iterator

22757

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3000 self.__contains__ = self._desccontains

20540

fa16c710a3d8 revset: added cached generated list on generatorset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20538

diff changeset

3001

22739

4ed47a1b2d24 generatorset: implement __nonzero__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22738

diff changeset

3002 def __nonzero__(self):

4ed47a1b2d24 generatorset: implement __nonzero__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22738

diff changeset

3003 for r in self:

4ed47a1b2d24 generatorset: implement __nonzero__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22738

diff changeset

3004 return True

4ed47a1b2d24 generatorset: implement __nonzero__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22738

diff changeset

3005 return False

4ed47a1b2d24 generatorset: implement __nonzero__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22738

diff changeset

3006

20536

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3007 def __contains__(self, x):

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3008 if x in self._cache:

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3009 return self._cache[x]

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3010

20825

3210b7930899 revset: improve performance of _generatorset.__contains__ (issue 4201)

Gregory Szorc <gregory.szorc@gmail.com>

parents: 20780

diff changeset

3011 # Use new values only, as existing values would be cached.

3210b7930899 revset: improve performance of _generatorset.__contains__ (issue 4201)

Gregory Szorc <gregory.szorc@gmail.com>

parents: 20780

diff changeset

3012 for l in self._consumegen():

20634

f2bb7ba59456 revset: changed generatorset code to remove unnecesary function call

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20615

diff changeset

3013 if l == x:

f2bb7ba59456 revset: changed generatorset code to remove unnecesary function call

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20615

diff changeset

3014 return True

20536

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3015

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3016 self._cache[x] = False

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3017 return False

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3018

22757

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3019 def _asccontains(self, x):

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3020 """version of contains optimised for ascending generator"""

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3021 if x in self._cache:

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3022 return self._cache[x]

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3023

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3024 # Use new values only, as existing values would be cached.

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3025 for l in self._consumegen():

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3026 if l == x:

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3027 return True

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3028 if l > x:

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3029 break

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3030

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3031 self._cache[x] = False

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3032 return False

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3033

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3034 def _desccontains(self, x):

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3035 """version of contains optimised for descending generator"""

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3036 if x in self._cache:

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3037 return self._cache[x]

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3038

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3039 # Use new values only, as existing values would be cached.

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3040 for l in self._consumegen():

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3041 if l == x:

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3042 return True

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3043 if l < x:

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3044 break

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3045

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3046 self._cache[x] = False

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3047 return False

d34969a4b1a8 generatorset: move membership testing on ordered gen to the main class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22756

diff changeset

3048

20536

532b114a6e02 revset: added generatorset class with cached __contains__ method

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20534

diff changeset

3049 def __iter__(self):

22800

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3050 if self._ascending:

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3051 it = self.fastasc

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3052 else:

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3053 it = self.fastdesc

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3054 if it is not None:

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3055 return it()

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3056 # we need to consume the iterator

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3057 for x in self._consumegen():

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3058 pass

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3059 # recall the same code

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3060 return iter(self)

22797

61ecabeeadb3 generatorset: move iteration code into _iterator

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22796

diff changeset

3061

61ecabeeadb3 generatorset: move iteration code into _iterator

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22796

diff changeset

3062 def _iterator(self):

20833

47d43e2323c5 revset: fix generatorset race condition

Durham Goode <durham@fb.com>

parents: 20829

diff changeset

3063 if self._finished:

22670

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3064 return iter(self._genlist)

20833

47d43e2323c5 revset: fix generatorset race condition

Durham Goode <durham@fb.com>

parents: 20829

diff changeset

3065

22494

14f6cebfcb8a revset: document the choice made in __generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22487

diff changeset

3066 # We have to use this complex iteration strategy to allow multiple

14f6cebfcb8a revset: document the choice made in __generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22487

diff changeset

3067 # iterations at the same time. We need to be able to catch revision

23139

e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues

Mads Kiilerich <madski@unity3d.com>

parents: 23127

diff changeset

3068 # removed from _consumegen and added to genlist in another instance.

22494

14f6cebfcb8a revset: document the choice made in __generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22487

diff changeset

3069 #

14f6cebfcb8a revset: document the choice made in __generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22487

diff changeset

3070 # Getting rid of it would provide an about 15% speed up on this

14f6cebfcb8a revset: document the choice made in __generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22487

diff changeset

3071 # iteration.

20833

47d43e2323c5 revset: fix generatorset race condition

Durham Goode <durham@fb.com>

parents: 20829

diff changeset

3072 genlist = self._genlist

22669

00c8abe64cf3 revset: prefetch an attribute in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22539

diff changeset

3073 nextrev = self._consumegen().next

00c8abe64cf3 revset: prefetch an attribute in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22539

diff changeset

3074 _len = len # cache global lookup

22670

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3075 def gen():

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3076 i = 0

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3077 while True:

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3078 if i < _len(genlist):

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3079 yield genlist[i]

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3080 else:

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3081 yield nextrev()

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3082 i += 1

44dce874de97 revset: rely on built in iterator when possible in _generatorset.__iter__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22669

diff changeset

3083 return gen()

20825

3210b7930899 revset: improve performance of _generatorset.__contains__ (issue 4201)

Gregory Szorc <gregory.szorc@gmail.com>

parents: 20780

diff changeset

3084

3210b7930899 revset: improve performance of _generatorset.__contains__ (issue 4201)

Gregory Szorc <gregory.szorc@gmail.com>

parents: 20780

diff changeset

3085 def _consumegen(self):

22528

b6dc3b79bb25 revset: avoid in loop lookup in _generatorset._consumegen

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22527

diff changeset

3086 cache = self._cache

b6dc3b79bb25 revset: avoid in loop lookup in _generatorset._consumegen

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22527

diff changeset

3087 genlist = self._genlist.append

20634

f2bb7ba59456 revset: changed generatorset code to remove unnecesary function call

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20615

diff changeset

3088 for item in self._gen:

22528

b6dc3b79bb25 revset: avoid in loop lookup in _generatorset._consumegen

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22527

diff changeset

3089 cache[item] = True

b6dc3b79bb25 revset: avoid in loop lookup in _generatorset._consumegen

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22527

diff changeset

3090 genlist(item)

20634

f2bb7ba59456 revset: changed generatorset code to remove unnecesary function call

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20615

diff changeset

3091 yield item

22798

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3092 if not self._finished:

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3093 self._finished = True

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3094 asc = self._genlist[:]

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3095 asc.sort()

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3096 self._asclist = asc

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3097 self.fastasc = asc.__iter__

586d7058ea48 generatorset: get list-based fast iterations after the generator is consumed

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22797

diff changeset

3098 self.fastdesc = asc.__reversed__

20703

e07b1fd30805 revset: added sort methods to generatorsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20695

diff changeset

3099

22996

a43d929d1fa1 generatorset: implement __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22995

diff changeset

3100 def __len__(self):

a43d929d1fa1 generatorset: implement __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22995

diff changeset

3101 for x in self._consumegen():

a43d929d1fa1 generatorset: implement __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22995

diff changeset

3102 pass

a43d929d1fa1 generatorset: implement __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22995

diff changeset

3103 return len(self._genlist)

a43d929d1fa1 generatorset: implement __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22995

diff changeset

3104

20703

e07b1fd30805 revset: added sort methods to generatorsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20695

diff changeset

3105 def sort(self, reverse=False):

22800

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3106 self._ascending = not reverse

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3107

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3108 def reverse(self):

29a8c20e14a8 generatorset: explicitly track iteration order

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22799

diff changeset

3109 self._ascending = not self._ascending

20703

e07b1fd30805 revset: added sort methods to generatorsets

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20695

diff changeset

3110

22801

6af9e9b6af39 generatorset: implement isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22800

diff changeset

3111 def isascending(self):

6af9e9b6af39 generatorset: implement isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22800

diff changeset

3112 return self._ascending

6af9e9b6af39 generatorset: implement isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22800

diff changeset

3113

6af9e9b6af39 generatorset: implement isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22800

diff changeset

3114 def isdescending(self):

6af9e9b6af39 generatorset: implement isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22800

diff changeset

3115 return not self._ascending

6af9e9b6af39 generatorset: implement isascending and isdescending

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22800

diff changeset

3116

22811

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3117 def first(self):

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3118 if self._ascending:

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3119 it = self.fastasc

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3120 else:

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3121 it = self.fastdesc

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3122 if it is None:

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3123 # we need to consume all and try again

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3124 for x in self._consumegen():

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3125 pass

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3126 return self.first()

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3127 if self:

23413

0c432696dae3 revset: fix first and last for generatorset (issue4465)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23127

diff changeset

3128 return it().next()

22811

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3129 return None

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3130

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3131 def last(self):

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3132 if self._ascending:

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3133 it = self.fastdesc

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3134 else:

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3135 it = self.fastasc

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3136 if it is None:

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3137 # we need to consume all and try again

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3138 for x in self._consumegen():

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3139 pass

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3140 return self.first()

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3141 if self:

23413

0c432696dae3 revset: fix first and last for generatorset (issue4465)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 23127

diff changeset

3142 return it().next()

22811

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3143 return None

c1fd827e1ae0 generatorset: implement first and last methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22810

diff changeset

3144

22509

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3145 def spanset(repo, start=None, end=None):

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3146 """factory function to dispatch between fullreposet and actual spanset

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3147

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3148 Feel free to update all spanset call sites and kill this function at some

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3149 point.

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3150 """

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3151 if start is None and end is None:

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3152 return fullreposet(repo)

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3153 return _spanset(repo, start, end)

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3154

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3155

22752

7bbc35c43bff spanset: drop _orderedsetmixin inheritance

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22751

diff changeset

3156 class _spanset(abstractsmartset):

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3157 """Duck type for baseset class which represents a range of revisions and

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3158 can work lazily and without having all the range in memory

20737

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3159

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3160 Note that spanset(x, y) behave almost like xrange(x, y) except for two

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3161 notable points:

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3162 - when x < y it will be automatically descending,

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3163 - revision filtered with this repoview will be skipped.

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3164

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3165 """

20525

aa73a6327df4 revset: changed spanset to take a repo argument

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20521

diff changeset

3166 def __init__(self, repo, start=0, end=None):

20737

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3167 """

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3168 start: first revision included the set

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3169 (default to 0)

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3170 end: first revision excluded (last+1)

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3171 (default to len(repo)

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3172

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3173 Spanset will be descending if `end` < `start`.

b141080e70c5 revset: added documentation and comment for spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20734

diff changeset

3174 """

22717

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3175 if end is None:

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3176 end = len(repo)

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3177 self._ascending = start <= end

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3178 if not self._ascending:

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3179 start, end = end + 1, start +1

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3180 self._start = start

22717

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3181 self._end = end

20525

aa73a6327df4 revset: changed spanset to take a repo argument

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20521

diff changeset

3182 self._hiddenrevs = repo.changelog.filteredrevs

20521

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3183

22717

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3184 def sort(self, reverse=False):

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3185 self._ascending = not reverse

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3186

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3187 def reverse(self):

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3188 self._ascending = not self._ascending

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3189

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3190 def _iterfilter(self, iterrange):

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3191 s = self._hiddenrevs

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3192 for r in iterrange:

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3193 if r not in s:

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3194 yield r

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3195

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3196 def __iter__(self):

22717

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3197 if self._ascending:

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3198 return self.fastasc()

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3199 else:

22717

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3200 return self.fastdesc()

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3201

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3202 def fastasc(self):

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3203 iterrange = xrange(self._start, self._end)

20521

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3204 if self._hiddenrevs:

22717

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3205 return self._iterfilter(iterrange)

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3206 return iter(iterrange)

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3207

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3208 def fastdesc(self):

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3209 iterrange = xrange(self._end - 1, self._start - 1, -1)

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3210 if self._hiddenrevs:

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3211 return self._iterfilter(iterrange)

b89f7e3a414d spanset: enforce the order lazily to gain `fastasc` and `fastdesc` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22716

diff changeset

3212 return iter(iterrange)

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3213

21201

c8b9c6147108 revset: fix revision filtering in spanset.contains (regression)

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 21199

diff changeset

3214 def __contains__(self, rev):

22526

1e6d2b6b37ea revset: do less lookup during spanset.__contains__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22510

diff changeset

3215 hidden = self._hiddenrevs

22718

7b123e5639f4 spanset: do a single range check in __contains__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22717

diff changeset

3216 return ((self._start <= rev < self._end)

22526

1e6d2b6b37ea revset: do less lookup during spanset.__contains__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22510

diff changeset

3217 and not (hidden and rev in hidden))

20484

a979078bd788 revset: added spanset class to represent revision ranges

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20483

diff changeset

3218

20716

fa1ac5faa7c4 revset: added __nonzero__ method to spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20715

diff changeset

3219 def __nonzero__(self):

fa1ac5faa7c4 revset: added __nonzero__ method to spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20715

diff changeset

3220 for r in self:

fa1ac5faa7c4 revset: added __nonzero__ method to spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20715

diff changeset

3221 return True

fa1ac5faa7c4 revset: added __nonzero__ method to spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20715

diff changeset

3222 return False

fa1ac5faa7c4 revset: added __nonzero__ method to spanset class

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20715

diff changeset

3223

20486

0f1ef9e9e904 revset: added operations to spanset to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20485

diff changeset

3224 def __len__(self):

20521

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3225 if not self._hiddenrevs:

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3226 return abs(self._end - self._start)

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3227 else:

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3228 count = 0

21205

e2031c8ca4f8 revset: also inline spanset._contained in __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 21204

diff changeset

3229 start = self._start

e2031c8ca4f8 revset: also inline spanset._contained in __len__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 21204

diff changeset

3230 end = self._end

20521

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3231 for rev in self._hiddenrevs:

21284

3e53a64345c1 revset: cosmetic changes in spanset range comparison

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 21283

diff changeset

3232 if (end < rev <= start) or (start <= rev < end):

20521

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3233 count += 1

1850a7f5fb66 revset: changed spanset implementation to take hidden revisions into account

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20512

diff changeset

3234 return abs(self._end - self._start) - count

20486

0f1ef9e9e904 revset: added operations to spanset to duck type baseset

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20485

diff changeset

3235

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

3236 def isascending(self):

23838

c90d195320c5 revset: fix spanset.isascending() to honor sort() or reverse() request

Yuya Nishihara <yuya@tcha.org>

parents: 23736

diff changeset

3237 return self._ascending

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

3238

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

3239 def isdescending(self):

23838

c90d195320c5 revset: fix spanset.isascending() to honor sort() or reverse() request

Yuya Nishihara <yuya@tcha.org>

parents: 23736

diff changeset

3240 return not self._ascending

20725

cf628b50afbb revset: added isascending and isdescending methods to smartset classes

Lucas Moscovicz <lmoscovicz@fb.com>

parents: 20724

diff changeset

3241

22809

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3242 def first(self):

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3243 if self._ascending:

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3244 it = self.fastasc

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3245 else:

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3246 it = self.fastdesc

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3247 for x in it():

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3248 return x

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3249 return None

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3250

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3251 def last(self):

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3252 if self._ascending:

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3253 it = self.fastdesc

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3254 else:

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3255 it = self.fastasc

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3256 for x in it():

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3257 return x

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3258 return None

88dad916c008 spanset: implement `first` and `last` methods

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22808

diff changeset

3259

22509

fbae659543cf revset: turn spanset into a factory function

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22508

diff changeset

3260 class fullreposet(_spanset):

22508

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3261 """a set containing all revisions in the repo

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3262

23139

e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues

Mads Kiilerich <madski@unity3d.com>

parents: 23127

diff changeset

3263 This class exists to host special optimization.

22508

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3264 """

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3265

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3266 def __init__(self, repo):

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3267 super(fullreposet, self).__init__(repo)

2434c68d82a8 revert: add a fullreposet class

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22504

diff changeset

3268

22510

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3269 def __and__(self, other):

23139

e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues

Mads Kiilerich <madski@unity3d.com>

parents: 23127

diff changeset

3270 """As self contains the whole repo, all of the other set should also be

e53f6b72a0e4 spelling: fixes from proofreading of spell checker issues

Mads Kiilerich <madski@unity3d.com>

parents: 23127

diff changeset

3271 in self. Therefore `self & other = other`.

22510

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3272

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3273 This boldly assumes the other contains valid revs only.

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3274 """

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3275 # other not a smartset, make is so

22883

e7b8cf352614 fullreposet: detect smartset using "isascending" instead of "set"

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22882

diff changeset

3276 if not util.safehasattr(other, 'isascending'):

22510

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3277 # filter out hidden revision

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3278 # (this boldly assumes all smartset are pure)

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3279 #

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3280 # `other` was used with "&", let's assume this is a set like

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3281 # object.

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3282 other = baseset(other - self._hiddenrevs)

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3283

23839

4982fade9733 revset: simplify fullreposet.__and__ to call sort() with boolean flag

Yuya Nishihara <yuya@tcha.org>

parents: 23834

diff changeset

3284 other.sort(reverse=self.isdescending())

22510

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3285 return other

911f5a6579d1 revset: fast implementation for fullreposet.__and__

Pierre-Yves David <pierre-yves.david@fb.com>

parents: 22509

diff changeset

3286

12823

80deae3bc5ea hggettext: handle i18nfunctions declaration for docstrings translations

Patrick Mezard <pmezard@gmail.com>

parents: 12821

diff changeset

3287 # tell hggettext to extract docstrings from these functions:

80deae3bc5ea hggettext: handle i18nfunctions declaration for docstrings translations

Patrick Mezard <pmezard@gmail.com>

parents: 12821

diff changeset

3288 i18nfunctions = symbols.values()

Mercurial > hg > mercurial-source

annotate mercurial/revset.py @ 23962:caff3675cba5 stable