annotate tests/test-filebranch.out @ 1803:06e7447c7302

speed up hg log --patch Changing dodiff to read the manifest/changelog for node1 before calling repo.update allows us to take advantage of the revlog revision cache. Before this patch and my previous "speed up hg log --debug" patch, when using hg log -p to display three revisions (A, B and C), dodiff and repo.changes would end up reading the manifests in this order: B A B A C B C B With both patches, this order becomes: A A B B B B C C (This considers only dodiff and repo.changes. I'm not sure how other parts of hg log enter the picture.) The speed up will depend on the revisions being displayed. (All "before" times already have my previous "speed up hg log --debug" patch applied.) hg repo (tip = 414e81ae971f). hg log -p before after real 0m50.981s 0m45.279s user 0m47.930s 0m42.560s sys 0m2.526s 0m2.523s output size: 6917897 bytes kernel repo (tip = 9d4e135960ed). hg log -p -l64 before after real 2m14.995s 1m45.025s user 2m9.509s 1m33.900s sys 0m3.663s 0m2.942s output size: 31497621 bytes same kernel repo. hg log -p -l64 -r c84c2069592f:0 before after real 1m48.045s 1m0.076s user 1m44.094s 0m58.492s sys 0m2.603s 0m1.103s output size: 197983 bytes c84c2069592f was the tip of a 10 day old kernel repo that I had lying around and was where I first tested this patch. For some weird coincidence it's also a place where the patch makes a huge difference.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 26 Feb 2006 02:26:17 +0100
parents 9344f5dd4488
children 6d50d6189269
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
1 creating base
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
2 creating branch a
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
3 creating branch b
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
4 we shouldn't have anything but n state here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
5 n 644 2 bar
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
6 n 644 3 baz
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
7 n 644 3 foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
8 n 644 2 quux
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
9 merging
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
10 pulling from ../a
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
11 searching for changes
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
12 adding changesets
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
13 adding manifests
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
14 adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 993
diff changeset
15 added 1 changesets with 2 changes to 2 files (+1 heads)
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
16 (run 'hg update' to get a working copy)
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
17 merging for foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
18 resolving manifests
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
19 getting bar
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
20 merging foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
21 resolving foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
22 we shouldn't have anything but foo in merge state here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
23 m 644 3 foo
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
24 main: we should have a merge here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
25 rev offset length base linkrev nodeid p1 p2
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
26 0 0 73 0 0 cdca01651b96 000000000000 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
27 1 73 68 1 1 f6718a9cb7f3 cdca01651b96 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
28 2 141 68 2 2 bdd988058d16 cdca01651b96 000000000000
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
29 3 209 66 3 3 d8a521142a3c f6718a9cb7f3 bdd988058d16
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
30 log should show foo and quux changed
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
31 changeset: 3:d8a521142a3c02186ee6c7254738a7e6427ed4c8
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
32 tag: tip
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
33 parent: 1:f6718a9cb7f31f1a92d27bd6544c71617d6d4e4f
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
34 parent: 2:bdd988058d16e2d7392958eace7b64817e44a54e
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
35 user: test
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
36 date: Thu Jan 1 00:00:00 1970 +0000
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
37 files: foo quux
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
38 description:
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
39 merge
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
40
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
41
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
42 foo: we should have a merge here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
43 rev offset length base linkrev nodeid p1 p2
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
44 0 0 3 0 0 b8e02f643373 000000000000 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
45 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
46 2 7 4 2 2 33d1fb69067a b8e02f643373 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
47 3 11 4 3 3 aa27919ee430 2ffeddde1b65 33d1fb69067a
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
48 bar: we shouldn't have a merge here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
49 rev offset length base linkrev nodeid p1 p2
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
50 0 0 3 0 0 b8e02f643373 000000000000 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
51 1 3 4 1 2 33d1fb69067a b8e02f643373 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
52 baz: we shouldn't have a merge here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
53 rev offset length base linkrev nodeid p1 p2
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
54 0 0 3 0 0 b8e02f643373 000000000000 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
55 1 3 4 1 1 2ffeddde1b65 b8e02f643373 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
56 quux: we shouldn't have a merge here
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
57 rev offset length base linkrev nodeid p1 p2
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
58 0 0 3 0 0 b8e02f643373 000000000000 000000000000
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
59 1 3 5 1 3 6128c0f33108 b8e02f643373 000000000000
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
60 manifest entries should match tips of all files
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
61 33d1fb69067a0139622a3fa3b7ba1cdb1367972e 644 bar
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
62 2ffeddde1b65b4827f6746174a145474129fa2ce 644 baz
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
63 aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 990
diff changeset
64 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux
990
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
65 everything should be clean now
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
66 checking changesets
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
67 checking manifests
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
68 crosschecking files in changesets and manifests
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
69 checking files
5007e0bdeed2 Fix long-standing excessive file merges
mpm@selenic.com
parents:
diff changeset
70 4 files, 4 changesets, 10 total revisions