Mercurial > hg
annotate tests/test-annotate.t @ 20954:dba91f8060eb
bundle2: add an exchange.getbundle function
This function can return a `HG10` or `HG20` bundle. It uses the `bundlecaps`
parameters to decides which one to return.
This is a distinct function from `changegroup.getbundle` for two reasons. First
the APIs of `bundle10` and `bundle20` are not compatible yet. The two functions
may be reunited in the future. Second `exchange.getbundle` will grow parameters
for all kinds of data (phases, obsmarkers, ...) so it's better to keep the
changegroup generation in its own function for now.
This function will be used it in the next changesets.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 04 Apr 2014 01:51:54 -0700 |
parents | 0fd0612dc855 |
children | dff638170c48 |
rev | line source |
---|---|
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
1 $ HGMERGE=true; export HGMERGE |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
2 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
3 init |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
4 |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
5 $ hg init repo |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
6 $ cd repo |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
8 commit |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
9 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
10 $ echo 'a' > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
11 $ hg ci -A -m test -u nobody -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
12 adding a |
4365
46280c004f22
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3405
diff
changeset
|
13 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
14 annotate -c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
15 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
16 $ hg annotate -c a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
17 8435f90966e4: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
18 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
19 annotate -cl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
20 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
21 $ hg annotate -cl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
22 8435f90966e4:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
23 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
24 annotate -d |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
25 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
26 $ hg annotate -d a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
27 Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
28 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
29 annotate -n |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
30 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
31 $ hg annotate -n a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
32 0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
33 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
34 annotate -nl |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
35 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
36 $ hg annotate -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
37 0:1: a |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
38 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
39 annotate -u |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
40 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
41 $ hg annotate -u a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
42 nobody: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
43 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
44 annotate -cdnu |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
45 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
46 $ hg annotate -cdnu a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
47 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
48 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
49 annotate -cdnul |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
50 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
51 $ hg annotate -cdnul a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
52 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
53 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
54 $ cat <<EOF >>a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
55 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
56 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
57 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
58 $ hg ci -ma1 -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
59 $ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
60 $ hg ci -mb -d '1 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
61 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
62 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
63 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
64 > b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
65 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
66 $ hg ci -mb2 -d '2 0' |
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
67 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
68 annotate -n b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
69 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
70 $ hg annotate -n b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
71 0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
72 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
73 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
74 3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
75 3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
76 3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
77 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
78 annotate --no-follow b |
4857
2192001e4bb4
Add --line-number option to hg annotate (issue506)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4659
diff
changeset
|
79 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
80 $ hg annotate --no-follow b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
81 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
82 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
83 2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
84 3: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
85 3: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
86 3: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
87 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
88 annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
89 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
90 $ hg annotate -nl b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
91 0:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
92 1:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
93 1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
94 3:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
95 3:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
96 3:6: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
97 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
98 annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
99 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
100 $ hg annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
101 0 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
102 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
103 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
104 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
105 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
106 3 b: b6 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
107 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
108 annotate -nlf b |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
109 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
110 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
111 0 a:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
112 1 a:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
113 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
114 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
115 3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
116 3 b:6: b6 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
117 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
118 $ hg up -C 2 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
119 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
|
120 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
121 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
122 > c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
123 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
124 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
125 $ hg ci -mb2.1 -d '2 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
126 created new head |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
127 $ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
128 merging b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
129 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
130 (branch merge, don't forget to commit) |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
131 $ hg ci -mmergeb -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
132 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
133 annotate after merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
134 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
135 $ hg annotate -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
136 0 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
137 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
138 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
139 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
140 4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
141 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
142 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
143 annotate after merge with -l |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
144 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
145 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
146 0 a:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
147 1 a:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
148 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
149 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
150 4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
151 3 b:5: b5 |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2925
diff
changeset
|
152 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
153 $ hg up -C 1 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
154 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
|
155 $ hg cp a b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
156 $ cat <<EOF > b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
157 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
158 > z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
159 > a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
160 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
161 $ hg ci -mc -d '3 0' |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
162 created new head |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
163 $ hg merge |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
164 merging b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
165 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
166 (branch merge, don't forget to commit) |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
167 $ cat <<EOF >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
168 > b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
169 > c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
170 > b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
171 > EOF |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
172 $ echo d >> b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
173 $ hg ci -mmerge2 -d '4 0' |
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 after rename merge |
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 -nf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
178 0 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
179 6 b: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
180 1 a: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
181 3 b: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
182 4 b: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
183 3 b: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
184 7 b: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
185 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
186 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
|
187 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
188 $ hg annotate -nlf b |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
189 0 a:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
190 6 b:2: z |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
191 1 a:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
192 3 b:4: b4 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
193 4 b:5: c |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
194 3 b:5: b5 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
195 7 b:7: d |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
196 |
14358
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
197 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
|
198 |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
199 $ 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
|
200 $ 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
|
201 $ 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
|
202 $ 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
|
203 $ 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
|
204 $ 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
|
205 $ hg annotate -nlf b |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
206 0 a: 1: a |
bf93e78f2638
annotate: fix alignment of columns in front of line numbers (issue2807)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
13697
diff
changeset
|
207 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
|
208 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
|
209 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
|
210 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
|
211 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
|
212 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
|
213 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
|
214 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
|
215 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
|
216 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
217 linkrev vs rev |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
218 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
219 $ hg annotate -r tip -n a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
220 0: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
221 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
222 1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
223 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
224 linkrev vs rev with -l |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
225 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
226 $ hg annotate -r tip -nl a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
227 0:1: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
228 1:2: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
229 1:3: a |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
230 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11852
diff
changeset
|
231 Issue589: "undelete" sequence leads to crash |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
232 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
233 annotate was crashing when trying to --follow something |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
234 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
235 like A -> B -> A |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
236 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
237 generate ABA rename configuration |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
238 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
239 $ echo foo > foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
240 $ hg add foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
241 $ hg ci -m addfoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
242 $ hg rename foo bar |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
243 $ hg ci -m renamefoo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
244 $ hg rename bar foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
245 $ hg ci -m renamebar |
4639
c7371aa0c153
test-annotate: add a test for issue 589.
Patrick Mezard <pmezard@gmail.com>
parents:
3405
diff
changeset
|
246 |
11852
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
247 annotate after ABA with follow |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
248 |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
249 $ hg annotate --follow foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
250 foo: foo |
b2f91119bf8c
tests: unify test-annotate
Martin Geisler <mg@lazybytes.net>
parents:
10369
diff
changeset
|
251 |
13697
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
252 missing file |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
253 |
eaee75036725
annotate: catch nonexistent files using match.bad callback (issue1590)
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
254 $ 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
|
255 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
|
256 [255] |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
257 |
15829
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
258 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
|
259 |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
260 $ printf "" > c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
261 $ 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
|
262 adding c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
263 $ hg annotate c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
264 $ printf "a\nb" > c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
265 $ hg ci -m test |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
266 $ hg annotate c |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
267 [0-9]+: a (re) |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
268 [0-9]+: b (re) |
2c480532f36e
annotate: append newline after non newline-terminated file listings
Ion Savin <ion.savin@tora.com>
parents:
15528
diff
changeset
|
269 |
18993
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
270 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
|
271 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
|
272 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
273 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
|
274 "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
|
275 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
|
276 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
|
277 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
278 $ cat > ../legacyrepo.py <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
279 > from mercurial import node, util |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
280 > def reposetup(ui, repo): |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
281 > class legacyrepo(repo.__class__): |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
282 > def _filecommit(self, fctx, manifest1, manifest2, |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
283 > linkrev, tr, changelist): |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
284 > fname = fctx.path() |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
285 > text = fctx.data() |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
286 > flog = self.file(fname) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
287 > fparent1 = manifest1.get(fname, node.nullid) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
288 > fparent2 = manifest2.get(fname, node.nullid) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
289 > meta = {} |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
290 > copy = fctx.renamed() |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
291 > if copy and copy[0] != fname: |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
292 > raise util.Abort('copying is not supported') |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
293 > if fparent2 != node.nullid: |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
294 > changelist.append(fname) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
295 > return flog.add(text, meta, tr, linkrev, |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
296 > fparent1, fparent2) |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
297 > raise util.Abort('only merging is supported') |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
298 > repo.__class__ = legacyrepo |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
299 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
300 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
301 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
302 > 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
303 > 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
304 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
305 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
306 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
307 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
308 $ hg add baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
309 $ 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
|
310 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
311 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
312 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
313 > 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
314 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
315 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
316 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
317 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
318 $ 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
|
319 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
320 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
321 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
322 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
323 > 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
324 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
325 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
326 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
327 $ hg debugsetparents 17 17 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
328 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:2" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
329 $ hg debugindexdot .hg/store/data/baz.i |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
330 digraph G { |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
331 -1 -> 0 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
332 0 -> 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
333 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
334 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
335 } |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
336 $ hg annotate baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
337 17: 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
338 18: 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
339 16: 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
340 16: 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
341 16: 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
342 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
343 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
344 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
345 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
346 > 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
347 > 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
348 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
349 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
350 $ 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
|
351 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
352 $ cat > baz <<EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
353 > 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
354 > 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
355 > 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
356 > 4 baz:4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
357 > 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
358 > EOF |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
359 $ hg debugsetparents 19 18 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
360 $ hg --config extensions.legacyrepo=../legacyrepo.py commit -m "baz:4" |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
361 $ hg debugindexdot .hg/store/data/baz.i |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
362 digraph G { |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
363 -1 -> 0 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
364 0 -> 1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
365 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
366 1 -> 2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
367 2 -> 3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
368 3 -> 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
369 2 -> 4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
370 } |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
371 $ hg annotate baz |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
372 17: 1 baz:1 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
373 18: 2 baz:2 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
374 19: 3 baz:3 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
375 20: 4 baz:4 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
376 16: 5 |
0fd0612dc855
annotate: increase refcount of each revisions correctly (issue3841)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
17347
diff
changeset
|
377 |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
378 Test annotate with whitespace options |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
379 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
380 $ cd .. |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
381 $ hg init repo-ws |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
382 $ cd repo-ws |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
383 $ cat > a <<EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
384 > aa |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
385 > |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
386 > b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
387 > EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
388 $ hg ci -Am "adda" |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
389 adding a |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
390 $ sed 's/EOL$//g' > a <<EOF |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
391 > a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
392 > |
17347
2da47de36b6f
check-code: fix check for trailing whitespace on continued lines too
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
393 > EOL |
15528
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
394 > b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
395 > EOF |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
396 $ hg ci -m "changea" |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
397 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
398 Annotate with no option |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
399 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
400 $ hg annotate a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
401 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
402 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
403 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
404 1: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
405 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
406 Annotate with --ignore-space-change |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
407 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
408 $ hg annotate --ignore-space-change a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
409 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
410 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
411 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
412 0: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
413 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
414 Annotate with --ignore-all-space |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
415 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
416 $ hg annotate --ignore-all-space a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
417 0: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
418 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
419 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
420 0: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
421 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
422 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
|
423 |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
424 $ hg annotate --ignore-blank-lines a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
425 1: a a |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
426 0: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
427 1: |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
428 1: b b |
a84698badf0b
annotate: support diff whitespace filtering flags (issue3030)
Patrick Mezard <pmezard@gmail.com>
parents:
14358
diff
changeset
|
429 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15829
diff
changeset
|
430 $ cd .. |