Mercurial > hg
view tests/test-mq-qdiff.t @ 49672:e92de86cf4f8
emitrevision: consider ancestors revision to emit as available base
This should make more delta base valid. This notably affects:
* case where we skipped some parent with empty delta to directly delta against
an ancestors
* case where an intermediate snapshots is stored.
This change means we could sent largish intermediate snapshots over the wire.
However this is actually a sub goal here. Sending snapshots over the wire means
the client have a high odd of simply storing the pre-computed delta instead of
doing a lengthy process that will… end up doing the same intermediate snapshot.
In addition the overall size of snapshot (or any level) is "only" some or the
overall delta size. (0.17% for my mercurial clone, 20% for my clone of Mozilla
try). So Sending them other the wire is unlikely to change large impact on the
bandwidth used.
If we decide that minimising the bandwidth is an explicit goal, we should
introduce new logic to filter-out snapshot as delta. The current code has no
notion explicite of snapshot so far, they just tended to fall into the wobbly
filtering options.
In some cases, this patch can yield large improvement to the bundling time:
### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog
# benchmark.name = perf-bundle
# benchmark.variants.revs = last-100000
before: 68.787066 seconds
after: 47.552677 seconds (-30.87%)
That translate to large improvement to the pull time :
### data-env-vars.name = mozilla-try-2019-02-18-zstd-sparse-revlog
# benchmark.name = pull
# benchmark.variants.issue6528 = disabled
# benchmark.variants.revs = last-100000
before: 142.186625 seconds
after: 75.897745 seconds (-46.62%)
No significant negative impact have been observed.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 12 Nov 2022 00:18:41 +0100 |
parents | e955549cd045 |
children |
line wrap: on
line source
$ cat <<EOF >> $HGRCPATH > [extensions] > mq = > [mq] > git = keep > EOF $ hg init a $ cd a $ echo 'base' > base $ hg ci -Ambase adding base $ hg qnew -mmqbase mqbase $ echo 'patched' > base $ hg qrefresh qdiff: $ hg qdiff diff -r d20a80d4def3 base --- a/base Thu Jan 01 00:00:00 1970 +0000 +++ b/base* (glob) @@ -1,1 +1,1 @@ -base +patched qdiff dirname: $ hg qdiff --nodates . diff -r d20a80d4def3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched qdiff filename: $ hg qdiff --nodates base diff -r d20a80d4def3 base --- a/base +++ b/base @@ -1,1 +1,1 @@ -base +patched $ hg revert -a $ hg qpop popping mqbase patch queue now empty $ hg qdelete mqbase $ printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines $ hg ci -Amlines -d '2 0' adding lines $ hg qnew -mmqbase2 mqbase2 $ printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines $ hg qdiff --nodates -U 1 diff -r b0c220e1cf43 lines --- a/lines +++ b/lines @@ -1,1 +1,3 @@ + + 1 @@ -4,4 +6,4 @@ 4 -hello world -goodbye world +hello world + goodbye world 7 $ hg qdiff --nodates -b diff -r b0c220e1cf43 lines --- a/lines +++ b/lines @@ -1,9 +1,11 @@ + + 1 2 3 4 hello world -goodbye world + goodbye world 7 8 9 $ hg qdiff --nodates -U 1 -B diff -r b0c220e1cf43 lines --- a/lines +++ b/lines @@ -4,4 +4,4 @@ 4 -hello world -goodbye world +hello world + goodbye world 7 $ hg qdiff --nodates -w diff -r b0c220e1cf43 lines --- a/lines +++ b/lines @@ -1,3 +1,5 @@ + + 1 2 3 $ hg qdiff --nodates --reverse diff -r b0c220e1cf43 lines --- a/lines +++ b/lines @@ -1,11 +1,9 @@ - - 1 2 3 4 -hello world - goodbye world +hello world +goodbye world 7 8 9 qdiff preserve existing git flag: $ hg qrefresh --git $ echo a >> lines $ hg qdiff diff --git a/lines b/lines --- a/lines +++ b/lines @@ -1,9 +1,12 @@ + + 1 2 3 4 -hello world -goodbye world +hello world + goodbye world 7 8 9 +a $ hg qdiff --stat lines | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) $ hg qrefresh qdiff when file deleted (but not removed) in working dir: $ hg qnew deleted-file $ echo a > newfile $ hg add newfile $ hg qrefresh $ rm newfile $ hg qdiff $ cd ..