phases: rework the logic of _pushdiscoveryphase to bound complexity
This rework the various graph traversal in _pushdiscoveryphase to keep the
complexity in check.
This is done though a couple of things:
- first, limiting the space we have to explore, for example, if we are not in
publishing push, we don't need to consider remote draft roots that are also
draft locally, as there is nothing to be moved there.
- avoid unbounded descendant computation, and use the faster "rev between"
computation.
This provide a massive boost to performance when exchanging with repository with
a massive amount of draft, like mozilla-try:
### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog
# benchmark.name = hg.command.push
# bin-env-vars.hg.flavor = default
# bin-env-vars.hg.py-re2-module = default
# benchmark.variants.explicit-rev = all-out-heads
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.reuse-external-delta-parent = default
## benchmark.variants.revs = any-1-extra-rev
before: 20.346590 seconds
after: 11.232059 seconds (-38.15%, -7.48 seconds)
## benchmark.variants.revs = any-100-extra-rev
before: 24.752051 seconds
after: 15.367412 seconds (-37.91%, -9.38 seconds)
After this changes, the push operation is still quite too slow. Some of this
can be attributed to general phases slowness (reading all the roots from disk
for example) and other know slowness (not using persistent-nodemap, branchmap,
tags, etc. We are also working on them, but with this series, phase discovery
during push no longer showing up in profile and this is a pretty nice and bit
low-hanging fruit out of the way.
### (same case as the above)
# benchmark.variants.revs = any-1-extra-rev
pre-%ln-change: 44.235070
this-changeset: 11.232059 seconds (-74.61%, -33.00 seconds)
# benchmark.variants.revs = any-100-extra-rev
pre-%ln-change: 49.234697
this-changeset: 15.367412 seconds (-68.79%, -33.87 seconds)
Note that with this change, the `hg push` performance is now much closer to the
`hg pull` performance, even it still lagging behind a bit. (and the overall
performance are still too slow).
### data-env-vars.name = mozilla-try-2023-03-22-ds2-pnm
# benchmark.variants.explicit-rev = all-out-heads
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.pulled-delta-reuse-policy = default
# bin-env-vars.hg.flavor = rust
## benchmark.variants.revs = any-1-extra-rev
hg.command.pull: 6.517450
hg.command.push: 11.219888
## benchmark.variants.revs = any-100-extra-rev
hg.command.pull: 10.160991
hg.command.push: 14.251107
### data-env-vars.name = mozilla-try-2023-03-22-zstd-sparse-revlog
# bin-env-vars.hg.py-re2-module = default
# benchmark.variants.explicit-rev = all-out-heads
# benchmark.variants.issue6528 = disabled
# benchmark.variants.protocol = ssh
# benchmark.variants.pulled-delta-reuse-policy = default
## bin-env-vars.hg.flavor = default
## benchmark.variants.revs = any-1-extra-rev
hg.command.pull: 8.577772
hg.command.push: 11.232059
## bin-env-vars.hg.flavor = default
## benchmark.variants.revs = any-100-extra-rev
hg.command.pull: 13.152976
hg.command.push: 15.367412
## bin-env-vars.hg.flavor = rust
## benchmark.variants.revs = any-1-extra-rev
hg.command.pull: 8.731982
hg.command.push: 11.178751
## bin-env-vars.hg.flavor = rust
## benchmark.variants.revs = any-100-extra-rev
hg.command.pull: 13.184236
hg.command.push: 15.620843
=======================================================
Test check for obsolescence and instability during push
=======================================================
$ . $TESTDIR/testlib/obsmarker-common.sh
$ cat >> $HGRCPATH << EOF
> [phases]
> publish=false
> [experimental]
> evolution = all
> EOF
Tests that pushing orphaness to the server is detected
======================================================
initial setup
$ mkdir base
$ cd base
$ hg init server
$ cd server
$ mkcommit root
$ hg phase --public .
$ mkcommit commit_A0_
$ mkcommit commit_B0_
$ cd ..
$ hg init client
$ cd client
$ echo '[paths]' >> .hg/hgrc
$ echo 'default=../server' >> .hg/hgrc
$ hg pull
pulling from $TESTTMP/base/server
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
new changesets 1e4be0697311:c09d8ab29fda (2 drafts)
(run 'hg update' to get a working copy)
$ hg up 'desc("root")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(having some unrelated change affects discovery result, we should ideally test both case)
$ hg branch unrelated --quiet
$ mkcommit unrelated
$ hg up null
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -G
o changeset: 3:16affbe0f986
| branch: unrelated
| tag: tip
| parent: 0:1e4be0697311
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: unrelated
|
| o changeset: 2:c09d8ab29fda
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | summary: commit_B0_
| |
| o changeset: 1:37624bf21024
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_A0_
|
o changeset: 0:1e4be0697311
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: root
$ cd ..
$ cd ..
Orphan from pruning
-------------------
Setup
$ cp -R base check-pruned
$ cd check-pruned/client
$ hg debugobsolete --record-parents `getid 'desc("commit_A0_")'`
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
$ hg log -G
o changeset: 3:16affbe0f986
| branch: unrelated
| tag: tip
| parent: 0:1e4be0697311
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: unrelated
|
| * changeset: 2:c09d8ab29fda
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan
| | summary: commit_B0_
| |
| x changeset: 1:37624bf21024
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| obsolete: pruned
| summary: commit_A0_
|
o changeset: 0:1e4be0697311
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: root
Pushing the result is prevented with a message
$ hg push --new-branch
pushing to $TESTTMP/check-pruned/server
searching for changes
abort: push includes orphan changeset: c09d8ab29fda!
[255]
$ cd ../..
Orphan from superseding
-----------------------
Setup
$ cp -R base check-superseded
$ cd check-superseded/client
$ hg up 'desc("commit_A0_")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch other
marked working directory as branch other
$ hg commit --amend -m commit_A1_
1 new orphan changesets
$ hg log -G
@ changeset: 4:df9b82a99e21
| branch: other
| tag: tip
| parent: 0:1e4be0697311
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: commit_A1_
|
| o changeset: 3:16affbe0f986
|/ branch: unrelated
| parent: 0:1e4be0697311
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: unrelated
|
| * changeset: 2:c09d8ab29fda
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan
| | summary: commit_B0_
| |
| x changeset: 1:37624bf21024
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| obsolete: rewritten using amend as 4:df9b82a99e21
| summary: commit_A0_
|
o changeset: 0:1e4be0697311
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: root
Pushing the result is prevented with a message
$ hg push --new-branch
pushing to $TESTTMP/check-superseded/server
searching for changes
abort: push includes orphan changeset: c09d8ab29fda!
[255]
$ cd ../..
Tests that user get warned if it is about to publish obsolete/unstable content
------------------------------------------------------------------------------
Orphan from pruning
-------------------
Make sure the only difference is phase:
$ cd check-pruned/client
$ hg push --force --rev 'not desc("unrelated")'
pushing to $TESTTMP/check-pruned/server
searching for changes
no changes found
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
[1]
Check something prevents a silent publication of the obsolete changeset
$ hg push --publish --new-branch
pushing to $TESTTMP/check-pruned/server
searching for changes
abort: push includes orphan changeset: c09d8ab29fda!
[255]
$ cd ../..
Orphan from superseding
-----------------------
Make sure the only difference is phase:
$ cd check-superseded/client
$ hg push --force --rev 'not desc("unrelated")'
pushing to $TESTTMP/check-superseded/server
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
Check something prevents a silent publication of the obsolete changeset
$ hg push --publish --new-branch
pushing to $TESTTMP/check-superseded/server
searching for changes
abort: push includes orphan changeset: c09d8ab29fda!
[255]
$ cd ../..