Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-filebranch @ 1534:80a3d6a0af71
Optimize manifest.add
Testing shows that manifest.add is spending a significant percentage of
its time running calcoffsets and doing text = "".join(addlist). This
patch removes the need for both of these by storying the manifest in a
character array, and using a modified bisect search to find lines without
the help of a separate index of line offsets.
manifest.add was also reworked to push delta construction/combination into the
main loop.
Time to apply 2751 patches (without psyco, ext3 noatime,data=writeback):
Stock hg: 4m45s real 3m32s user 55s sys
patched: 2m48s real 1m53s user 43s sys
quilt: 2m30s real 45s user 50s sys
(quilt does much more io...)
author | mason@suse.com |
---|---|
date | Fri, 11 Nov 2005 18:20:22 -0800 |
parents | 6f274afc05c7 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh # This test makes sure that we don't mark a file as merged with its ancestor # when we do a merge. cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge echo creating base hg init a cd a echo 1 > foo echo 1 > bar echo 1 > baz echo 1 > quux hg add foo bar baz quux hg commit -m "base" -d "0 0" cd .. hg clone a b echo creating branch a cd a echo 2a > foo echo 2a > bar hg commit -m "branch a" -d "0 0" echo creating branch b cd .. cd b echo 2b > foo echo 2b > baz hg commit -m "branch b" -d "0 0" echo "we shouldn't have anything but n state here" hg debugstate | cut -b 1-16,35- echo merging hg pull ../a env HGMERGE=../merge hg update -vm echo 2m > foo echo 2b > baz echo new > quux echo "we shouldn't have anything but foo in merge state here" hg debugstate | cut -b 1-16,35- | grep "^m" hg ci -m "merge" -d "0 0" echo "main: we should have a merge here" hg debugindex .hg/00changelog.i echo "log should show foo and quux changed" hg log -v -r tip echo "foo: we should have a merge here" hg debugindex .hg/data/foo.i echo "bar: we shouldn't have a merge here" hg debugindex .hg/data/bar.i echo "baz: we shouldn't have a merge here" hg debugindex .hg/data/baz.i echo "quux: we shouldn't have a merge here" hg debugindex .hg/data/quux.i echo "manifest entries should match tips of all files" hg manifest echo "everything should be clean now" hg status hg verify