outgoing: rework the handling of the `missingroots` case to be faster
The previous implementation was slow, to the point it was taking a significant
amount of `hg bundle --type none-streamv2` call. We rework the code to compute
the same value much faster, making the operation disappear from the `hg bundle
--type none-streamv2` profile. Someone would remark that producing a streamclone
does not requires an `outgoing` object. However that is a matter for another
day. There is other user of `missingroots` (non stream `hg bundle` call for
example), and they will also benefit from this rework.
We implement an old TODO in the process, directly computing the missing and
common attribute as we have most element at hand already.
### benchmark.name = hg.command.bundle
# bin-env-vars.hg.flavor = default
# bin-env-vars.hg.py-re2-module = default
# benchmark.variants.revs = all
# benchmark.variants.type = none-streamv2
## data-env-vars.name = heptapod-public-2024-03-25-zstd-sparse-revlog
before: 7.750458
after: 6.665565 (-14.00%, -1.08)
## data-env-vars.name = mercurial-public-2024-03-22-zstd-sparse-revlog
before: 0.700229
after: 0.496050 (-29.16%, -0.20)
## data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog
before: 346.508952
after: 316.749699 (-8.59%, -29.76)
## data-env-vars.name = pypy-2024-03-22-zstd-sparse-revlog
before: 3.401700
after: 2.915810 (-14.28%, -0.49)
## data-env-vars.name = tryton-public-2024-03-22-zstd-sparse-revlog
before: 1.870798
after: 1.461583 (-21.87%, -0.41)
note: this whole `missingroots` of outgoing has a limited number of callers and
could likely be replace by something simpler (like taking an explicit
"missing_revs" set for example). However this is a wider change and we focus on
a small impact, quick rework that does not change the API for now.
Testing recorded "modified" files for merge commit
==================================================
#require execbit
This file shows what hg says are "modified" files for a merge commit
(hg log -T {files}), somewhat exhaustively.
This test file shows merges that involves executable bit changing, check test-merge-combination-exec-bytes.t
For merges that involve files contents changing, check test-merge-combination-file-content.t
For testing of multiple corner case, check test-merge-combination-misc.t
Case with multiple or zero merge ancestors, copies/renames, and identical file contents
with different filelog revisions are not currently covered.
$ . $TESTDIR/testlib/merge-combination-util.sh
All the merges of executable bit.
$ range () {
> max=a
> for i in $@; do
> if [ $i = - ]; then continue; fi
> if [ $i > $max ]; then max=$i; fi
> done
> if [ $max = a ]; then echo f; else echo f x; fi
> }
$ isgood () { case $line in *f*x*) true;; *) false;; esac; }
$ createfile () {
> if [ -f a ] && (([ -x a ] && [ $v = x ]) || (! [ -x a ] && [ $v != x ]))
> then touch $file
> else touch a; if [ $v = x ]; then chmod +x a; else chmod -x a; fi
> fi
> }
$ genmerges
fffx : agree on "a"
ffxf : agree on "a"
ffxx : agree on ""
ffx- : agree on "a"
ff-x : hg said "", expected "a"
fxff : hg said "", expected "a"
fxfx : hg said "a", expected ""
fxf- : agree on "a"
fxxf : agree on "a"
fxxx : agree on ""
fxx- : agree on "a"
fx-f : hg said "", expected "a"
fx-x : hg said "", expected "a"
fx-- : hg said "", expected "a"
f-fx : agree on "a"
f-xf : agree on "a"
f-xx : hg said "", expected "a"
f-x- : agree on "a"
f--x : agree on "a"
-ffx : agree on "a"
-fxf C: agree on "a"
-fxx C: hg said "", expected "a"
-fx- C: agree on "a"
-f-x : hg said "", expected "a"
--fx : agree on "a"