Mercurial > hg
annotate tests/test-annotate.t @ 45841:bff719525815
errors: set detailed exit code to 30 for config errors
This is per https://www.mercurial-scm.org/wiki/ErrorCategoriesPlan.
Differential Revision: https://phab.mercurial-scm.org/D9311
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 22 Oct 2020 13:56:01 -0700 |
parents | 037e88d453fa |
children | c8860a212770 |
rev | line source |
---|---|
42151
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1 $ cat >> "$HGRCPATH" << EOF |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
2 > [ui] |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
3 > merge = :merge3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
4 > EOF |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
6 init |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
7 |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
8 $ hg init repo |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
9 $ cd repo |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
10 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
11 commit |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
12 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
13 $ echo 'a' > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
14 $ hg ci -A -m test -u nobody -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
15 adding a |
4365
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3405
diff
changeset
|
16 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
17 annotate -c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
18 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
19 $ hg annotate -c a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
20 8435f90966e4: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
21 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
22 annotate -cl |
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 $ hg annotate -cl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
25 8435f90966e4:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
26 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
27 annotate -d |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
28 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
29 $ hg annotate -d a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
30 Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
31 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
32 annotate -n |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
33 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
34 $ hg annotate -n a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
35 0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
36 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
37 annotate -nl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
38 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
39 $ hg annotate -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
40 0:1: a |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
41 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
42 annotate -u |
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 $ hg annotate -u a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
45 nobody: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
46 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
47 annotate -cdnu |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
48 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
49 $ hg annotate -cdnu a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
50 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
|
51 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
52 annotate -cdnul |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
53 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
54 $ hg annotate -cdnul a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
55 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
|
56 |
22480
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
57 annotate (JSON) |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
58 |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
59 $ hg annotate -Tjson a |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
60 [ |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
61 { |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
62 "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
|
63 "path": "a" |
22480
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 ] |
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 $ 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
|
68 [ |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
69 { |
39929
47cb6750dea3
annotate: rename {line_number} to {lineno} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
39798
diff
changeset
|
70 "lines": [{"date": [1.0, 0], "line": "a\n", "lineno": 1, "node": "8435f90966e442695d2ded29fdade2bac5ad8065", "path": "a", "rev": 0, "user": "nobody"}], |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
71 "path": "a" |
22480
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 ] |
dff638170c48
annotate: port to generic templater enabled by hidden -T option
Yuya Nishihara <yuya@tcha.org>
parents:
18993
diff
changeset
|
74 |
36985
66e64681e0a8
annotate: add support for template keywords and functions depending on ctx
Yuya Nishihara <yuya@tcha.org>
parents:
36827
diff
changeset
|
75 log-like templating |
66e64681e0a8
annotate: add support for template keywords and functions depending on ctx
Yuya Nishihara <yuya@tcha.org>
parents:
36827
diff
changeset
|
76 |
66e64681e0a8
annotate: add support for template keywords and functions depending on ctx
Yuya Nishihara <yuya@tcha.org>
parents:
36827
diff
changeset
|
77 $ hg annotate -T'{lines % "{rev} {node|shortest}: {line}"}' a |
66e64681e0a8
annotate: add support for template keywords and functions depending on ctx
Yuya Nishihara <yuya@tcha.org>
parents:
36827
diff
changeset
|
78 0 8435: a |
66e64681e0a8
annotate: add support for template keywords and functions depending on ctx
Yuya Nishihara <yuya@tcha.org>
parents:
36827
diff
changeset
|
79 |
39929
47cb6750dea3
annotate: rename {line_number} to {lineno} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
39798
diff
changeset
|
80 '{lineno}' field should be populated as necessary |
38358
57dc72b56b6c
annotate: automatically populate fields referenced from template
Yuya Nishihara <yuya@tcha.org>
parents:
37502
diff
changeset
|
81 |
39929
47cb6750dea3
annotate: rename {line_number} to {lineno} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
39798
diff
changeset
|
82 $ hg annotate -T'{lines % "{rev}:{lineno}: {line}"}' a |
38358
57dc72b56b6c
annotate: automatically populate fields referenced from template
Yuya Nishihara <yuya@tcha.org>
parents:
37502
diff
changeset
|
83 0:1: a |
38446
5b04a0c30f3f
formatter: look for template symbols from the associated name
Yuya Nishihara <yuya@tcha.org>
parents:
38358
diff
changeset
|
84 $ hg annotate -Ta a \ |
39929
47cb6750dea3
annotate: rename {line_number} to {lineno} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
39798
diff
changeset
|
85 > --config templates.a='"{lines % "{rev}:{lineno}: {line}"}"' |
38446
5b04a0c30f3f
formatter: look for template symbols from the associated name
Yuya Nishihara <yuya@tcha.org>
parents:
38358
diff
changeset
|
86 0:1: a |
38358
57dc72b56b6c
annotate: automatically populate fields referenced from template
Yuya Nishihara <yuya@tcha.org>
parents:
37502
diff
changeset
|
87 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
88 $ cat <<EOF >>a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
89 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
90 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
91 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
92 $ hg ci -ma1 -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
93 $ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
94 $ hg ci -mb -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
95 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
96 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
97 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
98 > b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
99 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
100 $ hg ci -mb2 -d '2 0' |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
101 |
37500
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
102 default output of '{lines}' should be readable |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
103 |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
104 $ hg annotate -T'{lines}' a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
105 0: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
106 1: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
107 1: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
108 $ hg annotate -T'{join(lines, "\n")}' a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
109 0: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
110 |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
111 1: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
112 |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
113 1: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
114 |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
115 several filters can be applied to '{lines}' |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
116 |
37502
40c7347f6848
formatter: remove template resources from nested items before generating JSON
Yuya Nishihara <yuya@tcha.org>
parents:
37500
diff
changeset
|
117 $ hg annotate -T'{lines|json}\n' a |
40c7347f6848
formatter: remove template resources from nested items before generating JSON
Yuya Nishihara <yuya@tcha.org>
parents:
37500
diff
changeset
|
118 [{"line": "a\n", "rev": 0}, {"line": "a\n", "rev": 1}, {"line": "a\n", "rev": 1}] |
37500
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
119 $ hg annotate -T'{lines|stringify}' a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
120 0: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
121 1: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
122 1: a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
123 $ hg annotate -T'{lines|count}\n' a |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
124 3 |
8bb3899a0f47
formatter: make nested items somewhat readable in template output
Yuya Nishihara <yuya@tcha.org>
parents:
37280
diff
changeset
|
125 |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
126 annotate multiple files (JSON) |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
127 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
128 $ hg annotate -Tjson a b |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
129 [ |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
130 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
131 "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
|
132 "path": "a" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
133 }, |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
134 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
135 "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
|
136 "path": "b" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
137 } |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
138 ] |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
139 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
140 annotate multiple files (template) |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
141 |
39369
34ba47117164
formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
38446
diff
changeset
|
142 $ hg annotate -T'== {path} ==\n{lines % "{rev}: {line}"}' a b |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
143 == a == |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
144 0: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
145 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
146 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
147 == b == |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
148 0: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
149 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
150 1: a |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
151 3: b4 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
152 3: b5 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
153 3: b6 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
154 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
155 annotate -n b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
156 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
157 $ hg annotate -n b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
158 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
|
159 1: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
160 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
161 3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
162 3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
163 3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
164 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
165 annotate --no-follow b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
166 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
167 $ hg annotate --no-follow b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
168 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
169 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
170 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
171 3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
172 3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
173 3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
174 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
175 annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
176 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
177 $ hg annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
178 0:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
179 1:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
180 1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
181 3:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
182 3:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
183 3:6: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
184 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
185 annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
186 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
187 $ hg annotate -nf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
188 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
|
189 1 a: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
190 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
191 3 b: b4 |
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 3 b: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
194 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
195 annotate -nlf b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
196 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
197 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
198 0 a:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
199 1 a:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
200 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
201 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
202 3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
203 3 b:6: b6 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
204 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
205 $ hg up -C 2 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
206 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
|
207 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
208 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
209 > c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
210 > b5 |
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 -mb2.1 -d '2 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 |
42151
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
216 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
217 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
218 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
219 [1] |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
220 $ cat b |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
221 a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
222 a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
223 a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
224 <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
225 b4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
226 c |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
227 b5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
228 ||||||| base |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
229 ======= |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
230 b4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
231 b5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
232 b6 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
233 >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
234 $ cat <<EOF > b |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
235 > a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
236 > a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
237 > a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
238 > b4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
239 > c |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
240 > b5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
241 > EOF |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
242 $ hg resolve --mark -q |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
243 $ rm b.orig |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
244 $ hg ci -mmergeb -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
245 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
246 annotate after merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
247 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
248 $ hg annotate -nf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
249 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
|
250 1 a: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
251 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
252 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
253 4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
254 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
255 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
256 annotate after merge with -l |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
257 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
258 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
259 0 a:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
260 1 a:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
261 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
262 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
263 4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
264 3 b:5: b5 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
265 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
266 $ hg up -C 1 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
267 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
|
268 $ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
269 $ cat <<EOF > b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
270 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
271 > z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
272 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
273 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
274 $ hg ci -mc -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
275 created new head |
42260
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
276 Work around the pure version not resolving the conflict like native code |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
277 #if pure |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
278 $ hg merge |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
279 merging b |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
280 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
281 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
282 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
283 [1] |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
284 $ cat <<EOF > b |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
285 > a |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
286 > z |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
287 > a |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
288 > b4 |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
289 > c |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
290 > b5 |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
291 > EOF |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
292 $ hg resolve -m b |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
293 (no more unresolved files) |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
294 $ rm b.orig |
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
295 #else |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
296 $ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
297 merging b |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42151
diff
changeset
|
298 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42151
diff
changeset
|
299 (branch merge, don't forget to commit) |
42260
d5b35d6972a5
tests: update annotate tests to work around simplemerge bug
Martin von Zweigbergk <martinvonz@google.com>
parents:
42222
diff
changeset
|
300 #endif |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
301 $ echo d >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
302 $ hg ci -mmerge2 -d '4 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
303 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
304 annotate after rename merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
305 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
306 $ hg annotate -nf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
307 0 a: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
308 6 b: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
309 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
310 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
311 4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
312 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
313 7 b: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
314 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
315 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
|
316 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
317 $ hg annotate -nlf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
318 0 a:1: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
319 6 b:2: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
320 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
321 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
322 4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
323 3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
324 7 b:7: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
325 |
32486
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
326 --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
|
327 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
328 $ 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
|
329 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
330 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
331 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
332 3 b:4: b4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
333 4 b:5: c |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
334 3 b:5: b5 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
335 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
336 |
32767
e5dd44f78ac6
tests: handle variation between pure and normal output in annotate --skip
Augie Fackler <raf@durin42.com>
parents:
32649
diff
changeset
|
337 --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
|
338 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
|
339 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
340 $ 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
|
341 0 a:1: a |
34487
323bed58cf57
test-annotate: fix up expected output for pure
Augie Fackler <augie@google.com>
parents:
34434
diff
changeset
|
342 1 a:2* z (no-pure !) |
323bed58cf57
test-annotate: fix up expected output for pure
Augie Fackler <augie@google.com>
parents:
34434
diff
changeset
|
343 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
|
344 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
345 3 b:4: b4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
346 4 b:5: c |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
347 3 b:5: b5 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
348 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
349 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
350 --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
|
351 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
352 $ 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
|
353 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
354 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
355 1 a:3: a |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
356 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
|
357 4 b:5: c |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
358 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
|
359 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
360 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
361 $ 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
|
362 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
363 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
364 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
365 3 b:4: b4 |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
366 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
|
367 3 b:5: b5 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
368 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
369 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
370 $ 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
|
371 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
372 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
373 1 a:3: a |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
374 1 a:3* b4 |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
375 1 a:3* c |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
376 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
|
377 7 b:7: d |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
378 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
379 $ 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
|
380 0 a:1: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
381 6 b:2: z |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
382 1 a:3: a |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
383 3 b:4: b4 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
384 4 b:5: c |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
385 3 b:5: b5 |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
386 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
|
387 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
388 --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
|
389 |
1df80eff24cf
annotate: add a new experimental --skip option to skip revs
Siddharth Agarwal <sid0@fb.com>
parents:
32085
diff
changeset
|
390 $ 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
|
391 0 a:1: a |
34434
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
392 0 a:1* z |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
393 0 a:1* a |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
394 0 a:1* b4 |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
395 0 a:1* c |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
396 0 a:1* b5 |
884b595f5195
annotate: mark lines affected by skip-annotate with *
Siddharth Agarwal <sid0@fb.com>
parents:
33943
diff
changeset
|
397 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
|
398 |
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
399 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
|
400 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
401 $ 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
|
402 $ 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
|
403 $ 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
|
404 $ 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
|
405 $ 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
|
406 $ 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
|
407 $ hg annotate -nlf b |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
408 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
|
409 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
|
410 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
|
411 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
|
412 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
|
413 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
|
414 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
|
415 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
|
416 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
|
417 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
|
418 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
419 linkrev vs rev |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
420 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
421 $ hg annotate -r tip -n a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
422 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
|
423 1: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
424 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
425 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
426 linkrev vs rev with -l |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
427 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
428 $ hg annotate -r tip -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
429 0:1: a |
30432
3633403888ae
bdiff: give slight preference to appending lines
Mads Kiilerich <madski@unity3d.com>
parents:
30431
diff
changeset
|
430 1:2: a |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
431 1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
432 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11852
diff
changeset
|
433 Issue589: "undelete" sequence leads to crash |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
434 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
435 annotate was crashing when trying to --follow something |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
436 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
437 like A -> B -> A |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
438 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
439 generate ABA rename configuration |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
440 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
441 $ echo foo > foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
442 $ hg add foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
443 $ hg ci -m addfoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
444 $ hg rename foo bar |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
445 $ hg ci -m renamefoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
446 $ hg rename bar foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
447 $ hg ci -m renamebar |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
448 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
449 annotate after ABA with follow |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
450 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
451 $ hg annotate --follow foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
452 foo: foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
453 |
13697
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
454 missing file |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
455 |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
456 $ 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
|
457 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
|
458 [255] |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
459 |
15829
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
460 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
|
461 |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
462 $ printf "" > c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
463 $ 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
|
464 adding c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
465 $ hg annotate c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
466 $ printf "a\nb" > c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
467 $ hg ci -m test |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
468 $ hg annotate c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
469 [0-9]+: a (re) |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
470 [0-9]+: b (re) |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
471 |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
472 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
|
473 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
|
474 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
475 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
|
476 "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
|
477 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
|
478 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
|
479 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
480 $ 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
|
481 > from __future__ import absolute_import |
45204
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
482 > from mercurial import commit, error, extensions, node |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
483 > def _filecommit(orig, repo, fctx, manifest1, manifest2, |
45443
037e88d453fa
commit: pass mergestate into _filecommit() instead of re-reading it
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45204
diff
changeset
|
484 > linkrev, tr, includecopymeta, ms): |
45204
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
485 > fname = fctx.path() |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
486 > text = fctx.data() |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
487 > flog = repo.file(fname) |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
488 > fparent1 = manifest1.get(fname, node.nullid) |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
489 > fparent2 = manifest2.get(fname, node.nullid) |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
490 > meta = {} |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
491 > copy = fctx.copysource() |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
492 > if copy and copy != fname: |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
493 > raise error.Abort('copying is not supported') |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
494 > if fparent2 != node.nullid: |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
495 > return flog.add(text, meta, tr, linkrev, |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
496 > fparent1, fparent2), 'modified' |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
497 > raise error.Abort('only merging is supported') |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
498 > def uisetup(ui): |
ce9ee81df9ff
commitctx: extract _filecommit too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
45192
diff
changeset
|
499 > extensions.wrapfunction(commit, '_filecommit', _filecommit) |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
500 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
501 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
502 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
503 > 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
504 > 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
505 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
506 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
507 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
508 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
509 $ hg add baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
510 $ 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
|
511 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
512 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
513 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
514 > 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
515 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
516 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
517 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
518 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
519 $ 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
|
520 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
521 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
522 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
523 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
524 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
525 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
526 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
527 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
528 $ hg debugsetparents 17 17 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
529 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:2" |
37280
435481393198
tests: don't use revlog paths in tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37120
diff
changeset
|
530 $ hg debugindexdot baz |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
531 digraph G { |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
532 -1 -> 0 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
533 0 -> 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
534 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
535 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
536 } |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
537 $ hg annotate baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
538 17: 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
539 18: 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
540 16: 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
541 16: 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
542 16: 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
543 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
544 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
545 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
546 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
547 > 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
548 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
549 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
550 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
551 $ 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
|
552 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
553 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
554 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
555 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
556 > 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
557 > 4 baz:4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
558 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
559 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
560 $ hg debugsetparents 19 18 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
561 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:4" |
37280
435481393198
tests: don't use revlog paths in tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37120
diff
changeset
|
562 $ hg debugindexdot baz |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
563 digraph G { |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
564 -1 -> 0 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
565 0 -> 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
566 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
567 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
568 2 -> 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
569 3 -> 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
570 2 -> 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
571 } |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
572 $ hg annotate baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
573 17: 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
574 18: 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
575 19: 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
576 20: 4 baz:4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
577 16: 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
578 |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
579 annotate clean file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
580 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
581 $ hg annotate -ncr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
582 11 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
583 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
584 annotate modified file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
585 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
586 $ echo foofoo >> foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
587 $ hg annotate -r "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
588 11 : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
589 20+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
590 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
591 $ hg annotate -cr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
592 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
593 b6bedd5477e7+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
594 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
595 $ hg annotate -ncr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
596 11 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
597 20 b6bedd5477e7+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
598 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
599 $ hg annotate --debug -ncr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
600 11 472b18db256d1e8282064eab4bfdaf48cbfe83cd : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
601 20 b6bedd5477e797f25e568a6402d4697f3f895a72+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
602 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
603 $ hg annotate -udr "wdir()" foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
604 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
|
605 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
|
606 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
607 $ hg annotate -ncr "wdir()" -Tjson foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
608 [ |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
609 { |
39798
ddca38941b2b
annotate: pass in wdir rev and node to formatter (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
39707
diff
changeset
|
610 "lines": [{"line": "foo\n", "node": "472b18db256d1e8282064eab4bfdaf48cbfe83cd", "rev": 11}, {"line": "foofoo\n", "node": "ffffffffffffffffffffffffffffffffffffffff", "rev": 2147483647}], |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
611 "path": "foo" |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
612 } |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
613 ] |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
614 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
615 annotate added file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
616 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
617 $ echo bar > bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
618 $ hg add bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
619 $ hg annotate -ncr "wdir()" bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
620 20 b6bedd5477e7+: bar |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
621 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
622 annotate renamed file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
623 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
624 $ hg rename foo renamefoo2 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
625 $ hg annotate -ncr "wdir()" renamefoo2 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
626 11 472b18db256d : foo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
627 20 b6bedd5477e7+: foofoo |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
628 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
629 annotate missing file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
630 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
631 $ rm baz |
33341
1a4eca3b12dd
test-annotate: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33284
diff
changeset
|
632 |
24498
ab3a8ed7cf1d
test-annotate: conditionalize error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24421
diff
changeset
|
633 $ 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
|
634 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) |
41420
b6673e9bdcf6
dispatch: quote filename in IOError as well
Yuya Nishihara <yuya@tcha.org>
parents:
39929
diff
changeset
|
635 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
|
636 [255] |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
637 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
638 annotate removed file |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
639 |
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
640 $ hg rm baz |
33341
1a4eca3b12dd
test-annotate: conditionalize output instead of tests
Matt Harbison <matt_harbison@yahoo.com>
parents:
33284
diff
changeset
|
641 |
24498
ab3a8ed7cf1d
test-annotate: conditionalize error output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
24421
diff
changeset
|
642 $ 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
|
643 abort: $TESTTMP\repo\baz: $ENOENT$ (windows !) |
41420
b6673e9bdcf6
dispatch: quote filename in IOError as well
Yuya Nishihara <yuya@tcha.org>
parents:
39929
diff
changeset
|
644 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
|
645 [255] |
24421
77881cade20e
annotate: add option to annotate working-directory files
Yuya Nishihara <yuya@tcha.org>
parents:
23705
diff
changeset
|
646 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
647 $ 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
|
648 $ hg id -n |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
649 20 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
650 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
651 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
|
652 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
|
653 when they should. |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
654 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
655 $ echo a >> foo |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
656 $ 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
|
657 $ 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
|
658 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
659 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
660 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
|
661 $ 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
|
662 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
663 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
664 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
|
665 $ 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
|
666 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
667 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
|
668 $ 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
|
669 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
|
670 20: baz:4 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
671 $ 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
|
672 $ mv baz1 baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
673 $ 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
|
674 $ 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
|
675 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
676 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
677 20: baz:4 |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
678 $ 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
|
679 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
|
680 20: baz:4 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
681 $ echo 6 >> baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
682 $ 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
|
683 $ 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
|
684 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
685 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
686 20: baz:4 |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
687 $ 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
|
688 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
|
689 20: baz:4 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
690 $ 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
|
691 $ mv baz.new baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
692 $ hg ci -m 'baz:3->3+' |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
693 $ 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
|
694 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
695 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
696 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
697 24: baz:3->3+ |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
698 $ 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
|
699 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
|
700 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
701 24: baz:3->3+ |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
702 $ 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
|
703 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
|
704 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
705 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
|
706 $ 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
|
707 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
|
708 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
709 renames are followed |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
710 $ hg mv baz qux |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
711 $ 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
|
712 $ mv qux.new qux |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
713 $ 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
|
714 $ 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
|
715 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
716 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
717 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
718 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
719 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
|
720 |
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
721 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
|
722 $ 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
|
723 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
|
724 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
725 merge |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
726 $ 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
|
727 $ echo 7 >> baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
728 $ 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
|
729 created new head |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
730 $ 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
|
731 $ mv baz.new baz |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
732 $ 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
|
733 $ 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
|
734 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
735 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
736 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
737 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
738 27: baz:3+->3- |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
739 $ hg merge 25 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
740 merging baz and qux to qux |
42151
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
741 warning: conflicts while merging qux! (edit, then use 'hg resolve --mark') |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
742 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
743 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
744 [1] |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
745 $ cat qux |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
746 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
747 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
748 1 baz:1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
749 2 baz:2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
750 <<<<<<< working copy: 863de62655ef - test: baz:3+->3- |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
751 3- baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
752 4 baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
753 ||||||| base |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
754 3+ baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
755 4 baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
756 ======= |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
757 3+ baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
758 4+ baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
759 >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+ |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
760 5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
761 6 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
762 7 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
763 $ cat > qux <<EOF |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
764 > 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
765 > 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
766 > 1 baz:1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
767 > 2 baz:2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
768 > 3- baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
769 > 4 baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
770 > 5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
771 > 6 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
772 > 7 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
773 > EOF |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
774 $ hg resolve --mark -q |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
775 $ rm qux.orig |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
776 $ 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
|
777 $ 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
|
778 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
779 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
780 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
781 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
782 25: qux:4->4+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
783 27: baz:3+->3- |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
784 28: merge |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
785 $ hg up 25 --quiet |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
786 $ hg merge 27 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
787 merging qux and baz to qux |
42151
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
788 warning: conflicts while merging qux! (edit, then use 'hg resolve --mark') |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
789 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
790 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
791 [1] |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
792 $ cat qux |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
793 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
794 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
795 1 baz:1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
796 2 baz:2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
797 <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
798 3+ baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
799 4+ baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
800 ||||||| base |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
801 3+ baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
802 4 baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
803 ======= |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
804 3- baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
805 4 baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
806 >>>>>>> merge rev: 863de62655ef - test: baz:3+->3- |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
807 5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
808 6 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
809 7 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
810 $ cat > qux <<EOF |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
811 > 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
812 > 0 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
813 > 1 baz:1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
814 > 2 baz:2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
815 > 3+ baz:3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
816 > 4+ baz:4 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
817 > 5 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
818 > 6 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
819 > EOF |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
820 $ hg resolve --mark -q |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
821 $ rm qux.orig |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
822 $ 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
|
823 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
|
824 $ 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
|
825 16: baz:0 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
826 19: baz:3 |
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
827 20: baz:4 |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
828 24: baz:3->3+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
829 25: qux:4->4+ |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
830 27: baz:3+->3- |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
831 29: merge from other side |
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
832 $ 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
|
833 |
31938
5e3b49defbff
revset: add a 'descend' argument to followlines to return descendants
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30804
diff
changeset
|
834 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
|
835 $ 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
|
836 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
|
837 |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
838 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
|
839 $ hg up 23 --quiet |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
840 $ sed 's/3/+3/' baz > baz.new |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
841 $ mv baz.new baz |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
842 $ hg ci -m 'baz:3->+3' |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
843 created new head |
31991
55987fc8aba1
context: add an assertion checking linerange consistency in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31955
diff
changeset
|
844 $ 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
|
845 @ 30: baz:3->+3 |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
846 : |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
847 : o 27: baz:3+->3- |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
848 : : |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
849 : o 24: baz:3->3+ |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
850 :/ |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
851 o 20: baz:4 |
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
852 |\ |
31991
55987fc8aba1
context: add an assertion checking linerange consistency in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31955
diff
changeset
|
853 | o 19: baz:3 |
55987fc8aba1
context: add an assertion checking linerange consistency in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31955
diff
changeset
|
854 |/ |
31992
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
855 o 18: baz:2 |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
856 : |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
857 o 16: baz:0 |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
858 | |
3e47a40d7a7a
context: possibly yield initial fctx in blockdescendants()
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
31991
diff
changeset
|
859 ~ |
31955
4c2c30bc38b4
context: follow all branches in blockdescendants()
Denis Laxalde <denis@laxalde.org>
parents:
31938
diff
changeset
|
860 |
33284
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
861 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
|
862 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
|
863 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
|
864 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
865 $ hg up 23 --quiet |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
866 $ 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
|
867 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
868 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
869 1 baz:1 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
870 2 baz:2 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
871 3+ baz:3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
872 4 baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
873 5 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
874 6 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
875 $ cat > baz << EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
876 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
877 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
878 > a |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
879 > b |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
880 > 3+ baz:3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
881 > 4 baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
882 > y |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
883 > z |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
884 > EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
885 $ 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
|
886 created new head |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
887 $ 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
|
888 merging baz |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
889 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
|
890 (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
|
891 $ 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
|
892 $ cat > baz << EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
893 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
894 > 0 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
895 > 1 baz:1 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
896 > 2+ baz:2 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
897 > 3+ baz:3 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
898 > 4 baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
899 > 5 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
900 > 6 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
901 > EOF |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
902 $ 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
|
903 $ 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
|
904 @ 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
|
905 | |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
906 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
|
907 |\ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
908 | 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
|
909 | : |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
910 | : 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
|
911 | :/ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
912 +---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
|
913 | : |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
914 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
|
915 :/ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
916 o 20: baz:4 |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
917 |\ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
918 ~ ~ |
b2670290eab4
followlines: join merge parents line ranges in blockdescendants() (issue5595)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
32767
diff
changeset
|
919 |
41562
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
920 An integer as a line range, which is parsed as '1:1' |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
921 |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
922 $ hg log -r 'followlines(baz, 1)' |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
923 changeset: 22:2174d0bf352a |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
924 user: test |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
925 date: Thu Jan 01 00:00:00 1970 +0000 |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
926 summary: added two lines with 0 |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
927 |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
928 |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
929 check error cases |
32063
befefdd34cf8
context: start walking from "introrev" in blockancestors()
Denis Laxalde <denis@laxalde.org>
parents:
31998
diff
changeset
|
930 $ hg up 24 --quiet |
30754
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
931 $ hg log -r 'followlines()' |
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
932 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
|
933 [255] |
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
934 $ 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
|
935 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
|
936 [255] |
41562
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
937 $ hg log -r 'followlines(baz, x)' |
1c04894e8fe1
revset: allow to parse single integer as a range
Yuya Nishihara <yuya@tcha.org>
parents:
41420
diff
changeset
|
938 hg: parse error: followlines expects a line number or a range |
30754
26209cb7184e
revset: parse variable-length arguments of followlines() by getargsdict()
Yuya Nishihara <yuya@tcha.org>
parents:
30719
diff
changeset
|
939 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
940 $ 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
|
941 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
|
942 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
943 $ 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
|
944 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
|
945 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
946 $ 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
|
947 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
|
948 [255] |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
949 $ 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
|
950 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
|
951 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
952 $ 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
|
953 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
|
954 [255] |
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
955 $ 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
|
956 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
|
957 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
958 $ 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
|
959 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
|
960 [255] |
30804
4227f80f72b2
revset: abuse x:y syntax to specify line range of followlines()
Yuya Nishihara <yuya@tcha.org>
parents:
30800
diff
changeset
|
961 $ 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
|
962 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
|
963 [255] |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
964 $ 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
|
965 hg: parse error at 43: not a prefix: [ |
36685
2a258985ffeb
revsetlang: add a hint for more useful parse errors
Ryan McElroy <rmcelroy@fb.com>
parents:
35230
diff
changeset
|
966 (followlines(baz, 2:4, startrev=20, descend=[1]) |
2a258985ffeb
revsetlang: add a hint for more useful parse errors
Ryan McElroy <rmcelroy@fb.com>
parents:
35230
diff
changeset
|
967 ^ here) |
31998
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
968 [255] |
83527d9f1f13
revset: properly parse "descend" argument of followlines()
Denis Laxalde <denis@laxalde.org>
parents:
31992
diff
changeset
|
969 $ 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
|
970 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
|
971 [255] |
30719
42c75b4fa46a
revset: add a followlines(file, fromline, toline[, rev]) revset
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
30432
diff
changeset
|
972 |
32649
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
973 Test empty annotate output |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
974 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
975 $ printf '\0' > binary |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
976 $ touch empty |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
977 $ 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
|
978 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
979 $ hg annotate binary empty |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
980 binary: binary file |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
981 |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
982 $ hg annotate -Tjson binary empty |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
983 [ |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
984 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
985 "path": "binary" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
986 }, |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
987 { |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
988 "lines": [], |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
989 "path": "empty" |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
990 } |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
991 ] |
7a209737f01c
annotate: restructure formatter output to be nested list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
32486
diff
changeset
|
992 |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
993 Test annotate with whitespace options |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
994 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
995 $ cd .. |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
996 $ hg init repo-ws |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
997 $ cd repo-ws |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
998 $ cat > a <<EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
999 > aa |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1000 > |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1001 > b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1002 > EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1003 $ hg ci -Am "adda" |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1004 adding a |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
1005 $ sed 's/EOL$//g' > a <<EOF |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1006 > a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1007 > |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
1008 > EOL |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1009 > b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1010 > EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1011 $ hg ci -m "changea" |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1012 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1013 Annotate with no option |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1014 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1015 $ hg annotate a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1016 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1017 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1018 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1019 1: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1020 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1021 Annotate with --ignore-space-change |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1022 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1023 $ hg annotate --ignore-space-change a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1024 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1025 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1026 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1027 0: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1028 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1029 Annotate with --ignore-all-space |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1030 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1031 $ hg annotate --ignore-all-space a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1032 0: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1033 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1034 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1035 0: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1036 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1037 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
|
1038 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1039 $ hg annotate --ignore-blank-lines a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1040 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1041 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1042 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1043 1: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
1044 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15829
diff
changeset
|
1045 $ 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
|
1046 |
36510
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1047 Annotate with orphaned CR (issue5798) |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1048 ------------------------------------- |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1049 |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1050 $ hg init repo-cr |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1051 $ cd repo-cr |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1052 |
36697
9a08f7d18c20
test-annotate: rewrite sed with some python
Yuya Nishihara <yuya@tcha.org>
parents:
36510
diff
changeset
|
1053 $ cat <<'EOF' >> "$TESTTMP/substcr.py" |
9a08f7d18c20
test-annotate: rewrite sed with some python
Yuya Nishihara <yuya@tcha.org>
parents:
36510
diff
changeset
|
1054 > import sys |
37120
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36985
diff
changeset
|
1055 > from mercurial.utils import procutil |
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36985
diff
changeset
|
1056 > procutil.setbinary(sys.stdin) |
a8a902d7176e
procutil: bulk-replace function calls to point to new module
Yuya Nishihara <yuya@tcha.org>
parents:
36985
diff
changeset
|
1057 > procutil.setbinary(sys.stdout) |
36697
9a08f7d18c20
test-annotate: rewrite sed with some python
Yuya Nishihara <yuya@tcha.org>
parents:
36510
diff
changeset
|
1058 > stdin = getattr(sys.stdin, 'buffer', sys.stdin) |
9a08f7d18c20
test-annotate: rewrite sed with some python
Yuya Nishihara <yuya@tcha.org>
parents:
36510
diff
changeset
|
1059 > stdout = getattr(sys.stdout, 'buffer', sys.stdout) |
9a08f7d18c20
test-annotate: rewrite sed with some python
Yuya Nishihara <yuya@tcha.org>
parents:
36510
diff
changeset
|
1060 > stdout.write(stdin.read().replace(b'\r', b'[CR]')) |
9a08f7d18c20
test-annotate: rewrite sed with some python
Yuya Nishihara <yuya@tcha.org>
parents:
36510
diff
changeset
|
1061 > EOF |
36510
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1062 |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1063 >>> with open('a', 'wb') as f: |
36827
12492794bf8c
py3: silence f.write() in test-annotate.t
Yuya Nishihara <yuya@tcha.org>
parents:
36760
diff
changeset
|
1064 ... f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') and None |
36510
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1065 $ hg ci -qAm0 |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1066 >>> with open('a', 'wb') as f: |
36827
12492794bf8c
py3: silence f.write() in test-annotate.t
Yuya Nishihara <yuya@tcha.org>
parents:
36760
diff
changeset
|
1067 ... f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') and None |
36510
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1068 $ hg ci -m1 |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1069 |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1070 $ hg annotate -r0 a | "$PYTHON" "$TESTTMP/substcr.py" |
36510
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1071 0: 0a[CR]0b[CR] |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1072 0: 0c[CR]0d[CR] |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1073 0: 0e |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1074 0: 0f |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1075 0: 0g |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1076 $ hg annotate -r1 a | "$PYTHON" "$TESTTMP/substcr.py" |
36510
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1077 0: 0a[CR]0b[CR] |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1078 1: 1c[CR]1d[CR] |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1079 0: 0e |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1080 1: 1f |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1081 0: 0g |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1082 |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1083 $ cd .. |
0a7c59a4c835
annotate: do not poorly split lines at CR (issue5798)
Yuya Nishihara <yuya@tcha.org>
parents:
35230
diff
changeset
|
1084 |
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
|
1085 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
|
1086 ------------------------------------------------ |
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
|
1087 |
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
|
1088 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
|
1089 |
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
|
1090 $ 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
|
1091 $ 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
|
1092 $ 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
|
1093 $ 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
|
1094 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
|
1095 $ 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
|
1096 $ 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
|
1097 $ 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
|
1098 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
|
1099 $ 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
|
1100 $ 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
|
1101 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
|
1102 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
|
1103 $ 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
|
1104 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
|
1105 $ 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
|
1106 $ hg commit -m 'contentC' |
24817
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1107 $ 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
|
1108 $ 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
|
1109 @ 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
|
1110 | 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
|
1111 | 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
|
1112 | 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
|
1113 | 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
|
1114 | |
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
|
1115 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
|
1116 | 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
|
1117 | 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
|
1118 | 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
|
1119 | |
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
|
1120 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
|
1121 | 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
|
1122 | 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
|
1123 | 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
|
1124 | 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
|
1125 | |
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
|
1126 | 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
|
1127 |/ 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
|
1128 | 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
|
1129 | 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
|
1130 | |
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
|
1131 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
|
1132 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
|
1133 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
|
1134 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
|
1135 |
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
|
1136 |
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
|
1137 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
|
1138 |
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
|
1139 $ 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
|
1140 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
|
1141 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
|
1142 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
|
1143 |
24817
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1144 $ hg annotate a -r 'wdir()' |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1145 0 : A |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1146 3 : B |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1147 4 : C |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1148 4+: W |
0bb98eee531d
committablefilectx: propagate ancestry info to parent to fix annotation
Yuya Nishihara <yuya@tcha.org>
parents:
24498
diff
changeset
|
1149 |
23705
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1150 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
|
1151 |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1152 $ 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
|
1153 0: A |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1154 3: B |
28a302e9225d
linkrev: also adjust linkrev when bootstrapping annotate (issue4305)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23702
diff
changeset
|
1155 |
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
|
1156 $ cd .. |
29861
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1157 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1158 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
|
1159 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1160 $ hg init repo-5360 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1161 $ cd repo-5360 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1162 $ echo 1 > a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1163 $ hg commit -A a -m 1 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1164 $ echo 2 >> a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1165 $ hg commit -m 2 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1166 $ echo a > a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1167 $ hg commit -m a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1168 $ hg update '.^' -q |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1169 $ echo 3 >> a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1170 $ hg commit -m 3 -q |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1171 $ hg merge 2 -q |
42151
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1172 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1173 [1] |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1174 $ cat a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1175 <<<<<<< working copy: 0a068f0261cf - test: 3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1176 1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1177 2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1178 3 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1179 ||||||| base |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1180 1 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1181 2 |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1182 ======= |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1183 a |
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1184 >>>>>>> merge rev: 9409851bc20a - test: a |
29861
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1185 $ cat > a << EOF |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1186 > b |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1187 > 1 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1188 > 2 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1189 > 3 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1190 > a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1191 > EOF |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1192 $ hg resolve --mark -q |
42151
7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
42141
diff
changeset
|
1193 $ rm a.orig |
29861
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1194 $ hg commit -m m |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1195 $ hg annotate a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1196 4: b |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1197 0: 1 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1198 1: 2 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1199 3: 3 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1200 2: a |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1201 |
2f6d5c60f6fc
annotate: pre-calculate the "needed" dictionary (issue5360)
Jun Wu <quark@fb.com>
parents:
26587
diff
changeset
|
1202 $ cd .. |