Mercurial > public > mercurial-scm > hg
annotate tests/test-annotate.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 | 2e1d8b238b6c |
children | c7371aa0c153 |
rev | line source |
---|---|
2923
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
1 % init |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
2 % commit |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
3 adding a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
4 % annotate -c |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
5 8435f90966e4: a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
6 % annotate -d |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
7 Thu Jan 01 00:00:01 1970 +0000: a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
8 % annotate -n |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
9 0: a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
10 % annotate -u |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
11 nobody: a |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
12 % annotate -cdnu |
cd47230a4eb9
tests: new test for "hg annotate"
Giorgos Keramidas <keramida@ceid.upatras.gr>
parents:
diff
changeset
|
13 nobody 0 8435f90966e4 Thu Jan 01 00:00:01 1970 +0000: a |
3172
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
14 % annotate b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
15 2: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
16 2: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
17 2: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
18 3: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
19 3: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
20 3: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
21 % annotate -nf b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
22 0 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
23 1 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
24 1 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
25 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
26 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
27 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
29 merging b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
31 (branch merge, don't forget to commit) |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
32 % annotate after merge |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
33 0 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
34 1 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
35 1 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
36 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
37 4 b: c |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
38 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
39 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
40 merging b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
41 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
42 (branch merge, don't forget to commit) |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
43 % annotate after rename merge |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
44 0 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
45 6 b: z |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
46 1 a: a |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
47 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
48 4 b: c |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
49 3 b: b |
5c93dd0ae413
Refactor annotate copy support.
Brendan Cully <brendan@kublai.com>
parents:
2923
diff
changeset
|
50 7 b: d |
3405
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3172
diff
changeset
|
51 % linkrev vs rev |
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3172
diff
changeset
|
52 0: a |
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3172
diff
changeset
|
53 1: a |
2e1d8b238b6c
Test annotate using named rev instead of linkrev
Brendan Cully <brendan@kublai.com>
parents:
3172
diff
changeset
|
54 1: a |