Mercurial > hg
view tests/test-fastannotate-protocol.t @ 42621:99ebde4fec99
commit: improve the files field of changelog for merges
Currently, the files list of merge commits repeats all the deletions
(either actual deletions, or files that got renamed) that happened
between base and p2 of the merge. If p2 is the main branch, the list
can easily be much bigger than the change being merged.
This results in various problems worth improving:
- changelog is bigger than necessary
- `hg log directory` lists many unrelated merge commits, and `hg log
-v -r commit` frequently fills multiple screens worth of files
- it possibly slows down adjustlinkrev, by forcing it to read more
manifests, and that function can certainly be a bottleneck
- the server side of pulls can waste a lot of time simply opening the
filelogs for pointless files (the constant factors for opening even
a tiny filelog is apparently pretty bad)
So stop listing such files as described in the code. Impacted merge
commits and their descendants get a different hash than they would
have without this. This doesn't seem problematic, except for
convert. The previous commit helped with that in the hg->hg case (but
if you do svn->hg twice from scratch, hashes can still change).
The rest of the description is numbers. I don't have much to report,
because recreating the files list of existing repositories is not
easy:
- debugupgradeformat and bundle/unbundle don't recreate the list
- export/import tends to choke quickly applying patches or on
description that contain diffs,
- merge commits from the convert extension don't have the right files
list for reasons orthogonal to the current commit
- replaying the merge with hg update/hg merge/hg revert --all/hg
commit can end up failing in hg revert
- I wasn't sure that using debugsetparents + debugrebuilddirstate
would really build the right thing
I measured commit time before and after this change, in a case with no
files filtered out, several files filtered out (no difference) and 5k
files filtered out (+1% time).
Recreating the 100 more recent merges in a private repo, the
concatenated uncompressed files lists goes from 1.12MB to
0.52MB. Excluding 3 merges that are not representative, then the size
goes from 570k to 15k.
I converted part of mozilla-central, and observed file list shrinking
quite a bit too, starting at the very first merge, 733641d9feaf, going
from 550 files to 10 files (although they have relatively few merges,
so they probably wouldn't care).
Differential Revision: https://phab.mercurial-scm.org/D6613
author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
---|---|
date | Tue, 02 Jul 2019 12:59:58 -0400 |
parents | 7116fc614cfc |
children | 9c4204b7f3e4 |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [ui] > ssh = "$PYTHON" "$TESTDIR/dummyssh" > [extensions] > fastannotate= > [fastannotate] > mainbranch=@ > EOF setup the server repo $ hg init repo-server $ cd repo-server $ cat >> .hg/hgrc << EOF > [fastannotate] > server=1 > EOF $ for i in 1 2 3 4; do > echo $i >> a > hg commit -A -m $i a > done $ [ -d .hg/fastannotate ] [1] $ hg bookmark @ $ cd .. setup the local repo $ hg clone 'ssh://user@dummy/repo-server' repo-local -q $ cd repo-local $ cat >> .hg/hgrc << EOF > [fastannotate] > client=1 > clientfetchthreshold=0 > EOF $ [ -d .hg/fastannotate ] [1] $ hg fastannotate a --debug running * (glob) sending hello command sending between command remote: * (glob) (?) remote: capabilities: * (glob) remote: * (glob) (?) sending protocaps command fastannotate: requesting 1 files sending getannotate command fastannotate: writing 112 bytes to fastannotate/default/a.l fastannotate: writing 94 bytes to fastannotate/default/a.m fastannotate: a: using fast path (resolved fctx: True) 0: 1 1: 2 2: 3 3: 4 the cache could be reused and no download is necessary $ hg fastannotate a --debug fastannotate: a: using fast path (resolved fctx: True) 0: 1 1: 2 2: 3 3: 4 if the client agrees where the head of the master branch is, no re-download happens even if the client has more commits $ echo 5 >> a $ hg commit -m 5 $ hg bookmark -r 3 @ -f $ hg fastannotate a --debug 0: 1 1: 2 2: 3 3: 4 4: 5 if the client has a different "@" (head of the master branch) and "@" is ahead of the server, the server can detect things are unchanged and does not return full contents (not that there is no "writing ... to fastannotate"), but the client can also build things up on its own (causing diverge) $ hg bookmark -r 4 @ -f $ hg fastannotate a --debug running * (glob) sending hello command sending between command remote: * (glob) (?) remote: capabilities: * (glob) remote: * (glob) (?) sending protocaps command fastannotate: requesting 1 files sending getannotate command fastannotate: a: 1 new changesets in the main branch 0: 1 1: 2 2: 3 3: 4 4: 5 if the client has a different "@" which is behind the server. no download is necessary $ hg fastannotate a --debug --config fastannotate.mainbranch=2 fastannotate: a: using fast path (resolved fctx: True) 0: 1 1: 2 2: 3 3: 4 4: 5 define fastannotate on-disk paths $ p1=.hg/fastannotate/default $ p2=../repo-server/.hg/fastannotate/default revert bookmark change so the client is behind the server $ hg bookmark -r 2 @ -f in the "fctx" mode with the "annotate" command, the client also downloads the cache. but not in the (default) "fastannotate" mode. $ rm $p1/a.l $p1/a.m $ hg annotate a --debug | grep 'fastannotate: writing' [1] $ hg annotate a --config fastannotate.modes=fctx --debug | grep 'fastannotate: writing' | sort fastannotate: writing 112 bytes to fastannotate/default/a.l fastannotate: writing 94 bytes to fastannotate/default/a.m the fastannotate cache (built server-side, downloaded client-side) in two repos have the same content (because the client downloads from the server) $ diff $p1/a.l $p2/a.l $ diff $p1/a.m $p2/a.m in the "fctx" mode, the client could also build the cache locally $ hg annotate a --config fastannotate.modes=fctx --debug --config fastannotate.mainbranch=4 | grep fastannotate fastannotate: requesting 1 files fastannotate: a: 1 new changesets in the main branch the server would rebuild broken cache automatically $ cp $p2/a.m $p2/a.m.bak $ echo BROKEN1 > $p1/a.m $ echo BROKEN2 > $p2/a.m $ hg fastannotate a --debug | grep 'fastannotate: writing' | sort fastannotate: writing 112 bytes to fastannotate/default/a.l fastannotate: writing 94 bytes to fastannotate/default/a.m $ diff $p1/a.m $p2/a.m $ diff $p2/a.m $p2/a.m.bak use the "debugbuildannotatecache" command to build annotate cache $ rm -rf $p1 $p2 $ hg --cwd ../repo-server debugbuildannotatecache a --debug fastannotate: a: 4 new changesets in the main branch $ hg --cwd ../repo-local debugbuildannotatecache a --debug running * (glob) sending hello command sending between command remote: * (glob) (?) remote: capabilities: * (glob) remote: * (glob) (?) sending protocaps command fastannotate: requesting 1 files sending getannotate command fastannotate: writing * (glob) fastannotate: writing * (glob) $ diff $p1/a.l $p2/a.l $ diff $p1/a.m $p2/a.m with the clientfetchthreshold config option, the client can build up the cache without downloading from the server $ rm -rf $p1 $ hg fastannotate a --debug --config fastannotate.clientfetchthreshold=10 fastannotate: a: 3 new changesets in the main branch 0: 1 1: 2 2: 3 3: 4 4: 5 if the fastannotate directory is not writable, the fctx mode still works $ rm -rf $p1 $ touch $p1 $ hg annotate a --debug --traceback --config fastannotate.modes=fctx fastannotate: a: cache broken and deleted fastannotate: prefetch failed: * (glob) fastannotate: a: cache broken and deleted fastannotate: falling back to the vanilla annotate: * (glob) 0: 1 1: 2 2: 3 3: 4 4: 5 with serverbuildondemand=False, the server will not build anything $ cat >> ../repo-server/.hg/hgrc <<EOF > [fastannotate] > serverbuildondemand=False > EOF $ rm -rf $p1 $p2 $ hg fastannotate a --debug | grep 'fastannotate: writing' [1]