Mercurial > hg
annotate tests/test-tags.t @ 13021:6c800e7ef2f6 stable
rebase: support --detach when null is common ancestor
author | Henrik Stuart <hg@hstuart.dk> |
---|---|
date | Sat, 20 Nov 2010 09:51:56 +0100 |
parents | 93c4da6c4416 |
children | 5ccdca7df211 |
rev | line source |
---|---|
11744 | 1 Helper functions: |
2 | |
3 $ cacheexists() { | |
4 > [ -f .hg/tags.cache ] && echo "tag cache exists" || echo "no tag cache" | |
5 > } | |
345 | 6 |
11744 | 7 $ dumptags() { |
8 > rev=$1 | |
9 > echo "rev $rev: .hgtags:" | |
10 > hg cat -r$rev .hgtags | |
11 > } | |
9151
f528d1a93491
tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
9144
diff
changeset
|
12 |
9152
4017291c4c48
tags: support 'instant' tag retrieval (issue548)
Greg Ward <greg-hg@gerg.ca>
parents:
9151
diff
changeset
|
13 # XXX need to test that the tag cache works when we strip an old head |
4017291c4c48
tags: support 'instant' tag retrieval (issue548)
Greg Ward <greg-hg@gerg.ca>
parents:
9151
diff
changeset
|
14 # and add a new one rooted off non-tip: i.e. node and rev of tip are the |
4017291c4c48
tags: support 'instant' tag retrieval (issue548)
Greg Ward <greg-hg@gerg.ca>
parents:
9151
diff
changeset
|
15 # same, but stuff has changed behind tip. |
4017291c4c48
tags: support 'instant' tag retrieval (issue548)
Greg Ward <greg-hg@gerg.ca>
parents:
9151
diff
changeset
|
16 |
11744 | 17 Setup: |
9143
a604c98dbf62
test-tags: clarify test output; simplify test script a bit (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
5658
diff
changeset
|
18 |
11744 | 19 $ hg init t |
20 $ cd t | |
21 $ cacheexists | |
22 no tag cache | |
23 $ hg id | |
24 000000000000 tip | |
25 $ cacheexists | |
26 no tag cache | |
27 $ echo a > a | |
28 $ hg add a | |
29 $ hg commit -m "test" | |
30 $ hg co | |
31 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
32 $ hg identify | |
33 acb14030fe0a tip | |
34 $ cacheexists | |
35 tag cache exists | |
36 | |
12758
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
37 Try corrupting the cache |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
38 |
12763
93c4da6c4416
test-tags: use printf instead of echo '...\n'
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12758
diff
changeset
|
39 $ printf 'a b' > .hg/tags.cache |
12758
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
40 $ hg identify |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
41 .hg/tags.cache is corrupt, rebuilding it |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
42 acb14030fe0a tip |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
43 $ cacheexists |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
44 tag cache exists |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
45 $ hg identify |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
46 acb14030fe0a tip |
2d754eae430c
tags: do not fail if tags.cache is corrupted (issue2444)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12640
diff
changeset
|
47 |
11744 | 48 Create local tag with long name: |
49 | |
50 $ T=`hg identify --debug --id` | |
51 $ hg tag -l "This is a local tag with a really long name!" | |
52 $ hg tags | |
53 tip 0:acb14030fe0a | |
54 This is a local tag with a really long name! 0:acb14030fe0a | |
55 $ rm .hg/localtags | |
56 | |
57 Create a tag behind hg's back: | |
9143
a604c98dbf62
test-tags: clarify test output; simplify test script a bit (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
5658
diff
changeset
|
58 |
11744 | 59 $ echo "$T first" > .hgtags |
60 $ cat .hgtags | |
61 acb14030fe0a21b60322c440ad2d20cf7685a376 first | |
62 $ hg add .hgtags | |
63 $ hg commit -m "add tags" | |
64 $ hg tags | |
65 tip 1:b9154636be93 | |
66 first 0:acb14030fe0a | |
67 $ hg identify | |
68 b9154636be93 tip | |
69 | |
70 Repeat with cold tag cache: | |
71 | |
72 $ rm -f .hg/tags.cache | |
73 $ hg identify | |
74 b9154636be93 tip | |
75 | |
76 And again, but now unable to write tag cache: | |
9143
a604c98dbf62
test-tags: clarify test output; simplify test script a bit (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
5658
diff
changeset
|
77 |
11744 | 78 $ rm -f .hg/tags.cache |
79 $ chmod 555 .hg | |
80 $ hg identify | |
81 b9154636be93 tip | |
82 $ chmod 755 .hg | |
83 | |
84 Create a branch: | |
9151
f528d1a93491
tags: implement persistent tag caching (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
9144
diff
changeset
|
85 |
11744 | 86 $ echo bb > a |
87 $ hg status | |
88 M a | |
89 $ hg identify | |
90 b9154636be93+ tip | |
91 $ hg co first | |
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
93 $ hg id | |
94 acb14030fe0a+ first | |
95 $ hg -v id | |
96 acb14030fe0a+ first | |
97 $ hg status | |
98 M a | |
99 $ echo 1 > b | |
100 $ hg add b | |
101 $ hg commit -m "branch" | |
102 created new head | |
103 $ hg id | |
104 c8edf04160c7 tip | |
105 | |
106 Merge the two heads: | |
9366
9ff178e7b627
tags: don't crash if unable to write tag cache
Greg Ward <greg-hg@gerg.ca>
parents:
9152
diff
changeset
|
107 |
11744 | 108 $ hg merge 1 |
109 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 (branch merge, don't forget to commit) | |
111 $ hg id | |
112 c8edf04160c7+b9154636be93+ tip | |
113 $ hg status | |
114 M .hgtags | |
115 $ hg commit -m "merge" | |
116 | |
117 Create a fake head, make sure tag not visible afterwards: | |
118 | |
119 $ cp .hgtags tags | |
120 $ hg tag last | |
121 $ hg rm .hgtags | |
122 $ hg commit -m "remove" | |
9143
a604c98dbf62
test-tags: clarify test output; simplify test script a bit (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
5658
diff
changeset
|
123 |
11744 | 124 $ mv tags .hgtags |
125 $ hg add .hgtags | |
126 $ hg commit -m "readd" | |
127 $ | |
128 $ hg tags | |
129 tip 6:35ff301afafe | |
130 first 0:acb14030fe0a | |
131 | |
132 Add invalid tags: | |
345 | 133 |
11744 | 134 $ echo "spam" >> .hgtags |
135 $ echo >> .hgtags | |
136 $ echo "foo bar" >> .hgtags | |
12366
c01dc9087d9a
tests: drop a bunch of sed calls from unified tests
Matt Mackall <mpm@selenic.com>
parents:
12327
diff
changeset
|
137 $ echo "a5a5 invalid" >> .hg/localtags |
11744 | 138 $ echo "committing .hgtags:" |
139 committing .hgtags: | |
140 $ cat .hgtags | |
141 acb14030fe0a21b60322c440ad2d20cf7685a376 first | |
142 spam | |
143 | |
144 foo bar | |
145 $ hg commit -m "tags" | |
146 | |
147 Report tag parse error on other head: | |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
148 |
11744 | 149 $ hg up 3 |
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
151 $ echo 'x y' >> .hgtags | |
152 $ hg commit -m "head" | |
153 created new head | |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
154 |
11744 | 155 $ hg tags |
156 .hgtags@75d9f02dfe28, line 2: cannot parse entry | |
157 .hgtags@75d9f02dfe28, line 4: node 'foo' is not well formed | |
158 .hgtags@c4be69a18c11, line 2: node 'x' is not well formed | |
159 tip 8:c4be69a18c11 | |
160 first 0:acb14030fe0a | |
161 $ hg tip | |
162 changeset: 8:c4be69a18c11 | |
163 tag: tip | |
164 parent: 3:ac5e980c4dc0 | |
165 user: test | |
166 date: Thu Jan 01 00:00:00 1970 +0000 | |
167 summary: head | |
168 | |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
169 |
11744 | 170 Test tag precedence rules: |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
171 |
11744 | 172 $ cd .. |
173 $ hg init t2 | |
174 $ cd t2 | |
175 $ echo foo > foo | |
176 $ hg add foo | |
177 $ hg ci -m 'add foo' # rev 0 | |
178 $ hg tag bar # rev 1 | |
179 $ echo >> foo | |
180 $ hg ci -m 'change foo 1' # rev 2 | |
181 $ hg up -C 1 | |
182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
183 $ hg tag -r 1 -f bar # rev 3 | |
184 $ hg up -C 1 | |
185 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
186 $ echo >> foo | |
187 $ hg ci -m 'change foo 2' # rev 4 | |
188 created new head | |
189 $ hg tags | |
190 tip 4:0c192d7d5e6b | |
191 bar 1:78391a272241 | |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
192 |
11744 | 193 Repeat in case of cache effects: |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
194 |
11744 | 195 $ hg tags |
196 tip 4:0c192d7d5e6b | |
197 bar 1:78391a272241 | |
198 | |
199 Detailed dump of tag info: | |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
200 |
11744 | 201 $ hg heads -q # expect 4, 3, 2 |
202 4:0c192d7d5e6b | |
203 3:6fa450212aeb | |
204 2:7a94127795a3 | |
205 $ dumptags 2 | |
206 rev 2: .hgtags: | |
207 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar | |
208 $ dumptags 3 | |
209 rev 3: .hgtags: | |
210 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar | |
211 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar | |
212 78391a272241d70354aa14c874552cad6b51bb42 bar | |
213 $ dumptags 4 | |
214 rev 4: .hgtags: | |
215 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar | |
9144
ad72e3b08bc0
test-tags: enhance the test to probe tag caching better (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
9143
diff
changeset
|
216 |
11744 | 217 Dump cache: |
218 | |
219 $ cat .hg/tags.cache | |
220 4 0c192d7d5e6b78a714de54a2e9627952a877e25a 0c04f2a8af31de17fab7422878ee5a2dadbc943d | |
221 3 6fa450212aeb2a21ed616a54aea39a4a27894cd7 7d3b718c964ef37b89e550ebdafd5789e76ce1b0 | |
222 2 7a94127795a33c10a370c93f731fd9fea0b79af6 0c04f2a8af31de17fab7422878ee5a2dadbc943d | |
223 | |
224 78391a272241d70354aa14c874552cad6b51bb42 bar | |
225 | |
226 Test tag removal: | |
9144
ad72e3b08bc0
test-tags: enhance the test to probe tag caching better (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
9143
diff
changeset
|
227 |
11744 | 228 $ hg tag --remove bar # rev 5 |
229 $ hg tip -vp | |
230 changeset: 5:5f6e8655b1c7 | |
231 tag: tip | |
232 user: test | |
233 date: Thu Jan 01 00:00:00 1970 +0000 | |
234 files: .hgtags | |
235 description: | |
236 Removed tag bar | |
237 | |
238 | |
239 diff -r 0c192d7d5e6b -r 5f6e8655b1c7 .hgtags | |
240 --- a/.hgtags Thu Jan 01 00:00:00 1970 +0000 | |
241 +++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 | |
242 @@ -1,1 +1,3 @@ | |
243 bbd179dfa0a71671c253b3ae0aa1513b60d199fa bar | |
244 +78391a272241d70354aa14c874552cad6b51bb42 bar | |
245 +0000000000000000000000000000000000000000 bar | |
246 | |
247 $ hg tags | |
248 tip 5:5f6e8655b1c7 | |
249 $ hg tags # again, try to expose cache bugs | |
250 tip 5:5f6e8655b1c7 | |
4213 | 251 |
11744 | 252 Remove nonexistent tag: |
253 | |
254 $ hg tag --remove foobar | |
255 abort: tag 'foobar' does not exist | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11744
diff
changeset
|
256 [255] |
11744 | 257 $ hg tip |
258 changeset: 5:5f6e8655b1c7 | |
259 tag: tip | |
260 user: test | |
261 date: Thu Jan 01 00:00:00 1970 +0000 | |
262 summary: Removed tag bar | |
263 | |
4266
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4213
diff
changeset
|
264 |
11744 | 265 Undo a tag with rollback: |
4651
7176f278d6f9
Test attempt to remove nonexistent tag
Brendan Cully <brendan@kublai.com>
parents:
4482
diff
changeset
|
266 |
11744 | 267 $ hg rollback # destroy rev 5 (restore bar) |
268 rolling back to revision 4 (undo commit) | |
269 $ hg tags | |
270 tip 4:0c192d7d5e6b | |
271 bar 1:78391a272241 | |
272 $ hg tags | |
273 tip 4:0c192d7d5e6b | |
274 bar 1:78391a272241 | |
275 | |
276 Test tag rank: | |
9144
ad72e3b08bc0
test-tags: enhance the test to probe tag caching better (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
9143
diff
changeset
|
277 |
11744 | 278 $ cd .. |
279 $ hg init t3 | |
280 $ cd t3 | |
281 $ echo foo > foo | |
282 $ hg add foo | |
283 $ hg ci -m 'add foo' # rev 0 | |
284 $ hg tag -f bar # rev 1 bar -> 0 | |
285 $ hg tag -f bar # rev 2 bar -> 1 | |
286 $ hg tag -fr 0 bar # rev 3 bar -> 0 | |
287 $ hg tag -fr 1 bar # rev 4 bar -> 1 | |
288 $ hg tag -fr 0 bar # rev 5 bar -> 0 | |
289 $ hg tags | |
290 tip 5:85f05169d91d | |
291 bar 0:bbd179dfa0a7 | |
292 $ hg co 3 | |
293 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
294 $ echo barbar > foo | |
295 $ hg ci -m 'change foo' # rev 6 | |
296 created new head | |
297 $ hg tags | |
298 tip 6:735c3ca72986 | |
299 bar 0:bbd179dfa0a7 | |
4267
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4266
diff
changeset
|
300 |
11744 | 301 Don't allow moving tag without -f: |
302 | |
303 $ hg tag -r 3 bar | |
304 abort: tag 'bar' already exists (use -f to force) | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11744
diff
changeset
|
305 [255] |
11744 | 306 $ hg tags |
307 tip 6:735c3ca72986 | |
308 bar 0:bbd179dfa0a7 | |
309 | |
310 Strip 1: expose an old head: | |
4482
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
311 |
11744 | 312 $ hg --config extensions.mq= strip 5 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
313 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob) |
11744 | 314 $ hg tags # partly stale cache |
315 tip 5:735c3ca72986 | |
316 bar 1:78391a272241 | |
317 $ hg tags # up-to-date cache | |
318 tip 5:735c3ca72986 | |
319 bar 1:78391a272241 | |
320 | |
321 Strip 2: destroy whole branch, no old head exposed | |
9144
ad72e3b08bc0
test-tags: enhance the test to probe tag caching better (issue548).
Greg Ward <greg-hg@gerg.ca>
parents:
9143
diff
changeset
|
322 |
11744 | 323 $ hg --config extensions.mq= strip 4 |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12376
diff
changeset
|
324 saved backup bundle to $TESTTMP/t3/.hg/strip-backup/*-backup.hg (glob) |
11744 | 325 $ hg tags # partly stale |
326 tip 4:735c3ca72986 | |
327 bar 0:bbd179dfa0a7 | |
328 $ rm -f .hg/tags.cache | |
329 $ hg tags # cold cache | |
330 tip 4:735c3ca72986 | |
331 bar 0:bbd179dfa0a7 | |
332 | |
333 Test tag rank with 3 heads: | |
5657
47915bf68c44
Properly check tag's existence as a local/global tag when removing it.
Osku Salerma <osku@iki.fi>
parents:
5524
diff
changeset
|
334 |
11744 | 335 $ cd .. |
336 $ hg init t4 | |
337 $ cd t4 | |
338 $ echo foo > foo | |
339 $ hg add | |
340 adding foo | |
341 $ hg ci -m 'add foo' # rev 0 | |
342 $ hg tag bar # rev 1 bar -> 0 | |
343 $ hg tag -f bar # rev 2 bar -> 1 | |
344 $ hg up -qC 0 | |
345 $ hg tag -fr 2 bar # rev 3 bar -> 2 | |
346 $ hg tags | |
347 tip 3:197c21bbbf2c | |
348 bar 2:6fa450212aeb | |
349 $ hg up -qC 0 | |
350 $ hg tag -m 'retag rev 0' -fr 0 bar # rev 4 bar -> 0, but bar stays at 2 | |
5657
47915bf68c44
Properly check tag's existence as a local/global tag when removing it.
Osku Salerma <osku@iki.fi>
parents:
5524
diff
changeset
|
351 |
11744 | 352 Bar should still point to rev 2: |
353 | |
354 $ hg tags | |
355 tip 4:3b4b14ed0202 | |
356 bar 2:6fa450212aeb | |
357 | |
358 Test that removing global/local tags does not get confused when trying | |
359 to remove a tag of type X which actually only exists as a type Y: | |
5657
47915bf68c44
Properly check tag's existence as a local/global tag when removing it.
Osku Salerma <osku@iki.fi>
parents:
5524
diff
changeset
|
360 |
11744 | 361 $ cd .. |
362 $ hg init t5 | |
363 $ cd t5 | |
364 $ echo foo > foo | |
365 $ hg add | |
366 adding foo | |
367 $ hg ci -m 'add foo' # rev 0 | |
5657
47915bf68c44
Properly check tag's existence as a local/global tag when removing it.
Osku Salerma <osku@iki.fi>
parents:
5524
diff
changeset
|
368 |
11744 | 369 $ hg tag -r 0 -l localtag |
370 $ hg tag --remove localtag | |
371 abort: tag 'localtag' is not a global tag | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11744
diff
changeset
|
372 [255] |
11744 | 373 $ |
374 $ hg tag -r 0 globaltag | |
375 $ hg tag --remove -l globaltag | |
376 abort: tag 'globaltag' is not a local tag | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11744
diff
changeset
|
377 [255] |
11744 | 378 $ hg tags -v |
379 tip 1:a0b6fe111088 | |
380 localtag 0:bbd179dfa0a7 local | |
381 globaltag 0:bbd179dfa0a7 |