Mercurial > hg
annotate tests/test-annotate.t @ 35547:b6dbc860570d
log: don't expand aliases in revset built from command options
Only -rREV should be rewritten with user aliases.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 04 Jan 2018 12:00:18 +0900 |
parents | feecfefeba25 |
children | 0a7c59a4c835 2a258985ffeb |
rev | line source |
---|---|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
1 $ HGMERGE=true; export HGMERGE |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
2 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
3 init |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
4 |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
5 $ hg init repo |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
6 $ cd repo |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
8 commit |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
9 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
10 $ echo 'a' > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
11 $ hg ci -A -m test -u nobody -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
12 adding a |
4365
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3405
diff
changeset
|
13 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
14 annotate -c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
15 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
16 $ hg annotate -c a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
17 8435f90966e4: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
19 annotate -cl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
20 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
21 $ hg annotate -cl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
22 8435f90966e4:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
23 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
24 annotate -d |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
25 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
26 $ hg annotate -d a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
27 Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
28 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
29 annotate -n |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
30 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
31 $ hg annotate -n a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
32 0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
33 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
34 annotate -nl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
35 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
36 $ hg annotate -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
37 0:1: a |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
38 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
39 annotate -u |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
40 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
41 $ hg annotate -u a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
42 nobody: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
43 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
44 annotate -cdnu |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
45 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
46 $ hg annotate -cdnu a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
47 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
48 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
49 annotate -cdnul |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
50 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
51 $ hg annotate -cdnul a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
52 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
53 |
22480
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
54 annotate (JSON) |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
55 |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
56 $ hg annotate -Tjson a |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
57 [ |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
58 { |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
59 "abspath": "a", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
60 "lines": [{"line": "a\n", "rev": 0}], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
61 "path": "a" |
22480
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
62 } |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
63 ] |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
64 |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
65 $ hg annotate -Tjson -cdfnul a |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
66 [ |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
67 { |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
68 "abspath": "a", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
69 "lines": [{"date": [1.0, 0], "file": "a", "line": "a\n", "line_number": 1, "node": "8435f90966e442695d2ded29fdade2bac5ad8065", "rev": 0, "user": "nobody"}], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
70 "path": "a" |
22480
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
71 } |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
72 ] |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
73 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
74 $ cat <<EOF >>a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
75 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
76 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
77 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
78 $ hg ci -ma1 -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
79 $ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
80 $ hg ci -mb -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
81 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
82 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
83 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
84 > b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
85 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
86 $ hg ci -mb2 -d '2 0' |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
87 |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
88 annotate multiple files (JSON) |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
89 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
90 $ hg annotate -Tjson a b |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
91 [ |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
92 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
93 "abspath": "a", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
94 "lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
95 "path": "a" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
96 }, |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
97 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
98 "abspath": "b", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
99 "lines": [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}, {"line": "b4\n", "rev": 3}, {"line": "b5\n", "rev": 3}, {"line": "b6\n", "rev": 3}], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
100 "path": "b" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
101 } |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
102 ] |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
103 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
104 annotate multiple files (template) |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
105 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
106 $ hg annotate -T'== {abspath} ==\n{lines % "{rev}: {line}"}' a b |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
107 == a == |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
108 0: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
109 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
110 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
111 == b == |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
112 0: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
113 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
114 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
115 3: b4 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
116 3: b5 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
117 3: b6 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
118 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
119 annotate -n b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
120 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
121 $ hg annotate -n b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
122 0: a |
30431
8c0c75aa3ff4
bdiff: give slight preference to longest matches in the middle of the B side
Mads Kiilerich <madski@unity3d.com>
parents:
29861
diff
changeset
|
123 1: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
124 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
125 3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
126 3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
127 3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
128 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
129 annotate --no-follow b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
130 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
131 $ hg annotate --no-follow b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
132 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
133 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
134 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
135 3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
136 3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
137 3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
138 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
139 annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
140 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
141 $ hg annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
142 0:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
143 1:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
144 1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
145 3:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
146 3:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
147 3:6: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
148 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
149 annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
150 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
151 $ hg annotate -nf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
152 0 a: a |
30431
8c0c75aa3ff4
bdiff: give slight preference to longest matches in the middle of the B side
Mads Kiilerich <madski@unity3d.com>
parents:
29861
diff
changeset
|
153 1 a: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
154 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
155 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
156 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
157 3 b: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
158 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
159 annotate -nlf b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
160 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
161 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
162 0 a:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
163 1 a:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
164 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
165 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
166 3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
167 3 b:6: b6 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
168 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
169 $ hg up -C 2 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
170 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
171 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
172 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
173 > c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
174 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
175 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
176 $ hg ci -mb2.1 -d '2 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
177 created new head |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
178 $ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
179 merging b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
180 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
181 (branch merge, don't forget to commit) |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
182 $ hg ci -mmergeb -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
183 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
184 annotate after merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
185 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
186 $ hg annotate -nf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
187 0 a: a |
30431
8c0c75aa3ff4
bdiff: give slight preference to longest matches in the middle of the B side
Mads Kiilerich <madski@unity3d.com>
parents:
29861
diff
changeset
|
188 1 a: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
189 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
190 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
191 4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
192 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
193 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
194 annotate after merge with -l |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
195 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
196 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
197 0 a:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
198 1 a:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
199 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
200 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
201 4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
202 3 b:5: b5 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
203 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
204 $ hg up -C 1 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
205 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
206 $ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
207 $ cat <<EOF > b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
208 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
209 > z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
210 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
211 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
212 $ hg ci -mc -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
213 created new head |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
214 $ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
215 merging b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
216 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
217 (branch merge, don't forget to commit) |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
218 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
219 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
220 > c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
221 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
222 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
223 $ echo d >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
224 $ hg ci -mmerge2 -d '4 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
225 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
226 annotate after rename merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
227 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
228 $ hg annotate -nf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
229 0 a: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
230 6 b: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
231 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
232 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
233 4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
234 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
235 7 b: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
236 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
237 annotate after rename merge with -l |
3405
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3202
diff
changeset
|
238 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
239 $ hg annotate -nlf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
240 0 a:1: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
241 6 b:2: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
242 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
243 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
244 4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
245 3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
246 7 b:7: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
247 |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
248 --skip nothing (should be the same as no --skip at all) |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
249 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
250 $ hg annotate -nlf b --skip '1::0' |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
251 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
252 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
253 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
254 3 b:4: b4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
255 4 b:5: c |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
256 3 b:5: b5 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
257 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
258 |
32767
e5dd44f78ac6
tests: handle variation between pure and normal output in annotate --skip
Augie Fackler <raf@durin42.com>
parents:
32649
diff
changeset
|
259 --skip a modified line. Note a slight behavior difference in pure - this is |
e5dd44f78ac6
tests: handle variation between pure and normal output in annotate --skip
Augie Fackler <raf@durin42.com>
parents:
32649
diff
changeset
|
260 because the pure code comes up with slightly different deltas internally. |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
261 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
262 $ hg annotate -nlf b --skip 6 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
263 0 a:1: a |
34487
323bed58cf57
test-annotate: fix up expected output for pure
Augie Fackler <augie@google.com>
parents:
34434
diff
changeset
|
264 1 a:2* z (no-pure !) |
323bed58cf57
test-annotate: fix up expected output for pure
Augie Fackler <augie@google.com>
parents:
34434
diff
changeset
|
265 0 a:1* z (pure !) |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
266 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
267 3 b:4: b4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
268 4 b:5: c |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
269 3 b:5: b5 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
270 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
271 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
272 --skip added lines (and test multiple skip) |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
273 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
274 $ hg annotate -nlf b --skip 3 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
275 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
276 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
277 1 a:3: a |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
278 1 a:3* b4 |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
279 4 b:5: c |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
280 1 a:3* b5 |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
281 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
282 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
283 $ hg annotate -nlf b --skip 4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
284 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
285 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
286 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
287 3 b:4: b4 |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
288 1 a:3* c |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
289 3 b:5: b5 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
290 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
291 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
292 $ hg annotate -nlf b --skip 3 --skip 4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
293 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
294 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
295 1 a:3: a |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
296 1 a:3* b4 |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
297 1 a:3* c |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
298 1 a:3* b5 |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
299 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
300 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
301 $ hg annotate -nlf b --skip 'merge()' |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
302 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
303 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
304 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
305 3 b:4: b4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
306 4 b:5: c |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
307 3 b:5: b5 |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
308 3 b:5* d |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
309 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
310 --skip everything -- use the revision the file was introduced in |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
311 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
312 $ hg annotate -nlf b --skip 'all()' |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
313 0 a:1: a |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
314 0 a:1* z |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
315 0 a:1* a |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
316 0 a:1* b4 |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
317 0 a:1* c |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
318 0 a:1* b5 |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
319 0 a:1* d |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
320 |
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
321 Issue2807: alignment of line numbers with -l |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
322 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
323 $ echo more >> b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
324 $ hg ci -mmore -d '5 0' |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
325 $ echo more >> b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
326 $ hg ci -mmore -d '6 0' |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
327 $ echo more >> b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
328 $ hg ci -mmore -d '7 0' |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
329 $ hg annotate -nlf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
330 0 a: 1: a |
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
331 6 b: 2: z |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
332 1 a: 3: a |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
333 3 b: 4: b4 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
334 4 b: 5: c |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
335 3 b: 5: b5 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
336 7 b: 7: d |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
337 8 b: 8: more |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
338 9 b: 9: more |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
339 10 b:10: more |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
340 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
341 linkrev vs rev |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
342 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
343 $ hg annotate -r tip -n a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
344 0: a |
30431
8c0c75aa3ff4
bdiff: give slight preference to longest matches in the middle of the B side
Mads Kiilerich <madski@unity3d.com>
parents:
29861
diff
changeset
|
345 1: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
346 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
347 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
348 linkrev vs rev with -l |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
349 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
350 $ hg annotate -r tip -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
351 0:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
352 1:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
353 1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
354 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11852
diff
changeset
|
355 Issue589: "undelete" sequence leads to crash |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
356 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
357 annotate was crashing when trying to --follow something |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
358 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
359 like A -> B -> A |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
360 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
361 generate ABA rename configuration |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
362 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
363 $ echo foo > foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
364 $ hg add foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
365 $ hg ci -m addfoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
366 $ hg rename foo bar |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
367 $ hg ci -m renamefoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
368 $ hg rename bar foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
369 $ hg ci -m renamebar |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
370 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
371 annotate after ABA with follow |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
372 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
373 $ hg annotate --follow foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
374 foo: foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
375 |
13697
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
376 missing file |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
377 |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
378 $ hg ann nosuchfile |
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
379 abort: nosuchfile: no such file in rev e9e6b4fa872f |
13697
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
380 [255] |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
381 |
15829
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
382 annotate file without '\n' on last line |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
383 |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
384 $ printf "" > c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
385 $ hg ci -A -m test -u nobody -d '1 0' |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
386 adding c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
387 $ hg annotate c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
388 $ printf "a\nb" > c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
389 $ hg ci -m test |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
390 $ hg annotate c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
391 [0-9]+: a (re) |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
392 [0-9]+: b (re) |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
393 |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
394 Issue3841: check annotation of the file of which filelog includes |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
395 merging between the revision and its ancestor |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
396 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
397 to reproduce the situation with recent Mercurial, this script uses (1) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
398 "hg debugsetparents" to merge without ancestor check by "hg merge", |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
399 and (2) the extension to allow filelog merging between the revision |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
400 and its ancestor by overriding "repo._filecommit". |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
401 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
402 $ cat > ../legacyrepo.py <<EOF |
33943
fa187801f4b8
tests: update test-annotate to pass our module import checker
Augie Fackler <raf@durin42.com>
parents:
33416
diff
changeset
|
403 > from __future__ import absolute_import |
fa187801f4b8
tests: update test-annotate to pass our module import checker
Augie Fackler <raf@durin42.com>
parents:
33416
diff
changeset
|
404 > from mercurial import error, node |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
405 > def reposetup(ui, repo): |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
406 > class legacyrepo(repo.__class__): |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
407 > def _filecommit(self, fctx, manifest1, manifest2, |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
408 > linkrev, tr, changelist): |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
409 > fname = fctx.path() |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
410 > text = fctx.data() |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
411 > flog = self.file(fname) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
412 > fparent1 = manifest1.get(fname, node.nullid) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
413 > fparent2 = manifest2.get(fname, node.nullid) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
414 > meta = {} |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
415 > copy = fctx.renamed() |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
416 > if copy and copy[0] != fname: |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24817
diff
changeset
|
417 > raise error.Abort('copying is not supported') |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
418 > if fparent2 != node.nullid: |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
419 > changelist.append(fname) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
420 > return flog.add(text, meta, tr, linkrev, |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
421 > fparent1, fparent2) |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24817
diff
changeset
|
422 > raise error.Abort('only merging is supported') |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
423 > repo.__class__ = legacyrepo |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
424 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
425 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
426 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
427 > 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
428 > 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
429 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
430 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
431 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
432 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
433 $ hg add baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
434 $ hg commit -m "baz:0" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
435 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
436 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
437 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
438 > 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
439 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
440 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
441 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
442 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
443 $ hg commit -m "baz:1" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
444 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
445 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
446 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
447 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
448 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
449 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
450 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
451 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
452 $ hg debugsetparents 17 17 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
453 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:2" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
454 $ hg debugindexdot .hg/store/data/baz.i |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
455 digraph G { |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
456 -1 -> 0 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
457 0 -> 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
458 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
459 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
460 } |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
461 $ hg annotate baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
462 17: 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
463 18: 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
464 16: 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
465 16: 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
466 16: 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
467 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
468 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
469 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
470 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
471 > 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
472 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
473 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
474 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
475 $ hg commit -m "baz:3" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
476 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
477 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
478 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
479 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
480 > 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
481 > 4 baz:4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
482 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
483 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
484 $ hg debugsetparents 19 18 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
485 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:4" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
486 $ hg debugindexdot .hg/store/data/baz.i |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
487 digraph G { |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
488 -1 -> 0 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
489 0 -> 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
490 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
491 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
492 2 -> 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
493 3 -> 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
494 2 -> 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
495 } |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
496 $ hg annotate baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
497 17: 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
498 18: 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
499 19: 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
500 20: 4 baz:4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
501 16: 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
502 |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
503 annotate clean file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
504 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
505 $ hg annotate -ncr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
506 11 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
507 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
508 annotate modified file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
509 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
510 $ echo foofoo >> foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
511 $ hg annotate -r "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
512 11 : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
513 20+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
514 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
515 $ hg annotate -cr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
516 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
517 b6bedd5477e7+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
518 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
519 $ hg annotate -ncr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
520 11 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
521 20 b6bedd5477e7+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
522 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
523 $ hg annotate --debug -ncr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
524 11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
525 20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
526 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
527 $ hg annotate -udr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
528 test Thu Jan 01 00:00:00 1970 +0000: foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
529 test [A-Za-z0-9:+ ]+: foofoo (re) |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
530 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
531 $ hg annotate -ncr "wdir()" -Tjson foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
532 [ |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
533 { |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
534 "abspath": "foo", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
535 "lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": null, "rev": null}], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
536 "path": "foo" |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
537 } |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
538 ] |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
539 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
540 annotate added file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
541 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
542 $ echo bar > bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
543 $ hg add bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
544 $ hg annotate -ncr "wdir()" bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
545 20 b6bedd5477e7+: bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
546 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
547 annotate renamed file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
548 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
549 $ hg rename foo renamefoo2 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
550 $ hg annotate -ncr "wdir()" renamefoo2 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
551 11 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
552 20 b6bedd5477e7+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
553 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
554 annotate missing file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
555 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
556 $ rm baz |
33341
1a4eca3b12dd
test-annotate: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33284
diff
changeset
|
557 |
24498
ab3a8ed7cf1d
test-annotate: conditionalize error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24421
diff
changeset
|
558 $ hg annotate -ncr "wdir()" baz |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34487
diff
changeset
|
559 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) |
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34487
diff
changeset
|
560 abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !) |
24498
ab3a8ed7cf1d
test-annotate: conditionalize error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24421
diff
changeset
|
561 [255] |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
562 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
563 annotate removed file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
564 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
565 $ hg rm baz |
33341
1a4eca3b12dd
test-annotate: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33284
diff
changeset
|
566 |
24498
ab3a8ed7cf1d
test-annotate: conditionalize error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24421
diff
changeset
|
567 $ hg annotate -ncr "wdir()" baz |
35230
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34487
diff
changeset
|
568 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) |
feecfefeba25
tests: add a substitution for ENOENT/ERROR_FILE_NOT_FOUND messages
Matt Harbison <matt_harbison@yahoo.com>
parents:
34487
diff
changeset
|
569 abort: $ENOENT$: $TESTTMP/repo/baz (no-windows !) |
24498
ab3a8ed7cf1d
test-annotate: conditionalize error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24421
diff
changeset
|
570 [255] |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
571 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
572 $ hg revert --all --no-backup --quiet |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
573 $ hg id -n |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
574 20 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
575 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
576 Test followlines() revset; we usually check both followlines(pat, range) and |
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
577 followlines(pat, range, descend=True) to make sure both give the same result |
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
578 when they should. |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
579 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
580 $ echo a >> foo |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
581 $ hg ci -m 'foo: add a' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
582 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
583 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
584 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
585 20: baz:4 |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
586 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=20)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
587 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
588 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
589 20: baz:4 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
590 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
591 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
592 19: baz:3 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
593 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=True)' |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
594 19: baz:3 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
595 20: baz:4 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
596 $ printf "0\n0\n" | cat - baz > baz1 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
597 $ mv baz1 baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
598 $ hg ci -m 'added two lines with 0' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
599 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
600 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
601 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
602 20: baz:4 |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
603 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, descend=true, startrev=19)' |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
604 19: baz:3 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
605 20: baz:4 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
606 $ echo 6 >> baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
607 $ hg ci -m 'added line 8' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
608 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
609 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
610 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
611 20: baz:4 |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
612 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=19, descend=1)' |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
613 19: baz:3 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
614 20: baz:4 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
615 $ sed 's/3/3+/' baz > baz.new |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
616 $ mv baz.new baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
617 $ hg ci -m 'baz:3->3+' |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
618 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, descend=0)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
619 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
620 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
621 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
622 24: baz:3->3+ |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
623 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:5, startrev=17, descend=True)' |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
624 19: baz:3 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
625 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
626 24: baz:3->3+ |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
627 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 1:2, descend=false)' |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
628 22: added two lines with 0 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
629 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
630 file patterns are okay |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
631 $ hg log -T '{rev}: {desc}\n' -r 'followlines("path:baz", 1:2)' |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
632 22: added two lines with 0 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
633 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
634 renames are followed |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
635 $ hg mv baz qux |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
636 $ sed 's/4/4+/' qux > qux.new |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
637 $ mv qux.new qux |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
638 $ hg ci -m 'qux:4->4+' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
639 $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
640 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
641 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
642 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
643 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
644 25: qux:4->4+ |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
645 |
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
646 but are missed when following children |
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
647 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=22, descend=True)' |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
648 24: baz:3->3+ |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
649 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
650 merge |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
651 $ hg up 24 --quiet |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
652 $ echo 7 >> baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
653 $ hg ci -m 'one more line, out of line range' |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
654 created new head |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
655 $ sed 's/3+/3-/' baz > baz.new |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
656 $ mv baz.new baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
657 $ hg ci -m 'baz:3+->3-' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
658 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
659 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
660 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
661 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
662 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
663 27: baz:3+->3- |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
664 $ hg merge 25 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
665 merging baz and qux to qux |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
666 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
667 (branch merge, don't forget to commit) |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
668 $ hg ci -m merge |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
669 $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
670 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
671 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
672 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
673 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
674 25: qux:4->4+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
675 27: baz:3+->3- |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
676 28: merge |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
677 $ hg up 25 --quiet |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
678 $ hg merge 27 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
679 merging qux and baz to qux |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
680 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
681 (branch merge, don't forget to commit) |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
682 $ hg ci -m 'merge from other side' |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
683 created new head |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
684 $ hg log -T '{rev}: {desc}\n' -r 'followlines(qux, 5:7)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
685 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
686 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
687 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
688 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
689 25: qux:4->4+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
690 27: baz:3+->3- |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
691 29: merge from other side |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
692 $ hg up 24 --quiet |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
693 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
694 we are missing the branch with rename when following children |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
695 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 5:7, startrev=26, descend=True)' |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
696 27: baz:3+->3- |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
697 |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
698 we follow all branches in descending direction |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
699 $ hg up 23 --quiet |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
700 $ sed 's/3/+3/' baz > baz.new |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
701 $ mv baz.new baz |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
702 $ hg ci -m 'baz:3->+3' |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
703 created new head |
31991
55987fc8aba1
context: add an assertion checking linerange consistency in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31955
diff
changeset
|
704 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 2:5, startrev=16, descend=True)' --graph |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
705 @ 30: baz:3->+3 |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
706 : |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
707 : o 27: baz:3+->3- |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
708 : : |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
709 : o 24: baz:3->3+ |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
710 :/ |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
711 o 20: baz:4 |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
712 |\ |
31991
55987fc8aba1
context: add an assertion checking linerange consistency in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31955
diff
changeset
|
713 | o 19: baz:3 |
55987fc8aba1
context: add an assertion checking linerange consistency in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31955
diff
changeset
|
714 |/ |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
715 o 18: baz:2 |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
716 : |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
717 o 16: baz:0 |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
718 | |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
719 ~ |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
720 |
33284
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
721 Issue5595: on a merge changeset with different line ranges depending on |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
722 parent, be conservative and use the surrounding interval to avoid loosing |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
723 track of possible further descendants in specified range. |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
724 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
725 $ hg up 23 --quiet |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
726 $ hg cat baz -r 24 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
727 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
728 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
729 1 baz:1 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
730 2 baz:2 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
731 3+ baz:3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
732 4 baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
733 5 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
734 6 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
735 $ cat > baz << EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
736 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
737 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
738 > a |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
739 > b |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
740 > 3+ baz:3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
741 > 4 baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
742 > y |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
743 > z |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
744 > EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
745 $ hg ci -m 'baz: mostly rewrite with some content from 24' |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
746 created new head |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
747 $ hg merge --tool :merge-other 24 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
748 merging baz |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
749 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
750 (branch merge, don't forget to commit) |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
751 $ hg ci -m 'merge forgetting about baz rewrite' |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
752 $ cat > baz << EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
753 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
754 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
755 > 1 baz:1 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
756 > 2+ baz:2 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
757 > 3+ baz:3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
758 > 4 baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
759 > 5 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
760 > 6 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
761 > EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
762 $ hg ci -m 'baz: narrow change (2->2+)' |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
763 $ hg log -T '{rev}: {desc}\n' -r 'followlines(baz, 3:4, startrev=20, descend=True)' --graph |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
764 @ 33: baz: narrow change (2->2+) |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
765 | |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
766 o 32: merge forgetting about baz rewrite |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
767 |\ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
768 | o 31: baz: mostly rewrite with some content from 24 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
769 | : |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
770 | : o 30: baz:3->+3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
771 | :/ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
772 +---o 27: baz:3+->3- |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
773 | : |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
774 o : 24: baz:3->3+ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
775 :/ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
776 o 20: baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
777 |\ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
778 ~ ~ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
779 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
780 check error cases |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
781 $ hg up 24 --quiet |
30754
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
782 $ hg log -r 'followlines()' |
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
783 hg: parse error: followlines takes at least 1 positional arguments |
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
784 [255] |
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
785 $ hg log -r 'followlines(baz)' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
786 hg: parse error: followlines requires a line range |
30754
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
787 [255] |
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
788 $ hg log -r 'followlines(baz, 1)' |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
789 hg: parse error: followlines expects a line range |
30754
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
790 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
791 $ hg log -r 'followlines(baz, 1:2, startrev=desc("b"))' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
792 hg: parse error: followlines expects exactly one revision |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
793 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
794 $ hg log -r 'followlines("glob:*", 1:2)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
795 hg: parse error: followlines expects exactly one file |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
796 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
797 $ hg log -r 'followlines(baz, 1:)' |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
798 hg: parse error: line range bounds must be integers |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
799 [255] |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
800 $ hg log -r 'followlines(baz, :1)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
801 hg: parse error: line range bounds must be integers |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
802 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
803 $ hg log -r 'followlines(baz, x:4)' |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
804 hg: parse error: line range bounds must be integers |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
805 [255] |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
806 $ hg log -r 'followlines(baz, 5:4)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
807 hg: parse error: line range must be positive |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
808 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
809 $ hg log -r 'followlines(baz, 0:4)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
810 hg: parse error: fromline must be strictly positive |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
811 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
812 $ hg log -r 'followlines(baz, 2:40)' |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
813 abort: line range exceeds file size |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
814 [255] |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
815 $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=[1])' |
33416
9467d5337292
revset: add experimental relation and subscript operators
Yuya Nishihara <yuya@tcha.org>
parents:
33341
diff
changeset
|
816 hg: parse error at 43: not a prefix: [ |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
817 [255] |
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
818 $ hg log -r 'followlines(baz, 2:4, startrev=20, descend=a)' |
32085
2a2744dffecf
revset: add i18n comments to error messages for followlines predicate
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32063
diff
changeset
|
819 hg: parse error: descend argument must be a boolean |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
820 [255] |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
821 |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
822 Test empty annotate output |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
823 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
824 $ printf '\0' > binary |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
825 $ touch empty |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
826 $ hg ci -qAm 'add binary and empty files' |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
827 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
828 $ hg annotate binary empty |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
829 binary: binary file |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
830 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
831 $ hg annotate -Tjson binary empty |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
832 [ |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
833 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
834 "abspath": "binary", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
835 "path": "binary" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
836 }, |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
837 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
838 "abspath": "empty", |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
839 "lines": [], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
840 "path": "empty" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
841 } |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
842 ] |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
843 |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
844 Test annotate with whitespace options |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
845 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
846 $ cd .. |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
847 $ hg init repo-ws |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
848 $ cd repo-ws |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
849 $ cat > a <<EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
850 > aa |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
851 > |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
852 > b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
853 > EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
854 $ hg ci -Am "adda" |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
855 adding a |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
856 $ sed 's/EOL$//g' > a <<EOF |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
857 > a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
858 > |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
859 > EOL |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
860 > b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
861 > EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
862 $ hg ci -m "changea" |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
863 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
864 Annotate with no option |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
865 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
866 $ hg annotate a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
867 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
868 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
869 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
870 1: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
871 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
872 Annotate with --ignore-space-change |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
873 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
874 $ hg annotate --ignore-space-change a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
875 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
876 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
877 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
878 0: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
879 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
880 Annotate with --ignore-all-space |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
881 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
882 $ hg annotate --ignore-all-space a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
883 0: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
884 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
885 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
886 0: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
887 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
888 Annotate with --ignore-blank-lines (similar to no options case) |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
889 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
890 $ hg annotate --ignore-blank-lines a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
891 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
892 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
893 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
894 1: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
895 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15829
diff
changeset
|
896 $ cd .. |
23702
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
897 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
898 Annotate with linkrev pointing to another branch |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
899 ------------------------------------------------ |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
900 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
901 create history with a filerev whose linkrev points to another branch |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
902 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
903 $ hg init branchedlinkrev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
904 $ cd branchedlinkrev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
905 $ echo A > a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
906 $ hg commit -Am 'contentA' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
907 adding a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
908 $ echo B >> a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
909 $ hg commit -m 'contentB' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
910 $ hg up --rev 'desc(contentA)' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
911 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
912 $ echo unrelated > unrelated |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
913 $ hg commit -Am 'unrelated' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
914 adding unrelated |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
915 created new head |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
916 $ hg graft -r 'desc(contentB)' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
917 grafting 1:fd27c222e3e6 "contentB" |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
918 $ echo C >> a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
919 $ hg commit -m 'contentC' |
24817
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
920 $ echo W >> a |
23702
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
921 $ hg log -G |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
922 @ changeset: 4:072f1e8df249 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
923 | tag: tip |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
924 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
925 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
926 | summary: contentC |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
927 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
928 o changeset: 3:ff38df03cc4b |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
929 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
930 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
931 | summary: contentB |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
932 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
933 o changeset: 2:62aaf3f6fc06 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
934 | parent: 0:f0932f74827e |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
935 | user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
936 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
937 | summary: unrelated |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
938 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
939 | o changeset: 1:fd27c222e3e6 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
940 |/ user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
941 | date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
942 | summary: contentB |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
943 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
944 o changeset: 0:f0932f74827e |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
945 user: test |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
946 date: Thu Jan 01 00:00:00 1970 +0000 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
947 summary: contentA |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
948 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
949 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
950 Annotate should list ancestor of starting revision only |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
951 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
952 $ hg annotate a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
953 0: A |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
954 3: B |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
955 4: C |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
956 |
24817
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
957 $ hg annotate a -r 'wdir()' |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
958 0 : A |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
959 3 : B |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
960 4 : C |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
961 4+: W |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
962 |
23705
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
963 Even when the starting revision is the linkrev-shadowed one: |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
964 |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
965 $ hg annotate a -r 3 |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
966 0: A |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
967 3: B |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
968 |
23702
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22480
diff
changeset
|
969 $ cd .. |
29861
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
970 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
971 Issue5360: Deleted chunk in p1 of a merge changeset |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
972 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
973 $ hg init repo-5360 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
974 $ cd repo-5360 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
975 $ echo 1 > a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
976 $ hg commit -A a -m 1 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
977 $ echo 2 >> a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
978 $ hg commit -m 2 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
979 $ echo a > a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
980 $ hg commit -m a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
981 $ hg update '.^' -q |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
982 $ echo 3 >> a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
983 $ hg commit -m 3 -q |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
984 $ hg merge 2 -q |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
985 $ cat > a << EOF |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
986 > b |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
987 > 1 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
988 > 2 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
989 > 3 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
990 > a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
991 > EOF |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
992 $ hg resolve --mark -q |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
993 $ hg commit -m m |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
994 $ hg annotate a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
995 4: b |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
996 0: 1 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
997 1: 2 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
998 3: 3 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
999 2: a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1000 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1001 $ cd .. |