Mercurial > hg
view mercurial/help/patterns.txt @ 42590:ab416b5d9b91
tests: add more tests of copy tracing with removed and re-added files
We had a test where the destination of a copy was removed and then
added back. This patch adds similar cases where the break in history
instead happens to the source file. There are three versions of this:
1. The break happens before the rename.
2. The break happens on a branch parallel to the rename (where copy
tracing is done via the merge base)
3. The source is added on each side of the merge base. The break in
history is thus in the form of a deletion when going backwards to
the merge base and the re-add happens on the other branch.
I've also added calls to `hg graft` in these cases to show the
breakage in issue 6163.
Another factor in these cases is matching nodeid (checked in
copies._tracefile()). I've made two copies each of the cases to show
the impact of that. One of these is the same as a test in
test-rename-merge1.t, so I also deleted that test from there.
Some of these tests currently fail, where "fail" is based on my
current thinking of how things should work. I had initially thought
that we should be more strict about not tracing copies across commits
where the file did not exist, but issue 6163 made me reconsider.
The only test case here that behaved differently in 4.9 is the
exact case reported in issue 6163.
Differential Revision: https://phab.mercurial-scm.org/D6599
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 21 Jun 2019 16:59:29 -0700 |
parents | 4fab8a7d2d72 |
children |
line wrap: on
line source
Mercurial accepts several notations for identifying one or more files at a time. By default, Mercurial treats filenames as shell-style extended glob patterns. Alternate pattern notations must be specified explicitly. .. note:: Patterns specified in ``.hgignore`` are not rooted. Please see :hg:`help hgignore` for details. To use a plain path name without any pattern matching, start it with ``path:``. These path names must completely match starting at the current repository root, and when the path points to a directory, it is matched recursively. To match all files in a directory non-recursively (not including any files in subdirectories), ``rootfilesin:`` can be used, specifying an absolute path (relative to the repository root). To use an extended glob, start a name with ``glob:``. Globs are rooted at the current directory; a glob such as ``*.c`` will only match files in the current directory ending with ``.c``. ``rootglob:`` can be used instead of ``glob:`` for a glob that is rooted at the root of the repository. The supported glob syntax extensions are ``**`` to match any string across path separators and ``{a,b}`` to mean "a or b". To use a Perl/Python regular expression, start a name with ``re:``. Regexp pattern matching is anchored at the root of the repository. To read name patterns from a file, use ``listfile:`` or ``listfile0:``. The latter expects null delimited patterns while the former expects line feeds. Each string read from the file is itself treated as a file pattern. To read a set of patterns from a file, use ``include:`` or ``subinclude:``. ``include:`` will use all the patterns from the given file and treat them as if they had been passed in manually. ``subinclude:`` will only apply the patterns against files that are under the subinclude file's directory. See :hg:`help hgignore` for details on the format of these files. All patterns, except for ``glob:`` specified in command line (not for ``-I`` or ``-X`` options), can match also against directories: files under matched directories are treated as matched. For ``-I`` and ``-X`` options, ``glob:`` will match directories recursively. Plain examples:: path:foo/bar a name bar in a directory named foo in the root of the repository path:path:name a file or directory named "path:name" rootfilesin:foo/bar the files in a directory called foo/bar, but not any files in its subdirectories and not a file bar in directory foo Glob examples:: glob:*.c any name ending in ".c" in the current directory *.c any name ending in ".c" in the current directory **.c any name ending in ".c" in any subdirectory of the current directory including itself. foo/* any file in directory foo foo/** any file in directory foo plus all its subdirectories, recursively foo/*.c any name ending in ".c" in the directory foo foo/**.c any name ending in ".c" in any subdirectory of foo including itself. rootglob:*.c any name ending in ".c" in the root of the repository Regexp examples:: re:.*\.c$ any name ending in ".c", anywhere in the repository File examples:: listfile:list.txt read list from list.txt with one file pattern per line listfile0:list.txt read list from list.txt with null byte delimiters See also :hg:`help filesets`. Include examples:: include:path/to/mypatternfile reads patterns to be applied to all paths subinclude:path/to/subignorefile reads patterns specifically for paths in the subdirectory