Mercurial > hg
view tests/test-notify-changegroup.t @ 42743:8c9a6adec67a
rust-discovery: using the children cache in add_missing
The DAG range computation often needs to get back to very old
revisions, and turns out to be disproportionately long, given
that the end goal is to remove the descendents of the given
missing revisons from the undecided set.
The fast iteration capabilities available in the Rust case make
it possible to avoid the DAG range entirely, at the cost of
precomputing the children cache, and to simply iterate on
children of the given missing revisions.
This is a case where staying on the same side of the interface
between the two languages has clear benefits.
On discoveries with initial undecided sets
small enough to bypass sampling entirely, the total cost of
computing the children cache and the subsequent iteration
becomes better than the Python + C counterpart, which relies on
reachableroots2.
For example, on a repo with more than one million revisions with
an initial undecided set of 11 elements, we get these figures:
Rust version with simple iteration
addcommons: 57.287us
first undecided computation: 184.278334ms
first children cache computation: 131.056us
addmissings iteration: 42.766us
first addinfo total: 185.24 ms
Python + C version
first addcommons: 0.29 ms
addcommons 0.21 ms
first undecided computation 191.35 ms
addmissings 45.75 ms
first addinfo total: 237.77 ms
On discoveries with large undecided sets, the initial price paid
makes the first addinfo slower than the Python + C version,
but that's more than compensated by the gain in sampling and
subsequent iterations.
Here's an extreme example with an undecided set of a million revisions:
Rust version:
first undecided computation: 293.842629ms
first children cache computation: 407.911297ms
addmissings iteration: 34.312869ms
first addinfo total: 776.02 ms
taking initial sample
query 2: sampling time: 1318.38 ms
query 2; still undecided: 1005013, sample size is: 200
addmissings: 143.062us
Python + C version:
first undecided computation 298.13 ms
addmissings 80.13 ms
first addinfo total: 399.62 ms
taking initial sample
query 2: sampling time: 3957.23 ms
query 2; still undecided: 1005013, sample size is: 200
addmissings 52.88 ms
Differential Revision: https://phab.mercurial-scm.org/D6428
author | Georges Racinet <georges.racinet@octobus.net> |
---|---|
date | Tue, 16 Apr 2019 01:16:39 +0200 |
parents | 5abc47d4ca6b |
children | 9a43cef9ec59 |
line wrap: on
line source
$ cat <<EOF >> $HGRCPATH > [extensions] > notify= > > [hooks] > changegroup.notify = python:hgext.notify.hook > > [notify] > sources = push > diffstat = False > maxsubject = 10 > > [usersubs] > foo@bar = * > > [reposubs] > * = baz > EOF $ hg init a clone $ hg --traceback clone a b updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a > b/a commit $ hg --traceback --cwd b commit -Ama adding a $ echo a >> b/a commit $ hg --traceback --cwd b commit -Amb push $ hg --traceback --cwd b push ../a 2>&1 | > "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")' pushing to ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Date: * (glob) Subject: * (glob) From: test X-Hg-Notification: changeset cb9a9f314b8b Message-Id: <*> (glob) To: baz, foo@bar changeset cb9a9f314b8b in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b summary: a changeset ba677d0156c1 in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 summary: b diffs (6 lines): diff -r 000000000000 -r ba677d0156c1 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,2 @@ +a +a $ hg --cwd a rollback repository tip rolled back to revision -1 (undo push) unbundle with unrelated source $ hg --cwd b bundle ../test.hg ../a searching for changes 2 changesets found $ hg --cwd a unbundle ../test.hg adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets cb9a9f314b8b:ba677d0156c1 (2 drafts) (run 'hg update' to get a working copy) $ hg --cwd a rollback repository tip rolled back to revision -1 (undo unbundle) unbundle with correct source $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 | > "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")' adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets cb9a9f314b8b:ba677d0156c1 (2 drafts) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Date: * (glob) Subject: * (glob) From: test X-Hg-Notification: changeset cb9a9f314b8b Message-Id: <*> (glob) To: baz, foo@bar changeset cb9a9f314b8b in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b summary: a changeset ba677d0156c1 in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1 summary: b diffs (6 lines): diff -r 000000000000 -r ba677d0156c1 a --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,2 @@ +a +a (run 'hg update' to get a working copy) Check that using the first committer as the author of a changeset works: Check that the config option works. Check that the first committer is indeed used for "From:". Check that the merge user is NOT used for "From:" Create new file $ echo a > b/b $ echo b >> b/b $ echo c >> b/b $ hg --traceback --cwd b commit -Amnewfile -u committer_1 adding b commit as one user $ echo x > b/b $ echo b >> b/b $ echo c >> b/b $ hg --traceback --cwd b commit -Amx -u committer_2 commit as other user, change file so we can do an (automatic) merge $ hg --cwd b up 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a > b/b $ echo b >> b/b $ echo y >> b/b $ hg --traceback --cwd b commit -Amy -u committer_3 created new head merge as a different user $ hg --cwd b merge --config notify.fromauthor=True merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg --traceback --cwd b commit -Am "merged" push $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 | > "$PYTHON" -c 'from __future__ import print_function ; import sys,re; print(re.sub("\n\t", " ", sys.stdin.read()), end="")' pushing to ../a searching for changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Date: * (glob) Subject: * (glob) From: committer_1 X-Hg-Notification: changeset 84e487dddc58 Message-Id: <*> (glob) To: baz, foo@bar changeset 84e487dddc58 in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=84e487dddc58 summary: newfile changeset b29c7a2b6b0c in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c summary: x changeset 0957c7d64886 in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=0957c7d64886 summary: y changeset 485b4e6b0249 in $TESTTMP/a details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249 summary: merged diffs (7 lines): diff -r ba677d0156c1 -r 485b4e6b0249 b --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/b Thu Jan 01 00:00:00 1970 +0000 @@ -0,0 +1,3 @@ +x +b +y $ hg --cwd a rollback repository tip rolled back to revision 1 (undo push)