##// END OF EJS Templates
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>...
# User Dan Villiom Podlaski Christiansen <danchr@gmail.com> # Date 1289564504 -3600 # Node ID b75264c15cc888cf38c3c7b8f619801e3c2589c7 # Parent 89b2e5d940f669e590096c6be70eee61c9172fff revsets: overload the branch() revset to also take a branch name. This should only change semantics in the specific case of a tag/branch conflict where the tag wasn't done on the branch with the same name. Previously, branch(whatever) would resolve to the branch of the tag in that case, whereas now it will resolve to the branch of the name. The previous behaviour, while documented, seemed very counter-intuitive to me. An alternate approach would be to introduce a new revset such as branchname() or namedbranch(). While this would retain backwards compatibility, the distinction between it and branch() would not be readily apparent to users. The most intuitive behaviour would be to have branch(x) require 'x' to be a branch name, and something like branchof(x) or samebranch(x) do what branch(x) currently does. Unfortunately, our backwards compatibility guarantees prevent us from doing that. Please note that while 'hg tag' guards against shadowing a branch, 'hg branch' does not. Besides, even if it did, that wouldn't solve the issue of conversions with such tags and branches...

File last commit:

r12821:165079e5 stable
r13750:7eb82f88 default
Show More
revsets.txt
87 lines | 2.3 KiB | text/plain | TextLexer
Martin Geisler
help: new revsets topic...
r11382 Mercurial supports a functional language for selecting a set of
revisions.
The language supports a number of predicates which are joined by infix
operators. Parenthesis can be used for grouping.
Identifiers such as branch names must be quoted with single or double
Matt Mackall
revset: improve help on strings
r11420 quotes if they contain characters outside of
``[._a-zA-Z0-9\x80-\xff]`` or if they match one of the predefined
Brodie Rao
revset: support raw string literals...
r12408 predicates.
Special characters can be used in quoted identifiers by escaping them,
e.g., ``\n`` is interpreted as a newline. To prevent them from being
interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``.
Martin Geisler
help: new revsets topic...
r11382
There is a single prefix operator:
``not x``
Changesets not in x. Short form is ``! x``.
These are the supported infix operators:
``x::y``
A DAG range, meaning all changesets that are descendants of x and
ancestors of y, including x and y themselves. If the first endpoint
is left out, this is equivalent to ``ancestors(y)``, if the second
Julian Cowley
revset: fix spelling typo
r11450 is left out it is equivalent to ``descendants(x)``.
Martin Geisler
help: new revsets topic...
r11382
An alternative syntax is ``x..y``.
``x:y``
All changesets with revision numbers between x and y, both
inclusive. Either endpoint can be left out, they default to 0 and
tip.
``x and y``
The intersection of changesets in x and y. Short form is ``x & y``.
``x or y``
The union of changesets in x and y. There are two alternative short
forms: ``x | y`` and ``x + y``.
``x - y``
Changesets in x but not in y.
The following predicates are supported:
Patrick Mezard
revsets: generate predicate help dynamically
r12821 .. predicatesmarker
Martin Geisler
help: new revsets topic...
r11382
Command line equivalents for :hg:`log`::
-f -> ::.
-d x -> date(x)
-k x -> keyword(x)
-m -> merge()
-u x -> user(x)
-b x -> branch(x)
-P x -> !::x
-l x -> limit(expr, x)
Brodie Rao
revsets: add descriptions for sample queries in the help
r12659 Some sample queries:
- Changesets on the default branch::
Mads Kiilerich
help: use Windows cmd compatible quoting in revset help
r12808 hg log -r "branch(default)"
Brodie Rao
revsets: add descriptions for sample queries in the help
r12659
- Changesets on the default branch since tag 1.5 (excluding merges)::
Mads Kiilerich
help: use Windows cmd compatible quoting in revset help
r12808 hg log -r "branch(default) and 1.5:: and not merge()"
Martin Geisler
help: new revsets topic...
r11382
Brodie Rao
revsets: add a sample query to the help for getting active branches
r12660 - Open branch heads::
Mads Kiilerich
help: use Windows cmd compatible quoting in revset help
r12808 hg log -r "head() and not closed()"
Brodie Rao
revsets: add a sample query to the help for getting active branches
r12660
Brodie Rao
revsets: add descriptions for sample queries in the help
r12659 - Changesets between tags 1.3 and 1.5 mentioning "bug" that affect
Martin Geisler
revsets: fix stray * in help topic
r12667 ``hgext/*``::
Brodie Rao
revsets: add descriptions for sample queries in the help
r12659
Mads Kiilerich
help: use Windows cmd compatible quoting in revset help
r12808 hg log -r "1.3::1.5 and keyword(bug) and file('hgext/*')"
Brodie Rao
revsets: add descriptions for sample queries in the help
r12659
- Changesets in committed May 2008, sorted by user::
Mads Kiilerich
help: use Windows cmd compatible quoting in revset help
r12808 hg log -r "sort(date('May 2008'), user)"
Brodie Rao
revsets: add descriptions for sample queries in the help
r12659
- Changesets mentioning "bug" or "issue" that are not in a tagged
release::
Mads Kiilerich
help: use Windows cmd compatible quoting in revset help
r12808 hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())"