##// END OF EJS Templates
merge: move almost all change/delete conflicts to resolve phase (BC) (API)...
merge: move almost all change/delete conflicts to resolve phase (BC) (API) We have finally laid all the groundwork to make this happen. The only change/delete conflicts that haven't been moved are .hgsubstate conflicts. Those are trickier to deal with and well outside the scope of this series. We add comprehensive testing not just for the initial selections but also for re-resolves and all possible dirstate transitions caused by merge tools. That testing managed to shake out several bugs in the way we were handling dirstate transitions. The other test changes are because we now treat change/delete conflicts as proper merges, and increment the 'merged' counter rather than the 'updated' counter. I believe this is the right approach here. For third-party extensions, if they're interacting with filemerge code they might have to deal with an absentfilectx rather than a regular filectx. Still to come: - add a 'leave unresolved' option to merges - change the default for non-interactive change/delete conflicts to be 'leave unresolved' - add debug output to go alongside debug outputs for binary and symlink file merges

File last commit:

r23742:3a4d8a6c default
r27137:25e4b2f0 default
Show More
revsets.txt
134 lines | 3.7 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.
Matt Mackall
revset: simplify help not about quoting
r15962 Identifiers such as branch names may need quoting with single or
double quotes if they contain characters like ``-`` or if they match
one of the predefined predicates.
Brodie Rao
revset: support raw string literals...
r12408
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.
Wagner Bruna
help/revsets: clean up whitespace between paragraphs
r14692
Kevin Gessner
revset: add ^ and ~ operators from parentrevspec extension...
r14070 ``x^n``
The nth parent of x, n == 0, 1, or 2.
For n == 0, x; for n == 1, the first parent of each changeset in x;
for n == 2, the second parent of changeset in x.
``x~n``
The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``.
There is a single postfix operator:
``x^``
Equivalent to ``x^1``, the first parent of each changeset in x.
Martin Geisler
help: new revsets topic...
r11382
The following predicates are supported:
Patrick Mezard
revsets: generate predicate help dynamically
r12821 .. predicatesmarker
Martin Geisler
help: new revsets topic...
r11382
Alexander Solovyov
revset aliases
r14098 New predicates (known as "aliases") can be defined, using any combination of
existing predicates or other aliases. An alias definition looks like::
<alias> = <definition>
Wagner Bruna
help/revsets: revset aliases can be defined on any config file
r14693 in the ``revsetalias`` section of a Mercurial configuration file. Arguments
of the form `$1`, `$2`, etc. are substituted from the alias into the
definition.
Alexander Solovyov
revset aliases
r14098
For example,
::
[revsetalias]
h = heads()
d($1) = sort($1, date)
rs($1, $2) = reverse(sort($1, $2))
defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is
exactly equivalent to ``reverse(sort(0:tip, author))``.
FUJIWARA Katsunori
revset: introduce new operator "##" to concatenate strings/symbols at runtime...
r23742 An infix operator ``##`` can concatenate strings and identifiers into
one string. For example::
[revsetalias]
issue($1) = grep(r'\bissue[ :]?' ## $1 ## r'\b|\bbug\(' ## $1 ## r'\)')
``issue(1234)`` is equivalent to ``grep(r'\bissue[ :]?1234\b|\bbug\(1234\)')``
in this case. This matches against all of "issue 1234", "issue:1234",
"issue1234" and "bug(1234)".
All other prefix, infix and postfix operators have lower priority than
``##``. For example, ``$1 ## $2~2`` is equivalent to ``($1 ## $2)~2``.
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
Idan Kamara
help/revset: fix grammar
r13937 - Changesets committed in May 2008, sorted by user::
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 "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::
FUJIWARA Katsunori
doc: use "tag" revset predicate instead of "tagged" for example in help...
r18469 hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tag())"