author | Simon Farnsworth <simonfar@fb.com> |
Mon, 06 Mar 2017 03:19:40 -0800 | |
changeset 31204 | 84e8a6834223 |
parent 29858 | 33461139c31c |
child 36495 | eafd380fe1b8 |
permissions | -rw-r--r-- |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13920
diff
changeset
|
1 |
$ hg init t |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
2 |
$ cd t |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
3 |
$ echo import > port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
4 |
$ hg add port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
5 |
$ hg commit -m 0 -u spam -d '0 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
6 |
$ echo export >> port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
7 |
$ hg commit -m 1 -u eggs -d '1 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
8 |
$ echo export > port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
9 |
$ echo vaportight >> port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
10 |
$ echo 'import/export' >> port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
11 |
$ hg commit -m 2 -u spam -d '2 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
12 |
$ echo 'import/export' >> port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
13 |
$ hg commit -m 3 -u eggs -d '3 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
14 |
$ head -n 3 port > port1 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
15 |
$ mv port1 port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
16 |
$ hg commit -m 4 -u spam -d '4 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
17 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
18 |
pattern error |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
19 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
20 |
$ hg grep '**test**' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
21 |
grep: invalid match pattern: nothing to repeat |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11902
diff
changeset
|
22 |
[1] |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
23 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
24 |
simple |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
25 |
|
17923
1e6b5faf9d4e
grep: don't search past the end of the searched string
Idan Kamara <idankk86@gmail.com>
parents:
17806
diff
changeset
|
26 |
$ hg grep '.*' |
1e6b5faf9d4e
grep: don't search past the end of the searched string
Idan Kamara <idankk86@gmail.com>
parents:
17806
diff
changeset
|
27 |
port:4:export |
1e6b5faf9d4e
grep: don't search past the end of the searched string
Idan Kamara <idankk86@gmail.com>
parents:
17806
diff
changeset
|
28 |
port:4:vaportight |
1e6b5faf9d4e
grep: don't search past the end of the searched string
Idan Kamara <idankk86@gmail.com>
parents:
17806
diff
changeset
|
29 |
port:4:import/export |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
30 |
$ hg grep port port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
31 |
port:4:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
32 |
port:4:vaportight |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
33 |
port:4:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
34 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
35 |
simple with color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
36 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
37 |
$ hg --config extensions.color= grep --config color.mode=ansi \ |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
38 |
> --color=always port port |
17806
dc7010ed0101
grep: colorize all fields
Idan Kamara <idankk86@gmail.com>
parents:
17805
diff
changeset
|
39 |
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mex\x1b[0;31;1mport\x1b[0m (esc) |
dc7010ed0101
grep: colorize all fields
Idan Kamara <idankk86@gmail.com>
parents:
17805
diff
changeset
|
40 |
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mva\x1b[0;31;1mport\x1b[0might (esc) |
21011
2db41f95c4a2
grep: highlight all matched words
Takumi IINO <trot.thunder@gmail.com>
parents:
17923
diff
changeset
|
41 |
\x1b[0;35mport\x1b[0m\x1b[0;36m:\x1b[0m\x1b[0;32m4\x1b[0m\x1b[0;36m:\x1b[0mim\x1b[0;31;1mport\x1b[0m/ex\x1b[0;31;1mport\x1b[0m (esc) |
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
diff
changeset
|
42 |
|
29858
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
43 |
simple templated |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
44 |
|
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
45 |
$ hg grep port \ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
46 |
> -T '{file}:{rev}:{node|short}:{texts % "{if(matched, text|upper, text)}"}\n' |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
47 |
port:4:914fa752cdea:exPORT |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
48 |
port:4:914fa752cdea:vaPORTight |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
49 |
port:4:914fa752cdea:imPORT/exPORT |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
50 |
|
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
51 |
simple JSON (no "change" field) |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
52 |
|
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
53 |
$ hg grep -Tjson port |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
54 |
[ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
55 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
56 |
"date": [4.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
57 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
58 |
"line_number": 1, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
59 |
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
60 |
"rev": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
61 |
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
62 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
63 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
64 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
65 |
"date": [4.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
66 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
67 |
"line_number": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
68 |
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
69 |
"rev": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
70 |
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
71 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
72 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
73 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
74 |
"date": [4.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
75 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
76 |
"line_number": 3, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
77 |
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
78 |
"rev": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
79 |
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
80 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
81 |
} |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
82 |
] |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
83 |
|
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
84 |
simple JSON without matching lines |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
85 |
|
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
86 |
$ hg grep -Tjson -l port |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
87 |
[ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
88 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
89 |
"date": [4.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
90 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
91 |
"line_number": 1, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
92 |
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
93 |
"rev": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
94 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
95 |
} |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
96 |
] |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
97 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
98 |
all |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
99 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
100 |
$ hg grep --traceback --all -nu port port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
101 |
port:4:4:-:spam:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
102 |
port:3:4:+:eggs:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
103 |
port:2:1:-:spam:import |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
104 |
port:2:2:-:spam:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
105 |
port:2:1:+:spam:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
106 |
port:2:2:+:spam:vaportight |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
107 |
port:2:3:+:spam:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
108 |
port:1:2:+:eggs:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
109 |
port:0:1:+:spam:import |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
110 |
|
29858
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
111 |
all JSON |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
112 |
|
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
113 |
$ hg grep --all -Tjson port port |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
114 |
[ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
115 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
116 |
"change": "-", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
117 |
"date": [4.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
118 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
119 |
"line_number": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
120 |
"node": "914fa752cdea87777ac1a8d5c858b0c736218f6c", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
121 |
"rev": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
122 |
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
123 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
124 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
125 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
126 |
"change": "+", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
127 |
"date": [3.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
128 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
129 |
"line_number": 4, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
130 |
"node": "95040cfd017d658c536071c6290230a613c4c2a6", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
131 |
"rev": 3, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
132 |
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
133 |
"user": "eggs" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
134 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
135 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
136 |
"change": "-", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
137 |
"date": [2.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
138 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
139 |
"line_number": 1, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
140 |
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
141 |
"rev": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
142 |
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
143 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
144 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
145 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
146 |
"change": "-", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
147 |
"date": [2.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
148 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
149 |
"line_number": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
150 |
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
151 |
"rev": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
152 |
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
153 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
154 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
155 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
156 |
"change": "+", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
157 |
"date": [2.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
158 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
159 |
"line_number": 1, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
160 |
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
161 |
"rev": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
162 |
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
163 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
164 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
165 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
166 |
"change": "+", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
167 |
"date": [2.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
168 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
169 |
"line_number": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
170 |
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
171 |
"rev": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
172 |
"texts": [{"matched": false, "text": "va"}, {"matched": true, "text": "port"}, {"matched": false, "text": "ight"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
173 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
174 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
175 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
176 |
"change": "+", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
177 |
"date": [2.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
178 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
179 |
"line_number": 3, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
180 |
"node": "3b325e3481a1f07435d81dfdbfa434d9a0245b47", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
181 |
"rev": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
182 |
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}, {"matched": false, "text": "/ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
183 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
184 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
185 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
186 |
"change": "+", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
187 |
"date": [1.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
188 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
189 |
"line_number": 2, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
190 |
"node": "8b20f75c158513ff5ac80bd0e5219bfb6f0eb587", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
191 |
"rev": 1, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
192 |
"texts": [{"matched": false, "text": "ex"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
193 |
"user": "eggs" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
194 |
}, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
195 |
{ |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
196 |
"change": "+", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
197 |
"date": [0.0, 0], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
198 |
"file": "port", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
199 |
"line_number": 1, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
200 |
"node": "f31323c9217050ba245ee8b537c713ec2e8ab226", |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
201 |
"rev": 0, |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
202 |
"texts": [{"matched": false, "text": "im"}, {"matched": true, "text": "port"}], |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
203 |
"user": "spam" |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
204 |
} |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
205 |
] |
33461139c31c
grep: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
29854
diff
changeset
|
206 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
207 |
other |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
208 |
|
17805
21c93988ca70
test-grep: add a test for -l
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
209 |
$ hg grep -l port port |
21c93988ca70
test-grep: add a test for -l
Idan Kamara <idankk86@gmail.com>
parents:
16912
diff
changeset
|
210 |
port:4 |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
211 |
$ hg grep import port |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
212 |
port:4:import/export |
2870
8eaaf1321bfe
grep: add --follow support.
Brendan Cully <brendan@kublai.com>
parents:
2869
diff
changeset
|
213 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
214 |
$ hg cp port port2 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
215 |
$ hg commit -m 4 -u spam -d '5 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
216 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
217 |
follow |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
218 |
|
15765
1ef46bcd76f8
grep: make multiline mode the default (BC)
Matt Mackall <mpm@selenic.com>
parents:
15293
diff
changeset
|
219 |
$ hg grep --traceback -f 'import\n\Z' port2 |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
220 |
port:0:import |
15765
1ef46bcd76f8
grep: make multiline mode the default (BC)
Matt Mackall <mpm@selenic.com>
parents:
15293
diff
changeset
|
221 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
222 |
$ echo deport >> port2 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
223 |
$ hg commit -m 5 -u eggs -d '6 0' |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
224 |
$ hg grep -f --all -nu port port2 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
225 |
port2:6:4:+:eggs:deport |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
226 |
port:4:4:-:spam:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
227 |
port:3:4:+:eggs:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
228 |
port:2:1:-:spam:import |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
229 |
port:2:2:-:spam:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
230 |
port:2:1:+:spam:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
231 |
port:2:2:+:spam:vaportight |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
232 |
port:2:3:+:spam:import/export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
233 |
port:1:2:+:eggs:export |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
234 |
port:0:1:+:spam:import |
3951
cb66641cdee3
grep: remove count handling, simplify, fix issue337
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3950
diff
changeset
|
235 |
|
24064
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
22947
diff
changeset
|
236 |
$ hg up -q null |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
22947
diff
changeset
|
237 |
$ hg grep -f port |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
22947
diff
changeset
|
238 |
[1] |
c260887cdbcd
log: fix --follow null parent not to include revision 0
Yuya Nishihara <yuya@tcha.org>
parents:
22947
diff
changeset
|
239 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
240 |
$ cd .. |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
241 |
$ hg init t2 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
242 |
$ cd t2 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
243 |
$ hg grep foobar foo |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11902
diff
changeset
|
244 |
[1] |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
245 |
$ hg grep foobar |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11902
diff
changeset
|
246 |
[1] |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
247 |
$ echo blue >> color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
248 |
$ echo black >> color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
249 |
$ hg add color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
250 |
$ hg ci -m 0 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
251 |
$ echo orange >> color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
252 |
$ hg ci -m 1 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
253 |
$ echo black > color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
254 |
$ hg ci -m 2 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
255 |
$ echo orange >> color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
256 |
$ echo blue >> color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
257 |
$ hg ci -m 3 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
258 |
$ hg grep orange |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
259 |
color:3:orange |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
260 |
$ hg grep --all orange |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
261 |
color:3:+:orange |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
262 |
color:2:-:orange |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
263 |
color:1:+:orange |
5106
ee702e7f181f
test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com>
parents:
4877
diff
changeset
|
264 |
|
29854
b842b1adfea2
grep: refactor loop that yields matched text with label
Yuya Nishihara <yuya@tcha.org>
parents:
24064
diff
changeset
|
265 |
test substring match: '^' should only match at the beginning |
b842b1adfea2
grep: refactor loop that yields matched text with label
Yuya Nishihara <yuya@tcha.org>
parents:
24064
diff
changeset
|
266 |
|
b842b1adfea2
grep: refactor loop that yields matched text with label
Yuya Nishihara <yuya@tcha.org>
parents:
24064
diff
changeset
|
267 |
$ hg grep '^.' --config extensions.color= --color debug |
b842b1adfea2
grep: refactor loop that yields matched text with label
Yuya Nishihara <yuya@tcha.org>
parents:
24064
diff
changeset
|
268 |
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lack |
b842b1adfea2
grep: refactor loop that yields matched text with label
Yuya Nishihara <yuya@tcha.org>
parents:
24064
diff
changeset
|
269 |
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|o]range |
b842b1adfea2
grep: refactor loop that yields matched text with label
Yuya Nishihara <yuya@tcha.org>
parents:
24064
diff
changeset
|
270 |
[grep.filename|color][grep.sep|:][grep.rev|3][grep.sep|:][grep.match|b]lue |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
271 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
272 |
match in last "line" without newline |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
273 |
|
22947
c63a09b6b337
tests: use $PYTHON instead of hardcoding python
Augie Fackler <raf@durin42.com>
parents:
21024
diff
changeset
|
274 |
$ $PYTHON -c 'fp = open("noeol", "wb"); fp.write("no infinite loop"); fp.close();' |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
275 |
$ hg ci -Amnoeol |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
276 |
adding noeol |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
277 |
$ hg grep loop |
15293
0e34699d6988
grep: correct handling of matching lines without line ending (issue3050)
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
278 |
noeol:4:no infinite loop |
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
279 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
280 |
$ cd .. |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
281 |
|
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
21011
diff
changeset
|
282 |
Issue685: traceback in grep -r after rename |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12316
diff
changeset
|
283 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
284 |
Got a traceback when using grep on a single |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
285 |
revision with renamed files. |
7240
dac14cc9711e
test 261a9f47b44b: grep w/ match in last line w/o newline
Christian Ebert <blacktrash@gmx.net>
parents:
5107
diff
changeset
|
286 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
287 |
$ hg init issue685 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
288 |
$ cd issue685 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
289 |
$ echo octarine > color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
290 |
$ hg ci -Amcolor |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
291 |
adding color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
292 |
$ hg rename color colour |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
293 |
$ hg ci -Am rename |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
294 |
$ hg grep octarine |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
295 |
colour:1:octarine |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
296 |
color:0:octarine |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
297 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
298 |
Used to crash here |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
299 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
300 |
$ hg grep -r 1 octarine |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
301 |
colour:1:octarine |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
302 |
$ cd .. |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
303 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
304 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
305 |
Issue337: test that grep follows parent-child relationships instead |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
306 |
of just using revision numbers. |
7240
dac14cc9711e
test 261a9f47b44b: grep w/ match in last line w/o newline
Christian Ebert <blacktrash@gmx.net>
parents:
5107
diff
changeset
|
307 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
308 |
$ hg init issue337 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
309 |
$ cd issue337 |
8849
80cc4b1a62d0
compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
8167
diff
changeset
|
310 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
311 |
$ echo white > color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
312 |
$ hg commit -A -m "0 white" |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
313 |
adding color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
314 |
|
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
315 |
$ echo red > color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
316 |
$ hg commit -A -m "1 red" |
8849
80cc4b1a62d0
compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
8167
diff
changeset
|
317 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
318 |
$ hg update 0 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
319 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
320 |
$ echo black > color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
321 |
$ hg commit -A -m "2 black" |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
322 |
created new head |
8849
80cc4b1a62d0
compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
8167
diff
changeset
|
323 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
324 |
$ hg update --clean 1 |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
325 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
326 |
$ echo blue > color |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
327 |
$ hg commit -A -m "3 blue" |
8849
80cc4b1a62d0
compare grep result between target and its parent
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
8167
diff
changeset
|
328 |
|
11902
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
329 |
$ hg grep --all red |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
330 |
color:3:-:red |
3c9a5ed9b1e2
tests: unify test-grep
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11141
diff
changeset
|
331 |
color:1:+:red |
13920
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
332 |
|
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
333 |
$ cd .. |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
334 |
|
13920
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
335 |
$ hg init a |
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
336 |
$ cd a |
16350
4f795f5fbb0b
tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents:
15765
diff
changeset
|
337 |
$ cp "$TESTDIR/binfile.bin" . |
13920
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
338 |
$ hg add binfile.bin |
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
339 |
$ hg ci -m 'add binfile.bin' |
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
340 |
$ hg grep "MaCam" --all |
332e400764e5
grep: don't print data from binary files for matches (issue2614)
Md. O. Shayan <mdoshayan@gmail.com>
parents:
12942
diff
changeset
|
341 |
binfile.bin:0:+: Binary file matches |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
342 |
|
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16350
diff
changeset
|
343 |
$ cd .. |