##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

bisect: avoid adding irrelevant revisions to bisect state...
bisect: avoid adding irrelevant revisions to bisect state When adding new revisions to the bisect state, it only makes sense to add information about revisions that are under consideration (i.e., those that are topologically between the known good and bad revisions). However, if the user passes in a revset (e.g., '!merge()' to exclude merge commits), hg will resolve the revset first and add all matching revisions to the bisect state (which in this case would likely be the majority of revisions in the repo). To avoid this, revisions should only be added to the bisect state if they are between the good and bad revisions (and therefore relevant to the bisection). -- Here are the results of some performance tests using the `mozilla-central` repo (since it is one of the largest freely-available hg repositories in the wild). These tests compare the performance of a locally-built `hg` before and after application of this series. Note that `--noupdate` is passed to avoid including update time (which should not vary across cases). Setup (run between each test): $ hg bisect --reset $ hg bisect --noupdate --bad 56c3ad4bde5c70714b784ccf15d099e0df0f5bde $ hg bisect --noupdate --good 57426696adaf08298af3027fa77486fee0633b13 Test using a revset that returns a very large number of revisions: $ time hg bisect --noupdate --skip '!merge()' > /dev/null Before: real 0m9.398s user 0m9.233s sys 0m0.120s After: real 0m1.513s user 0m1.425s sys 0m0.052s Test using a revset that is expensive to compute: $ time hg bisect --noupdate --skip 'desc("Bug")' > /dev/null Before: real 0m49.853s user 0m49.580s sys 0m0.243s After: real 0m4.120s user 0m4.036s sys 0m0.048s
marmoute - - Load All Authors

File last commit:

r50147:4141951d default
r50337:81623652 default
Show More
test-strip-cross.t
220 lines | 6.6 KiB | text/troff | Tads3Lexer
/ tests / test-strip-cross.t
History | Annotation | Raw |Copy content |Copy permalink
test stripping of filelogs where the linkrev doesn't always increase
$ echo '[extensions]' >> $HGRCPATH
$ echo 'strip =' >> $HGRCPATH
$ commit()
> {
> hg up -qC null
> count=1
> for i in "$@"; do
> for f in $i; do
> mkdir -p `dirname $f`
> echo $count > $f
> done
> count=`expr $count + 1`
> done
> hg commit -qAm "$*"
> }
2 1 0 2 0 1 2
$ mkdir files
$ cd files
$ hg init orig
$ cd orig
$ commit '201 210'
$ commit '102 120' '210'
$ commit '021'
$ commit '201' '021 120'
$ commit '012 021' '102 201' '120 210'
$ commit '102 120' '012 210' '021 201'
$ commit '201 210' '021 120' '012 102'
$ cd ..
$ hg clone -q -U -r 4 -r 5 -r 6 orig crossed
$ cd crossed
$ for i in 012 021 102 120 201 210; do
> echo $i
> hg debugindex $i
> echo
> done
012
rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 1 5d9299349fc0 000000000000 000000000000
2 2 2661d26c6496 000000000000 000000000000
021
rev linkrev nodeid p1-nodeid p2-nodeid
0 0 b8e02f643373 000000000000 000000000000
1 2 5d9299349fc0 000000000000 000000000000
2 1 2661d26c6496 000000000000 000000000000
102
rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b8e02f643373 000000000000 000000000000
1 0 5d9299349fc0 000000000000 000000000000
2 2 2661d26c6496 000000000000 000000000000
120
rev linkrev nodeid p1-nodeid p2-nodeid
0 1 b8e02f643373 000000000000 000000000000
1 2 5d9299349fc0 000000000000 000000000000
2 0 2661d26c6496 000000000000 000000000000
201
rev linkrev nodeid p1-nodeid p2-nodeid
0 2 b8e02f643373 000000000000 000000000000
1 0 5d9299349fc0 000000000000 000000000000
2 1 2661d26c6496 000000000000 000000000000
210
rev linkrev nodeid p1-nodeid p2-nodeid
0 2 b8e02f643373 000000000000 000000000000
1 1 5d9299349fc0 000000000000 000000000000
2 0 2661d26c6496 000000000000 000000000000
$ cd ..
$ for i in 0 1 2; do
> hg clone -q -U --pull crossed $i
> echo "% Trying to strip revision $i"
> hg --cwd $i strip $i
> echo "% Verifying"
> hg --cwd $i verify
> echo
> done
% Trying to strip revision 0
saved backup bundle to $TESTTMP/files/0/.hg/strip-backup/cbb8c2f0a2e3-239800b9-backup.hg
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 2 changesets with 12 changes to 6 files
% Trying to strip revision 1
saved backup bundle to $TESTTMP/files/1/.hg/strip-backup/124ecc0cbec9-6104543f-backup.hg
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 2 changesets with 12 changes to 6 files
% Trying to strip revision 2
saved backup bundle to $TESTTMP/files/2/.hg/strip-backup/f6439b304a1a-c6505a5f-backup.hg
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 2 changesets with 12 changes to 6 files
$ cd ..
Do a similar test where the manifest revlog has unordered linkrevs
$ mkdir manifests
$ cd manifests
$ hg init orig
$ cd orig
$ commit 'file'
$ commit 'other'
$ commit '' 'other'
$ HGUSER=another-user; export HGUSER
$ commit 'file'
$ commit 'other' 'file'
$ cd ..
$ hg clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
$ cd crossed
$ hg debugindex --manifest
rev linkrev nodeid p1-nodeid p2-nodeid
0 2 6bbc6fee55c2 000000000000 000000000000
1 0 1c556153fe54 000000000000 000000000000
2 1 1f76dba919fd 000000000000 000000000000
3 3 bbee06ad59d5 000000000000 000000000000
$ cd ..
$ for i in 2 3; do
> hg clone -q -U --pull crossed $i
> echo "% Trying to strip revision $i"
> hg --cwd $i strip $i
> echo "% Verifying"
> hg --cwd $i verify
> echo
> done
% Trying to strip revision 2
saved backup bundle to $TESTTMP/manifests/2/.hg/strip-backup/f3015ad03c03-4d98bdc2-backup.hg
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 3 changes to 2 files
% Trying to strip revision 3
saved backup bundle to $TESTTMP/manifests/3/.hg/strip-backup/9632aa303aa4-69192e3f-backup.hg
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 3 changes to 2 files
$ cd ..
Now a similar test for a non-root manifest revlog
$ cat >> $HGRCPATH <<EOF
> [experimental]
> treemanifests = yes
> EOF
$ mkdir treemanifests
$ cd treemanifests
$
$ hg --config experimental.treemanifest=True init orig
$ cd orig
$ commit 'dir/file'
$ commit 'dir/other'
$ commit '' 'dir/other'
$ HGUSER=yet-another-user; export HGUSER
$ commit 'otherdir dir/file'
$ commit 'otherdir dir/other' 'otherdir dir/file'
$ cd ..
$ hg --config experimental.treemanifest=True clone -q -U -r 1 -r 2 -r 3 -r 4 orig crossed
$ cd crossed
$ hg debugindex --dir dir
rev linkrev nodeid p1-nodeid p2-nodeid
0 2 6bbc6fee55c2 000000000000 000000000000
1 0 1c556153fe54 000000000000 000000000000
2 1 1f76dba919fd 000000000000 000000000000
3 3 bbee06ad59d5 000000000000 000000000000
$ cd ..
$ for i in 2 3; do
> hg --config experimental.treemanifest=True clone -q -U --pull crossed $i
> echo "% Trying to strip revision $i"
> hg --cwd $i strip $i
> echo "% Verifying"
> hg --cwd $i verify
> echo
> done
% Trying to strip revision 2
saved backup bundle to $TESTTMP/treemanifests/2/.hg/strip-backup/145f5c75f9ac-a105cfbe-backup.hg
% Verifying
checking changesets
checking manifests
checking directory manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 4 changes to 3 files
% Trying to strip revision 3
saved backup bundle to $TESTTMP/treemanifests/3/.hg/strip-backup/e4e3de5c3cb2-f4c70376-backup.hg
% Verifying
checking changesets
checking manifests
checking directory manifests
crosschecking files in changesets and manifests
checking files
checked 3 changesets with 4 changes to 3 files
$ cd ..