copies: iterate over children directly (instead of parents)
Before this change we would gather all parent → child edges and iterate on
all parent, gathering copy information for children and aggregating them from
there.
They are not strict requirement for edges to be processed in that specific
order. We could also simply iterate over all "children" revision and aggregate
data from both parents at the same time. This patch does that.
It make various things simpler:
* since both parents are processed at the same time, we no longer need to
cache data for merge (see next changeset for details),
* we no longer need nested loop to process data,
* we no longer need to store partial merge data for a rev from distinct loop
interaction to another when processing merges,
* we no longer need to build a full parent -> children mapping (we only rely on
a simpler "parent -> number of children" map (for memory efficiency),
* the data access pattern is now simpler (from lower revisions to higher
revisions) and entirely predicable. That predictability open the way to
prefetching and parallel processing.
So that new iterations order requires simpler code and open the way to
interesting optimisation.
The effect on performance is quite good. In the worse case, we don't see any
significant negative impact. And in the best case, the reduction of roundtrip
to Python provide us with a significant speed. Some example below:
Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev
---------------------------------------------------------------------------------------------------------------------------------------------------------------
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev
# full comparison between the previous changeset and this one
Repo Case Source-Rev Dest-Rev # of revisions old time new time Difference Factor time per rev
---------------------------------------------------------------------------------------------------------------------------------------------------------------
mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 1 revs, 0.000048 s, 0.000041 s, -0.000007 s, × 0.8542, 41 µs/rev
mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 6 revs, 0.000153 s, 0.000102 s, -0.000051 s, × 0.6667, 17 µs/rev
mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 1032 revs, 0.004209 s, 0.004254 s, +0.000045 s, × 1.0107, 4 µs/rev
pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 9 revs, 0.000203 s, 0.000282 s, +0.000079 s, × 1.3892, 31 µs/rev
pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 1 revs, 0.000059 s, 0.000048 s, -0.000011 s, × 0.8136, 48 µs/rev
pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 7 revs, 0.000194 s, 0.000211 s, +0.000017 s, × 1.0876, 30 µs/rev
pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 1 revs, 0.000380 s, 0.000375 s, -0.000005 s, × 0.9868, 375 µs/rev
pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 6 revs, 0.010588 s, 0.010574 s, -0.000014 s, × 0.9987, 1762 µs/rev
pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 4785 revs, 0.048961 s, 0.049974 s, +0.001013 s, × 1.0207, 10 µs/rev
pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 6780 revs, 0.083612 s, 0.084300 s, +0.000688 s, × 1.0082, 12 µs/rev
pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 5441 revs, 0.058579 s, 0.060128 s, +0.001549 s, × 1.0264, 11 µs/rev
pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 43645 revs, 0.736783 s, 0.686542 s, -0.050241 s, × 0.9318, 15 µs/rev
pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 2 revs, 0.022050 s, 0.009277 s, -0.012773 s, × 0.4207, 4638 µs/rev
pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 11316 revs, 0.120800 s, 0.114733 s, -0.006067 s, × 0.9498, 10 µs/rev
netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 2 revs, 0.000140 s, 0.000081 s, -0.000059 s, × 0.5786, 40 µs/rev
netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 2 revs, 0.000114 s, 0.000107 s, -0.000007 s, × 0.9386, 53 µs/rev
netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 3 revs, 0.000224 s, 0.000173 s, -0.000051 s, × 0.7723, 57 µs/rev
netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 9 revs, 0.000723 s, 0.000698 s, -0.000025 s, × 0.9654, 77 µs/rev
netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 1421 revs, 0.009665 s, 0.009248 s, -0.000417 s, × 0.9569, 6 µs/rev
netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 1533 revs, 0.014820 s, 0.015446 s, +0.000626 s, × 1.0422, 10 µs/rev
netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 5750 revs, 0.076049 s, 0.074373 s, -0.001676 s, × 0.9780, 12 µs/rev
netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 66949 revs, 0.683603 s, 0.639870 s, -0.043733 s, × 0.9360, 9 µs/rev
mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 2 revs, 0.000161 s, 0.000088 s, -0.000073 s, × 0.5466, 44 µs/rev
mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 8 revs, 0.000234 s, 0.000199 s, -0.000035 s, × 0.8504, 24 µs/rev
mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 9 revs, 0.000247 s, 0.000171 s, -0.000076 s, × 0.6923, 19 µs/rev
mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 7 revs, 0.000630 s, 0.000592 s, -0.000038 s, × 0.9397, 84 µs/rev
mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 3 revs, 0.003286 s, 0.003151 s, -0.000135 s, × 0.9589, 1050 µs/rev
mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062441 s, 0.061612 s, -0.000829 s, × 0.9867, 10268 µs/rev
mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005423 s, 0.005381 s, -0.000042 s, × 0.9923, 3 µs/rev
mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.005919 s, 0.003742 s, -0.002177 s, × 0.6322, 91 µs/rev
mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 7839 revs, 0.062597 s, 0.061983 s, -0.000614 s, × 0.9902, 7 µs/rev
mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.043551 s, 0.019861 s, -0.023690 s, × 0.4560, 32 µs/rev
mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 30263 revs, 0.192475 s, 0.188101 s, -0.004374 s, × 0.9773, 6 µs/rev
mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 153721 revs, 1.955575 s, 1.806696 s, -0.148879 s, × 0.9239, 11 µs/rev
mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 204976 revs, 2.886501 s, 2.682987 s, -0.203514 s, × 0.9295, 13 µs/rev
mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 2 revs, 0.001181 s, 0.000852 s, -0.000329 s, × 0.7214, 426 µs/rev
mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 2 revs, 0.001189 s, 0.000859 s, -0.000330 s, × 0.7225, 429 µs/rev
mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 4 revs, 0.000563 s, 0.000150 s, -0.000413 s, × 0.2664, 37 µs/rev
mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 2 revs, 0.001548 s, 0.001158 s, -0.000390 s, × 0.7481, 579 µs/rev
mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1 revs, 0.027782 s, 0.027240 s, -0.000542 s, × 0.9805, 27240 µs/rev
mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 6 revs, 0.062781 s, 0.062824 s, +0.000043 s, × 1.0007, 10470 µs/rev
mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 1593 revs, 0.005778 s, 0.005463 s, -0.000315 s, × 0.9455, 3 µs/rev
mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 41 revs, 0.006192 s, 0.004238 s, -0.001954 s, × 0.6844, 103 µs/rev
mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 6657 revs, 0.065391 s, 0.064113 s, -0.001278 s, × 0.9805, 9 µs/rev
mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 40314 revs, 0.317216 s, 0.294063 s, -0.023153 s, × 0.9270, 7 µs/rev
mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 38690 revs, 0.303119 s, 0.281493 s, -0.021626 s, × 0.9287, 7 µs/rev
mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 8598 revs, 0.110717 s, 0.076323 s, -0.034394 s, × 0.6894, 8 µs/rev
mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 615 revs, 0.045739 s, 0.020390 s, -0.025349 s, × 0.4458, 33 µs/rev
mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 97052 revs, 3.098021 s, 3.023879 s, -0.074142 s, × 0.9761, 31 µs/rev
mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 52031 revs, 0.771480 s, 0.735549 s, -0.035931 s, × 0.9534, 14 µs/rev
mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 363753 revs, 18.813422 s, 18.568900 s, -0.244522 s, × 0.9870, 51 µs/rev
mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 34414 revs, 0.962867 s, 0.502584 s, -0.460283 s, × 0.5220, 14 µs/rev
mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 362229 revs, 18.684923 s, 18.356645 s, -0.328278 s, × 0.9824, 50 µs/rev
mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 359344 revs, 18.296305 s, 18.250393 s, -0.045912 s, × 0.9975, 50 µs/rev
mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 192665 revs, 3.061887 s, 2.792459 s, -0.269428 s, × 0.9120, 14 µs/rev
mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 228985 revs, 103.869641 s, 107.697264 s, +3.827623 s, × 1.0369, 470 µs/rev
mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 382065 revs, 64.262957 s, 63.961040 s, -0.301917 s, × 0.9953, 167 µs/rev
Differential Revision: https://phab.mercurial-scm.org/D9422
$ hg init t
$ cd t
$ echo import > port
$ hg add port
$ hg commit -m 0 -u spam -d '0 0'
$ echo export >> port
$ hg commit -m 1 -u eggs -d '1 0'
$ echo export > port
$ echo vaportight >> port
$ echo 'import/export' >> port
$ hg commit -m 2 -u spam -d '2 0'
$ echo 'import/export' >> port
$ hg commit -m 3 -u eggs -d '3 0'
$ head -n 3 port > port1
$ mv port1 port
$ hg commit -m 4 -u spam -d '4 0'
pattern error
$ hg grep '**test**'
grep: invalid match pattern: nothing to repeat* (glob)
[1]
invalid revset syntax
$ hg log -r 'diffcontains()'
hg: parse error: diffcontains takes at least 1 argument
[10]
$ hg log -r 'diffcontains(:)'
hg: parse error: diffcontains requires a string pattern
[10]
$ hg log -r 'diffcontains("re:**test**")'
hg: parse error: invalid regular expression: nothing to repeat* (glob)
[10]
simple
$ hg grep -r tip:0 '.*'
port:4:export
port:4:vaportight
port:4:import/export
port:3:export
port:3:vaportight
port:3:import/export
port:3:import/export
port:2:export
port:2:vaportight
port:2:import/export
port:1:import
port:1:export
port:0:import
$ hg grep -r tip:0 port port
port:4:export
port:4:vaportight
port:4:import/export
port:3:export
port:3:vaportight
port:3:import/export
port:3:import/export
port:2:export
port:2:vaportight
port:2:import/export
port:1:import
port:1:export
port:0:import
simple from subdirectory
$ mkdir dir
$ cd dir
$ hg grep -r tip:0 port
port:4:export
port:4:vaportight
port:4:import/export
port:3:export
port:3:vaportight
port:3:import/export
port:3:import/export
port:2:export
port:2:vaportight
port:2:import/export
port:1:import
port:1:export
port:0:import
$ hg grep -r tip:0 port --config ui.relative-paths=yes
../port:4:export
../port:4:vaportight
../port:4:import/export
../port:3:export
../port:3:vaportight
../port:3:import/export
../port:3:import/export
../port:2:export
../port:2:vaportight
../port:2:import/export
../port:1:import
../port:1:export
../port:0:import
$ cd ..
simple with color
$ hg --config extensions.color= grep --config color.mode=ansi \
> --color=always port port -r tip:0
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc)
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m0\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m (esc)
simple templated
$ hg grep port -r tip:0 \
> -T '{path}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n'
port:4:914fa752cdea:exPORT
port:4:914fa752cdea:vaPORTight
port:4:914fa752cdea:imPORT/exPORT
port:3:95040cfd017d:exPORT
port:3:95040cfd017d:vaPORTight
port:3:95040cfd017d:imPORT/exPORT
port:3:95040cfd017d:imPORT/exPORT
port:2:3b325e3481a1:exPORT
port:2:3b325e3481a1:vaPORTight
port:2:3b325e3481a1:imPORT/exPORT
port:1:8b20f75c1585:imPORT
port:1:8b20f75c1585:exPORT
port:0:f31323c92170:imPORT
$ hg grep port -r tip:0 -T '{path}:{rev}:{texts}\n'
port:4:export
port:4:vaportight
port:4:import/export
port:3:export
port:3:vaportight
port:3:import/export
port:3:import/export
port:2:export
port:2:vaportight
port:2:import/export
port:1:import
port:1:export
port:0:import
$ hg grep port -r tip:0 -T '{path}:{tags}:{texts}\n'
port:tip:export
port:tip:vaportight
port:tip:import/export
port::export
port::vaportight
port::import/export
port::import/export
port::export
port::vaportight
port::import/export
port::import
port::export
port::import
simple JSON (no "change" field)
$ hg grep -r tip:0 -Tjson port
[
{
"date": [4, 0],
"lineno": 1,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"path": "port",
"rev": 4,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"date": [4, 0],
"lineno": 2,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"path": "port",
"rev": 4,
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
"user": "spam"
},
{
"date": [4, 0],
"lineno": 3,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"path": "port",
"rev": 4,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"date": [3, 0],
"lineno": 1,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"path": "port",
"rev": 3,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"date": [3, 0],
"lineno": 2,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"path": "port",
"rev": 3,
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
"user": "eggs"
},
{
"date": [3, 0],
"lineno": 3,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"path": "port",
"rev": 3,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"date": [3, 0],
"lineno": 4,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"path": "port",
"rev": 3,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"date": [2, 0],
"lineno": 1,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"date": [2, 0],
"lineno": 2,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
"user": "spam"
},
{
"date": [2, 0],
"lineno": 3,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"date": [1, 0],
"lineno": 1,
"node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
"path": "port",
"rev": 1,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"date": [1, 0],
"lineno": 2,
"node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
"path": "port",
"rev": 1,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"date": [0, 0],
"lineno": 1,
"node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
"path": "port",
"rev": 0,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
"user": "spam"
}
]
simple JSON without matching lines
$ hg grep -r tip:0 -Tjson -l port
[
{
"date": [4, 0],
"lineno": 1,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"path": "port",
"rev": 4,
"user": "spam"
},
{
"date": [3, 0],
"lineno": 1,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"path": "port",
"rev": 3,
"user": "eggs"
},
{
"date": [2, 0],
"lineno": 1,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"user": "spam"
},
{
"date": [1, 0],
"lineno": 1,
"node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
"path": "port",
"rev": 1,
"user": "eggs"
},
{
"date": [0, 0],
"lineno": 1,
"node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
"path": "port",
"rev": 0,
"user": "spam"
}
]
diff of each revision for reference
$ hg log -p -T'== rev: {rev} ==\n'
== rev: 4 ==
diff -r 95040cfd017d -r 914fa752cdea port
--- a/port Thu Jan 01 00:00:03 1970 +0000
+++ b/port Thu Jan 01 00:00:04 1970 +0000
@@ -1,4 +1,3 @@
export
vaportight
import/export
-import/export
== rev: 3 ==
diff -r 3b325e3481a1 -r 95040cfd017d port
--- a/port Thu Jan 01 00:00:02 1970 +0000
+++ b/port Thu Jan 01 00:00:03 1970 +0000
@@ -1,3 +1,4 @@
export
vaportight
import/export
+import/export
== rev: 2 ==
diff -r 8b20f75c1585 -r 3b325e3481a1 port
--- a/port Thu Jan 01 00:00:01 1970 +0000
+++ b/port Thu Jan 01 00:00:02 1970 +0000
@@ -1,2 +1,3 @@
-import
export
+vaportight
+import/export
== rev: 1 ==
diff -r f31323c92170 -r 8b20f75c1585 port
--- a/port Thu Jan 01 00:00:00 1970 +0000
+++ b/port Thu Jan 01 00:00:01 1970 +0000
@@ -1,1 +1,2 @@
import
+export
== rev: 0 ==
diff -r 000000000000 -r f31323c92170 port
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/port Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+import
all
$ hg grep --traceback --all -nu port port
port:4:4:-:spam:import/export
port:3:4:+:eggs:import/export
port:2:1:-:spam:import
port:2:2:+:spam:vaportight
port:2:3:+:spam:import/export
port:1:2:+:eggs:export
port:0:1:+:spam:import
all JSON
$ hg grep --all -Tjson port port
[
{
"change": "-",
"date": [4, 0],
"lineno": 4,
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c",
"path": "port",
"rev": 4,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
"date": [3, 0],
"lineno": 4,
"node": "95040cfd017d658c536071c6290230a613c4c2a6",
"path": "port",
"rev": 3,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"change": "-",
"date": [2, 0],
"lineno": 1,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
"date": [2, 0],
"lineno": 2,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}],
"user": "spam"
},
{
"change": "+",
"date": [2, 0],
"lineno": 3,
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47",
"path": "port",
"rev": 2,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}],
"user": "spam"
},
{
"change": "+",
"date": [1, 0],
"lineno": 2,
"node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587",
"path": "port",
"rev": 1,
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}],
"user": "eggs"
},
{
"change": "+",
"date": [0, 0],
"lineno": 1,
"node": "f31323c9217050ba245ee8b537c713ec2e8ab226",
"path": "port",
"rev": 0,
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}],
"user": "spam"
}
]
other
$ hg grep -r tip:0 -l port port
port:4
port:3
port:2
port:1
port:0
$ hg grep -r tip:0 import port
port:4:import/export
port:3:import/export
port:3:import/export
port:2:import/export
port:1:import
port:0:import
$ hg cp port port2
$ hg commit -m 4 -u spam -d '5 0'
follow
$ hg grep -r tip:0 --traceback -f 'import\n\Z' port2
[1]
$ echo deport >> port2
$ hg commit -m 5 -u eggs -d '6 0'
$ hg grep -f --all -nu port port2
port2:6:4:+:eggs:deport
port:4:4:-:spam:import/export
port:3:4:+:eggs:import/export
port:2:1:-:spam:import
port:2:2:+:spam:vaportight
port:2:3:+:spam:import/export
port:1:2:+:eggs:export
port:0:1:+:spam:import
$ hg up -q null
$ hg grep -r 'reverse(:.)' -f port
port:0:import
Test wdir
(at least, this shouldn't crash)
$ hg up -q
$ echo wport >> port2
$ hg stat
M port2
$ hg grep -r 'wdir()' port
port:2147483647:export
port:2147483647:vaportight
port:2147483647:import/export
port2:2147483647:export
port2:2147483647:vaportight
port2:2147483647:import/export
port2:2147483647:deport
port2:2147483647:wport
$ cd ..
$ hg init t2
$ cd t2
$ hg grep -r tip:0 foobar foo
[1]
$ hg grep -r tip:0 foobar
[1]
$ echo blue >> color
$ echo black >> color
$ hg add color
$ hg ci -m 0
$ echo orange >> color
$ hg ci -m 1
$ echo black > color
$ hg ci -m 2
$ echo orange >> color
$ echo blue >> color
$ hg ci -m 3
$ hg grep -r tip:0 orange
color:3:orange
color:1:orange
$ hg grep --all orange
color:3:+:orange
color:2:-:orange
color:1:+:orange
$ hg grep --diff orange --color=debug
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
[grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.deleted grep.change|-][grep.sep|:][grep.match|orange]
[grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.inserted grep.change|+][grep.sep|:][grep.match|orange]
$ hg grep --diff orange --color=yes
\x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m3\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
\x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m2\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1m-\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
\x1b[0;35mcolor\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;34m1\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32;1m+\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;31;1morange\x1b[0m (esc)
$ hg grep --diff orange
color:3:+:orange
color:2:-:orange
color:1:+:orange
revset predicate for "grep --diff"
$ hg log -qr 'diffcontains("re:^bl...$")'
0:203191eb5e21
$ hg log -qr 'diffcontains("orange")'
1:7c585a21e0d1
2:11bd8bc8d653
3:e0116d3829f8
$ hg log -qr '2:0 & diffcontains("orange")'
2:11bd8bc8d653
1:7c585a21e0d1
test substring match: '^' should only match at the beginning
$ hg grep -r tip:0 '^.' --config extensions.color= --color debug
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue
[grep.filename|color][grep.sep|:][grep.rev|2][grep.sep|:][grep.match|b]lack
[grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lue
[grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|b]lack
[grep.filename|color][grep.sep|:][grep.rev|1][grep.sep|:][grep.match|o]range
[grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lue
[grep.filename|color][grep.sep|:][grep.rev|0][grep.sep|:][grep.match|b]lack
match in last "line" without newline
$ "$PYTHON" -c 'fp = open("noeol", "wb"); fp.write(b"no infinite loop"); fp.close();'
$ hg ci -Amnoeol
adding noeol
$ hg grep -r tip:0 loop
noeol:4:no infinite loop
$ cd ..
Issue685: traceback in grep -r after rename
Got a traceback when using grep on a single
revision with renamed files.
$ hg init issue685
$ cd issue685
$ echo octarine > color
$ hg ci -Amcolor
adding color
$ hg rename color colour
$ hg ci -Am rename
$ hg grep -r tip:0 octarine
colour:1:octarine
color:0:octarine
Used to crash here
$ hg grep -r 1 octarine
colour:1:octarine
$ cd ..
Issue337: test that grep follows parent-child relationships instead
of just using revision numbers.
$ hg init issue337
$ cd issue337
$ echo white > color
$ hg commit -A -m "0 white"
adding color
$ echo red > color
$ hg commit -A -m "1 red"
$ hg update 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo black > color
$ hg commit -A -m "2 black"
created new head
$ hg update --clean 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo blue > color
$ hg commit -A -m "3 blue"
$ hg grep --all red
color:3:-:red
color:1:+:red
$ hg grep --diff red
color:3:-:red
color:1:+:red
Issue3885: test that changing revision order does not alter the
revisions printed, just their order.
$ hg grep --all red -r "all()"
color:1:+:red
color:3:-:red
$ hg grep --all red -r "reverse(all())"
color:3:-:red
color:1:+:red
$ hg grep --diff red -r "all()"
color:1:+:red
color:3:-:red
$ hg grep --diff red -r "reverse(all())"
color:3:-:red
color:1:+:red
$ cd ..
$ hg init a
$ cd a
$ cp "$TESTDIR/binfile.bin" .
$ hg add binfile.bin
$ hg ci -m 'add binfile.bin'
$ hg grep "MaCam" --all
binfile.bin:0:+: Binary file matches
$ hg grep "MaCam" --diff
binfile.bin:0:+: Binary file matches
$ cd ..
Moved line may not be collected by "grep --diff" since it first filters
the contents to be diffed by the pattern. (i.e.
"diff <(grep pat a) <(grep pat b)", not "diff a b | grep pat".)
This is much faster than generating full diff per revision.
$ hg init moved-line
$ cd moved-line
$ cat <<'EOF' > a
> foo
> bar
> baz
> EOF
$ hg ci -Am initial
adding a
$ cat <<'EOF' > a
> bar
> baz
> foo
> EOF
$ hg ci -m reorder
$ hg diff -c 1
diff -r a593cc55e81b -r 69789a3b6e80 a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,3 @@
-foo
bar
baz
+foo
can't find the move of "foo" at the revision 1:
$ hg grep --diff foo -r1
[1]
"bar" isn't moved at the revisoin 1:
$ hg grep --diff bar -r1
[1]
$ cd ..
Test for showing working of allfiles flag
$ hg init sng
$ cd sng
$ echo "unmod" >> um
$ echo old > old
$ hg ci -q -A -m "adds unmod to um"
$ echo "something else" >> new
$ hg ci -A -m "second commit"
adding new
$ hg grep -r "." "unmod"
um:1:unmod
Existing tracked files in the working directory are searched by default
$ echo modified >> new
$ echo 'added' > added; hg add added
$ echo 'added, missing' > added-missing; hg add added-missing; rm added-missing
$ echo 'untracked' > untracked
$ hg rm old
$ hg grep ''
added:added
new:something else
new:modified
um:unmod
#if symlink
Grepping a symlink greps its destination
$ rm -f added; ln -s symlink-added added
$ hg grep '' | grep added
added:symlink-added
But we reject symlinks as directories components of a tracked file as
usual:
$ mkdir dir; touch dir/f; hg add dir/f
$ rm -rf dir; ln -s / dir
$ hg grep ''
abort: path 'dir/f' traverses symbolic link 'dir'
[255]
#endif
But we can search files from some other revision with -rREV
$ hg grep -r. mod
um:1:unmod
$ hg grep --diff mod
um:0:+:unmod
$ cd ..
Change Default of grep by ui.tweakdefaults, that is, the files not in current
working directory should not be grepp-ed on
$ hg init ab
$ cd ab
$ cat <<'EOF' >> .hg/hgrc
> [ui]
> tweakdefaults = True
> EOF
$ echo "some text">>file1
$ hg add file1
$ hg commit -m "adds file1"
$ hg mv file1 file2
wdir revision is hidden by default:
$ hg grep "some"
file2:some text
but it should be available in template dict:
$ hg grep "some" -Tjson
[
{
"date": [0, 0],
"lineno": 1,
"node": "ffffffffffffffffffffffffffffffffffffffff",
"path": "file2",
"rev": 2147483647,
"texts": [{"matched": true, "text": "some"}, {"matched": false, "text": " text"}],
"user": "test"
}
]
$ cd ..
test -rMULTIREV
$ cd sng
$ hg rm um
$ hg commit -m "deletes um"
$ hg grep -r "0:2" "unmod"
um:0:unmod
um:1:unmod
$ hg grep -r "0:2" "unmod" um
um:0:unmod
um:1:unmod
$ hg grep -r "0:2" "unmod" "glob:**/um" # Check that patterns also work
um:0:unmod
um:1:unmod
$ cd ..
--follow with/without --diff and/or paths
-----------------------------------------
For each test case, we compare the history traversal of "hg log",
"hg grep --diff", and "hg grep" (--all-files).
"hg grep --diff" should traverse the log in the same way as "hg log".
"hg grep" (--all-files) is slightly different in that it includes
unmodified changes.
$ hg init follow
$ cd follow
$ cat <<'EOF' >> .hg/hgrc
> [command-templates]
> log = '{rev}: {join(files % "{status} {path}", ", ")}\n'
> EOF
$ for f in add0 add0-mod1 add0-rm1 add0-mod2 add0-rm2 add0-mod3 add0-mod4 add0-rm4; do
> echo data0 >> $f
> done
$ hg ci -qAm0
$ hg cp add0 add0-cp1
$ hg cp add0 add0-cp1-mod1
$ hg cp add0 add0-cp1-mod1-rm3
$ hg rm add0-rm1
$ for f in *mod1*; do
> echo data1 >> $f
> done
$ hg ci -qAm1
$ hg update -q 0
$ hg cp add0 add0-cp2
$ hg cp add0 add0-cp2-mod2
$ hg rm add0-rm2
$ for f in *mod2*; do
> echo data2 >> $f
> done
$ hg ci -qAm2
$ hg update -q 1
$ hg cp add0-cp1 add0-cp1-cp3
$ hg cp add0-cp1-mod1 add0-cp1-mod1-cp3-mod3
$ hg rm add0-cp1-mod1-rm3
$ for f in *mod3*; do
> echo data3 >> $f
> done
$ hg ci -qAm3
$ hg cp add0 add0-cp4
$ hg cp add0 add0-cp4-mod4
$ hg rm add0-rm4
$ for f in *mod4*; do
> echo data4 >> $f
> done
$ hg log -Gr':wdir()'
o 2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
|
@ 3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
|
| o 2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
| |
o | 1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
|/
o 0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
follow revision history from wdir parent:
$ hg log -f
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -f data
add0-cp1-mod1-cp3-mod3:3:+:data3
add0-mod3:3:+:data3
add0-cp1-mod1:1:+:data1
add0-cp1-mod1-rm3:1:+:data1
add0-mod1:1:+:data1
add0:0:+:data0
add0-mod1:0:+:data0
add0-mod2:0:+:data0
add0-mod3:0:+:data0
add0-mod4:0:+:data0
add0-rm1:0:+:data0
add0-rm2:0:+:data0
add0-rm4:0:+:data0
$ hg grep -f data
add0:3:data0
add0-cp1:3:data0
add0-cp1-cp3:3:data0
add0-cp1-mod1:3:data0
add0-cp1-mod1:3:data1
add0-cp1-mod1-cp3-mod3:3:data0
add0-cp1-mod1-cp3-mod3:3:data1
add0-cp1-mod1-cp3-mod3:3:data3
add0-mod1:3:data0
add0-mod1:3:data1
add0-mod2:3:data0
add0-mod3:3:data0
add0-mod3:3:data3
add0-mod4:3:data0
add0-rm2:3:data0
add0-rm4:3:data0
add0:1:data0
add0-cp1:1:data0
add0-cp1-mod1:1:data0
add0-cp1-mod1:1:data1
add0-cp1-mod1-rm3:1:data0
add0-cp1-mod1-rm3:1:data1
add0-mod1:1:data0
add0-mod1:1:data1
add0-mod2:1:data0
add0-mod3:1:data0
add0-mod4:1:data0
add0-rm2:1:data0
add0-rm4:1:data0
add0:0:data0
add0-mod1:0:data0
add0-mod2:0:data0
add0-mod3:0:data0
add0-mod4:0:data0
add0-rm1:0:data0
add0-rm2:0:data0
add0-rm4:0:data0
follow revision history from specified revision:
$ hg log -fr2
2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr2 data
add0-cp2-mod2:2:+:data2
add0-mod2:2:+:data2
add0:0:+:data0
add0-mod1:0:+:data0
add0-mod2:0:+:data0
add0-mod3:0:+:data0
add0-mod4:0:+:data0
add0-rm1:0:+:data0
add0-rm2:0:+:data0
add0-rm4:0:+:data0
$ hg grep -fr2 data
add0:2:data0
add0-cp2:2:data0
add0-cp2-mod2:2:data0
add0-cp2-mod2:2:data2
add0-mod1:2:data0
add0-mod2:2:data0
add0-mod2:2:data2
add0-mod3:2:data0
add0-mod4:2:data0
add0-rm1:2:data0
add0-rm4:2:data0
add0:0:data0
add0-mod1:0:data0
add0-mod2:0:data0
add0-mod3:0:data0
add0-mod4:0:data0
add0-rm1:0:data0
add0-rm2:0:data0
add0-rm4:0:data0
follow revision history from wdir:
$ hg log -fr'wdir()'
2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
BROKEN: should not abort because of removed file
$ hg grep --diff -fr'wdir()' data
add0-cp4-mod4:2147483647:+:data4
add0-mod4:2147483647:+:data4
add0-rm4:2147483647:-:abort: add0-rm4@None: not found in manifest
[50]
$ hg grep -fr'wdir()' data
add0:2147483647:data0
add0-cp1:2147483647:data0
add0-cp1-cp3:2147483647:data0
add0-cp1-mod1:2147483647:data0
add0-cp1-mod1:2147483647:data1
add0-cp1-mod1-cp3-mod3:2147483647:data0
add0-cp1-mod1-cp3-mod3:2147483647:data1
add0-cp1-mod1-cp3-mod3:2147483647:data3
add0-cp4:2147483647:data0
add0-cp4-mod4:2147483647:data0
add0-cp4-mod4:2147483647:data4
add0-mod1:2147483647:data0
add0-mod1:2147483647:data1
add0-mod2:2147483647:data0
add0-mod3:2147483647:data0
add0-mod3:2147483647:data3
add0-mod4:2147483647:data0
add0-mod4:2147483647:data4
add0-rm2:2147483647:data0
add0:3:data0
add0-cp1:3:data0
add0-cp1-cp3:3:data0
add0-cp1-mod1:3:data0
add0-cp1-mod1:3:data1
add0-cp1-mod1-cp3-mod3:3:data0
add0-cp1-mod1-cp3-mod3:3:data1
add0-cp1-mod1-cp3-mod3:3:data3
add0-mod1:3:data0
add0-mod1:3:data1
add0-mod2:3:data0
add0-mod3:3:data0
add0-mod3:3:data3
add0-mod4:3:data0
add0-rm2:3:data0
add0-rm4:3:data0
add0:1:data0
add0-cp1:1:data0
add0-cp1-mod1:1:data0
add0-cp1-mod1:1:data1
add0-cp1-mod1-rm3:1:data0
add0-cp1-mod1-rm3:1:data1
add0-mod1:1:data0
add0-mod1:1:data1
add0-mod2:1:data0
add0-mod3:1:data0
add0-mod4:1:data0
add0-rm2:1:data0
add0-rm4:1:data0
add0:0:data0
add0-mod1:0:data0
add0-mod2:0:data0
add0-mod3:0:data0
add0-mod4:0:data0
add0-rm1:0:data0
add0-rm2:0:data0
add0-rm4:0:data0
follow revision history from multiple revisions:
$ hg log -fr'1+2'
2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr'1+2' data
add0-cp2-mod2:2:+:data2
add0-mod2:2:+:data2
add0-cp1-mod1:1:+:data1
add0-cp1-mod1-rm3:1:+:data1
add0-mod1:1:+:data1
add0:0:+:data0
add0-mod1:0:+:data0
add0-mod2:0:+:data0
add0-mod3:0:+:data0
add0-mod4:0:+:data0
add0-rm1:0:+:data0
add0-rm2:0:+:data0
add0-rm4:0:+:data0
$ hg grep -fr'1+2' data
add0:2:data0
add0-cp2:2:data0
add0-cp2-mod2:2:data0
add0-cp2-mod2:2:data2
add0-mod1:2:data0
add0-mod2:2:data0
add0-mod2:2:data2
add0-mod3:2:data0
add0-mod4:2:data0
add0-rm1:2:data0
add0-rm4:2:data0
add0:1:data0
add0-cp1:1:data0
add0-cp1-mod1:1:data0
add0-cp1-mod1:1:data1
add0-cp1-mod1-rm3:1:data0
add0-cp1-mod1-rm3:1:data1
add0-mod1:1:data0
add0-mod1:1:data1
add0-mod2:1:data0
add0-mod3:1:data0
add0-mod4:1:data0
add0-rm2:1:data0
add0-rm4:1:data0
add0:0:data0
add0-mod1:0:data0
add0-mod2:0:data0
add0-mod3:0:data0
add0-mod4:0:data0
add0-rm1:0:data0
add0-rm2:0:data0
add0-rm4:0:data0
follow file history from wdir parent, unmodified in wdir:
$ hg log -f add0-mod3
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -f data add0-mod3
add0-mod3:3:+:data3
add0-mod3:0:+:data0
$ hg grep -f data add0-mod3
add0-mod3:3:data0
add0-mod3:3:data3
add0-mod3:1:data0
add0-mod3:0:data0
follow file history from wdir parent, modified in wdir:
$ hg log -f add0-mod4
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -f data add0-mod4
add0-mod4:0:+:data0
$ hg grep -f data add0-mod4
add0-mod4:3:data0
add0-mod4:1:data0
add0-mod4:0:data0
follow file history from wdir parent, copied but unmodified:
$ hg log -f add0-cp1-cp3
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -f data add0-cp1-cp3
add0:0:+:data0
BROKEN: should follow history across renames
$ hg grep -f data add0-cp1-cp3
add0-cp1-cp3:3:data0
follow file history from wdir parent, copied and modified:
$ hg log -f add0-cp1-mod1-cp3-mod3
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -f data add0-cp1-mod1-cp3-mod3
add0-cp1-mod1-cp3-mod3:3:+:data3
add0-cp1-mod1:1:+:data1
add0:0:+:data0
BROKEN: should follow history across renames
$ hg grep -f data add0-cp1-mod1-cp3-mod3
add0-cp1-mod1-cp3-mod3:3:data0
add0-cp1-mod1-cp3-mod3:3:data1
add0-cp1-mod1-cp3-mod3:3:data3
follow file history from wdir parent, copied in wdir:
$ hg log -f add0-cp4
abort: cannot follow nonexistent file: "add0-cp4"
[255]
$ hg grep --diff -f data add0-cp4
abort: cannot follow nonexistent file: "add0-cp4"
[255]
BROKEN: maybe better to abort
$ hg grep -f data add0-cp4
[1]
follow file history from wdir parent, removed:
$ hg log -f add0-cp1-mod1-rm3
abort: cannot follow file not in parent revision: "add0-cp1-mod1-rm3"
[255]
$ hg grep --diff -f data add0-cp1-mod1-rm3
abort: cannot follow file not in parent revision: "add0-cp1-mod1-rm3"
[255]
BROKEN: maybe better to abort
$ hg grep -f data add0-cp1-mod1-rm3
add0-cp1-mod1-rm3:1:data0
add0-cp1-mod1-rm3:1:data1
follow file history from wdir parent (explicit), removed:
$ hg log -fr. add0-cp1-mod1-rm3
abort: cannot follow file not in any of the specified revisions: "add0-cp1-mod1-rm3"
[255]
$ hg grep --diff -fr. data add0-cp1-mod1-rm3
abort: cannot follow file not in any of the specified revisions: "add0-cp1-mod1-rm3"
[255]
BROKEN: should abort
$ hg grep -fr. data add0-cp1-mod1-rm3
add0-cp1-mod1-rm3:1:data0
add0-cp1-mod1-rm3:1:data1
follow file history from wdir parent, removed in wdir:
$ hg log -f add0-rm4
abort: cannot follow file not in parent revision: "add0-rm4"
[255]
$ hg grep --diff -f data add0-rm4
abort: cannot follow file not in parent revision: "add0-rm4"
[255]
BROKEN: should abort
$ hg grep -f data add0-rm4
add0-rm4:3:data0
add0-rm4:1:data0
add0-rm4:0:data0
follow file history from wdir parent (explicit), removed in wdir:
$ hg log -fr. add0-rm4
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr. data add0-rm4
add0-rm4:0:+:data0
$ hg grep -fr. data add0-rm4
add0-rm4:3:data0
add0-rm4:1:data0
add0-rm4:0:data0
follow file history from wdir parent, multiple files:
$ hg log -f add0-mod3 add0-cp1-mod1
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
1: A add0-cp1, A add0-cp1-mod1, A add0-cp1-mod1-rm3, M add0-mod1, R add0-rm1
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -f data add0-mod3 add0-cp1-mod1
add0-mod3:3:+:data3
add0-cp1-mod1:1:+:data1
add0:0:+:data0
add0-mod3:0:+:data0
BROKEN: should follow history across renames
$ hg grep -f data add0-mod3 add0-cp1-mod1
add0-cp1-mod1:3:data0
add0-cp1-mod1:3:data1
add0-mod3:3:data0
add0-mod3:3:data3
add0-cp1-mod1:1:data0
add0-cp1-mod1:1:data1
add0-mod3:1:data0
add0-mod3:0:data0
follow file history from specified revision, modified:
$ hg log -fr2 add0-mod2
2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr2 data add0-mod2
add0-mod2:2:+:data2
add0-mod2:0:+:data0
$ hg grep -fr2 data add0-mod2
add0-mod2:2:data0
add0-mod2:2:data2
add0-mod2:0:data0
follow file history from specified revision, copied but unmodified:
$ hg log -fr2 add0-cp2
2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr2 data add0-cp2
add0:0:+:data0
BROKEN: should follow history across renames
$ hg grep -fr2 data add0-cp2
add0-cp2:2:data0
follow file history from specified revision, copied and modified:
$ hg log -fr2 add0-cp2-mod2
2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr2 data add0-cp2-mod2
add0-cp2-mod2:2:+:data2
add0:0:+:data0
BROKEN: should follow history across renames
$ hg grep -fr2 data add0-cp2-mod2
add0-cp2-mod2:2:data0
add0-cp2-mod2:2:data2
follow file history from specified revision, removed:
$ hg log -fr2 add0-rm2
abort: cannot follow file not in any of the specified revisions: "add0-rm2"
[255]
$ hg grep --diff -fr2 data add0-rm2
abort: cannot follow file not in any of the specified revisions: "add0-rm2"
[255]
BROKEN: should abort
$ hg grep -fr2 data add0-rm2
add0-rm2:0:data0
follow file history from specified revision, multiple files:
$ hg log -fr2 add0-cp2 add0-mod2
2: A add0-cp2, A add0-cp2-mod2, M add0-mod2, R add0-rm2
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr2 data add0-cp2 add0-mod2
add0-mod2:2:+:data2
add0:0:+:data0
add0-mod2:0:+:data0
BROKEN: should follow history across renames
$ hg grep -fr2 data add0-cp2 add0-mod2
add0-cp2:2:data0
add0-mod2:2:data0
add0-mod2:2:data2
add0-mod2:0:data0
follow file history from wdir, unmodified:
$ hg log -fr'wdir()' add0-mod3
2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr'wdir()' data add0-mod3
add0-mod3:3:+:data3
add0-mod3:0:+:data0
$ hg grep -fr'wdir()' data add0-mod3
add0-mod3:2147483647:data0
add0-mod3:2147483647:data3
add0-mod3:3:data0
add0-mod3:3:data3
add0-mod3:1:data0
add0-mod3:0:data0
follow file history from wdir, modified:
$ hg log -fr'wdir()' add0-mod4
2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr'wdir()' data add0-mod4
add0-mod4:2147483647:+:data4
add0-mod4:0:+:data0
$ hg grep -fr'wdir()' data add0-mod4
add0-mod4:2147483647:data0
add0-mod4:2147483647:data4
add0-mod4:3:data0
add0-mod4:1:data0
add0-mod4:0:data0
follow file history from wdir, copied but unmodified:
$ hg log -fr'wdir()' add0-cp4
2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr'wdir()' data add0-cp4
add0:0:+:data0
BROKEN: should follow history across renames
$ hg grep -fr'wdir()' data add0-cp4
add0-cp4:2147483647:data0
follow file history from wdir, copied and modified:
$ hg log -fr'wdir()' add0-cp4-mod4
2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr'wdir()' data add0-cp4-mod4
add0-cp4-mod4:2147483647:+:data4
add0:0:+:data0
BROKEN: should follow history across renames
$ hg grep -fr'wdir()' data add0-cp4-mod4
add0-cp4-mod4:2147483647:data0
add0-cp4-mod4:2147483647:data4
follow file history from wdir, multiple files:
$ hg log -fr'wdir()' add0-cp4 add0-mod4 add0-mod3
2147483647: A add0-cp4, A add0-cp4-mod4, M add0-mod4, R add0-rm4
3: A add0-cp1-cp3, A add0-cp1-mod1-cp3-mod3, R add0-cp1-mod1-rm3, M add0-mod3
0: A add0, A add0-mod1, A add0-mod2, A add0-mod3, A add0-mod4, A add0-rm1, A add0-rm2, A add0-rm4
$ hg grep --diff -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3
add0-mod4:2147483647:+:data4
add0-mod3:3:+:data3
add0:0:+:data0
add0-mod3:0:+:data0
add0-mod4:0:+:data0
BROKEN: should follow history across renames
$ hg grep -fr'wdir()' data add0-cp4 add0-mod4 add0-mod3
add0-cp4:2147483647:data0
add0-mod3:2147483647:data0
add0-mod3:2147483647:data3
add0-mod4:2147483647:data0
add0-mod4:2147483647:data4
add0-mod3:3:data0
add0-mod3:3:data3
add0-mod4:3:data0
add0-mod3:1:data0
add0-mod4:1:data0
add0-mod3:0:data0
add0-mod4:0:data0
$ cd ..