Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 2079:ee96ca273f32
New lazy index code for revlogs.
This tunes for large repositories. It does not read the whole
index file in one big chunk, but tries to buffer reads in more
reasonable chunks instead.
Search speeds are improved in two ways. When trying to find a
specific sha hash, it searches from the end of the file backward.
More recent entries are more likely to be relevant, especially the
tip.
Also, this can load only the mapping of nodes to revlog index number.
Loading the map uses less cpu (no struct.unpack) and much less
memory than loading both the map and the index.
This cuts down the time for hg tip on the 80,000 changeset
kernel repo from 1.8s to 3.69s. Most commands the pull a single
rev out of a big index get roughly the same benefit. Commands
that read the whole index are not slower.
author | mason@suse.com |
---|---|
date | Tue, 04 Apr 2006 16:47:12 -0400 |
parents | d436b21b20dc |
children | b2ae81a7df29 |
line wrap: on
line source
1:f248da0d4c3e 0:9eca13a34789 f248da0d4c3e tip 9eca13a34789 9eca13a34789+ reverting file1 9eca13a34789 f248da0d4c3e tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f248da0d4c3e+ tip reverting file1 f248da0d4c3e tip f248da0d4c3e tip f248da0d4c3e tip