##// END OF EJS Templates
test: use `printenv.py --line` in `test-ssh.t`...
test: use `printenv.py --line` in `test-ssh.t` This makes the output easier to update and read.

File last commit:

r41704:13f7a6a4 default
r41793:9a8d41fa default
Show More
revset.py
2372 lines | 80.3 KiB | text/x-python | PythonLexer
Matt Mackall
revset: introduce revset core
r11275 # revset.py - revision set queries for mercurial
#
# Copyright 2010 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
Gregory Szorc
revset: use absolute_import
r25971 from __future__ import absolute_import
import re
from .i18n import _
from . import (
Yuya Nishihara
dagop: split module hosting DAG-related algorithms from revset...
r32903 dagop,
Pierre-Yves David
revset: reintroduce and experimental revset for update destination...
r26713 destutil,
Yuya Nishihara
diffutil: move the module out of utils package...
r38607 diffutil,
Gregory Szorc
revset: use absolute_import
r25971 encoding,
error,
hbisect,
match as matchmod,
node,
obsolete as obsmod,
Jun Wu
revset: define successors revset...
r33377 obsutil,
Gregory Szorc
revset: use absolute_import
r25971 pathutil,
phases,
Pulkit Goyal
py3: handle keyword arguments correctly in revset.py...
r35368 pycompat,
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 registrar,
Gregory Szorc
revset: use absolute_import
r25971 repoview,
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 revsetlang,
Yuya Nishihara
revset: add support for integer and hex wdir identifiers...
r32659 scmutil,
Yuya Nishihara
smartset: move set classes and related functions from revset module (API)...
r30881 smartset,
Boris Feld
stack: follow-up on the stack revset...
r37407 stack as stackmod,
Gregory Szorc
revset: use absolute_import
r25971 util,
)
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 from .utils import (
dateutil,
stringutil,
)
Matt Mackall
revset: introduce revset core
r11275
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 # helpers for processing parsed tree
getsymbol = revsetlang.getsymbol
getstring = revsetlang.getstring
getinteger = revsetlang.getinteger
Denis Laxalde
revset: properly parse "descend" argument of followlines()...
r31998 getboolean = revsetlang.getboolean
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 getlist = revsetlang.getlist
Yuya Nishihara
revset: extract a helper to parse integer range...
r41702 getintrange = revsetlang.getintrange
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 getargs = revsetlang.getargs
getargsdict = revsetlang.getargsdict
Yuya Nishihara
smartset: move set classes and related functions from revset module (API)...
r30881 baseset = smartset.baseset
generatorset = smartset.generatorset
spanset = smartset.spanset
fullreposet = smartset.fullreposet
Yuya Nishihara
revset: move order constants from revsetlang...
r34018 # Constants for ordering requirement, used in getset():
#
# If 'define', any nested functions and operations MAY change the ordering of
# the entries in the set (but if changes the ordering, it MUST ALWAYS change
# it). If 'follow', any nested functions and operations MUST take the ordering
# specified by the first operand to the '&' operator.
#
# For instance,
#
# X & (Y | Z)
# ^ ^^^^^^^
# | follow
# define
#
# will be evaluated as 'or(y(x()), z(x()))', where 'x()' can change the order
# of the entries in the set, but 'y()', 'z()' and 'or()' shouldn't.
#
# 'any' means the order doesn't matter. For instance,
#
Yuya Nishihara
revset: fix example describing how ordering is determined...
r34019 # (X & !Y) | ancestors(Z)
# ^ ^
# any any
Yuya Nishihara
revset: move order constants from revsetlang...
r34018 #
Yuya Nishihara
revset: fix example describing how ordering is determined...
r34019 # For 'X & !Y', 'X' decides the order and 'Y' is subtracted from 'X', so the
# order of 'Y' does not matter. For 'ancestors(Z)', Z's order does not matter
# since 'ancestors' does not care about the order of its argument.
Yuya Nishihara
revset: move order constants from revsetlang...
r34018 #
# Currently, most revsets do not care about the order, so 'define' is
# equivalent to 'follow' for them, and the resulting order is based on the
# 'subset' parameter passed down to them:
#
Yuya Nishihara
revset: move order argument to run-time match function...
r34020 # m = revset.match(...)
# m(repo, subset, order=defineorder)
Yuya Nishihara
revset: move order constants from revsetlang...
r34018 # ^^^^^^
# For most revsets, 'define' means using the order this subset provides
#
# There are a few revsets that always redefine the order if 'define' is
# specified: 'sort(X)', 'reverse(X)', 'x:y'.
anyorder = 'any' # don't care the order, could be even random-shuffled
defineorder = 'define' # ALWAYS redefine, or ALWAYS follow the current order
followorder = 'follow' # MUST follow the current order
Matt Mackall
revset: introduce revset core
r11275 # helpers
Jun Wu
revset: remove order information from tree (API)...
r34013 def getset(repo, subset, x, order=defineorder):
Matt Mackall
revset: introduce revset core
r11275 if not x:
Martin Geisler
revset: all your error messages are belong to _
r11383 raise error.ParseError(_("missing argument"))
Jun Wu
revset: remove order information from tree (API)...
r34013 return methods[x[0]](repo, subset, *x[1:], order=order)
Matt Mackall
revset: introduce revset core
r11275
Matt Harbison
revset: add a utility for obtaining the source of a given rev...
r17003 def _getrevsource(repo, r):
extra = repo[r].extra()
for label in ('source', 'transplant_source', 'rebase_source'):
if label in extra:
try:
return repo[extra[label]].rev()
except error.RepoLookupError:
pass
return None
Yuya Nishihara
py3: drop b'' from repr() of smartset...
r35922 def _sortedb(xs):
Yuya Nishihara
pycompat: move rapply() from util...
r38594 return sorted(pycompat.rapply(pycompat.maybebytestr, xs))
Yuya Nishihara
py3: drop b'' from repr() of smartset...
r35922
Matt Mackall
revset: introduce revset core
r11275 # operator methods
Jun Wu
revset: remove order information from tree (API)...
r34013 def stringset(repo, subset, x, order):
Martin von Zweigbergk
revset: drop support for '' as alias for '.'...
r37281 if not x:
raise error.ParseError(_("empty string is not a valid revision"))
Martin von Zweigbergk
scmutil: add method for looking up a context given a revision symbol...
r37289 x = scmutil.intrev(scmutil.revsymbol(repo, x))
Yuya Nishihara
revset: drop magic of fullreposet membership test (issue4682)...
r25265 if (x in subset
or x == node.nullrev and isinstance(subset, fullreposet)):
Lucas Moscovicz
revset: added baseset class (still empty) to improve revset performance...
r20364 return baseset([x])
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Matt Mackall
revset: introduce revset core
r11275
Boris Feld
revset: introduce an API that avoids `formatspec` input serialization...
r41258 def rawsmartset(repo, subset, x, order):
"""argument is already a smartset, use that directly"""
if order == followorder:
return subset & x
else:
return x & subset
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def rangeset(repo, subset, x, y, order):
Pierre-Yves David
revset-rangeset: call 'getset' on a 'fullreposet'...
r23162 m = getset(repo, fullreposet(repo), x)
n = getset(repo, fullreposet(repo), y)
Matt Mackall
revset: deal with empty sets in range endpoints...
r11456
if not m or not n:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Yuya Nishihara
revset: extract function that creates range set from computed revisions...
r30043 return _makerangeset(repo, subset, m.first(), n.last(), order)
Yuya Nishihara
revset: do not transform range* operators in parsed tree...
r30803 def rangeall(repo, subset, x, order):
assert x is None
Boris Feld
revset: use 'tiprev' when appropriate...
r35691 return _makerangeset(repo, subset, 0, repo.changelog.tiprev(), order)
Yuya Nishihara
revset: do not transform range* operators in parsed tree...
r30803
Yuya Nishihara
revset: do not rewrite ':y' to '0:y' (issue5385)...
r30044 def rangepre(repo, subset, y, order):
# ':y' can't be rewritten to '0:y' since '0' may be hidden
n = getset(repo, fullreposet(repo), y)
if not n:
return baseset()
return _makerangeset(repo, subset, 0, n.last(), order)
Yuya Nishihara
revset: do not transform range* operators in parsed tree...
r30803 def rangepost(repo, subset, x, order):
m = getset(repo, fullreposet(repo), x)
if not m:
return baseset()
Boris Feld
revset: use 'tiprev' when appropriate...
r35691 return _makerangeset(repo, subset, m.first(), repo.changelog.tiprev(),
order)
Yuya Nishihara
revset: do not transform range* operators in parsed tree...
r30803
Yuya Nishihara
revset: extract function that creates range set from computed revisions...
r30043 def _makerangeset(repo, subset, m, n, order):
Yuya Nishihara
revset: work around x:y range where x or y is wdir()...
r25766 if m == n:
r = baseset([m])
elif n == node.wdirrev:
r = spanset(repo, m, len(repo)) + baseset([n])
elif m == node.wdirrev:
Boris Feld
revset: use 'tiprev' when appropriate...
r35691 r = baseset([m]) + spanset(repo, repo.changelog.tiprev(), n - 1)
Yuya Nishihara
revset: work around x:y range where x or y is wdir()...
r25766 elif m < n:
Lucas Moscovicz
revset: changed revsets to use spanset...
r20526 r = spanset(repo, m, n + 1)
Matt Mackall
revset: deal with empty sets in range endpoints...
r11456 else:
Lucas Moscovicz
revset: changed revsets to use spanset...
r20526 r = spanset(repo, m, n - 1)
Yuya Nishihara
revset: fix order of nested 'range' expression (BC)...
r29944
if order == defineorder:
return r & subset
else:
# carrying the sorting over when possible would be more efficient
return subset & r
Matt Mackall
revset: introduce revset core
r11275
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def dagrange(repo, subset, x, y, order):
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 r = fullreposet(repo)
Yuya Nishihara
dagop: split module hosting DAG-related algorithms from revset...
r32903 xs = dagop.reachableroots(repo, getset(repo, r, x), getset(repo, r, y),
includepath=True)
Yuya Nishihara
revset: make dagrange preserve order of input set...
r29139 return subset & xs
Bryan O'Sullivan
revset: turn dagrange into a function
r16860
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def andset(repo, subset, x, y, order):
Jun Wu
revset: remove order information from tree (API)...
r34013 if order == anyorder:
yorder = anyorder
else:
yorder = followorder
return getset(repo, getset(repo, subset, x, order), y, yorder)
Jun Wu
revset: do not flip "and" arguments when optimizing...
r34022 def andsmallyset(repo, subset, x, y, order):
# 'andsmally(x, y)' is equivalent to 'and(x, y)', but faster when y is small
Jun Wu
revset: remove order information from tree (API)...
r34013 if order == anyorder:
yorder = anyorder
else:
yorder = followorder
return getset(repo, getset(repo, subset, y, yorder), x, order)
Matt Mackall
revset: introduce revset core
r11275
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def differenceset(repo, subset, x, y, order):
Jun Wu
revset: remove order information from tree (API)...
r34013 return getset(repo, subset, x, order) - getset(repo, subset, y, anyorder)
Durham Goode
revset: use smartset minus operator...
r28217
Jun Wu
revset: remove order information from tree (API)...
r34013 def _orsetlist(repo, subset, xs, order):
Yuya Nishihara
revset: make balanced addsets by orset() without using _combinesets()...
r25929 assert xs
if len(xs) == 1:
Jun Wu
revset: remove order information from tree (API)...
r34013 return getset(repo, subset, xs[0], order)
Yuya Nishihara
revset: make balanced addsets by orset() without using _combinesets()...
r25929 p = len(xs) // 2
Jun Wu
revset: remove order information from tree (API)...
r34013 a = _orsetlist(repo, subset, xs[:p], order)
b = _orsetlist(repo, subset, xs[p:], order)
Yuya Nishihara
revset: make balanced addsets by orset() without using _combinesets()...
r25929 return a + b
Matt Mackall
revset: introduce revset core
r11275
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def orset(repo, subset, x, order):
Yuya Nishihara
revset: fix order of nested 'or' expression (BC)...
r29934 xs = getlist(x)
Yuya Nishihara
revset: leverage orset() to flatten ancestor() arguments...
r38508 if not xs:
return baseset()
Yuya Nishihara
revset: fix order of nested 'or' expression (BC)...
r29934 if order == followorder:
# slow path to take the subset order
Jun Wu
revset: remove order information from tree (API)...
r34013 return subset & _orsetlist(repo, fullreposet(repo), xs, anyorder)
Yuya Nishihara
revset: fix order of nested 'or' expression (BC)...
r29934 else:
Jun Wu
revset: remove order information from tree (API)...
r34013 return _orsetlist(repo, subset, xs, order)
Yuya Nishihara
revset: wrap arguments of 'or' by 'list' node...
r29929
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def notset(repo, subset, x, order):
Jun Wu
revset: remove order information from tree (API)...
r34013 return subset - getset(repo, subset, x, anyorder)
Matt Mackall
revset: introduce revset core
r11275
Yuya Nishihara
revset: add experimental relation and subscript operators...
r33416 def relationset(repo, subset, x, y, order):
raise error.ParseError(_("can't use a relation in this context"))
av6
revset: support ranges in #generations relation
r41395 def _splitrange(a, b):
"""Split range with bounds a and b into two ranges at 0 and return two
tuples of numbers for use as startdepth and stopdepth arguments of
revancestors and revdescendants.
>>> _splitrange(-10, -5) # [-10:-5]
((5, 11), (None, None))
>>> _splitrange(5, 10) # [5:10]
((None, None), (5, 11))
>>> _splitrange(-10, 10) # [-10:10]
((0, 11), (0, 11))
>>> _splitrange(-10, 0) # [-10:0]
((0, 11), (None, None))
>>> _splitrange(0, 10) # [0:10]
((None, None), (0, 11))
>>> _splitrange(0, 0) # [0:0]
((0, 1), (None, None))
>>> _splitrange(1, -1) # [1:-1]
((None, None), (None, None))
"""
ancdepths = (None, None)
descdepths = (None, None)
if a == b == 0:
ancdepths = (0, 1)
if a < 0:
ancdepths = (-min(b, 0), -a + 1)
if b > 0:
descdepths = (max(a, 0), b + 1)
return ancdepths, descdepths
Yuya Nishihara
revset: leverage getintrange() helper in relation-subscript operation (API)...
r41704 def generationsrel(repo, subset, x, rel, z, order):
av6
revset: support ranges in #generations relation
r41395 # TODO: rewrite tests, and drop startdepth argument from ancestors() and
# descendants() predicates
Yuya Nishihara
revset: leverage getintrange() helper in relation-subscript operation (API)...
r41704 a, b = getintrange(z,
_('relation subscript must be an integer or a range'),
_('relation subscript bounds must be integers'),
deffirst=-(dagop.maxlogdepth - 1),
deflast=+(dagop.maxlogdepth - 1))
av6
revset: support ranges in #generations relation
r41395 (ancstart, ancstop), (descstart, descstop) = _splitrange(a, b)
if ancstart is None and descstart is None:
return baseset()
revs = getset(repo, fullreposet(repo), x)
if not revs:
return baseset()
if ancstart is not None and descstart is not None:
s = dagop.revancestors(repo, revs, False, ancstart, ancstop)
s += dagop.revdescendants(repo, revs, False, descstart, descstop)
elif ancstart is not None:
s = dagop.revancestors(repo, revs, False, ancstart, ancstop)
elif descstart is not None:
s = dagop.revdescendants(repo, revs, False, descstart, descstop)
return subset & s
av6
revset: move subscript relation functions to its own dict...
r40967
Yuya Nishihara
revset: add experimental relation and subscript operators...
r33416 def relsubscriptset(repo, subset, x, y, z, order):
Yuya Nishihara
revset: add experimental ancestors/descendants relation subscript...
r33417 # this is pretty basic implementation of 'x#y[z]' operator, still
# experimental so undocumented. see the wiki for further ideas.
# https://www.mercurial-scm.org/wiki/RevsetOperatorPlan
rel = getsymbol(y)
av6
revset: move subscript relation functions to its own dict...
r40967 if rel in subscriptrelations:
Yuya Nishihara
revset: leverage getintrange() helper in relation-subscript operation (API)...
r41704 return subscriptrelations[rel](repo, subset, x, rel, z, order)
Yuya Nishihara
revset: add experimental ancestors/descendants relation subscript...
r33417
av6
revset: move subscript relation functions to its own dict...
r40967 relnames = [r for r in subscriptrelations.keys() if len(r) > 1]
raise error.UnknownIdentifier(rel, relnames)
Yuya Nishihara
revset: add experimental relation and subscript operators...
r33416
def subscriptset(repo, subset, x, y, order):
raise error.ParseError(_("can't use a subscript in this context"))
Jun Wu
revset: remove order information from tree (API)...
r34013 def listset(repo, subset, *xs, **opts):
timeless
revset: add hint for list error to use or
r27517 raise error.ParseError(_("can't use a list in this context"),
Martin von Zweigbergk
help: add quotes to a few commands we point to...
r38846 hint=_('see \'hg help "revsets.x or y"\''))
Matt Mackall
revset: introduce revset core
r11275
Jun Wu
revset: remove order information from tree (API)...
r34013 def keyvaluepair(repo, subset, k, v, order):
Yuya Nishihara
revset: add parsing rule for key=value pair...
r25704 raise error.ParseError(_("can't use a key-value pair in this context"))
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def func(repo, subset, a, b, order):
Yuya Nishihara
revset: check invalid function syntax "func-name"() explicitly...
r29441 f = getsymbol(a)
if f in symbols:
Augie Fackler
revset: avoid shadowing a variable with a list comprehension
r30392 func = symbols[f]
if getattr(func, '_takeorder', False):
return func(repo, subset, b, order)
return func(repo, subset, b)
Matt Harbison
revset: don't suggest private or undocumented queries...
r25632
keep = lambda fn: getattr(fn, '__doc__', None) is not None
syms = [s for (s, fn) in symbols.items() if keep(fn)]
Yuya Nishihara
revset: check invalid function syntax "func-name"() explicitly...
r29441 raise error.UnknownIdentifier(f, syms)
Matt Mackall
revset: introduce revset core
r11275
# functions
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 # symbols are callables like:
# fn(repo, subset, x)
# with:
# repo - current repository instance
# subset - of revisions to be examined
# x - argument in tree form
Jun Wu
revset: move weight information to predicate...
r34274 symbols = revsetlang.symbols
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 # symbols which can't be used for a DoS attack for any given input
# (e.g. those which accept regexes as plain strings shouldn't be included)
# functions that just return a lot of changesets (like all) don't count here
safesymbols = set()
FUJIWARA Katsunori
revset: replace predicate by revsetpredicate of registrar...
r28395 predicate = registrar.revsetpredicate()
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 @predicate('_destupdate')
Pierre-Yves David
revset: reintroduce and experimental revset for update destination...
r26713 def _destupdate(repo, subset, x):
# experimental revset for update destination
Martin von Zweigbergk
destutil: drop now-unused "check" parameter from destupdate()
r30962 args = getargsdict(x, 'limit', 'clean')
Pulkit Goyal
py3: handle keyword arguments correctly in revset.py...
r35368 return subset & baseset([destutil.destupdate(repo,
**pycompat.strkwargs(args))[0]])
Pierre-Yves David
revset: reintroduce and experimental revset for update destination...
r26713
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 @predicate('_destmerge')
Pierre-Yves David
revset: rename and test '_destmerge'...
r26716 def _destmerge(repo, subset, x):
# experimental revset for merge destination
Pierre-Yves David
destutil: allow to specify an explicit source for the merge...
r28139 sourceset = None
if x is not None:
sourceset = getset(repo, fullreposet(repo), x)
return subset & baseset([destutil.destmerge(repo, sourceset=sourceset)])
Pierre-Yves David
merge: move default destination computation in a revset...
r26303
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('adds(pattern)', safe=True, weight=30)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def adds(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets that add a file matching pattern.
FUJIWARA Katsunori
revset: add explanation about the pattern without explicit kind...
r20289
The pattern without explicit kind like ``glob:`` is expected to be
relative to the current directory and match against a file or a
directory.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "adds" is a keyword
pat = getstring(x, _("adds requires a pattern"))
return checkstatus(repo, subset, pat, 1)
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('ancestor(*changeset)', safe=True, weight=0.5)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def ancestor(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """A greatest common ancestor of the changesets.
Paul Cavallaro
revset: change ancestor to accept 0 or more arguments (issue3750)...
r18536
Accepts 0 or more changesets.
Will return empty list when passed no args.
Greatest common ancestor of a single changeset is that changeset.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: move lookup of first ancestor() candidate out of the loop
r38509 reviter = iter(orset(repo, fullreposet(repo), x, order=anyorder))
try:
anc = repo[next(reviter)]
except StopIteration:
return baseset()
for r in reviter:
anc = anc.ancestor(repo[r])
Mads Kiilerich
revlog: use context ancestor instead of changelog ancestor...
r20991
Yuya Nishihara
revset: add partial support for ancestor(wdir())...
r38541 r = scmutil.intrev(anc)
if r in subset:
return baseset([r])
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Yuya Nishihara
revset: add startdepth limit to ancestors() as internal option...
r33003 def _ancestors(repo, subset, x, followfirst=False, startdepth=None,
stopdepth=None):
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 heads = getset(repo, fullreposet(repo), x)
Mads Kiilerich
revset: better naming of variables containing the value of a single argument...
r22944 if not heads:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Yuya Nishihara
revset: add startdepth limit to ancestors() as internal option...
r33003 s = dagop.revancestors(repo, heads, followfirst, startdepth, stopdepth)
Pierre-Yves David
revset-_ancestor: use & instead of filter...
r23003 return subset & s
Patrick Mezard
graphlog: fix --follow-first --rev combinations...
r16409
Yuya Nishihara
revset: add depth limit to ancestors()...
r33002 @predicate('ancestors(set[, depth])', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def ancestors(repo, subset, x):
Yuya Nishihara
help: clarify ancestors() and descendants() include given set (issue5594)...
r32905 """Changesets that are ancestors of changesets in set, including the
given changesets themselves.
Yuya Nishihara
revset: add depth limit to ancestors()...
r33002
If depth is specified, the result only includes changesets up to
the specified generation.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: add startdepth limit to ancestors() as internal option...
r33003 # startdepth is for internal use only until we can decide the UI
args = getargsdict(x, 'ancestors', 'set depth startdepth')
Yuya Nishihara
revset: add support of keyword arguments to ancestors() and descendants()...
r32914 if 'set' not in args:
# i18n: "ancestors" is a keyword
raise error.ParseError(_('ancestors takes at least 1 argument'))
Yuya Nishihara
revset: add startdepth limit to ancestors() as internal option...
r33003 startdepth = stopdepth = None
if 'startdepth' in args:
n = getinteger(args['startdepth'],
"ancestors expects an integer startdepth")
if n < 0:
raise error.ParseError("negative startdepth")
startdepth = n
Yuya Nishihara
revset: add depth limit to ancestors()...
r33002 if 'depth' in args:
# i18n: "ancestors" is a keyword
n = getinteger(args['depth'], _("ancestors expects an integer depth"))
if n < 0:
raise error.ParseError(_("negative depth"))
stopdepth = n + 1
Yuya Nishihara
revset: add startdepth limit to ancestors() as internal option...
r33003 return _ancestors(repo, subset, args['set'],
startdepth=startdepth, stopdepth=stopdepth)
Patrick Mezard
graphlog: fix --follow-first --rev combinations...
r16409
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('_firstancestors', safe=True)
Patrick Mezard
graphlog: fix --follow-first --rev combinations...
r16409 def _firstancestors(repo, subset, x):
# ``_firstancestors(set)``
# Like ``ancestors(set)`` but follows only the first parents.
return _ancestors(repo, subset, x, followfirst=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
David Soria Parra
revset: lookup descendents for negative arguments to ancestor operator...
r32699 def _childrenspec(repo, subset, x, n, order):
"""Changesets that are the Nth child of a changeset
in set.
"""
cs = set()
for r in getset(repo, fullreposet(repo), x):
for i in range(n):
c = repo[r].children()
if len(c) == 0:
break
if len(c) > 1:
raise error.RepoLookupError(
_("revision in set has more than one child"))
Yuya Nishihara
revset: fix negative ancestor spec to not return changectx objects...
r32885 r = c[0].rev()
David Soria Parra
revset: lookup descendents for negative arguments to ancestor operator...
r32699 else:
cs.add(r)
return subset & cs
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def ancestorspec(repo, subset, x, n, order):
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 """``set~n``
Brodie Rao
cleanup: eradicate long lines
r16683 Changesets that are the Nth ancestor (first parents only) of a changeset
in set.
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 """
Yuya Nishihara
revset: factor out getinteger() helper...
r30801 n = getinteger(n, _("~ expects a number"))
David Soria Parra
revset: lookup descendents for negative arguments to ancestor operator...
r32699 if n < 0:
# children lookup
return _childrenspec(repo, subset, x, -n, order)
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 ps = set()
cl = repo.changelog
Pierre-Yves David
revset-ancestorspec: call 'getset' on a 'fullreposet'...
r23163 for r in getset(repo, fullreposet(repo), x):
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 for i in range(n):
Pulkit Goyal
revset: add support for using ~ operator on wdir() predicate...
r32441 try:
r = cl.parentrevs(r)[0]
except error.WdirUnsupported:
Martin von Zweigbergk
cleanup: use p1() and p2() instead of parents()[0] and parents()[1]...
r41442 r = repo[r].p1().rev()
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 ps.add(r)
Pierre-Yves David
revset: use `subset &` in `ancestorspec`...
r22531 return subset & ps
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('author(string)', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def author(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Alias for ``user(string)``.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "author" is a keyword
Matt Harbison
revset: stop lowercasing the regex pattern for 'author'...
r30782 n = getstring(x, _("author requires a string"))
kind, pattern, matcher = _substringmatcher(n, casesensitive=False)
return subset.filter(lambda x: matcher(repo[x].user()),
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 condrepr=('<user %r>', n))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('bisect(string)', safe=True)
"Yann E. MORIN"
revset: rename bisected() to bisect()...
r15134 def bisect(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets marked in the specified bisect status:
"Yann E. MORIN"
revset.bisect: add new 'range' set to the bisect keyword...
r15136
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
r15153 - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip
Mads Kiilerich
fix trivial spelling errors
r17424 - ``goods``, ``bads`` : csets topologically good/bad
"Yann E. MORIN"
hbisect: add two new revset descriptions: 'goods' and 'bads'...
r15153 - ``range`` : csets taking part in the bisection
- ``pruned`` : csets that are goods, bads or skipped
- ``untested`` : csets whose fate is yet unknown
- ``ignored`` : csets ignored due to DAG topology
Bryan O'Sullivan
bisect: track the current changeset (issue3382)...
r16647 - ``current`` : the cset currently being bisected
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "bisect" is a keyword
"Yann E. MORIN"
revset.bisect: move bisect() code to hbisect.py...
r15135 status = getstring(x, _("bisect requires a string")).lower()
Bryan O'Sullivan
revset: fix O(n**2) behaviour of bisect() (issue3381)
r16467 state = set(hbisect.get(repo, status))
Pierre-Yves David
revset: use `subset &` in `bisect`...
r22532 return subset & state
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
"Yann E. MORIN"
revset: rename bisected() to bisect()...
r15134 # Backward-compatibility
# - no help entry so that we do not advertise it any more
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('bisected', safe=True)
"Yann E. MORIN"
revset: rename bisected() to bisect()...
r15134 def bisected(repo, subset, x):
return bisect(repo, subset, x)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('bookmark([name])', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def bookmark(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """The named bookmark or all bookmarks.
Simon King
revset: add pattern matching to 'bookmarks' revset expression
r16822
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "bookmark" is a keyword
args = getargs(x, 0, 1, _('bookmark takes one or no arguments'))
if args:
bm = getstring(args[0],
# i18n: "bookmark" is a keyword
_('the argument to bookmark must be a string'))
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 kind, pattern, matcher = stringutil.stringmatcher(bm)
Pierre-Yves David
revset: unify code flow in `bookmark`...
r22499 bms = set()
Simon King
revset: add pattern matching to 'bookmarks' revset expression
r16822 if kind == 'literal':
Yuya Nishihara
revset: expand bookmark(.) to the active bookmark...
r39339 if bm == pattern:
pattern = repo._bookmarks.expandname(pattern)
Michael O'Connor
revset: bookmark revset interprets 'literal:' prefix correctly (issue4329)
r22105 bmrev = repo._bookmarks.get(pattern, None)
Simon King
revset: add pattern matching to 'bookmarks' revset expression
r16822 if not bmrev:
FUJIWARA Katsunori
revset: raise RepoLookupError to make present() predicate continue the query...
r23978 raise error.RepoLookupError(_("bookmark '%s' does not exist")
Yuya Nishihara
revset: strip off "literal:" prefix from bookmark not found error...
r26538 % pattern)
Pierre-Yves David
revset: unify code flow in `bookmark`...
r22499 bms.add(repo[bmrev].rev())
Simon King
revset: add pattern matching to 'bookmarks' revset expression
r16822 else:
matchrevs = set()
Kevin Bullock
bookmarks: don't use bookmarks.listbookmarks in local computations...
r18495 for name, bmrev in repo._bookmarks.iteritems():
Simon King
revset: add pattern matching to 'bookmarks' revset expression
r16822 if matcher(name):
matchrevs.add(bmrev)
for bmrev in matchrevs:
Pierre-Yves David
revset: unify code flow in `bookmark`...
r22499 bms.add(repo[bmrev].rev())
else:
Martin von Zweigbergk
cleanup: use set literals...
r32291 bms = {repo[r].rev() for r in repo._bookmarks.values()}
bms -= {node.nullrev}
Pierre-Yves David
revset: use `subset &` in `bookmark`...
r22530 return subset & bms
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('branch(string or set)', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def branch(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 All changesets belonging to the given branch or the branches of the given
changesets.
Simon King
revset: add pattern matching to 'branch' revset expression
r16821
Matt Harbison
help: eliminate duplicate text for revset string patterns...
r30784 Pattern matching is supported for `string`. See
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 :hg:`help revisions.patterns`.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Durham Goode
revbranchcache: store repo on the object...
r24374 getbi = repo.revbranchcache().branchinfo
Yuya Nishihara
revset: add support for branch(wdir()) and wdir() & branch()
r32683 def getbranch(r):
try:
return getbi(r)[0]
except error.WdirUnsupported:
return repo[r].branch()
Mads Kiilerich
revset: use localrepo revbranchcache for branch name filtering...
r23787
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 try:
b = getstring(x, '')
except error.ParseError:
# not a string, but another revspec, e.g. tip()
pass
Simon King
revset: add pattern matching to 'branch' revset expression
r16821 else:
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 kind, pattern, matcher = stringutil.stringmatcher(b)
Simon King
revset: add pattern matching to 'branch' revset expression
r16821 if kind == 'literal':
# note: falls through to the revspec case if no branch with
Yuya Nishihara
revset: do not fall through to revspec for literal: branch (issue4838)...
r26537 # this name exists and pattern kind is not specified explicitly
Simon King
revset: add pattern matching to 'branch' revset expression
r16821 if pattern in repo.branchmap():
Yuya Nishihara
revset: add support for branch(wdir()) and wdir() & branch()
r32683 return subset.filter(lambda r: matcher(getbranch(r)),
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 condrepr=('<branch %r>', b))
Yuya Nishihara
revset: do not fall through to revspec for literal: branch (issue4838)...
r26537 if b.startswith('literal:'):
raise error.RepoLookupError(_("branch '%s' does not exist")
% pattern)
Simon King
revset: add pattern matching to 'branch' revset expression
r16821 else:
Yuya Nishihara
revset: add support for branch(wdir()) and wdir() & branch()
r32683 return subset.filter(lambda r: matcher(getbranch(r)),
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 condrepr=('<branch %r>', b))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 s = getset(repo, fullreposet(repo), x)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 b = set()
for r in s:
Yuya Nishihara
revset: add support for branch(wdir()) and wdir() & branch()
r32683 b.add(getbranch(r))
Pierre-Yves David
revset-branch: remove usage of `set()`...
r22867 c = s.__contains__
Yuya Nishihara
revset: add support for branch(wdir()) and wdir() & branch()
r32683 return subset.filter(lambda r: c(r) or getbranch(r) in b,
Yuya Nishihara
py3: drop b'' from repr() of smartset...
r35922 condrepr=lambda: '<branch %r>' % _sortedb(b))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Boris Feld
revset: rename bumped into phasedivergent...
r33771 @predicate('phasedivergent()', safe=True)
def phasedivergent(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Mutable changesets marked as successors of public changesets.
Pierre-Yves David
revset: add a bumped revset...
r17829
Boris Feld
revset: rename bumped into phasedivergent...
r33771 Only non-public and non-obsolete changesets can be `phasedivergent`.
Boris Feld
revset: mark evolution-related revsets as experimental...
r33855 (EXPERIMENTAL)
Pierre-Yves David
revset: add a bumped revset...
r17829 """
Boris Feld
revset: rename bumped into phasedivergent...
r33771 # i18n: "phasedivergent" is a keyword
getargs(x, 0, 0, _("phasedivergent takes no arguments"))
Boris Feld
obsolete: rename bumped volatile set into phasedivergent volatile set...
r33774 phasedivergent = obsmod.getrevs(repo, 'phasedivergent')
return subset & phasedivergent
Pierre-Yves David
revset: add a bumped revset...
r17829
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('bundle()', safe=True)
Tomasz Kleczek
bundle: add revset expression to show bundle contents (issue3487)...
r17913 def bundle(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets in the bundle.
Tomasz Kleczek
bundle: add revset expression to show bundle contents (issue3487)...
r17913
Bundle must be specified by the -R option."""
try:
Mads Kiilerich
bundlerepo: improve performance for bundle() revset expression...
r18411 bundlerevs = repo.changelog.bundlerevs
Tomasz Kleczek
bundle: add revset expression to show bundle contents (issue3487)...
r17913 except AttributeError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("no bundle provided - specify with -R"))
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & bundlerevs
Tomasz Kleczek
bundle: add revset expression to show bundle contents (issue3487)...
r17913
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def checkstatus(repo, subset, pat, field):
Patrick Mezard
revset: fix adds/modifies/removes and patterns (issue3403)...
r16521 hasset = matchmod.patkind(pat) == 'set'
Lucas Moscovicz
revset: added lazyset implementation to checkstatus...
r20457
Martin von Zweigbergk
revset: don't recreate matcher for every revision...
r23115 mcache = [None]
Lucas Moscovicz
revset: added lazyset implementation to checkstatus...
r20457 def matches(x):
c = repo[x]
Martin von Zweigbergk
revset: don't recreate matcher for every revision...
r23115 if not mcache[0] or hasset:
mcache[0] = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
m = mcache[0]
fname = None
if not m.anypats() and len(m.files()) == 1:
fname = m.files()[0]
Patrick Mezard
revset: fix adds/modifies/removes and patterns (issue3403)...
r16521 if fname is not None:
if fname not in c.files():
Lucas Moscovicz
revset: added lazyset implementation to checkstatus...
r20457 return False
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 else:
for f in c.files():
if m(f):
break
else:
Lucas Moscovicz
revset: added lazyset implementation to checkstatus...
r20457 return False
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 files = repo.status(c.p1().node(), c.node())[field]
Patrick Mezard
revset: fix adds/modifies/removes and patterns (issue3403)...
r16521 if fname is not None:
if fname in files:
Lucas Moscovicz
revset: added lazyset implementation to checkstatus...
r20457 return True
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 else:
for f in files:
if m(f):
Lucas Moscovicz
revset: added lazyset implementation to checkstatus...
r20457 return True
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches, condrepr=('<status[%r] %r>', field, pat))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Martin von Zweigbergk
revsets: passing a set to baseset() is not wrong...
r29406 def _children(repo, subset, parentset):
Pierre-Yves David
revset: gratuitous code move in '_children'...
r25550 if not parentset:
return baseset()
Matt Mackall
revset: optimize roots and children
r15899 cs = set()
pr = repo.changelog.parentrevs
Pierre-Yves David
revset: use parentsets.min in _children...
r25567 minrev = parentset.min()
Yuya Nishihara
revset: make children() not look at p2 if null (issue5439)...
r30699 nullrev = node.nullrev
Martin von Zweigbergk
revsets: passing a set to baseset() is not wrong...
r29406 for r in subset:
Siddharth Agarwal
revset.children: ignore rev numbers that are too low...
r18063 if r <= minrev:
continue
Yuya Nishihara
revset: make children() not look at p2 if null (issue5439)...
r30699 p1, p2 = pr(r)
if p1 in parentset:
cs.add(r)
if p2 != nullrev and p2 in parentset:
cs.add(r)
Matt Mackall
revsets: backout d04aac468bf4 due to performance regressions
r20709 return baseset(cs)
Matt Mackall
revset: optimize roots and children
r15899
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('children(set)', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def children(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Child changesets of changesets in set.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Pierre-Yves David
revset-children: call 'getset' on a 'fullreposet'...
r23164 s = getset(repo, fullreposet(repo), x)
Matt Mackall
revset: optimize roots and children
r15899 cs = _children(repo, subset, s)
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & cs
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('closed()', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def closed(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset is closed.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "closed" is a keyword
getargs(x, 0, 0, _("closed takes no arguments"))
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(lambda r: repo[r].closesbranch(),
condrepr='<branch closed>')
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Sean Farley
revset: add optimization for heads(commonancestors())...
r38644 # for internal use
@predicate('_commonancestorheads(set)', safe=True)
def _commonancestorheads(repo, subset, x):
# This is an internal method is for quickly calculating "heads(::x and
# ::y)"
Valentin Gatien-Baron
revset: make heads(commonancestors(x + x^)) be x^, not x...
r39863 # These greatest common ancestors are the same ones that the consensus bid
Sean Farley
revset: add optimization for heads(commonancestors())...
r38644 # merge will find.
Valentin Gatien-Baron
revset: make heads(commonancestors(x + x^)) be x^, not x...
r39863 startrevs = getset(repo, fullreposet(repo), x, order=anyorder)
Sean Farley
revset: add optimization for heads(commonancestors())...
r38644
Valentin Gatien-Baron
revset: make heads(commonancestors(x + x^)) be x^, not x...
r39863 ancs = repo.changelog._commonancestorsheads(*list(startrevs))
Sean Farley
revset: add optimization for heads(commonancestors())...
r38644 return subset & baseset(ancs)
Sean Farley
revsets: add commonancestors revset...
r38643 @predicate('commonancestors(set)', safe=True)
def commonancestors(repo, subset, x):
Valentin Gatien-Baron
revset: reword commonancestor()'s help...
r39861 """Changesets that are ancestors of every changeset in set.
Sean Farley
revsets: add commonancestors revset...
r38643 """
Valentin Gatien-Baron
revset: make commonancestors(x + x^) be ::(x^), not ::x...
r39859 startrevs = getset(repo, fullreposet(repo), x, order=anyorder)
if not startrevs:
Yuya Nishihara
revset: special case commonancestors(none()) to be empty set...
r38727 return baseset()
Valentin Gatien-Baron
revset: make commonancestors(x + x^) be ::(x^), not ::x...
r39859 for r in startrevs:
Sean Farley
revsets: add commonancestors revset...
r38643 subset &= dagop.revancestors(repo, baseset([r]))
return subset
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('contains(pattern)', weight=100)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def contains(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """The revision's manifest contains a file matching pattern (but might not
Greg Hurrell
help: clarify distinction among `contains`/`file`/`filelog`...
r21199 modify it). See :hg:`help patterns` for information about file patterns.
FUJIWARA Katsunori
revset: add explanation about the pattern without explicit kind...
r20289
The pattern without explicit kind like ``glob:`` is expected to be
relative to the current directory and match against a file exactly
for efficiency.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "contains" is a keyword
pat = getstring(x, _("contains requires a pattern"))
Lucas Moscovicz
revset: added lazyset implementation to contains revset
r20461
def matches(x):
if not matchmod.patkind(pat):
pats = pathutil.canonpath(repo.root, repo.getcwd(), pat)
if pats in repo[x]:
return True
else:
c = repo[x]
m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=c)
Matt Mackall
revsets: provide contexts for filesets...
r15964 for f in c.manifest():
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 if m(f):
Lucas Moscovicz
revset: added lazyset implementation to contains revset
r20461 return True
return False
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches, condrepr=('<contains %r>', pat))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('converted([id])', safe=True)
Matt Harbison
revset: add a predicate for finding converted changesets...
r17002 def converted(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets converted from the given identifier in the old repository if
Matt Harbison
revset: add a predicate for finding converted changesets...
r17002 present, or all converted changesets if no identifier is specified.
"""
# There is exactly no chance of resolving the revision, so do a simple
# string compare and hope for the best
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 rev = None
Matt Harbison
revset: add a predicate for finding converted changesets...
r17002 # i18n: "converted" is a keyword
l = getargs(x, 0, 1, _('converted takes one or no arguments'))
if l:
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "converted" is a keyword
Matt Harbison
revset: add a predicate for finding converted changesets...
r17002 rev = getstring(l[0], _('converted requires a revision'))
def _matchvalue(r):
source = repo[r].extra().get('convert_revision', None)
return source is not None and (rev is None or source.startswith(rev))
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(lambda r: _matchvalue(r),
condrepr=('<converted %r>', rev))
Matt Harbison
revset: add a predicate for finding converted changesets...
r17002
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('date(interval)', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def date(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets within the interval, see :hg:`help dates`.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "date" is a keyword
ds = getstring(x, _("date requires a string"))
Boris Feld
util: extract all date-related utils in utils/dateutil module...
r36625 dm = dateutil.matchdate(ds)
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(lambda x: dm(repo[x].date()[0]),
condrepr=('<date %r>', ds))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('desc(string)', safe=True, weight=10)
Thomas Arendsen Hein
revset: add desc(string) to search in commit messages...
r14650 def desc(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Search commit message for string. The match is case-insensitive.
Matt Harbison
revset: add regular expression support to 'desc'...
r30783
Matt Harbison
help: eliminate duplicate text for revset string patterns...
r30784 Pattern matching is supported for `string`. See
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 :hg:`help revisions.patterns`.
Thomas Arendsen Hein
revset: add desc(string) to search in commit messages...
r14650 """
# i18n: "desc" is a keyword
Matt Harbison
revset: add regular expression support to 'desc'...
r30783 ds = getstring(x, _("desc requires a string"))
kind, pattern, matcher = _substringmatcher(ds, casesensitive=False)
return subset.filter(lambda r: matcher(repo[r].description()),
condrepr=('<desc %r>', ds))
Thomas Arendsen Hein
revset: add desc(string) to search in commit messages...
r14650
Yuya Nishihara
revset: add depth limit to descendants() (issue5374)...
r33080 def _descendants(repo, subset, x, followfirst=False, startdepth=None,
stopdepth=None):
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 roots = getset(repo, fullreposet(repo), x)
Mads Kiilerich
revset: better naming of variables containing the value of a single argument...
r22944 if not roots:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Yuya Nishihara
revset: add depth limit to descendants() (issue5374)...
r33080 s = dagop.revdescendants(repo, roots, followfirst, startdepth, stopdepth)
Yuya Nishihara
dagop: change revdescendants() to include all root revisions...
r33075 return subset & s
Patrick Mezard
graphlog: fix --follow-first --rev combinations...
r16409
Yuya Nishihara
revset: add depth limit to descendants() (issue5374)...
r33080 @predicate('descendants(set[, depth])', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def descendants(repo, subset, x):
Yuya Nishihara
help: clarify ancestors() and descendants() include given set (issue5594)...
r32905 """Changesets which are descendants of changesets in set, including the
given changesets themselves.
Yuya Nishihara
revset: add depth limit to descendants() (issue5374)...
r33080
If depth is specified, the result only includes changesets up to
the specified generation.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: add depth limit to descendants() (issue5374)...
r33080 # startdepth is for internal use only until we can decide the UI
args = getargsdict(x, 'descendants', 'set depth startdepth')
Yuya Nishihara
revset: add support of keyword arguments to ancestors() and descendants()...
r32914 if 'set' not in args:
# i18n: "descendants" is a keyword
raise error.ParseError(_('descendants takes at least 1 argument'))
Yuya Nishihara
revset: add depth limit to descendants() (issue5374)...
r33080 startdepth = stopdepth = None
if 'startdepth' in args:
n = getinteger(args['startdepth'],
"descendants expects an integer startdepth")
if n < 0:
raise error.ParseError("negative startdepth")
startdepth = n
if 'depth' in args:
# i18n: "descendants" is a keyword
n = getinteger(args['depth'], _("descendants expects an integer depth"))
if n < 0:
raise error.ParseError(_("negative depth"))
stopdepth = n + 1
return _descendants(repo, subset, args['set'],
startdepth=startdepth, stopdepth=stopdepth)
Patrick Mezard
graphlog: fix --follow-first --rev combinations...
r16409
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('_firstdescendants', safe=True)
Patrick Mezard
graphlog: fix --follow-first --rev combinations...
r16409 def _firstdescendants(repo, subset, x):
# ``_firstdescendants(set)``
# Like ``descendants(set)`` but follows only the first parents.
return _descendants(repo, subset, x, followfirst=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('destination([set])', safe=True, weight=10)
Matt Harbison
revset: add destination() predicate...
r17186 def destination(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets that were created by a graft, transplant or rebase operation,
Matt Harbison
revset: add destination() predicate...
r17186 with the given revisions specified as the source. Omitting the optional set
is the same as passing all().
"""
if x is not None:
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 sources = getset(repo, fullreposet(repo), x)
Matt Harbison
revset: add destination() predicate...
r17186 else:
Yuya Nishihara
revset: drop unnecessary calls of getall() with empty argument...
r24201 sources = fullreposet(repo)
Matt Harbison
revset: add destination() predicate...
r17186
dests = set()
# subset contains all of the possible destinations that can be returned, so
Mads Kiilerich
revset: better naming of variables containing the value of a single argument...
r22944 # iterate over them and see if their source(s) were provided in the arg set.
# Even if the immediate src of r is not in the arg set, src's source (or
Matt Harbison
revset: add destination() predicate...
r17186 # further back) may be. Scanning back further than the immediate src allows
# transitive transplants and rebases to yield the same results as transitive
# grafts.
for r in subset:
src = _getrevsource(repo, r)
lineage = None
while src is not None:
if lineage is None:
lineage = list()
lineage.append(r)
# The visited lineage is a match if the current source is in the arg
# set. Since every candidate dest is visited by way of iterating
timeless@mozdev.org
spelling: further
r17494 # subset, any dests further back in the lineage will be tested by a
Matt Harbison
revset: add destination() predicate...
r17186 # different iteration over subset. Likewise, if the src was already
# selected, the current lineage can be selected without going back
# further.
Mads Kiilerich
revset: better naming of variables containing the value of a single argument...
r22944 if src in sources or src in dests:
Matt Harbison
revset: add destination() predicate...
r17186 dests.update(lineage)
break
r = src
src = _getrevsource(repo, r)
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(dests.__contains__,
Yuya Nishihara
py3: drop b'' from repr() of smartset...
r35922 condrepr=lambda: '<destination %r>' % _sortedb(dests))
Matt Harbison
revset: add destination() predicate...
r17186
Boris Feld
revset: remane divergent into contentdivergent...
r33770 @predicate('contentdivergent()', safe=True)
def contentdivergent(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """
Boris Feld
revset: mark evolution-related revsets as experimental...
r33855 Final successors of changesets with an alternative set of final
successors. (EXPERIMENTAL)
Pierre-Yves David
obsolete: add revset and test for divergent changesets...
r18071 """
Boris Feld
revset: remane divergent into contentdivergent...
r33770 # i18n: "contentdivergent" is a keyword
getargs(x, 0, 0, _("contentdivergent takes no arguments"))
Boris Feld
obsolete: rename divergent volatile set into contentdivergent volatile set...
r33773 contentdivergent = obsmod.getrevs(repo, 'contentdivergent')
return subset & contentdivergent
Pierre-Yves David
obsolete: add revset and test for divergent changesets...
r18071
Yuya Nishihara
revset: add experimental support for extdata...
r34458 @predicate('extdata(source)', safe=False, weight=100)
def extdata(repo, subset, x):
"""Changesets in the specified extdata source. (EXPERIMENTAL)"""
# i18n: "extdata" is a keyword
args = getargsdict(x, 'extdata', 'source')
source = getstring(args.get('source'),
# i18n: "extdata" is a keyword
_('extdata takes at least 1 string argument'))
data = scmutil.extdatasource(repo, source)
return subset & baseset(data)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('extinct()', safe=True)
Pierre-Yves David
obsolete: compute extinct changesets...
r17173 def extinct(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Obsolete changesets with obsolete descendants only.
Patrick Mezard
revset: minor doc fixes on obsolete related revsets
r17291 """
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "extinct" is a keyword
FUJIWARA Katsunori
revset: use appropriate predicate name in error messages...
r17258 getargs(x, 0, 0, _("extinct takes no arguments"))
Pierre-Yves David
obsolete: rename `getobscache` into `getrevs`...
r17825 extincts = obsmod.getrevs(repo, 'extinct')
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & extincts
Pierre-Yves David
obsolete: compute extinct changesets...
r17173
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('extra(label, [value])', safe=True)
Henrik Stuart
revset: add function for matching extra data (issue2767)
r16661 def extra(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets with the given label in the extra metadata, with the given
Simon King
revset: add pattern matching to 'extra' revset expression
r16824 optional value.
Matt Harbison
help: eliminate duplicate text for revset string patterns...
r30784 Pattern matching is supported for `value`. See
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 :hg:`help revisions.patterns`.
Simon King
revset: add pattern matching to 'extra' revset expression
r16824 """
Yuya Nishihara
revset: rename getkwargs() to getargsdict()...
r25767 args = getargsdict(x, 'extra', 'label value')
Yuya Nishihara
revset: port extra() to support keyword arguments...
r25706 if 'label' not in args:
# i18n: "extra" is a keyword
raise error.ParseError(_('extra takes at least 1 argument'))
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "extra" is a keyword
Yuya Nishihara
revset: port extra() to support keyword arguments...
r25706 label = getstring(args['label'], _('first argument to extra must be '
'a string'))
Henrik Stuart
revset: add function for matching extra data (issue2767)
r16661 value = None
Yuya Nishihara
revset: port extra() to support keyword arguments...
r25706 if 'value' in args:
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "extra" is a keyword
Yuya Nishihara
revset: port extra() to support keyword arguments...
r25706 value = getstring(args['value'], _('second argument to extra must be '
'a string'))
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 kind, value, matcher = stringutil.stringmatcher(value)
Henrik Stuart
revset: add function for matching extra data (issue2767)
r16661
def _matchvalue(r):
extra = repo[r].extra()
Simon King
revset: add pattern matching to 'extra' revset expression
r16824 return label in extra and (value is None or matcher(extra[label]))
Henrik Stuart
revset: add function for matching extra data (issue2767)
r16661
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(lambda r: _matchvalue(r),
condrepr=('<extra[%r] %r>', label, value))
Pierre-Yves David
phases: implements simple revset symbol...
r15819
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('filelog(pattern)', safe=True)
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342 def filelog(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets connected to the specified filelog.
FUJIWARA Katsunori
revset: add explanation about difference between 'filelog()' and 'file()'
r17244
Greg Hurrell
help: clarify distinction among `contains`/`file`/`filelog`...
r21199 For performance reasons, visits only revisions mentioned in the file-level
filelog, rather than filtering through all changesets (much faster, but
doesn't include deletes or duplicate changes). For a slower, more accurate
result, use ``file()``.
FUJIWARA Katsunori
revset: add explanation about the pattern without explicit kind...
r20289
The pattern without explicit kind like ``glob:`` is expected to be
relative to the current directory and match against a file exactly
for efficiency.
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719
If some linkrev points to revisions filtered by the current repoview, we'll
work around it to return a non-filtered value.
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342 """
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "filelog" is a keyword
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342 pat = getstring(x, _("filelog requires a pattern"))
s = set()
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719 cl = repo.changelog
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342
Matt Mackall
revsets: provide contexts for filesets...
r15964 if not matchmod.patkind(pat):
FUJIWARA Katsunori
revset: use "canonpath()" for "filelog()" pattern without explicit kind...
r20288 f = pathutil.canonpath(repo.root, repo.getcwd(), pat)
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719 files = [f]
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342 else:
FUJIWARA Katsunori
revset: use "canonpath()" for "filelog()" pattern without explicit kind...
r20288 m = matchmod.match(repo.root, repo.getcwd(), [pat], ctx=repo[None])
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719 files = (f for f in repo[None] if m(f))
for f in files:
fl = repo.file(f)
Matt Mackall
log: speed up single file log with hidden revs (issue4747)...
r27945 known = {}
scanpos = 0
Pierre-Yves David
linkrev: work around linkrev to filtered entry in 'filelog' revset...
r23719 for fr in list(fl):
Matt Mackall
log: speed up single file log with hidden revs (issue4747)...
r27945 fn = fl.node(fr)
if fn in known:
s.add(known[fn])
Martin von Zweigbergk
filelog: remove trailing "form feed" character
r23821 continue
Matt Mackall
log: speed up single file log with hidden revs (issue4747)...
r27945
lr = fl.linkrev(fr)
if lr in cl:
s.add(lr)
elif scanpos is not None:
# lowest matching changeset is filtered, scan further
# ahead in changelog
start = max(lr, scanpos) + 1
scanpos = None
for r in cl.revs(start):
# minimize parsing of non-matching entries
if f in cl.revision(r) and f in cl.readfiles(r):
try:
# try to use manifest delta fastpath
n = repo[r].filenode(f)
if n not in known:
if n == fn:
s.add(r)
scanpos = r
break
else:
known[n] = r
except error.ManifestLookupError:
# deletion in changelog
continue
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342
Pierre-Yves David
revset: use `subset &` in `filelog`...
r22534 return subset & s
Matt Mackall
revset: introduce filelog() to emulate log's fast path...
r14342
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('first(set, [n])', safe=True, takeorder=True, weight=0)
Yuya Nishihara
revset: fix order of first/last members in compound expression (BC)...
r32800 def first(repo, subset, x, order):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """An alias for limit().
Matt Mackall
revsets: add first alias for last
r15117 """
Yuya Nishihara
revset: fix order of first/last members in compound expression (BC)...
r32800 return limit(repo, subset, x, order)
Matt Mackall
revsets: add first alias for last
r15117
Patrick Mezard
context: add followfirst arg to filectx and workingfilectx...
r16185 def _follow(repo, subset, x, name, followfirst=False):
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 args = getargsdict(x, name, 'file startrev')
Yuya Nishihara
revset: alias follow(startrev=rev) to ancestors(rev)...
r35301 revs = None
if 'startrev' in args:
revs = getset(repo, fullreposet(repo), args['startrev'])
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 if 'file' in args:
x = getstring(args['file'], _("%s expected a pattern") % name)
Yuya Nishihara
revset: alias follow(startrev=rev) to ancestors(rev)...
r35301 if revs is None:
revs = [None]
Yuya Nishihara
revset: make follow() accept multiple startrevs...
r35299 fctxs = []
for r in revs:
ctx = mctx = repo[r]
if r is None:
ctx = repo['.']
m = matchmod.match(repo.root, repo.getcwd(), [x],
ctx=mctx, default='path')
fctxs.extend(ctx[f].introfilectx() for f in ctx.manifest().walk(m))
Yuya Nishihara
dagop: add smartset interface to filectxancestors()...
r35297 s = dagop.filerevancestors(fctxs, followfirst)
Patrick Mezard
context: add followfirst arg to filectx and workingfilectx...
r16185 else:
Yuya Nishihara
revset: alias follow(startrev=rev) to ancestors(rev)...
r35301 if revs is None:
revs = baseset([repo['.'].rev()])
s = dagop.revancestors(repo, revs, followfirst)
Patrick Mezard
context: add followfirst arg to filectx and workingfilectx...
r16185
Pierre-Yves David
revset: use `subset &` in `follow`...
r22535 return subset & s
Patrick Mezard
context: add followfirst arg to filectx and workingfilectx...
r16185
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 @predicate('follow([file[, startrev]])', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def follow(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """
Yuya Nishihara
revset: replace "working copy" with "working directory" in function help
r24366 An alias for ``::.`` (ancestors of the working directory's first parent).
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 If file pattern is specified, the histories of files matching given
Gábor Stefanik
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)...
r29814 pattern in the revision given by startrev are followed, including copies.
Matt Mackall
revset: add follow(filename) to follow a filename's history across copies
r14343 """
Patrick Mezard
context: add followfirst arg to filectx and workingfilectx...
r16185 return _follow(repo, subset, x, 'follow')
Matt Mackall
revset: add follow(filename) to follow a filename's history across copies
r14343
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('_followfirst', safe=True)
Patrick Mezard
graphlog: implement --follow-first...
r16174 def _followfirst(repo, subset, x):
Yuya Nishihara
revset: make follow() accept keyword arguments...
r35300 # ``followfirst([file[, startrev]])``
# Like ``follow([file[, startrev]])`` but follows only the first parent
Gábor Stefanik
revset: support "follow(renamed.py, e22f4f3f06c3)" (issue5334)...
r29814 # of every revisions or files revisions.
Patrick Mezard
context: add followfirst arg to filectx and workingfilectx...
r16185 return _follow(repo, subset, x, '_followfirst', followfirst=True)
Matt Mackall
revset: add follow(filename) to follow a filename's history across copies
r14343
Denis Laxalde
revset: add a 'descend' argument to followlines to return descendants...
r31938 @predicate('followlines(file, fromline:toline[, startrev=., descend=False])',
safe=True)
Denis Laxalde
revset: add a followlines(file, fromline, toline[, rev]) revset...
r30719 def followlines(repo, subset, x):
"""Changesets modifying `file` in line range ('fromline', 'toline').
Yuya Nishihara
revset: rename rev argument of followlines() to startrev...
r30800 Line range corresponds to 'file' content at 'startrev' and should hence be
consistent with file size. If startrev is not specified, working directory's
Denis Laxalde
revset: add a followlines(file, fromline, toline[, rev]) revset...
r30719 parent is used.
Denis Laxalde
revset: add a 'descend' argument to followlines to return descendants...
r31938
By default, ancestors of 'startrev' are returned. If 'descend' is True,
descendants of 'startrev' are returned though renames are (currently) not
followed in this direction.
Denis Laxalde
revset: add a followlines(file, fromline, toline[, rev]) revset...
r30719 """
Denis Laxalde
revset: add a 'descend' argument to followlines to return descendants...
r31938 args = getargsdict(x, 'followlines', 'file *lines startrev descend')
Yuya Nishihara
revset: abuse x:y syntax to specify line range of followlines()...
r30804 if len(args['lines']) != 1:
raise error.ParseError(_("followlines requires a line range"))
Denis Laxalde
revset: add a followlines(file, fromline, toline[, rev]) revset...
r30719
rev = '.'
Yuya Nishihara
revset: rename rev argument of followlines() to startrev...
r30800 if 'startrev' in args:
revs = getset(repo, fullreposet(repo), args['startrev'])
Yuya Nishihara
revset: parse variable-length arguments of followlines() by getargsdict()
r30754 if len(revs) != 1:
raise error.ParseError(
FUJIWARA Katsunori
revset: add i18n comments to error messages for followlines predicate...
r32086 # i18n: "followlines" is a keyword
Yuya Nishihara
revset: parse variable-length arguments of followlines() by getargsdict()
r30754 _("followlines expects exactly one revision"))
rev = revs.last()
pat = getstring(args['file'], _("followlines requires a pattern"))
Denis Laxalde
revset: extract a parsefollowlinespattern helper function...
r34855 # i18n: "followlines" is a keyword
msg = _("followlines expects exactly one file")
fname = scmutil.parsefollowlinespattern(repo, rev, pat, msg)
Yuya Nishihara
revset: extract a helper to parse integer range...
r41702 fromline, toline = util.processlinerange(
*getintrange(args['lines'][0],
# i18n: "followlines" is a keyword
Yuya Nishihara
revset: allow to parse single integer as a range...
r41703 _("followlines expects a line number or a range"),
Yuya Nishihara
revset: extract a helper to parse integer range...
r41702 _("line range bounds must be integers")))
Denis Laxalde
revset: add a followlines(file, fromline, toline[, rev]) revset...
r30719
fctx = repo[rev].filectx(fname)
Denis Laxalde
revset: properly parse "descend" argument of followlines()...
r31998 descend = False
if 'descend' in args:
descend = getboolean(args['descend'],
FUJIWARA Katsunori
revset: add i18n comments to error messages for followlines predicate...
r32086 # i18n: "descend" is a keyword
_("descend argument must be a boolean"))
Denis Laxalde
revset: properly parse "descend" argument of followlines()...
r31998 if descend:
Denis Laxalde
revset: add a 'descend' argument to followlines to return descendants...
r31938 rs = generatorset(
(c.rev() for c, _linerange
Yuya Nishihara
dagop: move blockancestors() and blockdescendants() from context...
r32904 in dagop.blockdescendants(fctx, fromline, toline)),
Denis Laxalde
revset: add a 'descend' argument to followlines to return descendants...
r31938 iterasc=True)
else:
rs = generatorset(
(c.rev() for c, _linerange
Yuya Nishihara
dagop: move blockancestors() and blockdescendants() from context...
r32904 in dagop.blockancestors(fctx, fromline, toline)),
Denis Laxalde
revset: add a 'descend' argument to followlines to return descendants...
r31938 iterasc=False)
return subset & rs
Denis Laxalde
revset: add a followlines(file, fromline, toline[, rev]) revset...
r30719
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('all()', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def getall(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """All changesets, the same as ``0:tip``.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "all" is a keyword
getargs(x, 0, 0, _("all takes no arguments"))
Yuya Nishihara
revset: have all() filter out null revision...
r24202 return subset & spanset(repo) # drop "null" if any
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('grep(regex)', weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def grep(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
Martin Geisler
merge with stable
r14357 to ensure special escape characters are handled correctly. Unlike
``keyword(string)``, the match is case-sensitive.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
try:
# i18n: "grep" is a keyword
gr = re.compile(getstring(x, _("grep requires a string")))
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except re.error as e:
Augie Fackler
revset: use {force,}bytestr to fix some %r formatting issues...
r36598 raise error.ParseError(
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 _('invalid match pattern: %s') % stringutil.forcebytestr(e))
Lucas Moscovicz
revset: added lazyset implementation to grep revset...
r20453
def matches(x):
c = repo[x]
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 for e in c.files() + [c.user(), c.description()]:
if gr.search(e):
Lucas Moscovicz
revset: added lazyset implementation to grep revset...
r20453 return True
return False
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches, condrepr=('<grep %r>', gr.pattern))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('_matchfiles', safe=True)
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 def _matchfiles(repo, subset, x):
# _matchfiles takes a revset list of prefixed arguments:
#
# [p:foo, i:bar, x:baz]
#
# builds a match object from them and filters subset. Allowed
# prefixes are 'p:' for regular patterns, 'i:' for include
Patrick Mezard
graphlog: evaluate FILE/-I/-X filesets on the working dir...
r16181 # patterns and 'x:' for exclude patterns. Use 'r:' prefix to pass
# a revision identifier, or the empty string to reference the
# working directory, from which the match object is
Patrick Mezard
graphlog: correctly handle calls in subdirectories
r16411 # initialized. Use 'd:' to set the default matching mode, default
# to 'glob'. At most one 'r:' and 'd:' argument can be passed.
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161
Yuya Nishihara
revset: drop translation markers from error messages of internal _matchfiles...
r28271 l = getargs(x, 1, -1, "_matchfiles requires at least one argument")
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 pats, inc, exc = [], [], []
Patrick Mezard
graphlog: correctly handle calls in subdirectories
r16411 rev, default = None, None
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 for arg in l:
Yuya Nishihara
revset: drop translation markers from error messages of internal _matchfiles...
r28271 s = getstring(arg, "_matchfiles requires string arguments")
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 prefix, value = s[:2], s[2:]
if prefix == 'p:':
pats.append(value)
elif prefix == 'i:':
inc.append(value)
elif prefix == 'x:':
exc.append(value)
Patrick Mezard
graphlog: evaluate FILE/-I/-X filesets on the working dir...
r16181 elif prefix == 'r:':
if rev is not None:
Yuya Nishihara
revset: drop translation markers from error messages of internal _matchfiles...
r28271 raise error.ParseError('_matchfiles expected at most one '
'revision')
Matt Harbison
revset: evaluate filesets against each revision for 'file()' (issue5778)...
r35835 if value == '': # empty means working directory
rev = node.wdirrev
else:
Martin von Zweigbergk
log: evaluate filesets on working copy, not its parent...
r23950 rev = value
Patrick Mezard
graphlog: correctly handle calls in subdirectories
r16411 elif prefix == 'd:':
if default is not None:
Yuya Nishihara
revset: drop translation markers from error messages of internal _matchfiles...
r28271 raise error.ParseError('_matchfiles expected at most one '
'default mode')
Patrick Mezard
graphlog: correctly handle calls in subdirectories
r16411 default = value
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 else:
Yuya Nishihara
revset: drop translation markers from error messages of internal _matchfiles...
r28271 raise error.ParseError('invalid _matchfiles prefix: %s' % prefix)
Patrick Mezard
graphlog: correctly handle calls in subdirectories
r16411 if not default:
default = 'glob'
Matt Harbison
revset: evaluate filesets against each revision for 'file()' (issue5778)...
r35835 hasset = any(matchmod.patkind(p) == 'set' for p in pats + inc + exc)
Lucas Moscovicz
revset: added lazyset implementation to _matchfiles...
r20458
Matt Harbison
revset: evaluate filesets against each revision for 'file()' (issue5778)...
r35835 mcache = [None]
Matt Mackall
revset: avoid recalculating filesets...
r23061
Pierre-Yves David
revset: speed up '_matchfiles'...
r27028 # This directly read the changelog data as creating changectx for all
# revisions is quite expensive.
Laurent Charignon
log: speed up hg log <file|folder>...
r27440 getfiles = repo.changelog.readfiles
Pierre-Yves David
revset: speed up '_matchfiles'...
r27028 wdirrev = node.wdirrev
Lucas Moscovicz
revset: added lazyset implementation to _matchfiles...
r20458 def matches(x):
Pierre-Yves David
revset: speed up '_matchfiles'...
r27028 if x == wdirrev:
files = repo[x].files()
else:
Laurent Charignon
log: speed up hg log <file|folder>...
r27440 files = getfiles(x)
Matt Harbison
revset: evaluate filesets against each revision for 'file()' (issue5778)...
r35835
if not mcache[0] or (hasset and rev is None):
r = x if rev is None else rev
mcache[0] = matchmod.match(repo.root, repo.getcwd(), pats,
include=inc, exclude=exc, ctx=repo[r],
default=default)
m = mcache[0]
Pierre-Yves David
revset: speed up '_matchfiles'...
r27028 for f in files:
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 if m(f):
Lucas Moscovicz
revset: added lazyset implementation to _matchfiles...
r20458 return True
return False
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches,
condrepr=('<matchfiles patterns=%r, include=%r '
'exclude=%r, default=%r, rev=%r>',
pats, inc, exc, default, rev))
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('file(pattern)', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def hasfile(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets affecting files matched by pattern.
FUJIWARA Katsunori
revset: add explanation about difference between 'filelog()' and 'file()'
r17244
Greg Ward
revset: polish explanation of the difference between file() and filelog()
r17265 For a faster but less accurate result, consider using ``filelog()``
instead.
FUJIWARA Katsunori
revset: add explanation about the pattern without explicit kind...
r20289
This predicate uses ``glob:`` as the default kind of pattern.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "file" is a keyword
pat = getstring(x, _("file requires a pattern"))
Patrick Mezard
graphlog: paths/-I/-X handling requires a new revset...
r16161 return _matchfiles(repo, subset, ('string', 'p:' + pat))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('head()', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def head(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset is a named branch head.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "head" is a keyword
getargs(x, 0, 0, _("head takes no arguments"))
hs = set()
Pierre-Yves David
revset: translate node directly with changelog in 'head'...
r25620 cl = repo.changelog
Martin von Zweigbergk
revsets: use itervalues() where only values are needed...
r29407 for ls in repo.branchmap().itervalues():
Pierre-Yves David
revset: translate node directly with changelog in 'head'...
r25620 hs.update(cl.rev(h) for h in ls)
Martin von Zweigbergk
revset: make head() honor order of subset...
r29408 return subset & baseset(hs)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Yuya Nishihara
revset: fix heads() order to always follow the input set (BC)...
r38498 @predicate('heads(set)', safe=True, takeorder=True)
def heads(repo, subset, x, order):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Members of set with no children in set.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: fix heads() order to always follow the input set (BC)...
r38498 # argument set should never define order
if order == defineorder:
order = followorder
Boris Feld
revset: inline parents computation to reuse the input argument...
r41310 inputset = getset(repo, fullreposet(repo), x, order=order)
Boris Feld
revset: use changelog's `headrevs` method to compute heads...
r41312 wdirparents = None
if node.wdirrev in inputset:
# a bit slower, but not common so good enough for now
wdirparents = [p.rev() for p in repo[None].parents()]
inputset = set(inputset)
inputset.discard(node.wdirrev)
heads = repo.changelog.headrevs(inputset)
if wdirparents is not None:
heads.difference_update(wdirparents)
heads.add(node.wdirrev)
heads = baseset(heads)
return subset & heads
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('hidden()', safe=True)
Patrick Mezard
revset: add hidden() revset
r17390 def hidden(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Hidden changesets.
Patrick Mezard
revset: add hidden() revset
r17390 """
# i18n: "hidden" is a keyword
getargs(x, 0, 0, _("hidden takes no arguments"))
Kevin Bullock
filtering: rename filters to their antonyms...
r18382 hiddenrevs = repoview.filterrevs(repo, 'visible')
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & hiddenrevs
Patrick Mezard
revset: add hidden() revset
r17390
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('keyword(string)', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def keyword(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Search commit message, user name, and names of changed files for
Martin Geisler
merge with stable
r14357 string. The match is case-insensitive.
Matt Harbison
revset: point to 'grep' in the 'keyword' help for regex searches...
r30772
For a regular expression or case sensitive search of these fields, use
``grep(regex)``.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "keyword" is a keyword
FUJIWARA Katsunori
i18n: use "encoding.lower()" to normalize specified string for revset...
r15726 kw = encoding.lower(getstring(x, _("keyword requires a string")))
Lucas Moscovicz
revset: added lazyset implementation to keyword revset...
r20447
def matches(r):
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 c = repo[r]
Pierre-Yves David
revset: gratuitous formating fix in keyword...
r25551 return any(kw in encoding.lower(t)
for t in c.files() + [c.user(), c.description()])
Lucas Moscovicz
revset: added lazyset implementation to keyword revset...
r20447
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches, condrepr=('<keyword %r>', kw))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('limit(set[, n[, offset]])', safe=True, takeorder=True, weight=0)
Yuya Nishihara
revset: fix order of first/last members in compound expression (BC)...
r32800 def limit(repo, subset, x, order):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """First n members of set, defaulting to 1, starting from offset.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: add optional offset argument to limit() predicate...
r26638 args = getargsdict(x, 'limit', 'set n offset')
Yuya Nishihara
revset: port limit() to support keyword arguments...
r26637 if 'set' not in args:
# i18n: "limit" is a keyword
Yuya Nishihara
revset: add optional offset argument to limit() predicate...
r26638 raise error.ParseError(_("limit requires one to three arguments"))
Yuya Nishihara
revset: add default value to getinteger() helper...
r30802 # i18n: "limit" is a keyword
lim = getinteger(args.get('n'), _("limit expects a number"), default=1)
Yuya Nishihara
revset: reject negative number to select first/last n members...
r32798 if lim < 0:
raise error.ParseError(_("negative number to select"))
Yuya Nishihara
revset: add default value to getinteger() helper...
r30802 # i18n: "limit" is a keyword
ofs = getinteger(args.get('offset'), _("limit expects a number"), default=0)
Yuya Nishihara
revset: factor out getinteger() helper...
r30801 if ofs < 0:
raise error.ParseError(_("negative offset"))
Yuya Nishihara
revset: port limit() to support keyword arguments...
r26637 os = getset(repo, fullreposet(repo), args['set'])
Yuya Nishihara
smartset: extract method to slice abstractsmartset...
r32819 ls = os.slice(ofs, ofs + lim)
Yuya Nishihara
revset: fix order of first/last members in compound expression (BC)...
r32800 if order == followorder and lim > 1:
return subset & ls
Yuya Nishihara
revset: filter first/last members by __and__ operation...
r32799 return ls & subset
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Yuya Nishihara
revset: fix order of first/last members in compound expression (BC)...
r32800 @predicate('last(set, [n])', safe=True, takeorder=True)
def last(repo, subset, x, order):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Last n members of set, defaulting to 1.
Matt Mackall
revsets: add a last function...
r14061 """
# i18n: "last" is a keyword
Matt Mackall
revset: add default of 1 to limit and last functions
r15116 l = getargs(x, 1, 2, _("last requires one or two arguments"))
Yuya Nishihara
revset: factor out getinteger() helper...
r30801 lim = 1
if len(l) == 2:
Matt Mackall
revsets: add a last function...
r14061 # i18n: "last" is a keyword
Yuya Nishihara
revset: factor out getinteger() helper...
r30801 lim = getinteger(l[1], _("last expects a number"))
Yuya Nishihara
revset: reject negative number to select first/last n members...
r32798 if lim < 0:
raise error.ParseError(_("negative number to select"))
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 os = getset(repo, fullreposet(repo), l[0])
Lucas Moscovicz
revset: changed last implementation to use lazy classes...
r20534 os.reverse()
Yuya Nishihara
smartset: extract method to slice abstractsmartset...
r32819 ls = os.slice(0, lim)
Yuya Nishihara
revset: fix order of first/last members in compound expression (BC)...
r32800 if order == followorder and lim > 1:
return subset & ls
Yuya Nishihara
revset: filter first/last members by __and__ operation...
r32799 ls.reverse()
return ls & subset
Matt Mackall
revsets: add a last function...
r14061
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('max(set)', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def maxrev(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset with highest revision number in set.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 os = getset(repo, fullreposet(repo), x)
Durham Goode
revset: remove existence check from min() and max()...
r26305 try:
Lucas Moscovicz
revset: changed minrev and maxrev implementations to use ordered sets...
r20754 m = os.max()
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 if m in subset:
Yuya Nishihara
revset: add inspection data to max() and min() functions...
r28427 return baseset([m], datarepr=('<max %r, %r>', subset, os))
Durham Goode
revset: remove existence check from min() and max()...
r26305 except ValueError:
# os.max() throws a ValueError when the collection is empty.
# Same as python's max().
pass
Yuya Nishihara
revset: add inspection data to max() and min() functions...
r28427 return baseset(datarepr=('<max %r, %r>', subset, os))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('merge()', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def merge(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset is a merge changeset.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "merge" is a keyword
getargs(x, 0, 0, _("merge takes no arguments"))
cl = repo.changelog
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(lambda r: cl.parentrevs(r)[1] != -1,
condrepr='<merge>')
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('branchpoint()', safe=True)
Ivan Andrus
revsets: add branchpoint() function...
r17753 def branchpoint(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets with more than one child.
Ivan Andrus
revsets: add branchpoint() function...
r17753 """
# i18n: "branchpoint" is a keyword
getargs(x, 0, 0, _("branchpoint takes no arguments"))
cl = repo.changelog
if not subset:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Pierre-Yves David
revset: mark spots that should use 'smartset.min()'...
r25549 # XXX this should be 'parentset.min()' assuming 'parentset' is a smartset
# (and if it is not, it should.)
Ivan Andrus
revsets: add branchpoint() function...
r17753 baserev = min(subset)
parentscount = [0]*(len(repo) - baserev)
Pierre-Yves David
clfilter: use changelog to iterate over the repo in branchpoint...
r17785 for r in cl.revs(start=baserev + 1):
Ivan Andrus
revsets: add branchpoint() function...
r17753 for p in cl.parentrevs(r):
if p >= baserev:
parentscount[p - baserev] += 1
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(lambda r: parentscount[r - baserev] > 1,
condrepr='<branchpoint>')
Ivan Andrus
revsets: add branchpoint() function...
r17753
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('min(set)', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def minrev(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset with lowest revision number in set.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 os = getset(repo, fullreposet(repo), x)
Durham Goode
revset: remove existence check from min() and max()...
r26305 try:
Lucas Moscovicz
revset: changed minrev and maxrev implementations to use ordered sets...
r20754 m = os.min()
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 if m in subset:
Yuya Nishihara
revset: add inspection data to max() and min() functions...
r28427 return baseset([m], datarepr=('<min %r, %r>', subset, os))
Durham Goode
revset: remove existence check from min() and max()...
r26305 except ValueError:
# os.min() throws a ValueError when the collection is empty.
# Same as python's min().
pass
Yuya Nishihara
revset: add inspection data to max() and min() functions...
r28427 return baseset(datarepr=('<min %r, %r>', subset, os))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('modifies(pattern)', safe=True, weight=30)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def modifies(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets modifying files matched by pattern.
FUJIWARA Katsunori
revset: add explanation about the pattern without explicit kind...
r20289
The pattern without explicit kind like ``glob:`` is expected to be
relative to the current directory and match against a file or a
directory.
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 """
# i18n: "modifies" is a keyword
pat = getstring(x, _("modifies requires a pattern"))
return checkstatus(repo, subset, pat, 0)
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 @predicate('named(namespace)')
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836 def named(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """The changesets in a given namespace.
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836
Matt Harbison
help: eliminate duplicate text for revset string patterns...
r30784 Pattern matching is supported for `namespace`. See
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 :hg:`help revisions.patterns`.
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836 """
# i18n: "named" is a keyword
args = getargs(x, 1, 1, _('named requires a namespace argument'))
ns = getstring(args[0],
# i18n: "named" is a keyword
_('the argument to named must be a string'))
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 kind, pattern, matcher = stringutil.stringmatcher(ns)
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836 namespaces = set()
if kind == 'literal':
if pattern not in repo.names:
FUJIWARA Katsunori
revset: raise RepoLookupError to make present() predicate continue the query...
r23978 raise error.RepoLookupError(_("namespace '%s' does not exist")
% ns)
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836 namespaces.add(repo.names[pattern])
else:
for name, ns in repo.names.iteritems():
if matcher(name):
namespaces.add(ns)
names = set()
for ns in namespaces:
for name in ns.listnames(repo):
FUJIWARA Katsunori
revset: mask specific names for named() predicate...
r24151 if name not in ns.deprecated:
names.update(repo[n].rev() for n in ns.nodes(repo, name))
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836
Martin von Zweigbergk
cleanup: use set literals...
r32291 names -= {node.nullrev}
Sean Farley
namespaces: add revset for 'named(namespace)'...
r23836 return subset & names
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('id(string)', safe=True)
Matt Mackall
revset: avoid demandimport bug...
r16417 def node_(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Revision non-ambiguously specified by the given hex string prefix.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Martin Geisler
revset: add translator comments to i18n strings
r12815 # i18n: "id" is a keyword
Benoit Boissinot
revset: use 'requires' instead of 'wants' in error message
r12736 l = getargs(x, 1, 1, _("id requires one argument"))
Martin Geisler
revset: add translator comments to i18n strings
r12815 # i18n: "id" is a keyword
Benoit Boissinot
revset: use 'requires' instead of 'wants' in error message
r12736 n = getstring(l[0], _("id requires a string"))
Augie Fackler
revset: add id() and rev() to allow explicitly referring to changes by hash or rev
r12716 if len(n) == 40:
Alexander Drozdov
revset: id() called with 40-byte strings should give the same results as for short strings...
r24904 try:
rn = repo.changelog.rev(node.bin(n))
Yuya Nishihara
revset: add support for integer and hex wdir identifiers...
r32659 except error.WdirUnsupported:
rn = node.wdirrev
Alexander Drozdov
revset: id() called with 40-byte strings should give the same results as for short strings...
r24904 except (LookupError, TypeError):
rn = None
Augie Fackler
revset: add id() and rev() to allow explicitly referring to changes by hash or rev
r12716 else:
Matt Harbison
revset: fix traceback for bogus revisions in id(rev)...
r16735 rn = None
Yuya Nishihara
revlog: add support for partial matching of wdir node id...
r32684 try:
Martin von Zweigbergk
revset: use resolvehexnodeidprefix() in id() predicate (BC)...
r37884 pm = scmutil.resolvehexnodeidprefix(repo, n)
Yuya Nishihara
revlog: add support for partial matching of wdir node id...
r32684 if pm is not None:
Yuya Nishihara
revset: add support for integer and hex wdir identifiers...
r32659 rn = repo.changelog.rev(pm)
Martin von Zweigbergk
revset: make id() an empty set for ambiguous nodeid (BC)...
r37883 except LookupError:
pass
Yuya Nishihara
revlog: add support for partial matching of wdir node id...
r32684 except error.WdirUnsupported:
rn = node.wdirrev
Matt Harbison
revset: fix traceback for bogus revisions in id(rev)...
r16735
Pierre-Yves David
revset-node: speedup by a few hundred fold...
r23005 if rn is None:
return baseset()
result = baseset([rn])
return result & subset
Augie Fackler
revset: add id() and rev() to allow explicitly referring to changes by hash or rev
r12716
Martin von Zweigbergk
revsets: define a none() revset...
r38294 @predicate('none()', safe=True)
def none(repo, subset, x):
"""No changesets.
"""
# i18n: "none" is a keyword
getargs(x, 0, 0, _("none takes no arguments"))
return baseset()
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('obsolete()', safe=True)
Pierre-Yves David
revset: add an `obsolete` symbol...
r17170 def obsolete(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Mutable changeset with a newer version."""
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "obsolete" is a keyword
Pierre-Yves David
revset: add an `obsolete` symbol...
r17170 getargs(x, 0, 0, _("obsolete takes no arguments"))
Pierre-Yves David
obsolete: rename `getobscache` into `getrevs`...
r17825 obsoletes = obsmod.getrevs(repo, 'obsolete')
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & obsoletes
Pierre-Yves David
revset: add an `obsolete` symbol...
r17170
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('only(set, [set])', safe=True)
Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
r23466 def only(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets that are ancestors of the first set that are not ancestors
Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
r23466 of any other head in the repo. If a second set is specified, the result
is ancestors of the first set that are not ancestors of the second set
(i.e. ::<set1> - ::<set2>).
"""
cl = repo.changelog
# i18n: "only" is a keyword
args = getargs(x, 1, 2, _('only takes one or two arguments'))
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 include = getset(repo, fullreposet(repo), args[0])
Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
r23466 if len(args) == 1:
if not include:
return baseset()
Yuya Nishihara
dagop: split module hosting DAG-related algorithms from revset...
r32903 descendants = set(dagop.revdescendants(repo, include, False))
Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
r23466 exclude = [rev for rev in cl.headrevs()
if not rev in descendants and not rev in include]
else:
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 exclude = getset(repo, fullreposet(repo), args[1])
Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
r23466
results = set(cl.findmissingrevs(common=exclude, heads=include))
Pierre-Yves David
revset: mark spots that use 'set' instead of 'smartset'...
r25554 # XXX we should turn this into a baseset instead of a set, smartset may do
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 # some optimizations from the fact this is a baseset.
Yuya Nishihara
revset: move 'only' so that functions are sorted alphabetically
r23466 return subset & results
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('origin([set])', safe=True)
Matt Harbison
revset: add origin() predicate...
r17185 def origin(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """
Matt Harbison
revset: add origin() predicate...
r17185 Changesets that were specified as a source for the grafts, transplants or
rebases that created the given revisions. Omitting the optional set is the
same as passing all(). If a changeset created by these operations is itself
specified as a source for one of these operations, only the source changeset
for the first operation is selected.
"""
if x is not None:
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 dests = getset(repo, fullreposet(repo), x)
Matt Harbison
revset: add origin() predicate...
r17185 else:
Yuya Nishihara
revset: drop unnecessary calls of getall() with empty argument...
r24201 dests = fullreposet(repo)
Matt Harbison
revset: add origin() predicate...
r17185
def _firstsrc(rev):
src = _getrevsource(repo, rev)
if src is None:
return None
while True:
prev = _getrevsource(repo, src)
if prev is None:
return src
src = prev
Martin von Zweigbergk
cleanup: use set literals...
r32291 o = {_firstsrc(r) for r in dests}
o -= {None}
Pierre-Yves David
revset: mark spots that use 'set' instead of 'smartset'...
r25554 # XXX we should turn this into a baseset instead of a set, smartset may do
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 # some optimizations from the fact this is a baseset.
Pierre-Yves David
revset: use `subset &` in `origin`...
r22536 return subset & o
Matt Harbison
revset: add origin() predicate...
r17185
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('outgoing([path])', safe=False, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def outgoing(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets not found in the specified destination repository, or the
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 default push location.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Gregory Szorc
revset: don't import discovery at module level...
r24722 # Avoid cycles.
Gregory Szorc
revset: use absolute_import
r25971 from . import (
discovery,
hg,
)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 # i18n: "outgoing" is a keyword
Mads Kiilerich
revset and fileset: fix typos in parser error messages
r14717 l = getargs(x, 0, 1, _("outgoing takes one or no arguments"))
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 # i18n: "outgoing" is a keyword
dest = l and getstring(l[0], _("outgoing requires a repository path")) or ''
Hollis Blanchard
outgoing: respect ":pushurl" paths (issue5365)...
r35454 if not dest:
# ui.paths.getpath() explicitly tests for None, not just a boolean
dest = None
path = repo.ui.paths.getpath(dest, default=('default-push', 'default'))
if not path:
raise error.Abort(_('default repository not configured!'),
hint=_("see 'hg help config.paths'"))
dest = path.pushloc or path.loc
branches = path.branch, []
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
if revs:
revs = [repo.lookup(rev) for rev in revs]
Matt Mackall
hg: change various repository() users to use peer() where appropriate...
r14556 other = hg.peer(repo, {}, dest)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 repo.ui.pushbuffer()
Pierre-Yves David
discovery: introduce outgoing object for result of findcommonoutgoing...
r15837 outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 repo.ui.popbuffer()
cl = repo.changelog
Martin von Zweigbergk
cleanup: use set literals...
r32291 o = {cl.rev(r) for r in outgoing.missing}
Pierre-Yves David
revset: use `subset &` in `outgoing`...
r22529 return subset & o
Augie Fackler
revset: add id() and rev() to allow explicitly referring to changes by hash or rev
r12716
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('p1([set])', safe=True)
Matt Mackall
revset: introduce revset core
r11275 def p1(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """First parent of changesets in set, or the working directory.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 if x is None:
Matt Mackall
misc: replace .parents()[0] with p1()
r13878 p = repo[x].p1().rev()
Pierre-Yves David
revset: use `subset &` in bare `p1()`...
r22538 if p >= 0:
return subset & baseset([p])
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
Matt Mackall
revset: introduce revset core
r11275 ps = set()
cl = repo.changelog
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 for r in getset(repo, fullreposet(repo), x):
Pulkit Goyal
revset: make `hg log -r 'wdir()^'` work (issue4905)...
r32403 try:
ps.add(cl.parentrevs(r)[0])
except error.WdirUnsupported:
Martin von Zweigbergk
cleanup: use p1() and p2() instead of parents()[0] and parents()[1]...
r41442 ps.add(repo[r].p1().rev())
Martin von Zweigbergk
cleanup: use set literals...
r32291 ps -= {node.nullrev}
Pierre-Yves David
revset: mark spots that use 'set' instead of 'smartset'...
r25554 # XXX we should turn this into a baseset instead of a set, smartset may do
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 # some optimizations from the fact this is a baseset.
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & ps
Matt Mackall
revset: introduce revset core
r11275
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('p2([set])', safe=True)
Matt Mackall
revset: introduce revset core
r11275 def p2(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Second parent of changesets in set, or the working directory.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 if x is None:
ps = repo[x].parents()
try:
Patrick Mezard
revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)...
r12935 p = ps[1].rev()
Pierre-Yves David
revset: use `subset &` in bare `p2()`...
r22539 if p >= 0:
return subset & baseset([p])
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928 except IndexError:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Kevin Bullock
revsets: let p1() and p2() return parents of working dir...
r12928
Matt Mackall
revset: introduce revset core
r11275 ps = set()
cl = repo.changelog
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 for r in getset(repo, fullreposet(repo), x):
Pulkit Goyal
revset: add support for p2(wdir()) to get second parent of working directory...
r32440 try:
ps.add(cl.parentrevs(r)[1])
except error.WdirUnsupported:
parents = repo[r].parents()
if len(parents) == 2:
ps.add(parents[1])
Martin von Zweigbergk
cleanup: use set literals...
r32291 ps -= {node.nullrev}
Pierre-Yves David
revset: mark spots that use 'set' instead of 'smartset'...
r25554 # XXX we should turn this into a baseset instead of a set, smartset may do
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 # some optimizations from the fact this is a baseset.
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & ps
Matt Mackall
revset: introduce revset core
r11275
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def parentpost(repo, subset, x, order):
Yuya Nishihara
revset: add stub to handle parentpost operation...
r29931 return p1(repo, subset, x)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('parents([set])', safe=True)
Matt Mackall
revset: introduce revset core
r11275 def parents(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 The set of all parents for all changesets in set, or the working directory.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Kevin Bullock
revsets: let parents() return parents of working dir...
r12929 if x is None:
Pierre-Yves David
revset: refactor parents() into a single return point...
r22496 ps = set(p.rev() for p in repo[x].parents())
else:
ps = set()
cl = repo.changelog
Pierre-Yves David
revset: prefetch method in "parents"...
r25716 up = ps.update
parentrevs = cl.parentrevs
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 for r in getset(repo, fullreposet(repo), x):
Pulkit Goyal
revset: use try-except instead of if-else because of perf...
r32439 try:
up(parentrevs(r))
except error.WdirUnsupported:
Pierre-Yves David
revset: prefetch method in "parents"...
r25716 up(p.rev() for p in repo[r].parents())
Martin von Zweigbergk
cleanup: use set literals...
r32291 ps -= {node.nullrev}
Pierre-Yves David
revert: bring back usage of `subset & ps` in `parents`...
r22712 return subset & ps
Matt Mackall
revset: introduce revset core
r11275
Jun Wu
revset: use phasecache.getrevset...
r31017 def _phase(repo, subset, *targets):
"""helper to select all rev in <targets> phases"""
Jun Wu
revset: use phasecache.getrevset to calculate public()...
r35331 return repo._phasecache.getrevset(repo, targets, subset)
Pierre-Yves David
revset: refactor the non-public phase code...
r25621
Boris Feld
phase: expose a `_phase(idx)` revset...
r39310 @predicate('_phase(idx)', safe=True)
def phase(repo, subset, x):
l = getargs(x, 1, 1, ("_phase requires one argument"))
target = getinteger(l[0], ("_phase expects a number"))
return _phase(repo, subset, target)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('draft()', safe=True)
Pierre-Yves David
revset: refactor the non-public phase code...
r25621 def draft(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset in draft phase."""
Pierre-Yves David
revset: refactor the non-public phase code...
r25621 # i18n: "draft" is a keyword
getargs(x, 0, 0, _("draft takes no arguments"))
target = phases.draft
return _phase(repo, subset, target)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('secret()', safe=True)
Pierre-Yves David
revset: refactor the non-public phase code...
r25621 def secret(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset in secret phase."""
Pierre-Yves David
revset: refactor the non-public phase code...
r25621 # i18n: "secret" is a keyword
getargs(x, 0, 0, _("secret takes no arguments"))
target = phases.secret
return _phase(repo, subset, target)
Boris Feld
stack: import Evolve stack test file...
r37019 @predicate('stack([revs])', safe=True)
Boris Feld
stack: follow-up on the stack revset...
r37407 def stack(repo, subset, x):
"""Experimental revset for the stack of changesets or working directory
parent. (EXPERIMENTAL)
"""
Boris Feld
stack: import Evolve stack test file...
r37019 if x is None:
Boris Feld
stack: follow-up on the stack revset...
r37407 stacks = stackmod.getstack(repo, x)
Boris Feld
stack: import Evolve stack test file...
r37019 else:
stacks = smartset.baseset([])
for revision in getset(repo, fullreposet(repo), x):
Boris Feld
stack: follow-up on the stack revset...
r37407 currentstack = stackmod.getstack(repo, revision)
Boris Feld
stack: import Evolve stack test file...
r37019 stacks = stacks + currentstack
Boris Feld
stack: follow-up on the stack revset...
r37407 return subset & stacks
Boris Feld
stack: import Evolve stack test file...
r37019
Yuya Nishihara
revset: pass around ordering flags to operations...
r29932 def parentspec(repo, subset, x, n, order):
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 """``set^0``
The set.
``set^1`` (or ``set^``), ``set^2``
First or second parent, respectively, of all changesets in set.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Brodie Rao
revset: handle re.compile() errors in grep()...
r12320 try:
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 n = int(n[1])
Kevin Gessner
revset: add missing whitespace
r14072 if n not in (0, 1, 2):
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 raise ValueError
Matt Mackall
revsets: actually catch type error on tip^p1(tip) (issue2884)...
r14851 except (TypeError, ValueError):
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 raise error.ParseError(_("^ expects a number 0, 1, or 2"))
ps = set()
Matt Mackall
revset: introduce revset core
r11275 cl = repo.changelog
Pierre-Yves David
revset-parentspec: call 'getset' on a 'fullreposet'...
r23165 for r in getset(repo, fullreposet(repo), x):
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 if n == 0:
ps.add(r)
elif n == 1:
Pulkit Goyal
revset: add support for "wdir()^n"...
r32436 try:
ps.add(cl.parentrevs(r)[0])
except error.WdirUnsupported:
Martin von Zweigbergk
cleanup: use p1() and p2() instead of parents()[0] and parents()[1]...
r41442 ps.add(repo[r].p1().rev())
Pulkit Goyal
revset: remove redundant condition and change to else from elif...
r32438 else:
Pulkit Goyal
revset: add support for "wdir()^n"...
r32436 try:
parents = cl.parentrevs(r)
if parents[1] != node.nullrev:
ps.add(parents[1])
except error.WdirUnsupported:
parents = repo[r].parents()
if len(parents) == 2:
ps.add(parents[1].rev())
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & ps
Matt Mackall
revset: introduce revset core
r11275
Jun Wu
revset: remove order information from tree (API)...
r34013 @predicate('present(set)', safe=True, takeorder=True)
def present(repo, subset, x, order):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """An empty set, if any revision in set isn't found; otherwise,
Patrick Mezard
revsets: generate predicate help dynamically
r12821 all revisions in set.
FUJIWARA Katsunori
doc: add detail explanation for 'present()' predicate of revsets
r16748
If any of specified revisions is not present in the local repository,
the query is normally aborted. But this predicate allows the query
to continue even in such cases.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Wagner Bruna
revset: predicate to avoid lookup errors...
r11944 try:
Jun Wu
revset: remove order information from tree (API)...
r34013 return getset(repo, subset, x, order)
Wagner Bruna
revset: predicate to avoid lookup errors...
r11944 except error.RepoLookupError:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Wagner Bruna
revset: predicate to avoid lookup errors...
r11944
Yuya Nishihara
revset: drop docstring from internal _notpublic() function...
r25224 # for internal use
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('_notpublic', safe=True)
Laurent Charignon
revset: optimize not public revset...
r25191 def _notpublic(repo, subset, x):
Yuya Nishihara
revset: drop translation marker from error message of _notpublic()...
r25225 getargs(x, 0, 0, "_notpublic takes no arguments")
Jun Wu
revset: use phasecache.getrevset...
r31017 return _phase(repo, subset, phases.draft, phases.secret)
Laurent Charignon
revset: optimize not public revset...
r25191
Jun Wu
revset: optimize "draft() & ::x" pattern...
r34067 # for internal use
@predicate('_phaseandancestors(phasename, set)', safe=True)
def _phaseandancestors(repo, subset, x):
# equivalent to (phasename() & ancestors(set)) but more efficient
# phasename could be one of 'draft', 'secret', or '_notpublic'
args = getargs(x, 2, 2, "_phaseandancestors requires two arguments")
phasename = getsymbol(args[0])
s = getset(repo, fullreposet(repo), args[1])
draft = phases.draft
secret = phases.secret
phasenamemap = {
'_notpublic': draft,
'draft': draft, # follow secret's ancestors
'secret': secret,
}
if phasename not in phasenamemap:
raise error.ParseError('%r is not a valid phasename' % phasename)
minimalphase = phasenamemap[phasename]
getphase = repo._phasecache.phase
def cutfunc(rev):
return getphase(repo, rev) < minimalphase
revs = dagop.revancestors(repo, s, cutfunc=cutfunc)
if phasename == 'draft': # need to remove secret changesets
revs = revs.filter(lambda r: getphase(repo, r) == draft)
return subset & revs
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('public()', safe=True)
Pierre-Yves David
phases: implements simple revset symbol...
r15819 def public(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changeset in public phase."""
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "public" is a keyword
Pierre-Yves David
phases: implements simple revset symbol...
r15819 getargs(x, 0, 0, _("public takes no arguments"))
Jun Wu
revset: use phasecache.getrevset to calculate public()...
r35331 return _phase(repo, subset, phases.public)
Pierre-Yves David
phases: implements simple revset symbol...
r15819
Yuya Nishihara
revset: prevent using outgoing() and remote() in hgweb session (BC)...
r30850 @predicate('remote([id [,path]])', safe=False)
Matt Mackall
revset: add remote() predicate to lookup remote revisions
r15936 def remote(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Local revision that corresponds to the given identifier in a
Matt Mackall
revset: add remote() predicate to lookup remote revisions
r15936 remote repository, if present. Here, the '.' identifier is a
synonym for the current local branch.
"""
Gregory Szorc
revset: use absolute_import
r25971 from . import hg # avoid start-up nasties
Matt Mackall
revset: add remote() predicate to lookup remote revisions
r15936 # i18n: "remote" is a keyword
timeless
grammar: favor zero, one, two over ... or no
r27293 l = getargs(x, 0, 2, _("remote takes zero, one, or two arguments"))
Matt Mackall
revset: add remote() predicate to lookup remote revisions
r15936
q = '.'
if len(l) > 0:
# i18n: "remote" is a keyword
q = getstring(l[0], _("remote requires a string id"))
if q == '.':
q = repo['.'].branch()
dest = ''
if len(l) > 1:
# i18n: "remote" is a keyword
dest = getstring(l[1], _("remote requires a repository path"))
dest = repo.ui.expandpath(dest or 'default')
dest, branches = hg.parseurl(dest)
revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
if revs:
revs = [repo.lookup(rev) for rev in revs]
other = hg.peer(repo, {}, dest)
n = other.lookup(q)
if n in repo:
r = repo[n].rev()
FUJIWARA Katsunori
revset: fix 'remote()' failure when remote repo has more revs than local...
r16006 if r in subset:
Lucas Moscovicz
revset: added baseset class (still empty) to improve revset performance...
r20364 return baseset([r])
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Matt Mackall
revset: add remote() predicate to lookup remote revisions
r15936
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('removes(pattern)', safe=True, weight=30)
Matt Mackall
revset: introduce revset core
r11275 def removes(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets which remove files matching pattern.
FUJIWARA Katsunori
revset: add explanation about the pattern without explicit kind...
r20289
The pattern without explicit kind like ``glob:`` is expected to be
relative to the current directory and match against a file or a
directory.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Martin Geisler
revset: add translator comments to i18n strings
r12815 # i18n: "removes" is a keyword
Benoit Boissinot
revset: use 'requires' instead of 'wants' in error message
r12736 pat = getstring(x, _("removes requires a pattern"))
Matt Mackall
revset: introduce revset core
r11275 return checkstatus(repo, subset, pat, 2)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('rev(number)', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def rev(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Revision with the given numeric identifier.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 # i18n: "rev" is a keyword
l = getargs(x, 1, 1, _("rev requires one argument"))
try:
# i18n: "rev" is a keyword
l = int(getstring(l[0], _("rev requires a number")))
Matt Mackall
revsets: actually catch type error on tip^p1(tip) (issue2884)...
r14851 except (TypeError, ValueError):
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 # i18n: "rev" is a keyword
raise error.ParseError(_("rev expects a number"))
Yuya Nishihara
revset: add support for integer and hex wdir identifiers...
r32659 if l not in repo.changelog and l not in (node.nullrev, node.wdirrev):
Yuya Nishihara
revset: have rev() drop out-of-range or filtered rev explicitly (issue4396)...
r23062 return baseset()
Pierre-Yves David
revset: use `subset &` in `rev`...
r22537 return subset & baseset([l])
Matt Mackall
revset: introduce revset core
r11275
Boris Feld
revset: introduce an internal `_rev` predicate for '%d' usage...
r41333 @predicate('_rev(number)', safe=True)
def _rev(repo, subset, x):
# internal version of "rev(x)" that raise error if "x" is invalid
# i18n: "rev" is a keyword
l = getargs(x, 1, 1, _("rev requires one argument"))
try:
# i18n: "rev" is a keyword
l = int(getstring(l[0], _("rev requires a number")))
except (TypeError, ValueError):
# i18n: "rev" is a keyword
raise error.ParseError(_("rev expects a number"))
repo.changelog.node(l) # check that the rev exists
return subset & baseset([l])
Boris Feld
revset: document the `revset(...)` syntax...
r40346 @predicate('revset(set)', safe=True, takeorder=True)
def revsetpredicate(repo, subset, x, order):
"""Strictly interpret the content as a revset.
The content of this special predicate will be strictly interpreted as a
revset. For example, ``revset(id(0))`` will be interpreted as "id(0)"
without possible ambiguity with a "id(0)" bookmark or tag.
"""
return getset(repo, subset, x, order)
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('matching(revision [, field])', safe=True)
Angel Ezquerra
revset: add "matching" keyword...
r16402 def matching(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets in which a given set of fields match the set of fields in the
Angel Ezquerra
revset: add "matching" keyword...
r16402 selected revision or set.
FUJIWARA Katsunori
doc: flatten description of 'matching()' predicate to be formatted well...
r16528
Angel Ezquerra
revset: add "matching" keyword...
r16402 To match more than one field pass the list of fields to match separated
FUJIWARA Katsunori
doc: flatten description of 'matching()' predicate to be formatted well...
r16528 by spaces (e.g. ``author description``).
Valid fields are most regular revision fields and some special fields.
Regular revision fields are ``description``, ``author``, ``branch``,
Angel Ezquerra
revset: add "diff" field to "matching" keyword...
r17102 ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``
and ``diff``.
Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the
contents of the revision. Two revisions matching their ``diff`` will
also match their ``files``.
FUJIWARA Katsunori
doc: flatten description of 'matching()' predicate to be formatted well...
r16528
Special fields are ``summary`` and ``metadata``:
``summary`` matches the first line of the description.
Jesse Glick
revset: documentation typo "metatadata"
r16639 ``metadata`` is equivalent to matching ``description user date``
FUJIWARA Katsunori
doc: flatten description of 'matching()' predicate to be formatted well...
r16528 (i.e. it matches the main metadata fields).
``metadata`` is the default field which is used when no fields are
specified. You can match more than one field at a time.
Angel Ezquerra
revset: add "matching" keyword...
r16402 """
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "matching" is a keyword
Angel Ezquerra
revset: add "matching" keyword...
r16402 l = getargs(x, 1, 2, _("matching takes 1 or 2 arguments"))
Pierre-Yves David
revset-matching: call 'getset' on a 'fullreposet'...
r23166 revs = getset(repo, fullreposet(repo), l[0])
Angel Ezquerra
revset: add "matching" keyword...
r16402
fieldlist = ['metadata']
if len(l) > 1:
fieldlist = getstring(l[1],
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "matching" is a keyword
Angel Ezquerra
revset: add "matching" keyword...
r16402 _("matching requires a string "
"as its second argument")).split()
Angel Ezquerra
revset: add "diff" field to "matching" keyword...
r17102 # Make sure that there are no repeated fields,
# expand the 'special' 'metadata' field type
# and check the 'files' whenever we check the 'diff'
Angel Ezquerra
revset: add "matching" keyword...
r16402 fields = []
for field in fieldlist:
if field == 'metadata':
fields += ['user', 'description', 'date']
Angel Ezquerra
revset: add "diff" field to "matching" keyword...
r17102 elif field == 'diff':
# a revision matching the diff must also match the files
# since matching the diff is very costly, make sure to
# also match the files first
fields += ['files', 'diff']
Angel Ezquerra
revset: add "matching" keyword...
r16402 else:
if field == 'author':
field = 'user'
fields.append(field)
fields = set(fields)
Angel Ezquerra
revset: make matching keyword not match summary when matching for description
r16444 if 'summary' in fields and 'description' in fields:
# If a revision matches its description it also matches its summary
fields.discard('summary')
Angel Ezquerra
revset: add "matching" keyword...
r16402
# We may want to match more than one field
Angel Ezquerra
revset: speedup matching() by first matching fields that take less time to...
r16446 # Not all fields take the same amount of time to be matched
# Sort the selected fields in order of increasing matching cost
Patrick Mezard
revset: make matching() work on python 2.4...
r16453 fieldorder = ['phase', 'parents', 'user', 'date', 'branch', 'summary',
Angel Ezquerra
revset: add "diff" field to "matching" keyword...
r17102 'files', 'description', 'substate', 'diff']
Angel Ezquerra
revset: speedup matching() by first matching fields that take less time to...
r16446 def fieldkeyfunc(f):
try:
return fieldorder.index(f)
except ValueError:
# assume an unknown field is very costly
return len(fieldorder)
fields = list(fields)
fields.sort(key=fieldkeyfunc)
Angel Ezquerra
revset: add "matching" keyword...
r16402 # Each field will be matched with its own "getfield" function
# which will be added to the getfieldfuncs array of functions
getfieldfuncs = []
_funcs = {
'user': lambda r: repo[r].user(),
'branch': lambda r: repo[r].branch(),
'date': lambda r: repo[r].date(),
'description': lambda r: repo[r].description(),
'files': lambda r: repo[r].files(),
'parents': lambda r: repo[r].parents(),
'phase': lambda r: repo[r].phase(),
'substate': lambda r: repo[r].substate,
'summary': lambda r: repo[r].description().splitlines()[0],
Boris Feld
revset: pass an explicit `diffopts` objet to context.diff
r38584 'diff': lambda r: list(repo[r].diff(
Yuya Nishihara
diffutil: remove diffopts() in favor of diffallopts()...
r38606 opts=diffutil.diffallopts(repo.ui, {'git': True}))),
Angel Ezquerra
revset: add "matching" keyword...
r16402 }
for info in fields:
getfield = _funcs.get(info, None)
if getfield is None:
raise error.ParseError(
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "matching" is a keyword
Angel Ezquerra
revset: add "matching" keyword...
r16402 _("unexpected field name passed to matching: %s") % info)
getfieldfuncs.append(getfield)
# convert the getfield array of functions into a "getinfo" function
# which returns an array of field values (or a single value if there
# is only one field to match)
Angel Ezquerra
revset: speedup matching() by stopping the match early if a field does not match...
r16445 getinfo = lambda r: [f(r) for f in getfieldfuncs]
Angel Ezquerra
revset: add "matching" keyword...
r16402
Lucas Moscovicz
revset: added lazyset implementation to matching revset...
r20459 def matches(x):
for rev in revs:
target = getinfo(rev)
Angel Ezquerra
revset: speedup matching() by stopping the match early if a field does not match...
r16445 match = True
for n, f in enumerate(getfieldfuncs):
Lucas Moscovicz
revset: added lazyset implementation to matching revset...
r20459 if target[n] != f(x):
Angel Ezquerra
revset: speedup matching() by stopping the match early if a field does not match...
r16445 match = False
if match:
Lucas Moscovicz
revset: added lazyset implementation to matching revset...
r20459 return True
return False
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches, condrepr=('<matching%r %r>', fields, revs))
Angel Ezquerra
revset: add "matching" keyword...
r16402
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('reverse(set)', safe=True, takeorder=True, weight=0)
Yuya Nishihara
revset: make reverse() noop depending on ordering requirement (BC)...
r29945 def reverse(repo, subset, x, order):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Reverse order of set.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Jun Wu
revset: remove order information from tree (API)...
r34013 l = getset(repo, subset, x, order)
Yuya Nishihara
revset: make reverse() noop depending on ordering requirement (BC)...
r29945 if order == defineorder:
l.reverse()
Matt Mackall
revset: introduce revset core
r11275 return l
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('roots(set)', safe=True)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def roots(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets in set with no parent changeset in set.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 s = getset(repo, fullreposet(repo), x)
Pierre-Yves David
revset: improves time complexity of 'roots(xxx)'...
r25647 parents = repo.changelog.parentrevs
def filter(r):
for p in parents(r):
if 0 <= p and p in s:
return False
return True
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset & s.filter(filter, condrepr='<roots>')
Wagner Bruna
revset: predicate to avoid lookup errors...
r11944
Yuya Nishihara
revset: define table of sort() key functions...
r29265 _sortkeyfuncs = {
'rev': lambda c: c.rev(),
'branch': lambda c: c.branch(),
'desc': lambda c: c.description(),
'user': lambda c: c.user(),
'author': lambda c: c.user(),
'date': lambda c: c.date()[0],
}
Yuya Nishihara
revset: extract function that validates sort() arguments...
r29365 def _getsortargs(x):
"""Parse sort options into (set, [(key, reverse)], opts)"""
Martijn Pieters
revset: add new topographical sort...
r29348 args = getargsdict(x, 'sort', 'set keys topo.firstbranch')
Martijn Pieters
revset: use getargsdict for sort()...
r29238 if 'set' not in args:
# i18n: "sort" is a keyword
raise error.ParseError(_('sort requires one or two arguments'))
Matt Mackall
revset: introduce revset core
r11275 keys = "rev"
Martijn Pieters
revset: use getargsdict for sort()...
r29238 if 'keys' in args:
FUJIWARA Katsunori
i18n: add/relocate "i18n keyword" comments for i18n messages in revset.py
r17259 # i18n: "sort" is a keyword
Martijn Pieters
revset: use getargsdict for sort()...
r29238 keys = getstring(args['keys'], _("sort spec must be a string"))
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 keyflags = []
for k in keys.split():
fk = k
Pulkit Goyal
py3: use .startswith() instead of bytes[0]...
r35932 reverse = (k.startswith('-'))
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 if reverse:
k = k[1:]
if k not in _sortkeyfuncs and k != 'topo':
Augie Fackler
revset: use {force,}bytestr to fix some %r formatting issues...
r36598 raise error.ParseError(
_("unknown sort key %r") % pycompat.bytestr(fk))
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 keyflags.append((k, reverse))
if len(keyflags) > 1 and any(k == 'topo' for k, reverse in keyflags):
Martijn Pieters
revset: add new topographical sort...
r29348 # i18n: "topo" is a keyword
FUJIWARA Katsunori
revset: refactor to make xgettext put i18n comments into hg.pot file...
r29646 raise error.ParseError(_('topo sort order cannot be combined '
'with other sort keys'))
Martijn Pieters
revset: add new topographical sort...
r29348
Yuya Nishihara
revset: build dict of extra sort options before evaluating set...
r29364 opts = {}
Martijn Pieters
revset: add new topographical sort...
r29348 if 'topo.firstbranch' in args:
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 if any(k == 'topo' for k, reverse in keyflags):
Yuya Nishihara
revset: build dict of extra sort options before evaluating set...
r29364 opts['topo.firstbranch'] = args['topo.firstbranch']
Martijn Pieters
revset: add new topographical sort...
r29348 else:
# i18n: "topo" and "topo.firstbranch" are keywords
FUJIWARA Katsunori
revset: refactor to make xgettext put i18n comments into hg.pot file...
r29646 raise error.ParseError(_('topo.firstbranch can only be used '
'when using the topo sort key'))
Martijn Pieters
revset: add new topographical sort...
r29348
Yuya Nishihara
revset: extract function that validates sort() arguments...
r29365 return args['set'], keyflags, opts
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('sort(set[, [-]key... [, ...]])', safe=True, takeorder=True,
weight=10)
Yuya Nishihara
revset: make sort() noop depending on ordering requirement (BC)...
r29946 def sort(repo, subset, x, order):
Yuya Nishihara
revset: extract function that validates sort() arguments...
r29365 """Sort set by keys. The default sort order is ascending, specify a key
as ``-key`` to sort in descending order.
The keys can be:
- ``rev`` for the revision number,
- ``branch`` for the branch name,
- ``desc`` for the commit message (description),
- ``user`` for user name (``author`` can be used as an alias),
- ``date`` for the commit date
- ``topo`` for a reverse topographical sort
The ``topo`` sort order cannot be combined with other sort keys. This sort
takes one optional argument, ``topo.firstbranch``, which takes a revset that
specifies what topographical branches to prioritize in the sort.
"""
s, keyflags, opts = _getsortargs(x)
Jun Wu
revset: remove order information from tree (API)...
r34013 revs = getset(repo, subset, s, order)
Yuya Nishihara
revset: build dict of extra sort options before evaluating set...
r29364
Yuya Nishihara
revset: make sort() noop depending on ordering requirement (BC)...
r29946 if not keyflags or order != defineorder:
Lucas Moscovicz
revset: changed sort method to use native sort implementation of smartsets...
r20719 return revs
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 if len(keyflags) == 1 and keyflags[0][0] == "rev":
revs.sort(reverse=keyflags[0][1])
Lucas Moscovicz
revset: changed sort method to use native sort implementation of smartsets...
r20719 return revs
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 elif keyflags[0][0] == "topo":
Yuya Nishihara
revset: build dict of extra sort options before evaluating set...
r29364 firstbranch = ()
if 'topo.firstbranch' in opts:
firstbranch = getset(repo, subset, opts['topo.firstbranch'])
Yuya Nishihara
dagop: split module hosting DAG-related algorithms from revset...
r32903 revs = baseset(dagop.toposort(revs, repo.changelog.parentrevs,
firstbranch),
Martijn Pieters
revset: add new topographical sort...
r29348 istopo=True)
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 if keyflags[0][1]:
Martijn Pieters
revset: add new topographical sort...
r29348 revs.reverse()
return revs
Yuya Nishihara
revset: make sort() do dumb multi-pass sorting for multiple keys (issue5218)...
r29001 # sort() is guaranteed to be stable
ctxs = [repo[r] for r in revs]
Yuya Nishihara
revset: build list of (key, reverse) pairs before sorting...
r29363 for k, reverse in reversed(keyflags):
ctxs.sort(key=_sortkeyfuncs[k], reverse=reverse)
Yuya Nishihara
revset: make sort() do dumb multi-pass sorting for multiple keys (issue5218)...
r29001 return baseset([c.rev() for c in ctxs])
Matt Mackall
revset: introduce revset core
r11275
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 @predicate('subrepo([pattern])')
Matt Harbison
revset: add the 'subrepo' symbol...
r24446 def subrepo(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """Changesets that add, modify or remove the given subrepo. If no subrepo
Matt Harbison
revset: add the 'subrepo' symbol...
r24446 pattern is named, any subrepo changes are returned.
"""
# i18n: "subrepo" is a keyword
args = getargs(x, 0, 1, _('subrepo takes at most one argument'))
Yuya Nishihara
revset: define "pat" variable unconditionally in subrepo()...
r28272 pat = None
Matt Harbison
revset: add the 'subrepo' symbol...
r24446 if len(args) != 0:
pat = getstring(args[0], _("subrepo requires a pattern"))
m = matchmod.exact(repo.root, repo.root, ['.hgsubstate'])
def submatches(names):
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 k, p, m = stringutil.stringmatcher(pat)
Matt Harbison
revset: add the 'subrepo' symbol...
r24446 for name in names:
if m(name):
yield name
def matches(x):
c = repo[x]
s = repo.status(c.p1().node(), c.node(), match=m)
Yuya Nishihara
revset: define "pat" variable unconditionally in subrepo()...
r28272 if pat is None:
Matt Harbison
revset: add the 'subrepo' symbol...
r24446 return s.added or s.modified or s.removed
if s.added:
Augie Fackler
cleanup: use __builtins__.any instead of util.any...
r25149 return any(submatches(c.substate.keys()))
Matt Harbison
revset: add the 'subrepo' symbol...
r24446
if s.modified:
subs = set(c.p1().substate.keys())
subs.update(c.substate.keys())
for path in submatches(subs):
if c.p1().substate.get(path) != c.substate.get(path):
return True
if s.removed:
Augie Fackler
cleanup: use __builtins__.any instead of util.any...
r25149 return any(submatches(c.p1().substate.keys()))
Matt Harbison
revset: add the 'subrepo' symbol...
r24446
return False
Yuya Nishihara
revset: add inspection data to all filter() calls...
r28424 return subset.filter(matches, condrepr=('<subrepo %r>', pat))
Matt Harbison
revset: add the 'subrepo' symbol...
r24446
Jun Wu
revset: define successors revset...
r33377 def _mapbynodefunc(repo, s, f):
"""(repo, smartset, [node] -> [node]) -> smartset
Helper method to map a smartset to another smartset given a function only
talking about nodes. Handles converting between rev numbers and nodes, and
filtering.
"""
cl = repo.unfiltered().changelog
torev = cl.rev
tonode = cl.node
nodemap = cl.nodemap
result = set(torev(n) for n in f(tonode(r) for r in s) if n in nodemap)
return smartset.baseset(result - repo.changelog.filteredrevs)
@predicate('successors(set)', safe=True)
def successors(repo, subset, x):
"""All successors for set, including the given set themselves"""
s = getset(repo, fullreposet(repo), x)
f = lambda nodes: obsutil.allsuccessors(repo.obsstore, nodes)
d = _mapbynodefunc(repo, s, f)
return subset & d
Matt Harbison
revset: stop lowercasing the regex pattern for 'author'...
r30782 def _substringmatcher(pattern, casesensitive=True):
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 kind, pattern, matcher = stringutil.stringmatcher(
pattern, casesensitive=casesensitive)
Simon King
revset: add pattern matching to the 'user' revset expression
r16823 if kind == 'literal':
Matt Harbison
revset: stop lowercasing the regex pattern for 'author'...
r30782 if not casesensitive:
pattern = encoding.lower(pattern)
matcher = lambda s: pattern in encoding.lower(s)
else:
matcher = lambda s: pattern in s
Simon King
revset: add pattern matching to the 'user' revset expression
r16823 return kind, pattern, matcher
Simon King
revset: add helper function for matching strings to patterns
r16819
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('tag([name])', safe=True)
Augie Fackler
revset: rename tagged() to tag() and allow it to take an optional tag name
r12715 def tag(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """The specified tag by name, or all tagged revisions if no name is given.
Matt Harbison
revset: document the regular expression support for tag(name)...
r20824
Matt Harbison
help: eliminate duplicate text for revset string patterns...
r30784 Pattern matching is supported for `name`. See
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 :hg:`help revisions.patterns`.
Patrick Mezard
revsets: generate predicate help dynamically
r12821 """
Martin Geisler
revset: add translator comments to i18n strings
r12815 # i18n: "tag" is a keyword
Augie Fackler
revset: rename tagged() to tag() and allow it to take an optional tag name
r12715 args = getargs(x, 0, 1, _("tag takes one or no arguments"))
Matt Mackall
revset: add tagged predicate
r11280 cl = repo.changelog
Augie Fackler
revset: rename tagged() to tag() and allow it to take an optional tag name
r12715 if args:
Simon King
revset: add pattern matching to 'tag' revset expression...
r16820 pattern = getstring(args[0],
# i18n: "tag" is a keyword
_('the argument to tag must be a string'))
Yuya Nishihara
stringutil: bulk-replace call sites to point to new module...
r37102 kind, pattern, matcher = stringutil.stringmatcher(pattern)
Simon King
revset: add pattern matching to 'tag' revset expression...
r16820 if kind == 'literal':
Matt Mackall
revset: avoid validating all tag nodes for tag(x)...
r16825 # avoid resolving all tags
tn = repo._tagscache.tags.get(pattern, None)
if tn is None:
FUJIWARA Katsunori
revset: raise RepoLookupError to make present() predicate continue the query...
r23978 raise error.RepoLookupError(_("tag '%s' does not exist")
% pattern)
Martin von Zweigbergk
cleanup: use set literals...
r32291 s = {repo[tn].rev()}
Simon King
revset: add pattern matching to 'tag' revset expression...
r16820 else:
Martin von Zweigbergk
cleanup: use set literals...
r32291 s = {cl.rev(n) for t, n in repo.tagslist() if matcher(t)}
Augie Fackler
revset: rename tagged() to tag() and allow it to take an optional tag name
r12715 else:
Martin von Zweigbergk
cleanup: use set literals...
r32291 s = {cl.rev(n) for t, n in repo.tagslist() if t != 'tip'}
Lucas Moscovicz
revset: added intersection to baseset class...
r20367 return subset & s
Matt Mackall
revset: add tagged predicate
r11280
FUJIWARA Katsunori
revset: use decorator to mark a predicate as safe...
r27587 @predicate('tagged', safe=True)
Patrick Mezard
revsets: generate predicate help dynamically
r12821 def tagged(repo, subset, x):
return tag(repo, subset, x)
Boris Feld
revset: rename unstable into orphan...
r33769 @predicate('orphan()', safe=True)
def orphan(repo, subset, x):
Boris Feld
revset: mark evolution-related revsets as experimental...
r33855 """Non-obsolete changesets with obsolete ancestors. (EXPERIMENTAL)
Patrick Mezard
revset: minor doc fixes on obsolete related revsets
r17291 """
Boris Feld
revset: rename unstable into orphan...
r33769 # i18n: "orphan" is a keyword
getargs(x, 0, 0, _("orphan takes no arguments"))
Boris Feld
obsolete: rename unstable volatile set into orphan volatile set...
r33772 orphan = obsmod.getrevs(repo, 'orphan')
return subset & orphan
Pierre-Yves David
obsolete: compute unstable changeset...
r17171
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('user(string)', safe=True, weight=10)
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 def user(repo, subset, x):
FUJIWARA Katsunori
revset: use decorator to register a function as revset predicate...
r27584 """User name contains string. The match is case-insensitive.
Simon King
revset: add pattern matching to the 'user' revset expression
r16823
Matt Harbison
help: eliminate duplicate text for revset string patterns...
r30784 Pattern matching is supported for `string`. See
Yuya Nishihara
help: use :hg: role and canonical name to point to revset string patterns...
r30799 :hg:`help revisions.patterns`.
Matt Mackall
bookmarks: move revset support to core
r13359 """
Idan Kamara
revset: rearrange code so functions are sorted alphabetically
r13915 return author(repo, subset, x)
Matt Mackall
bookmarks: move revset support to core
r13359
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('wdir()', safe=True, weight=0)
Yuya Nishihara
revset: add wdir() function to specify workingctx revision by command...
r24419 def wdir(repo, subset, x):
Yuya Nishihara
revset: document wdir() as an experimental function...
r30701 """Working directory. (EXPERIMENTAL)"""
Yuya Nishihara
revset: add wdir() function to specify workingctx revision by command...
r24419 # i18n: "wdir" is a keyword
getargs(x, 0, 0, _("wdir takes no arguments"))
Yuya Nishihara
revset: use integer representation of wdir() in revset...
r25765 if node.wdirrev in subset or isinstance(subset, fullreposet):
return baseset([node.wdirrev])
Yuya Nishihara
revset: add wdir() function to specify workingctx revision by command...
r24419 return baseset()
Yuya Nishihara
revset: fix order of nested '_(|int|hex)list' expression (BC)...
r29935 def _orderedlist(repo, subset, x):
Matt Mackall
revset: optimize building large lists in formatrevspec...
r15898 s = getstring(x, "internal error")
if not s:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Yuya Nishihara
revset: make internal _list() expression remove duplicated revisions...
r25341 # remove duplicates here. it's difficult for caller to deduplicate sets
# because different symbols can point to the same rev.
Yuya Nishihara
revset: add fast path for _list() of integer revisions...
r25344 cl = repo.changelog
Yuya Nishihara
revset: make internal _list() expression remove duplicated revisions...
r25341 ls = []
seen = set()
for t in s.split('\0'):
Yuya Nishihara
revset: add fast path for _list() of integer revisions...
r25344 try:
# fast path for integer revision
r = int(t)
Augie Fackler
revset: use %d to turn an int into a bytestr...
r36599 if ('%d' % r) != t or r not in cl:
Yuya Nishihara
revset: add fast path for _list() of integer revisions...
r25344 raise ValueError
Durham Goode
revset: fix resolving strings from a list...
r26143 revs = [r]
Yuya Nishihara
revset: add fast path for _list() of integer revisions...
r25344 except ValueError:
Jun Wu
revset: remove order information from tree (API)...
r34013 revs = stringset(repo, subset, t, defineorder)
Durham Goode
revset: fix resolving strings from a list...
r26143
for r in revs:
if r in seen:
continue
if (r in subset
or r == node.nullrev and isinstance(subset, fullreposet)):
ls.append(r)
seen.add(r)
Yuya Nishihara
revset: make internal _list() expression remove duplicated revisions...
r25341 return baseset(ls)
Matt Mackall
revset: optimize building large lists in formatrevspec...
r15898
Lucas Moscovicz
revset: added _intlist method to replace _list for %ld...
r20566 # for internal use
Yuya Nishihara
revset: fix order of nested '_(|int|hex)list' expression (BC)...
r29935 @predicate('_list', safe=True, takeorder=True)
def _list(repo, subset, x, order):
if order == followorder:
# slow path to take the subset order
return subset & _orderedlist(repo, fullreposet(repo), x)
else:
return _orderedlist(repo, subset, x)
def _orderedintlist(repo, subset, x):
Lucas Moscovicz
revset: added _intlist method to replace _list for %ld...
r20566 s = getstring(x, "internal error")
if not s:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Lucas Moscovicz
revset: added _intlist method to replace _list for %ld...
r20566 ls = [int(r) for r in s.split('\0')]
Pierre-Yves David
revset-_intlist: remove usage of `set()`...
r22876 s = subset
Lucas Moscovicz
revset: added _intlist method to replace _list for %ld...
r20566 return baseset([r for r in ls if r in s])
Lucas Moscovicz
revset: added _hexlist method to replace _list for %ln...
r20569 # for internal use
Jun Wu
revset: move weight information to predicate...
r34274 @predicate('_intlist', safe=True, takeorder=True, weight=0)
Yuya Nishihara
revset: fix order of nested '_(|int|hex)list' expression (BC)...
r29935 def _intlist(repo, subset, x, order):
if order == followorder:
# slow path to take the subset order
return subset & _orderedintlist(repo, fullreposet(repo), x)
else:
return _orderedintlist(repo, subset, x)
def _orderedhexlist(repo, subset, x):
Lucas Moscovicz
revset: added _hexlist method to replace _list for %ln...
r20569 s = getstring(x, "internal error")
if not s:
Pierre-Yves David
baseset: use default value instead of [] when possible...
r22802 return baseset()
Lucas Moscovicz
revset: added _hexlist method to replace _list for %ln...
r20569 cl = repo.changelog
ls = [cl.rev(node.bin(r)) for r in s.split('\0')]
Pierre-Yves David
revset-_hexlist: remove usage of `set()`...
r22877 s = subset
Lucas Moscovicz
revset: added _hexlist method to replace _list for %ln...
r20569 return baseset([r for r in ls if r in s])
Matt Mackall
revset: optimize building large lists in formatrevspec...
r15898
Yuya Nishihara
revset: fix order of nested '_(|int|hex)list' expression (BC)...
r29935 # for internal use
@predicate('_hexlist', safe=True, takeorder=True)
def _hexlist(repo, subset, x, order):
if order == followorder:
# slow path to take the subset order
return subset & _orderedhexlist(repo, fullreposet(repo), x)
else:
return _orderedhexlist(repo, subset, x)
Matt Mackall
revset: introduce revset core
r11275 methods = {
"range": rangeset,
Yuya Nishihara
revset: do not transform range* operators in parsed tree...
r30803 "rangeall": rangeall,
Yuya Nishihara
revset: do not rewrite ':y' to '0:y' (issue5385)...
r30044 "rangepre": rangepre,
Yuya Nishihara
revset: do not transform range* operators in parsed tree...
r30803 "rangepost": rangepost,
Bryan O'Sullivan
revset: turn dagrange into a function
r16860 "dagrange": dagrange,
Matt Mackall
revset: introduce revset core
r11275 "string": stringset,
Jordi Gutiérrez Hermoso
revset: don't error out if tokens parse as existing symbols...
r24932 "symbol": stringset,
Matt Mackall
revset: introduce revset core
r11275 "and": andset,
Jun Wu
revset: do not flip "and" arguments when optimizing...
r34022 "andsmally": andsmallyset,
Matt Mackall
revset: introduce revset core
r11275 "or": orset,
"not": notset,
Durham Goode
revset: use smartset minus operator...
r28217 "difference": differenceset,
Yuya Nishihara
revset: add experimental relation and subscript operators...
r33416 "relation": relationset,
"relsubscript": relsubscriptset,
"subscript": subscriptset,
Matt Mackall
revset: introduce revset core
r11275 "list": listset,
Yuya Nishihara
revset: add parsing rule for key=value pair...
r25704 "keyvalue": keyvaluepair,
Matt Mackall
revset: introduce revset core
r11275 "func": func,
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 "ancestor": ancestorspec,
"parent": parentspec,
Yuya Nishihara
revset: add stub to handle parentpost operation...
r29931 "parentpost": parentpost,
Boris Feld
revset: introduce an API that avoids `formatspec` input serialization...
r41258 "smartset": rawsmartset,
Matt Mackall
revset: introduce revset core
r11275 }
av6
revset: move subscript relation functions to its own dict...
r40967 subscriptrelations = {
"g": generationsrel,
"generations": generationsrel,
}
Martin von Zweigbergk
revset: use revsymbol() for checking if a symbol is valid...
r37368 def lookupfn(repo):
return lambda symbol: scmutil.isrevsymbol(repo, symbol)
Yuya Nishihara
revset: pass in lookup function instead of repo (API)...
r37692 def match(ui, spec, lookup=None):
Yuya Nishihara
revset: move order argument to run-time match function...
r34020 """Create a matcher for a single revision spec"""
Yuya Nishihara
revset: pass in lookup function to matchany() (issue5879)...
r37992 return matchany(ui, [spec], lookup=lookup)
Yuya Nishihara
revset: add option to make matcher takes the ordering of the input set...
r29955
Yuya Nishihara
revset: pass in lookup function instead of repo (API)...
r37692 def matchany(ui, specs, lookup=None, localalias=None):
Yuya Nishihara
revset: add matchany() to construct OR expression from a list of specs...
r25927 """Create a matcher that will include any revisions matching one of the
Yuya Nishihara
revset: add option to make matcher takes the ordering of the input set...
r29955 given specs
Yuya Nishihara
revset: pass in lookup function instead of repo (API)...
r37692 If lookup function is not None, the parser will first attempt to handle
old-style ranges, which may contain operator characters.
Jun Wu
revset: make repo.anyrevs accept customized alias override (API)...
r33336 If localalias is not None, it is a dict {name: definitionstring}. It takes
precedence over [revsetalias] config section.
Yuya Nishihara
revset: add option to make matcher takes the ordering of the input set...
r29955 """
Yuya Nishihara
revset: add matchany() to construct OR expression from a list of specs...
r25927 if not specs:
def mfunc(repo, subset=None):
return baseset()
return mfunc
if not all(specs):
raise error.ParseError(_("empty query"))
if len(specs) == 1:
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 tree = revsetlang.parse(specs[0], lookup)
Yuya Nishihara
revset: add matchany() to construct OR expression from a list of specs...
r25927 else:
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 tree = ('or',
('list',) + tuple(revsetlang.parse(s, lookup) for s in specs))
Yuya Nishihara
revset: add public function to create matcher from evaluatable tree...
r29906
Jun Wu
revset: make repo.anyrevs accept customized alias override (API)...
r33336 aliases = []
warn = None
Matt Mackall
revset: allow bypassing alias expansion...
r14900 if ui:
Jun Wu
revset: make repo.anyrevs accept customized alias override (API)...
r33336 aliases.extend(ui.configitems('revsetalias'))
warn = ui.warn
if localalias:
aliases.extend(localalias.items())
if aliases:
tree = revsetlang.expandaliases(tree, aliases, warn=warn)
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 tree = revsetlang.foldconcat(tree)
Jun Wu
revset: remove order information from tree (API)...
r34013 tree = revsetlang.analyze(tree)
Yuya Nishihara
revset: split language services to revsetlang module (API)...
r31024 tree = revsetlang.optimize(tree)
Yuya Nishihara
revset: move order argument to run-time match function...
r34020 return makematcher(tree)
Yuya Nishihara
revset: add public function to create matcher from evaluatable tree...
r29906
Yuya Nishihara
revset: move order argument to run-time match function...
r34020 def makematcher(tree):
Yuya Nishihara
revset: add public function to create matcher from evaluatable tree...
r29906 """Create a matcher from an evaluatable tree"""
Yuya Nishihara
revset: make match function follow given subset if specified (API)...
r34021 def mfunc(repo, subset=None, order=None):
if order is None:
if subset is None:
order = defineorder # 'x'
else:
order = followorder # 'subset & x'
Yuya Nishihara
revset: make match function initiate query from full set by default...
r24114 if subset is None:
Yuya Nishihara
revset: specify fullreposet without using spanset factory...
r24115 subset = fullreposet(repo)
Jun Wu
revset: remove order information from tree (API)...
r34013 return getset(repo, subset, tree, order)
Matt Mackall
revset: introduce revset core
r11275 return mfunc
Patrick Mezard
revsets: generate predicate help dynamically
r12821
FUJIWARA Katsunori
registrar: define revsetpredicate to decorate revset predicate...
r28393 def loadpredicate(ui, extname, registrarobj):
"""Load revset predicates from specified registrarobj
"""
for name, func in registrarobj._table.iteritems():
symbols[name] = func
if func._safe:
safesymbols.add(name)
FUJIWARA Katsunori
revset: replace predicate by revsetpredicate of registrar...
r28395 # load built-in predicates explicitly to setup safesymbols
loadpredicate(None, None, predicate)
Patrick Mezard
hggettext: handle i18nfunctions declaration for docstrings translations
r12823 # tell hggettext to extract docstrings from these functions:
i18nfunctions = symbols.values()