Mercurial > hg
annotate tests/test-tags.out @ 4531:b51a8138292a
Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 09 Jun 2007 01:04:28 -0300 |
parents | 99f411ba0380 |
children | 7176f278d6f9 |
rev | line source |
---|---|
345 | 1 unknown |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
3 0acdaf898367 tip |
4143
26314500a5e1
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3577
diff
changeset
|
4 tip 0:0acdaf898367 |
26314500a5e1
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3577
diff
changeset
|
5 This is a local tag with a really long name! 0:0acdaf898367 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
6 0acdaf8983679e0aac16e811534eb49d7ee1f2b4 first |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
7 tip 1:8a3ca90d111d |
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
8 first 0:0acdaf898367 |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
9 8a3ca90d111d tip |
748 | 10 M a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
11 8a3ca90d111d+ tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
12 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
13 0acdaf898367+ first |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
14 0acdaf898367+ first |
748 | 15 M a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
16 8216907a933d tip |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1986
diff
changeset
|
18 (branch merge, don't forget to commit) |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
993
diff
changeset
|
19 8216907a933d+8a3ca90d111d+ tip |
993 | 20 M .hgtags |
2967
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2966
diff
changeset
|
21 tip 6:e2174d339386 |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
22 first 0:0acdaf898367 |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
23 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3455
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2967
diff
changeset
|
24 .hgtags@c071f74ab5eb, line 2: cannot parse entry |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2967
diff
changeset
|
25 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2967
diff
changeset
|
26 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
27 localtags, line 1: tag 'invalid' refers to unknown node |
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
28 tip 8:4ca6f1b1a68c |
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2320
diff
changeset
|
29 first 0:0acdaf898367 |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
30 changeset: 8:4ca6f1b1a68c |
3455
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2967
diff
changeset
|
31 .hgtags@c071f74ab5eb, line 2: cannot parse entry |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2967
diff
changeset
|
32 .hgtags@c071f74ab5eb, line 4: node 'foo' is not well formed |
baa271270829
Use file contexts in tags code
Matt Mackall <mpm@selenic.com>
parents:
2967
diff
changeset
|
33 .hgtags@4ca6f1b1a68c, line 2: node 'x' is not well formed |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
34 localtags, line 1: tag 'invalid' refers to unknown node |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
35 tag: tip |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
36 parent: 3:b2ef3841386b |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
37 user: test |
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
38 date: Mon Jan 12 13:46:40 1970 +0000 |
2320
dbdce3b99988
fix parsing of tags. make parse errors useful. add new tag tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2175
diff
changeset
|
39 summary: head |
1986
719cf07b076d
add checking for invalid entries in tag files
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
40 |
3577
7f7425306925
Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3455
diff
changeset
|
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7f7425306925
Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3455
diff
changeset
|
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7f7425306925
Correct optimization from 3464f5e77f34; add a test.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3455
diff
changeset
|
43 tip 4:36195b728445 |
4211
e29f2db5ab18
Make the tags algorithm smarter
Matt Mackall <mpm@selenic.com>
parents:
4143
diff
changeset
|
44 bar 1:b204a97e6e8d |
4213 | 45 changeset: 5:57e1983b4a60 |
46 tag: tip | |
47 user: test | |
48 date: Mon Jan 12 13:46:40 1970 +0000 | |
49 summary: Removed tag bar | |
50 | |
51 tip 5:57e1983b4a60 | |
4266
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4213
diff
changeset
|
52 tip 5:d8bb4d1eff25 |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4213
diff
changeset
|
53 bar 0:b409d9da318e |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4213
diff
changeset
|
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4213
diff
changeset
|
55 tip 6:b5ff9d142648 |
fe7f38dda34b
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com>
parents:
4213
diff
changeset
|
56 bar 0:b409d9da318e |
4267
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4266
diff
changeset
|
57 abort: a tag named bar already exists (use -f to force) |
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4266
diff
changeset
|
58 tip 6:b5ff9d142648 |
8185a1ca8628
tags: require -f to replace an existing tag
Matt Mackall <mpm@selenic.com>
parents:
4266
diff
changeset
|
59 bar 0:b409d9da318e |
4482
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
60 adding foo |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
61 tip 3:ca8479b4351c |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
62 bar 2:72b852876a42 |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
63 % bar should still point to rev 2 |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
64 tip 4:40af5d225513 |
99f411ba0380
use .extend instead of .append in readtags
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4267
diff
changeset
|
65 bar 2:72b852876a42 |