##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-annotate
Martin Geisler -
r11852:b2f91119 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,115 +1,230 b''
1 #!/bin/sh
1 $ HGMERGE=true; export HGMERGE
2
3 init
4
5 $ hg init
2
6
3 HGMERGE=true; export HGMERGE
7 commit
8
9 $ echo 'a' > a
10 $ hg ci -A -m test -u nobody -d '1 0'
11 adding a
4
12
5 echo % init
13 annotate -c
6 hg init
14
15 $ hg annotate -c a
16 8435f90966e4: a
7
17
8 echo % commit
18 annotate -cl
9 echo 'a' > a
19
10 hg ci -A -m test -u nobody -d '1 0'
20 $ hg annotate -cl a
21 8435f90966e4:1: a
22
23 annotate -d
11
24
12 echo % annotate -c
25 $ hg annotate -d a
13 hg annotate -c a
26 Thu Jan 01 00:00:01 1970 +0000: a
27
28 annotate -n
14
29
15 echo % annotate -cl
30 $ hg annotate -n a
16 hg annotate -cl a
31 0: a
32
33 annotate -nl
34
35 $ hg annotate -nl a
36 0:1: a
17
37
18 echo % annotate -d
38 annotate -u
19 hg annotate -d a
39
40 $ hg annotate -u a
41 nobody: a
42
43 annotate -cdnu
20
44
21 echo % annotate -n
45 $ hg annotate -cdnu a
22 hg annotate -n a
46 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a
47
48 annotate -cdnul
49
50 $ hg annotate -cdnul a
51 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000:1: a
23
52
24 echo % annotate -nl
53 $ cat <<EOF >>a
25 hg annotate -nl a
54 > a
26
55 > a
27 echo % annotate -u
56 > EOF
28 hg annotate -u a
57 $ hg ci -ma1 -d '1 0'
58 $ hg cp a b
59 $ hg ci -mb -d '1 0'
60 $ cat <<EOF >> b
61 > b4
62 > b5
63 > b6
64 > EOF
65 $ hg ci -mb2 -d '2 0'
29
66
30 echo % annotate -cdnu
67 annotate -n b
31 hg annotate -cdnu a
32
68
33 echo % annotate -cdnul
69 $ hg annotate -n b
34 hg annotate -cdnul a
70 0: a
71 1: a
72 1: a
73 3: b4
74 3: b5
75 3: b6
76
77 annotate --no-follow b
35
78
36 cat <<EOF >>a
79 $ hg annotate --no-follow b
37 a
80 2: a
38 a
81 2: a
39 EOF
82 2: a
40 hg ci -ma1 -d '1 0'
83 3: b4
41 hg cp a b
84 3: b5
42 hg ci -mb -d '1 0'
85 3: b6
43 cat <<EOF >> b
86
44 b4
87 annotate -nl b
45 b5
88
46 b6
89 $ hg annotate -nl b
47 EOF
90 0:1: a
48 hg ci -mb2 -d '2 0'
91 1:2: a
92 1:3: a
93 3:4: b4
94 3:5: b5
95 3:6: b6
96
97 annotate -nf b
98
99 $ hg annotate -nf b
100 0 a: a
101 1 a: a
102 1 a: a
103 3 b: b4
104 3 b: b5
105 3 b: b6
106
107 annotate -nlf b
49
108
50 echo % annotate -n b
109 $ hg annotate -nlf b
51 hg annotate -n b
110 0 a:1: a
52 echo % annotate --no-follow b
111 1 a:2: a
53 hg annotate --no-follow b
112 1 a:3: a
54 echo % annotate -nl b
113 3 b:4: b4
55 hg annotate -nl b
114 3 b:5: b5
56 echo % annotate -nf b
115 3 b:6: b6
57 hg annotate -nf b
58 echo % annotate -nlf b
59 hg annotate -nlf b
60
116
61 hg up -C 2
117 $ hg up -C 2
62 cat <<EOF >> b
118 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
63 b4
119 $ cat <<EOF >> b
64 c
120 > b4
65 b5
121 > c
66 EOF
122 > b5
67 hg ci -mb2.1 -d '2 0'
123 > EOF
68 hg merge
124 $ hg ci -mb2.1 -d '2 0'
69 hg ci -mmergeb -d '3 0'
125 created new head
70 echo % annotate after merge
126 $ hg merge
71 hg annotate -nf b
127 merging b
72 echo % annotate after merge with -l
128 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
73 hg annotate -nlf b
129 (branch merge, don't forget to commit)
130 $ hg ci -mmergeb -d '3 0'
131
132 annotate after merge
133
134 $ hg annotate -nf b
135 0 a: a
136 1 a: a
137 1 a: a
138 3 b: b4
139 4 b: c
140 3 b: b5
141
142 annotate after merge with -l
143
144 $ hg annotate -nlf b
145 0 a:1: a
146 1 a:2: a
147 1 a:3: a
148 3 b:4: b4
149 4 b:5: c
150 3 b:5: b5
74
151
75 hg up -C 1
152 $ hg up -C 1
76 hg cp a b
153 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
77 cat <<EOF > b
154 $ hg cp a b
78 a
155 $ cat <<EOF > b
79 z
156 > a
80 a
157 > z
81 EOF
158 > a
82 hg ci -mc -d '3 0'
159 > EOF
83 hg merge
160 $ hg ci -mc -d '3 0'
84 cat <<EOF >> b
161 created new head
85 b4
162 $ hg merge
86 c
163 merging b
87 b5
164 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
88 EOF
165 (branch merge, don't forget to commit)
89 echo d >> b
166 $ cat <<EOF >> b
90 hg ci -mmerge2 -d '4 0'
167 > b4
91 echo % annotate after rename merge
168 > c
92 hg annotate -nf b
169 > b5
93 echo % annotate after rename merge with -l
170 > EOF
94 hg annotate -nlf b
171 $ echo d >> b
172 $ hg ci -mmerge2 -d '4 0'
173
174 annotate after rename merge
175
176 $ hg annotate -nf b
177 0 a: a
178 6 b: z
179 1 a: a
180 3 b: b4
181 4 b: c
182 3 b: b5
183 7 b: d
184
185 annotate after rename merge with -l
95
186
96 echo % linkrev vs rev
187 $ hg annotate -nlf b
97 hg annotate -r tip -n a
188 0 a:1: a
98 echo % linkrev vs rev with -l
189 6 b:2: z
99 hg annotate -r tip -nl a
190 1 a:3: a
191 3 b:4: b4
192 4 b:5: c
193 3 b:5: b5
194 7 b:7: d
195
196 linkrev vs rev
197
198 $ hg annotate -r tip -n a
199 0: a
200 1: a
201 1: a
202
203 linkrev vs rev with -l
100
204
101 # test issue 589
205 $ hg annotate -r tip -nl a
102 # annotate was crashing when trying to --follow something
206 0:1: a
103 # like A -> B -> A
207 1:2: a
104 echo % generate ABA rename configuration
208 1:3: a
105 echo foo > foo
209
106 hg add foo
210 test issue 589
107 hg ci -m addfoo
211
108 hg rename foo bar
212 annotate was crashing when trying to --follow something
109 hg ci -m renamefoo
213
110 hg rename bar foo
214 like A -> B -> A
111 hg ci -m renamebar
215
216 generate ABA rename configuration
112
217
113 echo % annotate after ABA with follow
218 $ echo foo > foo
114 hg annotate --follow foo
219 $ hg add foo
220 $ hg ci -m addfoo
221 $ hg rename foo bar
222 $ hg ci -m renamefoo
223 $ hg rename bar foo
224 $ hg ci -m renamebar
115
225
226 annotate after ABA with follow
227
228 $ hg annotate --follow foo
229 foo: foo
230
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now