Gregory Szorc <gregory.szorc@gmail.com> [Mon, 10 Dec 2018 19:41:43 +0000] rev 40920
tests: add sparserevlog requirement to test-sqlitestore.t
Looks like this test was missed when enabling sparse revlogs by default.
Differential Revision: https://phab.mercurial-scm.org/D5402
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 02:21:52 +0100] rev 40919
tests: remove all transitional configuration
Now that sparse-revlog is enabled by default, we no longer needs it.
Differential Revision: https://phab.mercurial-scm.org/D5346
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:22:38 +0100] rev 40918
sparse-revlog: enabled by default
The feature provides large benefits. It now seems mature enough to be enabled
by default.
* It solves catastrophic issues regarding delta storage in revlog,
* It allows for shorter delta chain in all repositories, improving
performances.
Running benchmark of a wide range of operation did not reveal problematic
impact. Performance gains are observed where expected.
The format is supported by Mercurial version 4.7. So it seems safe to enable
it by default now.
Here is a reminder of key numbers regarding this delta strategy effect on
repository size and performance.
Effect on Size:
===============
For repositories with a lot of branches, sparse-revlog significantly improve
size, fixing limitation associated with the span of a delta chain. In
addition, sparse-revlog, deal well with limitations of the delta chain length.
For large repositories, this allows for a stiff reduction of the delta chain
without a problematic impact on the repository size. This delta chain length
improvement helps all repositories, not just the ones with many branches.
As a reminder, here are the default chain limits for each "format":
* no-sparse: none
* sparse: 1000
Mercurial
---------
Manifest Size:
limit | none | 1000
------------|-------------|------------
no-sparse | 6 143 044 | 6 269 496
sparse | 5 798 796 | 5 827 025
Manifest Chain length data
limit || none || 1000
value || average | max || average | max
------------||---------|---------||---------|---------
no-sparse || 429 | 1 397 || 397 | 1 000
sparse || 326 | 1 290 || 313 | 1 000
Full Store Size
limit | none | 1000
------------|-------------|------------
no-sparse | 46 944 775 | 47 166 129
sparse | 46 622 445 | 46 723 774
pypy
----
Manifest Size:
limit | none | 1000
------------|-------------|------------
no-sparse | 52 941 760 | 56 200 970
sparse | 26 348 229 | 27 384 133
Manifest Chain length data
limit || none || 1000
value || average | max || average | max
------------||---------|---------||---------|---------
no-sparse || 769 | 3 889 || 390 | 1 000
sparse || 1 223 | 3 846 || 495 | 1 000
Full Store Size
limit | none | 1000
------------|-------------|------------
no-sparse | 336 050 203 | 339 309 413
sparse | 338 673 985 | 339 709 889
Mozilla
-------
Manifest Size:
limit | none | 1000
------------|----------------|---------------
no-sparse | 215 096 339 | 1 708 853 525
sparse | 188 947 271 | 278 894 170
Manifest Chain length data
limit || none || 1000
value || average | max || average | max
------------||---------|---------||---------|--------
no-sparse || 20 454 | 59 562 || 491 | 1 000
sparse || 23 509 | 69 891 || 489 | 1 000
Full Store Size
limit | none | 1000
------------|----------------|---------------
no-sparse | 2 377 578 715 | 3 876 258 798
sparse | 2 441 677 137 | 2 535 997 381
Netbeans
--------
Manifest Size:
limit | none | 1000
------------|----------------|---------------
no-sparse | 130 088 982 | 741 590 565
sparse | 118 836 887 | 159 161 207
Manifest Chain length data
limit || none || 1000
value || average | max || average | max
------------||---------|---------||---------|---------
no-sparse || 19 321 | 61 397 || 510 | 1 000
sparse || 21 240 | 61 583 || 503 | 1 000
Full Store Size
limit | none | 1000
------------|----------------|---------------
no-sparse | 1 160 013 008 | 1 771 514 591
sparse | 1 164 959 988 | 1 205 284 308
Private repo #1
---------------
Manifest Size:
limit | none | 1000
------------|-----------------|---------------
no-sparse | 33 725 285 081 | 33 724 834 190
sparse | 350 542 420 | 423 470 579
Manifest Chain length data
limit || none || 1000
value || average | max || average | max
------------||---------|---------||---------|---------
no-sparse || 282 | 8 885 || 113 | 1 000
snapshot || 3 655 | 8 951 || 530 | 1 000
Full Store Size
limit | none | 1000
------------|----------------|---------------
no-sparse | 41 544 149 652 | 41 543 698 761
sparse | 8 448 037 300 | 8 520 965 459
Effect on speed:
================
Performances are strongly impacted by the delta chain length. Longer chain
results in slower revision restoration. For this reason, the 1000 chain limit
introduced by sparse-revlog helps repository with previously large chains a
lot. In our corpus, this means `netbeans` and `mozilla-central` who suffered
from unreasonable manifest delta chain length.
Another way sparse revlog helps, is by producing better delta's. For
repositories with many branches, the pathological patterns that resulted in
many sub-optimal deltas are gone. Smaller delta help with operations where
deltas are directly relevant, like bundle.
However, the sparse-revlog logic introduces some extra processing and a more
throughout testing of possible delta candidates. Adding an extra cost in some
cases. This cost is usually counterbalanced by the other performance gain.
However, for smaller repositories not affected by delta chain length issues or
branching related issues, this might make things a bit slower. However, these
are also repository where revlog performance is dwarfed by other costs.
Below are the summary of some timing from the performance test suite running
at `http://perf.octobus.net/` for a handful of key commands and operation.
It is important to keep in mind that most of this command works on the tip
part of the repository. The non-sparse and sparse version produce different
delta chains and the tip revision can end up at an arbitrary point of these
chains. This will impact some performance number listed in this summary.
For the record: here is the delta chain length for the tip revision of
manifest log in the benchmarked repository:
| no-sparse | sparse |
mercurial | 94 | 904 |
pypy | 23 | 673 |
netbeans | 4158 | 258 |
mozilla | 63263 | 781 |
As you can see, the chain length for mercurial and pypy turn out to be
significantly longer. The netbeans and mozilla one get shorter because these
repositories benefit from the maximum chain length.
Timing for `hg commit`:
-----------------------
The time taken by `hg commit` does not varies significantly, no drawback for
using sparse here.
| no-sparse | sparse |
mercurial | 68.1ms | 66.7ms |
pypy | 95.0ms | 94.1ms |
netbeans | 614.0ms | 611.0ms |
mozilla | 1340.0ms | 1.320.0ms |
Check the final section for statistics on a wider array of write.
Timing for bundling 10 000 changesets
-------------------------------------
The repository that benefits from better delta see a good performance boost.
The other ones are not significantly affected.
| no-sparse | sparse |
mercurial | 3.1s | 3.0s |
pypy | 25.1s | 7.5s |
netbeans | 24.2s | 17.0s |
mozilla | 23.7s | 25.0s |
Timing for unbundling 1 000 changesets
--------------------------------------
Mercurial and mozilla are unaffected. The pypy repository benefit well from
the better delta.
However, the netbeans repository takes a visible hit. Digging that difference
reveals that it comes from the sparse-revlog bundle having to deal with a
snapshot that was re-encoded in the bundle. The slow path for adding new a revision
had to be triggered for it, slowing things down. The Sparse versions do not have
such snapshot to handle similar cases in the tested configuration.
| no-sparse | sparse |
mercurial | 519ms | 502ms |
pypy | 1.270ms | 886ms |
netbeans | 1.370ms | 2.250ms |
mozilla | 3.230ms | 3.210ms |
Netbeans benefits from the better deltas in other dimensions too. For
example, the produced bundle is significantly smaller:
* netbeans-no-sparse.hg: 2.3MB
* netbeans-sparse.hg: 1.9MB
Timing to restore the tip most manifest entry:
----------------------------------------------
Nothing surprising here. The timing for mercurial and pypy are within a small
range where they won't affect performance much. In our tested case, they are
slower as they use a longer chain.
Timing for netbeans and mozilla improves a lot. Removing a significant amount
of time.
| no-sparse | sparse |
mercurial | 1.09ms | 3.15ms |
pypy | 4.11ms | 10.70ms |
netbeans | 239.00ms | 112.00ms |
mozilla | 688.00ms | 198.00ms |
Reading 100 revision in descending order:
-----------------------------------------
We see the same kind of effect when reading the last 100 revisions. Large
boost for netbeans and mozilla, as they use much smaller delta chain.
Mercurial and pypy longer chain means slower reads, but nothing gets out of
control.
| no-sparse | sparse |
mercurial | 0.089s | 0.268s |
pypy | 0.259s | 0.698s |
netbeans | 125.000s | 20.600s |
mozilla | 23.000s | 11.400s |
Writing from full text: statistic for the last 30K revisions
------------------------------------------------------------
This benchmark adds revisions to revlog from their full text. This is similar
to the work done during a commit, but for a large amount of revisions so that
we get a more relevant view.
We see better overall performances with sparse-revlog. The very worst case is
usually slower with sparse-revlog, but does not gets out of control. For the
vast majorities of the other writes, sparse-revlog is significantly faster for
larger repositories. This is reflected in the accumulated rewrite time for
netbeans and mozilla.
The notable exception is the pypy repository where things get slower. The
extra processing is not balanced by shorter delta chain. However, this is to
be seen as a blocking issue. First, the overall time spend dealing with revlog
for the repository pypy size is small compared to the other costs, so we get
slower on operations that matter less than for other larger repository.
Second, we still get nice size benefit from using sparse-revlog, smaller repo
size brings other usability and speed benefit (eg: bundle size).
max time | no-sparse | sparse |
mercurial | 0.010143s | 0.045280s |
pypy | 0.034924s | 0.243288s |
netbeans | 0.605371s | 2.130876s |
mozilla | 1.478342s | 3.424541s |
99% time | no-sparse | sparse |
mercurial | 0.003774s | 0.003758s |
pypy | 0.017387s | 0.025310s |
netbeans | 0.576913s | 0.271195s |
mozilla | 1.478342s | 0.449661s |
95% time | no-sparse | sparse |
mercurial | 0.002069s | 0.002120s |
pypy | 0.010141s | 0.014797s |
netbeans | 0.540202s | 0.258644s |
mozilla | 0.654830s | 0.243440s |
full time | no-sparse | sparse |
mercurial | 14.15s | 14.87s |
pypy | 90.50s | 137.12s |
netbeans | 6401.06s | 3411.14s |
mozilla | 3086.89s | 1991.97s |
Differential Revision: https://phab.mercurial-scm.org/D5345
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:22:30 +0100] rev 40917
test: preemptively disable sparse-revlog for some of test-upgrade-repo
Some part of this test assumes sparse-revlog is off. We enforce it explicitly.
Differential Revision: https://phab.mercurial-scm.org/D5344
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:19:48 +0100] rev 40916
test: enable sparse-revlog for test-wireproto-content-redirects.t
We are about to enable sparse-revlog globally. To help with reviewing the tests
change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5343
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:18:58 +0100] rev 40915
test: enable sparse-revlog for test-wireproto-command-capabilities.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5342
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:18:45 +0100] rev 40914
test: enable sparse-revlog for test-wireproto-caching.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5341
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:18:33 +0100] rev 40913
test: enable sparse-revlog for test-treemanifest.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5340
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:18:16 +0100] rev 40912
test: enable sparse-revlog for test-stream-bundle-v2.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5339
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:18:03 +0100] rev 40911
test: enable sparse-revlog for test-ssh.t
We are about to enable sparse-revlog globally. To help with reviewing the tests
change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5338
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:17:05 +0100] rev 40910
test: enable sparse-revlog for test-ssh-proto-unbundle.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5337
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:17:35 +0100] rev 40909
test: enable sparse-revlog for test-ssh-proto.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5336
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:16:12 +0100] rev 40908
test: enable sparse-revlog for test-ssh-bundle1.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5335
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:15:51 +0100] rev 40907
test: enable sparse-revlog for test-sparse-requirement.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5334
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:15:37 +0100] rev 40906
test: enable sparse-revlog for test-revlog-v2.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5333
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:15:21 +0100] rev 40905
test: enable sparse-revlog for test-repo-compengines.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5332
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:14:54 +0100] rev 40904
test: enable sparse-revlog for test-remotefilelog-log.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5331
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:14:22 +0100] rev 40903
test: enable sparse-revlog for test-remotefilelog-clone-tree.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5330
Boris Feld <boris.feld@octobus.net> [Wed, 28 Nov 2018 20:00:57 +0100] rev 40902
test: enable sparse-revlog for test-remotefilelog-clone.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5329
Boris Feld <boris.feld@octobus.net> [Wed, 28 Nov 2018 20:01:08 +0100] rev 40901
test: enable sparse-revlog for test-phases.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5328
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:12:37 +0100] rev 40900
test: enable sparse-revlog for test-narrow-clone.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5327
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:12:15 +0100] rev 40899
test: enable sparse-revlog for test-narrow-clone-stream.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5326
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:12:01 +0100] rev 40898
test: enable sparse-revlog for test-narrow-clone-no-ellipsis.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5325
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:09:19 +0100] rev 40897
test: enable sparse-revlog for test-lfs-serve.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5324
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:09:08 +0100] rev 40896
test: enable sparse-revlog for test-lfs-largefiles.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5323
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:08:56 +0100] rev 40895
test: enable sparse-revlog for test-lfconvert.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5322
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:06:10 +0100] rev 40894
test: enable sparse-revlog for test-init.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5321
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:08:42 +0100] rev 40893
test: enable sparse-revlog for test-http-protocol.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5320
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:04:59 +0100] rev 40892
test: enable sparse-revlog for test-hgweb-commands.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5319
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:04:04 +0100] rev 40891
test: enable sparse-revlog for test-debugcommands.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5318
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:02:18 +0100] rev 40890
test: enable sparse-revlog for test-clone-uncompressed.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5317
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:03:04 +0100] rev 40889
test: enable sparse-revlog for test-clonebundles.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5316
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:43:34 +0100] rev 40888
test: enable sparse-revlog for test-bundle.t
We are about to enable sparse-revlog globally. To help with reviewing the
tests change, we isolate them in individual changesets.
Differential Revision: https://phab.mercurial-scm.org/D5315
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:13:01 +0100] rev 40887
test: make sure sparse-revlog does not interfer with test-parseindex.t
That test carefully craft revlog to reproduce issues. We do not want new revlog
behavior to interfere with that.
Differential Revision: https://phab.mercurial-scm.org/D5314
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:41:23 +0100] rev 40886
test: explicitly disable sparse-revlog in test-http-bad-server.t
The `test-http-bad-server.t` test is very fragile with hard-coded number all
around. Adding any new capability have massive consequences on it that are
long and tiresome to handle. Since the test check more generic protocol level
behavior, it does not need to follow all new capabilities. Disabling the
capabilities is a much simpler way to avoid the issue.
We make sure `sparse-revlog` will not impact this test once turned on by
default.
Differential Revision: https://phab.mercurial-scm.org/D5313
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:40:33 +0100] rev 40885
test: explicitly disable sparse-revlog in test-generaldelta.t
That test is about testing generaldelta without further improvement. We ensure
it will stay that way even if sparse-revlog is turned on by default. The
sparse-revlog format is tested on his own in a different test file.
Differential Revision: https://phab.mercurial-scm.org/D5312
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 01:42:03 +0100] rev 40884
sparse-revlog: disable sparse-revlog if config disable general-delta
Sparse-revlog requires general-delta in order to work. If general-delta is
explicitly disabled through configuration, we should honor that and also
disabled sparse-revlog.
This change will be more relevant when sparse-revlog is enabled by default.
Differential Revision: https://phab.mercurial-scm.org/D5311
Boris Feld <boris.feld@octobus.net> [Mon, 12 Nov 2018 00:48:11 +0100] rev 40883
test: fix config typo in test-upgrade-repo.t
Differential Revision: https://phab.mercurial-scm.org/D5310
Pulkit Goyal <pulkit@yandex-team.ru> [Mon, 10 Dec 2018 15:45:46 +0300] rev 40882
tests: use $RUNTESTDIR instead of $TESTDIR in narrow-library.sh
This is done so that third party extensions can use narrow-library.sh in tests.
Differential Revision: https://phab.mercurial-scm.org/D5400
Boris Feld <boris.feld@octobus.net> [Mon, 10 Dec 2018 10:21:08 +0100] rev 40881
tests: update network related errors for Debian 9
We have a CI job that runs the Mercurial tests in parallel. Some of the
network related failures seems to be different on the environment. Oddly,
those failures happens only when running the tests in parallel, not when
running the test file only.
I have no idea how to get the windows formatted message for the error, if
someone could give me an hand, I will update this changeset with the value.
Differential Revision: https://phab.mercurial-scm.org/D5401
Yuya Nishihara <yuya@tcha.org> [Sun, 04 Nov 2018 16:57:05 +0900] rev 40880
util: implement pop() on lrucachedict
This moves __delitem__() to pop() as the requirement is pretty much the same,
and reimplement __delitem__() by using pop().
Yuya Nishihara <yuya@tcha.org> [Wed, 31 Oct 2018 22:29:05 +0900] rev 40879
util: add method to peek item in lrucachedict
I want a function that doesn't unnecessarily update the internal state of
the cache dict after fork().
Yuya Nishihara <yuya@tcha.org> [Wed, 31 Oct 2018 22:05:45 +0900] rev 40878
commandserver: loop over selector events
An IPC socket will be waited by the same selector.
Yuya Nishihara <yuya@tcha.org> [Wed, 31 Oct 2018 22:03:07 +0900] rev 40877
commandserver: remove redundant "if True" block
Yuya Nishihara <yuya@tcha.org> [Wed, 31 Oct 2018 22:02:38 +0900] rev 40876
commandserver: extract handler of new socket connection
This prepares for adding an IPC socket.
Yuya Nishihara <yuya@tcha.org> [Wed, 31 Oct 2018 21:57:11 +0900] rev 40875
commandserver: pass around option to hook repo instance creation
This is necessary to wrap a repo instance so the master process will be
notified on repo.close().
Matt Harbison <matt_harbison@yahoo.com> [Sun, 09 Dec 2018 19:40:54 -0500] rev 40874
py3: stop subscripting socket.error
In 3.3 and later, this is now an alias for OSError. I hacked up the server code
enough that I was able to trigger the exception handler in server.py from
test-http-bundle1.t. Other instances of this either subscript through the
`args` member, or reference the errno or strerror attributes.
Note that on Windows, the errno value seems to reflect the Winsock error, so the
various tests for EPIPE seem like they would always fail. But that seems to be
the case in py2 as well.
Boris Feld <boris.feld@octobus.net> [Sun, 09 Dec 2018 16:49:55 +0100] rev 40873
test: update test-logtoprocess.t to not requires less
The test previously assumed that a working pager was present in the test
environment. Update it to use the fakepager instead.
Differential Revision: https://phab.mercurial-scm.org/D5399
Matt Harbison <matt_harbison@yahoo.com> [Sun, 09 Dec 2018 21:23:34 -0500] rev 40872
py3: quote several instances of $PYTHON for Windows
Python3 lives in Program Files by default. The last remaining unquoted instance
is in test-hghave.t. I can't figure out how to quote that, as it either
complains:
'c:\\Program' is not recognized as an internal or external command,
operable program or batch file.
or
$TESTTMP.sh: line 22: "C:/Program Files/Python37/python.exe": $ENOENT$
Matt Harbison <matt_harbison@yahoo.com> [Sun, 09 Dec 2018 18:35:35 -0500] rev 40871
py3: adapt test-largefiles-wireproto.t to python3
Matt Harbison <matt_harbison@yahoo.com> [Sun, 09 Dec 2018 13:53:08 -0500] rev 40870
py3: byteify test-push-race.t
Matt Harbison <matt_harbison@yahoo.com> [Sun, 09 Dec 2018 13:33:36 -0500] rev 40869
py3: convert filename to bytes in test-hardlinks.t
Windows was complaining about passing str to CreateFileA() in win32.py.
Martin von Zweigbergk <martinvonz@google.com> [Sat, 08 Dec 2018 23:41:54 -0800] rev 40868
narrow: keep bookmarks temporarily stripped for as long as commits are
The narrow extension also has support for shallowness and for
inserting older commits on pull. It works by temporarily stripping
newer commits, adding the older commits, then re-applying the stripped
bundle. The regular Mercurial server uses that when you widen,
although it shouldn't be necessary there. Our Google-internal server
does it when the user requests an older commit.
Our Google-internal tests fail since
7caf632e30c3 (filecache:
unimplement __set__() and __delete__() (API), 2018-10-20). I haven't
quite understood the problem, but it's related to the way we
temporarily hide bookmarks while the commits they point to are
stripped. When a transaction is started, Mercurial tries to read
various things from the repo for the transaction summary. That leads
to computation of hidden commits, which leads to an attempt to find
commits pinned by bookmarks. This is the reason we temporarily hide
the bookmarks. I think the aforementioned commit makes the restored
bookmarks visible earlier than before (which seems like an
improvement), so we can no longer incorrectly rely on the
repo._bookmarks field being cached too long (IIUC).
This patch makes it so we restore the temporarily hidden bookmarks
only after the temporary bundle has been re-applied. It also adapts
the code to update the repo.__bookmarks field using the pattern
described in the aforementioned commit instead of writing directly to
the fiels.
I have spent many hours trying to understand what was going on here,
but I still don't know if this can also happen without our custom
server. So this patch unfortunately does not add any tests; I have
only been able to test the fix using our Google-internal tests.
Differential Revision: https://phab.mercurial-scm.org/D5398
Martin von Zweigbergk <martinvonz@google.com> [Sat, 08 Dec 2018 23:04:11 -0800] rev 40867
narrow: drop obsolete support for old Mercurial
Not needed since narrow is shipped with core.
Differential Revision: https://phab.mercurial-scm.org/D5397
Martin von Zweigbergk <martinvonz@google.com> [Thu, 06 Dec 2018 10:15:41 -0800] rev 40866
tests: test that narrow preserves bookmarks on widen
When widening inserts older commits in the changelog, we have to
preserve bookmarks so they are not removed by the call to
repair.strip() we temporarily do. We didn't have any tests for that
before.
Differential Revision: https://phab.mercurial-scm.org/D5396
Martin von Zweigbergk <martinvonz@google.com> [Fri, 07 Dec 2018 14:23:17 -0800] rev 40865
rebase: clarify that commits that become empty are skipped
Our message just said that it created no changes, but we didn't
explicitly say that that meant that the the commit was not rebased. It
also wasn't clear why it created no changes, so this patch also
clarifies that that was because the changes were already in the
destination.
Differential Revision: https://phab.mercurial-scm.org/D5395
Martin von Zweigbergk <martinvonz@google.com> [Fri, 07 Dec 2018 14:17:09 -0800] rev 40864
rebase: format commit in usual way when explaining that it became empty
We use the _ctxdesc() for other similar messages, so it seems we
should use it here too.
Differential Revision: https://phab.mercurial-scm.org/D5394
Yuya Nishihara <yuya@tcha.org> [Mon, 29 Oct 2018 21:50:53 +0900] rev 40863
rust: propagate error of index_get_parents() properly
Before, rustla_contains() would return 0 on error, and the exception would
be cleared or noticed somewhere else. We need to propagate the error from
AncestorsIterator up to the FFI surface.
Yuya Nishihara <yuya@tcha.org> [Sun, 02 Dec 2018 22:20:38 +0900] rev 40862
rust: look up HgRevlogIndex_GetParents() from symbol table
And removes the unused index_get_parents_checked() function.
I expect the Index struct will be turned into a pyobject type, though I
haven't written any PoC-level patches yet.
Yuya Nishihara <yuya@tcha.org> [Sun, 02 Dec 2018 22:10:37 +0900] rev 40861
revlog: add public CPython function to get parent revisions
Since this is a public function, it validates the input revision, and supports
nullrev. index_get_parents_checked() will be replaced by this function.