Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/help/filesets.txt @ 26117:4dc5b51f38fe
revlog: change generaldelta delta parent heuristic
The old generaldelta heuristic was "if p1 (or p2) was closer than the last full text,
use it, otherwise use prev". This was problematic when a repo contained multiple
branches that were very different. If commits to branch A were pushed, and the
last full text was branch B, it would generate a fulltext. Then if branch B was
pushed, it would generate another fulltext. The problem is that the last
fulltext (and delta'ing against `prev` in general) has no correlation with the
contents of the incoming revision, and therefore will always have degenerate
cases.
According to the blame, that algorithm was chosen to minimize the chain length.
Since there is already code that protects against that (the delta-vs-fulltext
code), and since it has been improved since the original generaldelta algorithm
went in (2011), I believe the chain length criteria will still be preserved.
The new algorithm always diffs against p1 (or p2 if it's closer), unless the
resulting delta will fail the delta-vs-fulltext check, in which case we delta
against prev.
Some before and after stats on manifest.d size.
internal large repo
old heuristic - 2.0 GB
new heuristic - 1.2 GB
mozilla-central
old heuristic - 242 MB
new heuristic - 261 MB
The regression in mozilla central is due to the new heuristic choosing p2r as
the delta when it's closer to the tip. Switching the algorithm to always prefer
p1r brings the size back down (242 MB). This is result of the way in which
mozilla does merges and pushes, and the result could easily swing the other
direction in other repos (depending on if they merge X into Y or Y into X), but
will never be as degenerate as before.
I future patch will address the regression by introducing an optional, even more
aggressive delta heuristic which will knock the mozilla manifest size down
dramatically.
author | Durham Goode <durham@fb.com> |
---|---|
date | Sun, 30 Aug 2015 13:58:11 -0700 |
parents | cf56f7a60b45 |
children | a4bc8fff67fc |
rev | line source |
---|---|
14686 | 1 Mercurial supports a functional language for selecting a set of |
18960
170fc0949fb6
check-code: check txt files for trailing whitespace
Mads Kiilerich <madski@unity3d.com>
parents:
15825
diff
changeset
|
2 files. |
14686 | 3 |
4 Like other file patterns, this pattern type is indicated by a prefix, | |
5 'set:'. The language supports a number of predicates which are joined | |
6 by infix operators. Parenthesis can be used for grouping. | |
7 | |
8 Identifiers such as filenames or patterns must be quoted with single | |
9 or double quotes if they contain characters outside of | |
10 ``[.*{}[]?/\_a-zA-Z0-9\x80-\xff]`` or if they match one of the | |
11 predefined predicates. This generally applies to file patterns other | |
12 than globs and arguments for predicates. | |
13 | |
14 Special characters can be used in quoted identifiers by escaping them, | |
15 e.g., ``\n`` is interpreted as a newline. To prevent them from being | |
16 interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``. | |
17 | |
18 There is a single prefix operator: | |
19 | |
20 ``not x`` | |
21 Files not in x. Short form is ``! x``. | |
22 | |
23 These are the supported infix operators: | |
24 | |
25 ``x and y`` | |
26 The intersection of files in x and y. Short form is ``x & y``. | |
27 | |
28 ``x or y`` | |
29 The union of files in x and y. There are two alternative short | |
30 forms: ``x | y`` and ``x + y``. | |
31 | |
32 ``x - y`` | |
33 Files in x but not in y. | |
34 | |
35 The following predicates are supported: | |
36 | |
37 .. predicatesmarker | |
38 | |
39 Some sample queries: | |
40 | |
41 - Show status of files that appear to be binary in the working directory:: | |
42 | |
43 hg status -A "set:binary()" | |
44 | |
45 - Forget files that are in .hgignore but are already tracked:: | |
46 | |
47 hg forget "set:hgignore() and not ignored()" | |
48 | |
49 - Find text files that contain a string:: | |
50 | |
23109
cf56f7a60b45
help: use "hg files" instead of "hg locate" in "hg help filesets"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18960
diff
changeset
|
51 hg files "set:grep(magic) and not binary()" |
14686 | 52 |
53 - Find C files in a non-standard encoding:: | |
54 | |
23109
cf56f7a60b45
help: use "hg files" instead of "hg locate" in "hg help filesets"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18960
diff
changeset
|
55 hg files "set:**.c and not encoding('UTF-8')" |
14686 | 56 |
57 - Revert copies of large binary files:: | |
58 | |
59 hg revert "set:copied() and binary() and size('>1M')" | |
60 | |
14829
968c301a1005
help: fileset foo.lst was named files.lst
Arne Babenhauserheide <bab@draketo.de>
parents:
14686
diff
changeset
|
61 - Remove files listed in foo.lst that contain the letter a or b:: |
14686 | 62 |
63 hg remove "set: 'listfile:foo.lst' and (**a* or **b*)" | |
64 | |
65 See also :hg:`help patterns`. |