Matt Harbison <matt_harbison@yahoo.com> [Fri, 25 Nov 2022 18:39:47 -0500] rev 49888
pytype: stop excluding mercurial/ui.py
ui.extractchoices() is perhaps making assumptions that it shouldn't about the
pattern always matching, but presumably we have test coverage for that.
PyCharm flags the updated classes with a warning "Class xxx must implement all
abstract methods", and suggests adding `abc.ABC` to the superclasses. I'm not
sure why, unless it doesn't recognize the `__getattr__()` delegation pattern.
Additionally, we can't unconditionally subclass `typing.BinaryIO` because that
defeats the `__getattr__` delegation to the wrapped object at runtime. Instead,
it has to only subclass during the type checking phase[1].
In any event, this fixes:
File "/mnt/c/Users/Matt/hg/mercurial/ui.py", line 1518, in _runpager:
Function subprocess.Popen.__new__ was called with the wrong arguments [wrong-arg-types]
Expected: (cls, args, bufsize, executable, stdin,
stdout: Optional[Union[IO, int]] = ..., ...)
Actually passed: (cls, args, bufsize, stdin,
stdout: Union[mercurial.utils.procutil.WriteAllWrapper,
mercurial.windows.winstdout], ...)
File "/mnt/c/Users/Matt/hg/mercurial/ui.py", line 1798, in extractchoices:
No attribute 'group' on None [attribute-error]
In Optional[Match[bytes]]
File "/mnt/c/Users/Matt/hg/mercurial/ui.py", line 1799, in extractchoices:
No attribute 'group' on None [attribute-error]
In Optional[Match[bytes]]
[1] https://stackoverflow.com/q/71365594
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 07 Dec 2022 20:12:23 +0100] rev 49887
bundle: emit full snapshot as is, without doing a redelta
With the new `forced` delta-reused policy, it become important to be able to
send full snapshot where full snapshot are needed. Otherwise, the fallback delta
will simply be used on the client sideā¦ creating monstrous delta chain, since
revision that are meant as a reset of delta-chain chain becoming too complex are
simply adding a new full delta-tree on the leaf of another one.
In the `non-forced` cases, client process full snapshot from the bundle
differently from deltas, so client will still try to convert the full snapshot
into a delta if possible. So this will no lead to pathological storage
explosion.
I have considered making this configurable, but the impact seems limited enough
that it does not seems to be worth it. Especially with the current
sparse-revlog format that use "delta-tree" with multiple level snapshots, full
snapshot are much less frequent and not that different from other intermediate
snapshot that we are already sending over the wire anyway.
CPU wise, this will help the bundling side a little as it will not need to
reconstruct revisions and compute deltas. The unbundling side might save a tiny
amount of CPU as it won't need to reconstruct the delta-base to reconstruct the
revision full text. This only slightly visible in some of the benchmarks. And
have no real impact on most of them.
### data-env-vars.name = pypy-2018-08-01-zstd-sparse-revlog
# benchmark.name = perf-bundle
# benchmark.variants.revs = last-40000
before: 11.467186 seconds
just-emit-full: 11.190576 seconds (-2.41%)
with-pull-force: 11.041091 seconds (-3.72%)
# benchmark.name = perf-unbundle
# benchmark.variants.revs = last-40000
before: 16.744862
just-emit-full:: 16.561036 seconds (-1.10%)
with-pull-force: 16.389344 seconds (-2.12%)
# benchmark.name = pull
# benchmark.variants.revs = last-40000
before: 26.870569
just-emit-full: 26.391188 seconds (-1.78%)
with-pull-force: 25.633184 seconds (-4.60%)
Space wise (so network-wise) the impact is fairly small. When taking compression into
account.
Below are tests the size of `hg bundle --all` for a handful of benchmark repositories
(with bzip, zstd compression and without it)
This show a small increase in the bundle size, but nothing really significant
except maybe for mozilla-try (+12%) that nobody really pulls large chunk of anyway.
Mozilla-try is also the repository that benefit the most for not having to
recompute deltas client size.
### mercurial:
bzip-before: 26 406 342 bytes
bzip-after: 26 691 543 bytes +1.08%
zstd-before: 27 918 645 bytes
zstd-after: 28 075 896 bytes +0.56%
none-before: 98 675 601 bytes
none-after: 100 411 237 bytes +1.76%
### pypy
bzip-before: 201 295 752 bytes
bzip-after: 209 780 282 bytes +4.21%
zstd-before: 202 974 795 bytes
zstd-after: 205 165 780 bytes +1.08%
none-before: 871 070 261 bytes
none-after: 993 595 057 bytes +14.07%
### netbeans
bzip-before: 601 314 330 bytes
bzip-after: 614 246 241 bytes +2.15%
zstd-before: 604 745 136 bytes
zstd-after: 615 497 705 bytes +1.78%
none-before: 3 338 238 571 bytes
none-after: 3 439 422 535 bytes +3.03%
### mozilla-central
bzip-before: 1 493 006 921 bytes
bzip-after: 1 549 650 570 bytes +3.79%
zstd-before: 1 481 910 102 bytes
zstd-after: 1 513 052 415 bytes +2.10%
none-before: 6 535 929 910 bytes
none-after: 7 010 191 342 bytes +7.26%
### mozilla-try
bzip-before: 6 583 425 999 bytes
bzip-after: 7 423 536 928 bytes +12.76%
zstd-before: 6 021 009 212 bytes
zstd-after: 6 674 922 420 bytes +10.86%
none-before: 22 954 739 558 bytes
none-after: 26 013 854 771 bytes +13.32%
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 06 Dec 2022 12:10:31 +0100] rev 49886
bundle: when forcing acceptance of incoming delta also accept snapshot
Snapshot where never considered reusable and the unbundling side always tried
to find a delta from them. In the `forced` mode this is counter-productive
because it will either connect two delta-tree that should not be connected or
it will spend potentially a lot of time because creating a full snapshot
anyway.
So in this mode, we accept the full snapshot as is.
This changeset is benchmarked with its children so please do not split them
apart when landing.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 07 Dec 2022 20:05:19 +0100] rev 49885
delta-find: properly report full snapshot used from cache as such
The number of tries and the delta base is reported differently so we missed
there detection initially.
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 07 Dec 2022 22:40:54 +0100] rev 49884
test-acl: glob the payload size again
This size of bundle-2 payload are irrelevant for this test and only appears in
its output because other pieces of the debug output are important.
We glob it these number before they get in our way again.
Martin von Zweigbergk <martinvonz@google.com> [Tue, 29 Nov 2022 15:41:28 -0800] rev 49883
amend: add a --draft option to set phase to draft
Some users create commits in secret phase by default and then want to make them
draft so they can be uploaded. This patch adds a --draft option for that. We
already have a flag for changing the phase to secret, so it seems consistent to
have one for draft.
Martin von Zweigbergk <martinvonz@google.com> [Tue, 29 Nov 2022 13:07:16 -0800] rev 49882
commit: add --draft option to use draft phase
Martin von Zweigbergk <martinvonz@google.com> [Tue, 29 Nov 2022 14:40:17 -0800] rev 49881
tests: use graph log in test-phases.t
It's hard to tell that the phases are ordered correctly without seeing the
graph.
Martin von Zweigbergk <martinvonz@google.com> [Tue, 29 Nov 2022 13:31:01 -0800] rev 49880
commit: move check for incompatible args earlier
I think it makes sense to check the command line arguments as early as possible,
so we don't have to wait for a repo lock to tell the user that they passed
invalid arguments.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 07 Nov 2022 22:30:30 -0500] rev 49879
delta-find: add a delta-reuse policy that blindly accepts incoming deltas
When this policy is set, incoming deltas are blindly accepted without regard
for the validity of the chain they build.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 01:24:34 +0100] rev 49878
delta-find: add a `delta-reuse-policy` on configuration `path`
That option allows to control the behavior on a per-path basis, opening the way
to treating pulls from central servers differently than other operations.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 01:31:23 +0100] rev 49877
changegroup: add `delta_base_reuse_policy` argument
The argument available through function from changegroup.apply to
`revlog.apply` allow to override the revlog configuration in terms of
delta-base-reuse policy when searching for a delta to store a revision.
It will be put to use in the next changesets.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 01:16:22 +0100] rev 49876
bundleoperation: optionnaly record the `remote` that produced the bundle
We have the information at hand, and the peer now have knownledge of its `path` object, which constaints useful behavior configuration.
So the simpler seems to be to pass that object around so it can be used if
needed.
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 05 Dec 2022 03:23:46 +0100] rev 49875
delta-find: add a test checking various simple behavior
There are enough work happening in this area that it is worth having a dedicated
test for it. So far we add to small test checking that the "best" parent is
picked as the delta base and that this behavior can be controlled during commit
and unbundle.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 19:34:01 +0100] rev 49874
peer: pass the `path` to the statichttp peer
We now have all peer able to receive and store a `path` object. Hooray.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 06:16:58 +0100] rev 49873
peer: get the `path` object down to the sshpeer
Same logic as the other peers.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 06:16:45 +0100] rev 49872
logexchange: use the proper accessors to get the remote url
There is an official method, let us use it.
this will prevent a crash when the private attribute disappear.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 00:24:28 +0100] rev 49871
peer: get the `path` object down to the httppeer
One more peer with a path stored.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 05:53:13 +0100] rev 49870
path: fix `url.copy` dropping the port
The copy method have been wrong for a while, but the new code reveals it.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 18:19:59 +0100] rev 49869
peer: pass the `path` object to `make_peer`
We don't do anything with it yet, but we can start implementing it for each peer
type starting now.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 18:18:57 +0100] rev 49868
path: allow to copy a path while adjusting the url
This will be used by `scheme` in the next changesets.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 00:19:23 +0100] rev 49867
peer: store the path object used to build a peer from a repo
This is the simplest case, we so starts with it.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 17:41:44 +0100] rev 49866
peer: build a `path` object on the fly when needed
So now, we always have a `path` object around when building the peer
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 00:16:07 +0100] rev 49865
peer: have `repo.peer` take an optional `path` argument
We are ready to start to actually set the value now.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 00:13:50 +0100] rev 49864
peer: add a `path` attribute to peer
It will start being set in the coming changesets.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 00:00:41 +0100] rev 49863
peer: have a common constructor and use it
For now it does not do much, but we will extend it to also store a path object
soon.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 18:04:51 +0100] rev 49862
peer: use a dedicated name for the `peer` constructor
We want to change the argument it takes, so we rather make them different
function.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 18:04:37 +0100] rev 49861
peer: dissolve `_peerlookup` into its last two callers
This is about to need more changes and the function won't be useful. We do it
early to clarify later changes.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 03:45:45 +0100] rev 49860
peer: stop having a `peer()` method on `peer()`
This is already a peer, why do you want a peer if you already have one.
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 03 Dec 2022 03:45:39 +0100] rev 49859
clone: explicitly detect the need to fetch a peer
Instead of having `peer()` method on all `peer()` for this usecase, we could
simply handle it explicitly.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 19:15:04 +0100] rev 49858
addbranchrevs: explicitly detect the need to fetch a peer
Instead of having `peer()` method on all `peer()` for this usecase, we could
simply handle it explicitly.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 17:01:54 +0100] rev 49857
path: pass `path` to `peer` in `hg clone`
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 16:49:54 +0100] rev 49856
path: use `get_clone_path_obj` in share
The return is simpler to use, and this mean less user for the old function.
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 16:42:36 +0100] rev 49855
path: pass `path` to `peer` in mq
We directly use the `path` object to build the `peer` object.
There is one case where we don't. We should fix that at the same time as we fix
the sub-repo cases.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 16:36:43 +0100] rev 49854
path: use `get_clone_path_obj` in _getlocal
We don't need to feed the `path` object to a `peer` object, but using an higher
level function is simpler here (e.g. no subscript access, explicit attribute
access).
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 16:34:00 +0100] rev 49853
path: pass `path` to `peer` in `hg init`
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 16:30:48 +0100] rev 49852
path: add a `get_clone_path_obj` function
Same logic as the `get_unique_pull_path_obj` function, this give access to the
`path` object directly.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 03:56:23 +0100] rev 49851
path: simplify the implementation of `get_clone_path`
We can simply use the logic from `get_unique_pull_path_obj` now.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 03:51:27 +0100] rev 49850
path: clarify document of `get_clone_path`
This return a url as `bytes`, not a `path` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:52:27 +0100] rev 49849
path: pass `path` to `peer` in `hg perf::discovery`
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:49:39 +0100] rev 49848
path: pass `path` to `peer` in remotefilelog's tests
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:48:17 +0100] rev 49847
path: pass `path` to `peer` in `hg fastannotate`
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:45:46 +0100] rev 49846
path: pass `path` to `peer` in infinitepush
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:42:17 +0100] rev 49845
path: pass `path` to `peer` in largefiles
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:38:03 +0100] rev 49844
path: pass `path` to `peer` in narrow
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:37:15 +0100] rev 49843
path: pass `path` to `peer` in `hg fetch`
We directly use the `path` object to build the `peer` object.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:33:50 +0100] rev 49842
path: use `get_unique_pull_path_obj` in `hg relink`
This is not really needed, but that help removing caller of the older function.
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 02 Dec 2022 06:31:19 +0100] rev 49841
path: pass `path` to `peer` in `hg transplant`
We directly use the `path` object to build the `peer` object.