Mercurial > hg
view mercurial/help/filesets.txt @ 27039:d7517deedf86
filemerge._picktool: only pick from nomerge tools for change/delete conflicts
For --tool or HGMERGE, we could have either:
(a) proceeded with the particular tool, then failed the merge.
(b) chosen to prompt regardless.
We're explicitly choosing (b) here, because it's effectively what we've been
doing so far and helps maintain an easier-to-use interface.
However, in future patches we're going to change the default selection from
'pick changed version' to 'leave unresolved'. That fixes most of the brokenness
involved with choice (b).
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Sun, 15 Nov 2015 21:40:15 -0800 |
parents | cf56f7a60b45 |
children | a4bc8fff67fc |
line wrap: on
line source
Mercurial supports a functional language for selecting a set of files. Like other file patterns, this pattern type is indicated by a prefix, 'set:'. The language supports a number of predicates which are joined by infix operators. Parenthesis can be used for grouping. Identifiers such as filenames or patterns must be quoted with single or double quotes if they contain characters outside of ``[.*{}[]?/\_a-zA-Z0-9\x80-\xff]`` or if they match one of the predefined predicates. This generally applies to file patterns other than globs and arguments for 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'...'``. There is a single prefix operator: ``not x`` Files not in x. Short form is ``! x``. These are the supported infix operators: ``x and y`` The intersection of files in x and y. Short form is ``x & y``. ``x or y`` The union of files in x and y. There are two alternative short forms: ``x | y`` and ``x + y``. ``x - y`` Files in x but not in y. The following predicates are supported: .. predicatesmarker Some sample queries: - Show status of files that appear to be binary in the working directory:: hg status -A "set:binary()" - Forget files that are in .hgignore but are already tracked:: hg forget "set:hgignore() and not ignored()" - Find text files that contain a string:: hg files "set:grep(magic) and not binary()" - Find C files in a non-standard encoding:: hg files "set:**.c and not encoding('UTF-8')" - Revert copies of large binary files:: hg revert "set:copied() and binary() and size('>1M')" - Remove files listed in foo.lst that contain the letter a or b:: hg remove "set: 'listfile:foo.lst' and (**a* or **b*)" See also :hg:`help patterns`.