##// END OF EJS Templates
unshelve: disable unshelve during merge (issue5123)...
unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169

File last commit:

r35759:73432eee default
r42217:03f6480b default
Show More
filesets.txt
79 lines | 2.1 KiB | text/plain | TextLexer
Matt Mackall
fileset: add a help topic...
r14686 Mercurial supports a functional language for selecting a set of
Mads Kiilerich
check-code: check txt files for trailing whitespace
r18960 files.
Matt Mackall
fileset: add a help topic...
r14686
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
Yuya Nishihara
fileset: add kind:pat operator...
r35759 than globs and arguments for predicates. Pattern prefixes such as
``path:`` may be specified without quoting.
Matt Mackall
fileset: add a help topic...
r14686
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'...'``.
Matt Harbison
help: apply the section headings from revsets to filesets...
r30729 See also :hg:`help patterns`.
Matt Harbison
help: merge the various operator sections of revsets, filesets and templates...
r30731 Operators
=========
Matt Harbison
help: apply the section headings from revsets to filesets...
r30729
Matt Mackall
fileset: add a help topic...
r14686 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.
Matt Harbison
help: apply the section headings from revsets to filesets...
r30729 Predicates
==========
Matt Mackall
fileset: add a help topic...
r14686 The following predicates are supported:
.. predicatesmarker
Matt Harbison
help: apply the section headings from revsets to filesets...
r30729 Examples
========
Matt Mackall
fileset: add a help topic...
r14686 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::
FUJIWARA Katsunori
help: use "hg files" instead of "hg locate" in "hg help filesets"...
r23109 hg files "set:grep(magic) and not binary()"
Matt Mackall
fileset: add a help topic...
r14686
- Find C files in a non-standard encoding::
FUJIWARA Katsunori
help: use "hg files" instead of "hg locate" in "hg help filesets"...
r23109 hg files "set:**.c and not encoding('UTF-8')"
Matt Mackall
fileset: add a help topic...
r14686
- Revert copies of large binary files::
hg revert "set:copied() and binary() and size('>1M')"
Pierre-Yves David
fileset: add revs(revs, fileset) to evaluate set in working directory...
r31193 - Revert files that were added to the working directory::
Yuya Nishihara
help: fix example of revs() fileset
r31286 hg revert "set:revs('wdir()', added())"
Pierre-Yves David
fileset: add revs(revs, fileset) to evaluate set in working directory...
r31193
Arne Babenhauserheide
help: fileset foo.lst was named files.lst
r14829 - Remove files listed in foo.lst that contain the letter a or b::
Matt Mackall
fileset: add a help topic...
r14686
Yuya Nishihara
fileset: add kind:pat operator...
r35759 hg remove "set: listfile:foo.lst and (**a* or **b*)"