##// 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
Augie Fackler - - Load All Authors

File last commit:

r39243:1ddb296e default
r50337:81623652 default
Show More
test-fastannotate-renames.t
168 lines | 4.2 KiB | text/troff | Tads3Lexer
/ tests / test-fastannotate-renames.t
History | Annotation | Raw |Copy content |Copy permalink
$ cat >> $HGRCPATH << EOF
> [extensions]
> fastannotate=
> [fastannotate]
> mainbranch=main
> EOF
$ hg init repo
$ cd repo
add or rename files on top of the master branch
$ echo a1 > a
$ echo b1 > b
$ hg commit -qAm 1
$ hg bookmark -i main
$ hg fastannotate --debug -nf b
fastannotate: b: 1 new changesets in the main branch
0 b: b1
$ hg fastannotate --debug -nf a
fastannotate: a: 1 new changesets in the main branch
0 a: a1
$ echo a2 >> a
$ cat > b << EOF
> b0
> b1
> EOF
$ hg mv a t
$ hg mv b a
$ hg mv t b
$ hg commit -m 'swap names'
existing linelogs are not helpful with such renames in side branches
$ hg fastannotate --debug -nf a
fastannotate: a: linelog cannot help in annotating this revision
1 a: b0
0 b: b1
$ hg fastannotate --debug -nf b
fastannotate: b: linelog cannot help in annotating this revision
0 a: a1
1 b: a2
move main branch forward, rebuild should happen
$ hg bookmark -i main -r . -q
$ hg fastannotate --debug -nf b
fastannotate: b: cache broken and deleted
fastannotate: b: 2 new changesets in the main branch
0 a: a1
1 b: a2
$ hg fastannotate --debug -nf b
fastannotate: b: using fast path (resolved fctx: True)
0 a: a1
1 b: a2
for rev 0, the existing linelog is still useful for a, but not for b
$ hg fastannotate --debug -nf a -r 0
fastannotate: a: using fast path (resolved fctx: True)
0 a: a1
$ hg fastannotate --debug -nf b -r 0
fastannotate: b: linelog cannot help in annotating this revision
0 b: b1
a rebuild can also be triggered if "the main branch last time" mismatches
$ echo a3 >> a
$ hg commit -m a3
$ cat >> b << EOF
> b3
> b4
> EOF
$ hg commit -m b4
$ hg bookmark -i main -q
$ hg fastannotate --debug -nf a
fastannotate: a: cache broken and deleted
fastannotate: a: 3 new changesets in the main branch
1 a: b0
0 b: b1
2 a: a3
$ hg fastannotate --debug -nf a
fastannotate: a: using fast path (resolved fctx: True)
1 a: b0
0 b: b1
2 a: a3
linelog can be updated without being helpful
$ hg mv a t
$ hg mv b a
$ hg mv t b
$ hg commit -m 'swap names again'
$ hg fastannotate --debug -nf b
fastannotate: b: 1 new changesets in the main branch
1 a: b0
0 b: b1
2 a: a3
$ hg fastannotate --debug -nf b
fastannotate: b: linelog cannot help in annotating this revision
1 a: b0
0 b: b1
2 a: a3
move main branch forward again, rebuilds are one-time
$ hg bookmark -i main -q
$ hg fastannotate --debug -nf a
fastannotate: a: cache broken and deleted
fastannotate: a: 4 new changesets in the main branch
0 a: a1
1 b: a2
3 b: b3
3 b: b4
$ hg fastannotate --debug -nf b
fastannotate: b: cache broken and deleted
fastannotate: b: 4 new changesets in the main branch
1 a: b0
0 b: b1
2 a: a3
$ hg fastannotate --debug -nf a
fastannotate: a: using fast path (resolved fctx: True)
0 a: a1
1 b: a2
3 b: b3
3 b: b4
$ hg fastannotate --debug -nf b
fastannotate: b: using fast path (resolved fctx: True)
1 a: b0
0 b: b1
2 a: a3
list changeset hashes to improve readability
$ hg log -T '{rev}:{node}\n'
4:980e1ab8c516350172928fba95b49ede3b643dca
3:14e123fedad9f491f5dde0beca2a767625a0a93a
2:96495c41e4c12218766f78cdf244e768d7718b0f
1:35c2b781234c994896aba36bd3245d3104e023df
0:653e95416ebb5dbcc25bbc7f75568c9e01f7bd2f
annotate a revision not in the linelog. linelog cannot be used, but does not get rebuilt either
$ hg fastannotate --debug -nf a -r 96495c41e4c12218766f78cdf244e768d7718b0f
fastannotate: a: linelog cannot help in annotating this revision
1 a: b0
0 b: b1
2 a: a3
$ hg fastannotate --debug -nf a -r 2
fastannotate: a: linelog cannot help in annotating this revision
1 a: b0
0 b: b1
2 a: a3
$ hg fastannotate --debug -nf a -r .
fastannotate: a: using fast path (resolved fctx: True)
0 a: a1
1 b: a2
3 b: b3
3 b: b4
annotate an ancient revision where the path matches. linelog can be used
$ hg fastannotate --debug -nf a -r 0
fastannotate: a: using fast path (resolved fctx: True)
0 a: a1
$ hg fastannotate --debug -nf a -r 653e95416ebb5dbcc25bbc7f75568c9e01f7bd2f
fastannotate: a: using fast path (resolved fctx: False)
0 a: a1