bisect: avoid copying ancestor list for non-merge commits
During a bisection, hg needs to compute a list of all ancestors for every
candidate commit. This is accomplished via a bottom-up traversal of the set of
candidates, during which each revision's ancestor list is populated using the
ancestor list of its parent(s). Previously, this involved copying the entire
list, which could be very long in if the bisection range was large.
To help improve this, we can observe that each candidate commit is visited
exactly once, at which point its ancestor list is copied into its children's
lists and then dropped. In the case of non-merge commits, a commit's ancestor
list consists exactly of its parent's list plus itself. This means that we can
trivially reuse the parent's existing list for one of its non-merge children,
which avoids copying entirely if that commit is the parent's only child. This
makes bisections over linear ranges of commits much faster.
During some informal testing in the large publicly-available `mozilla-central`
repository, this noticeably sped up bisections over large ranges of history:
Setup:
$ cd mozilla-central
$ hg bisect --reset
$ hg bisect --good 0
$ hg log -r tip -T '{rev}\n'
628417
Test:
$ time hg bisect --bad tip --noupdate
Before:
real 3m35.927s
user 3m35.553s
sys 0m0.319s
After:
real 1m41.142s
user 1m40.810s
sys 0m0.285s
Make a narrow clone then archive it
$ . "$TESTDIR/narrow-library.sh"
$ hg init master
$ cd master
$ for x in `$TESTDIR/seq.py 3`; do
> echo $x > "f$x"
> hg add "f$x"
> hg commit -m "Add $x"
> done
$ cat >> .hg/hgrc << EOF
> [narrowacl]
> default.includes=f1 f2
> EOF
$ hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid
$ cat hg.pid >> "$DAEMON_PIDS"
$ cd ..
$ hg clone http://localhost:$HGPORT1 narrowclone1
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 2 files
new changesets * (glob)
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
The clone directory should only contain f1 and f2
$ ls -A -1 narrowclone1 | sort
.hg
f1
f2
Requirements should contain narrowhg
$ hg debugrequires -R narrowclone1 | grep narrowhg
narrowhg-experimental
NarrowHG should track f1 and f2
$ hg -R narrowclone1 tracked
I path:f1
I path:f2
Narrow should not be able to widen to include f3
$ hg -R narrowclone1 tracked --addinclude f3
comparing with http://localhost:$HGPORT1/
searching for changes
abort: The following includes are not accessible for test: ['path:f3']
[255]
$ ls -A -1 narrowclone1 | sort
.hg
f1
f2
$ hg -R narrowclone1 tracked
I path:f1
I path:f2
Narrow should allow widen to include f2
$ hg -R narrowclone1 tracked --removeinclude f2 > /dev/null
$ hg -R narrowclone1 tracked
I path:f1
$ ls -A -1 narrowclone1 | sort
.hg
f1
$ hg -R narrowclone1 tracked --addinclude f2
comparing with http://localhost:$HGPORT1/
searching for changes
adding changesets
adding manifests
adding file changes
added 0 changesets with 1 changes to 1 files
$ hg -R narrowclone1 tracked
I path:f1
I path:f2
$ ls -A -1 narrowclone1 | sort
.hg
f1
f2