Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-excessive-merge.out @ 1803:06e7447c7302

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ef8cd889a78b
children 7544700fd931
line wrap: on
line source

changeset:   4:2ee31f665a86
tag:         tip
parent:      1:96155394af80
parent:      2:92cc4c306b19
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     merge a/b -> blah

changeset:   3:e16a66a37edd
parent:      2:92cc4c306b19
parent:      1:96155394af80
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     merge b/a -> blah

changeset:   2:92cc4c306b19
parent:      0:5e0375449e74
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     branch b

changeset:   1:96155394af80
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     branch a

changeset:   0:5e0375449e74
user:        test
date:        Thu Jan  1 00:00:00 1970 +0000
summary:     test

   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      60      0       0 5e0375449e74 000000000000 000000000000
     1        60      62      1       1 96155394af80 5e0375449e74 000000000000
     2       122      62      2       2 92cc4c306b19 5e0375449e74 000000000000
     3       184      69      3       3 e16a66a37edd 92cc4c306b19 96155394af80
     4       253      29      3       4 2ee31f665a86 96155394af80 92cc4c306b19

1
79d7492df40aa0fa093ec4209be78043c181f094 644 a
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 b
2
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
3
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b
4
79d7492df40aa0fa093ec4209be78043c181f094 644 a
79d7492df40aa0fa093ec4209be78043c181f094 644 b

   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
     1         5       6      1       1 79d7492df40a 2ed2a3912a0b 000000000000
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 4 total revisions