Fri, 06 Aug 2021 16:27:17 -0400 debugrebuildfncache: add a cheaper option to rebuild the fncache
Valentin Gatien-Baron <vgatien-baron@janestreet.com> [Fri, 06 Aug 2021 16:27:17 -0400] rev 47875
debugrebuildfncache: add a cheaper option to rebuild the fncache On my repository, debugrebuildfncache takes 5-10min with the lock. With the flag added in this commit, it takes 10s. The tradeoff is that it only recovers from certain kinds of corruptions. It is intended to to recover faster from fncaches broken by a revlog split during a transaction that ends up being rolled back. Differential Revision: https://phab.mercurial-scm.org/D11265
Fri, 06 Aug 2021 16:17:17 -0400 test: reduce noise, so the important bits stand out
Valentin Gatien-Baron <vgatien-baron@janestreet.com> [Fri, 06 Aug 2021 16:17:17 -0400] rev 47874
test: reduce noise, so the important bits stand out Differential Revision: https://phab.mercurial-scm.org/D11264
Tue, 24 Aug 2021 17:27:16 +0200 wireprotov1peer: update all rpcs to use the new batchable scheme
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Tue, 24 Aug 2021 17:27:16 +0200] rev 47873
wireprotov1peer: update all rpcs to use the new batchable scheme If desired, we could keep the future class and the function that upgrades an old style rpc instead of a new style, for extensions. Differential Revision: https://phab.mercurial-scm.org/D11212
Tue, 24 Aug 2021 17:27:16 +0200 wireprotov1peer: simplify the way batchable rpcs are defined
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Tue, 24 Aug 2021 17:27:16 +0200] rev 47872
wireprotov1peer: simplify the way batchable rpcs are defined The scheme with futures/generator is confusing due to the way communication is done by side effects, especially with two different "future" objects. Just returning a request and a function to read the response is easier to understand. There are tests failures with the largefiles extension due to it aliasing one rpc to another one, which gets fixed in the next commit. Differential Revision: https://phab.mercurial-scm.org/D11211
Wed, 25 Aug 2021 11:32:49 +0200 clone: properly create target directories during local clone (issue6581) stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Aug 2021 11:32:49 +0200] rev 47871
clone: properly create target directories during local clone (issue6581) The store encoding was mudding the water. This lead to local clone crashing for file with long filename as their destination directory needed to be encoded. Differential Revision: https://phab.mercurial-scm.org/D11340
Wed, 25 Aug 2021 10:00:55 +0200 clone: add a file demonstrating issue6581 in test-clone-stream.t stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Aug 2021 10:00:55 +0200] rev 47870
clone: add a file demonstrating issue6581 in test-clone-stream.t This is quite noisy so we adds it in its own changeset. Fixes for the issue are coming in the next patch. Differential Revision: https://phab.mercurial-scm.org/D11339
Wed, 25 Aug 2021 10:42:09 +0200 clone: verify the local clone in test-clone-stream.t stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Aug 2021 10:42:09 +0200] rev 47869
clone: verify the local clone in test-clone-stream.t This will help detecting corruption. Differential Revision: https://phab.mercurial-scm.org/D11338
Wed, 25 Aug 2021 10:08:37 +0200 clone: automatically glob stream clone output in test stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Aug 2021 10:08:37 +0200] rev 47868
clone: automatically glob stream clone output in test Touching `test-clone-stream.t` is very painful otherwise. Differential Revision: https://phab.mercurial-scm.org/D11337
Wed, 25 Aug 2021 09:32:21 +0200 clone: fix a comment in test-clone-stream.t stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Aug 2021 09:32:21 +0200] rev 47867
clone: fix a comment in test-clone-stream.t Differential Revision: https://phab.mercurial-scm.org/D11336
Sun, 22 Aug 2021 17:59:21 -0400 windows: degrade to py2 behavior when reading a non-symlink as a symlink stable
Matt Harbison <matt_harbison@yahoo.com> [Sun, 22 Aug 2021 17:59:21 -0400] rev 47866
windows: degrade to py2 behavior when reading a non-symlink as a symlink While waiting for the push to hg-committed in WSL to complete, I ran a `phabimport` from Windows and got this traceback: $ hg phabimport 11313 ** Unknown exception encountered with possibly-broken third-party extension "mercurial_keyring" (version N/A) ** which supports versions unknown of Mercurial. ** Please disable "mercurial_keyring" and try your action again. ** If that fixes the bug please report it to https://foss.heptapod.net/mercurial/mercurial_keyring/issues ** Python 3.9.5 (default, May 6 2021, 17:29:31) [MSC v.1928 64 bit (AMD64)] ** Mercurial Distributed SCM (version 5.9rc1+hg32.0e2f5733563d) ** Extensions loaded: absorb, blackbox, evolve 10.3.3, extdiff, fastannotate, fix, mercurial_keyring, mq, phabblocker 20210126, phabricator, rebase, show, strip, topic 0.22.3 Traceback (most recent call last): File "mercurial.lock", line 279, in _trylock File "mercurial.vfs", line 202, in makelock File "mercurial.util", line 2147, in makelock FileExistsError: [WinError 183] Cannot create a file when that file already exists: b'hp-omen:78348' -> b'C:\\Users\\Matt\\hg/.hg/store/lock' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "<string>", line 24, in <module> File "mercurial.dispatch", line 144, in run File "mercurial.dispatch", line 250, in dispatch File "mercurial.dispatch", line 294, in _rundispatch File "mercurial.dispatch", line 470, in _runcatch File "mercurial.dispatch", line 480, in _callcatch File "mercurial.scmutil", line 153, in callcatch File "mercurial.dispatch", line 460, in _runcatchfunc File "mercurial.dispatch", line 1273, in _dispatch File "mercurial.dispatch", line 918, in runcommand File "mercurial.dispatch", line 1285, in _runcommand File "mercurial.dispatch", line 1271, in <lambda> File "mercurial.util", line 1886, in check File "mercurial.util", line 1886, in check File "hgext.mq", line 4239, in mqcommand File "mercurial.util", line 1886, in check File "mercurial.util", line 1886, in check File "hgext.phabricator", line 314, in inner File "hgext.phabricator", line 2222, in phabimport File "hgext.phabricator", line 2123, in readpatch File "hgext.phabricator", line 2199, in _write File "mercurial.localrepo", line 2956, in lock File "mercurial.localrepo", line 2918, in _lock File "mercurial.lock", line 152, in trylock File "mercurial.lock", line 283, in _trylock File "mercurial.lock", line 314, in _readlock File "mercurial.vfs", line 221, in readlock File "mercurial.util", line 2163, in readlock File "mercurial.windows", line 619, in readlink ValueError: not a symbolic link Both exceptions look accurate (the file exists, and the Windows side can't read WSL side symlinks). I didn't try to reproduce this entirely within the Windows side, but we can do better than a cryptic stacktrace. With this change, the same scenario results in this abort: abort: C:\Users\Matt\hg/.hg/store/lock: The file cannot be accessed by the system When both the `push` and `phabimport` are done on the Windows side, it prints a message about waiting for the lock, and successfully applies the patch after the push completes. I'm not sure if there's enough info to be able to convert the abort into the wait scenario. As it stands now, we don't support symlinks on Windows, which requires either a UAC Administrator level process or an opt-in in developer mode, and there are several places where the new symlink on Windows support in py3 was explicitly disabled in order to get tests to pass quicker. Differential Revision: https://phab.mercurial-scm.org/D11333
Wed, 18 Aug 2021 21:59:55 -0400 pyoxidizer: add user-site to `sys.path` on Windows stable
Matt Harbison <matt_harbison@yahoo.com> [Wed, 18 Aug 2021 21:59:55 -0400] rev 47865
pyoxidizer: add user-site to `sys.path` on Windows This is a port of 53221078e0de to Windows to allow pip-installed extensions to be loaded without specifying a path. It's a major headache to have an hg.exe on `PATH` that needs to have the path to the extensions specified, because WSL doesn't see the same path. This is only for Windows for now, to match the currently shipping py2 behavior. There is a better solution with using the `site` package, but this needs support in PyOxidizer[1]. [1] https://github.com/indygreg/PyOxidizer/issues/430 Differential Revision: https://phab.mercurial-scm.org/D11308
Wed, 18 Aug 2021 14:58:42 -0400 zeroconf: fix an issue concatenating bytes and str stable
Matt Harbison <matt_harbison@yahoo.com> [Wed, 18 Aug 2021 14:58:42 -0400] rev 47864
zeroconf: fix an issue concatenating bytes and str `bytes(length)` doesn't do what we want, so use `str`. There appear to be a ton more issues in this extension, including: - globals()[b'_GLOBAL_DONE'] using bytes as the key - `__author__` and similar using bytes - `BadDomainName` is feeding bytes to the Exception constructor - DNSRecord.toString() has the wrong signature (should be str, not bytes) Differential Revision: https://phab.mercurial-scm.org/D11303
Tue, 24 Aug 2021 23:42:35 +0200 revlog: fix more type confusion in index_replace_sidedata_info (issue6580) stable
Julien Cristau <jcristau@debian.org> [Tue, 24 Aug 2021 23:42:35 +0200] rev 47863
revlog: fix more type confusion in index_replace_sidedata_info (issue6580) We were telling python that "rev" was a Py_ssize_t (via the "n" format), but it was actually an int. Differential Revision: https://phab.mercurial-scm.org/D11335
Tue, 24 Aug 2021 12:44:34 +0200 revlog: fix type confusion with sidedata_comp_len (issue6580) stable
Julien Cristau <jcristau@mozilla.com> [Tue, 24 Aug 2021 12:44:34 +0200] rev 47862
revlog: fix type confusion with sidedata_comp_len (issue6580) The format string uses "i" (int) for sidedata_comp_len, so we shouldn't be passing a pointer to Py_ssize_t to PyArg_ParseTuple. On 64-bit big-endian, this would result in python only writing to the upper 32 bits, and things go downhill from there. Differential Revision: https://phab.mercurial-scm.org/D11334
Fri, 20 Aug 2021 11:23:41 +0200 dirstate: directly call the dirstatemap in `set_untracked`
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 11:23:41 +0200] rev 47861
dirstate: directly call the dirstatemap in `set_untracked` This function is only called in two places: the deprecated "remove" method and in the new `set_untracked` method. So we simply inline the appropriate content in `set_untracked`, paving the way to dropping the deprecated code and its associated function. Differential Revision: https://phab.mercurial-scm.org/D11313
Thu, 19 Aug 2021 17:42:55 +0200 resources: narrow the try:except clause to minimum
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Aug 2021 17:42:55 +0200] rev 47860
resources: narrow the try:except clause to minimum Otherwise this mind hides other import or attribute errors. Differential Revision: https://phab.mercurial-scm.org/D11312
Sun, 22 Aug 2021 16:32:06 -0400 merge with stable
Matt Harbison <matt_harbison@yahoo.com> [Sun, 22 Aug 2021 16:32:06 -0400] rev 47859
merge with stable
Thu, 19 Aug 2021 17:47:27 +0200 resources: stop important a non existent FileNotFoundError stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Aug 2021 17:47:27 +0200] rev 47858
resources: stop important a non existent FileNotFoundError The error was hidden by the wide try/except Differential Revision: https://phab.mercurial-scm.org/D11311
Thu, 19 Aug 2021 17:46:46 +0200 template: FileNotFoundError is actually a built in exception stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Aug 2021 17:46:46 +0200] rev 47857
template: FileNotFoundError is actually a built in exception However it is python3 only. Differential Revision: https://phab.mercurial-scm.org/D11310
Thu, 19 Aug 2021 18:04:14 +0200 check-code: drop the camelcase checks stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Aug 2021 18:04:14 +0200] rev 47856
check-code: drop the camelcase checks Fro about 2 years we have been using CamelCase is class names. That rules gets in the way of assigning class or exception in compatibility layers. I think it is safe to drop it now that we started using CamelCase for some case. My motivation for this is the need to assign `FileNotFoundError` in `pycompat`. Differential Revision: https://phab.mercurial-scm.org/D11309
Fri, 20 Aug 2021 00:23:49 +0530 Added signature for changeset 53221078e0de stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 20 Aug 2021 00:23:49 +0530] rev 47855
Added signature for changeset 53221078e0de
Fri, 20 Aug 2021 00:23:40 +0530 Added tag 5.9 for changeset 53221078e0de stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 20 Aug 2021 00:23:40 +0530] rev 47854
Added tag 5.9 for changeset 53221078e0de
Mon, 16 Aug 2021 18:39:58 +0200 pyoxidizer: always run the associated CI jobs stable 5.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 16 Aug 2021 18:39:58 +0200] rev 47853
pyoxidizer: always run the associated CI jobs Now that all tests are passing, we can enable this by default. Differential Revision: https://phab.mercurial-scm.org/D11306
Wed, 18 Aug 2021 21:28:36 +0200 pyoxidizer: skip for ZeroConf related test for now stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 21:28:36 +0200] rev 47852
pyoxidizer: skip for ZeroConf related test for now These test are failing for obscure reason. They are fairly minor and Since they are the only thing between us and enabling pyoxidizer testing in the CI by default, we just shallow the bad output for now. Differential Revision: https://phab.mercurial-scm.org/D11305
Wed, 18 Aug 2021 21:05:46 +0200 pyoxidizer: disable the test for disabled & broken extensions help stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 21:05:46 +0200] rev 47851
pyoxidizer: disable the test for disabled & broken extensions help The test is a bit fragile and the feature is significantly broken for 3rd party extension already. So we disable that section with a comment about why and what is needed. Differential Revision: https://phab.mercurial-scm.org/D11304
Wed, 18 Aug 2021 21:37:55 +0200 pyoxidizer: re-install PYTHONPATH behavior stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 21:37:55 +0200] rev 47850
pyoxidizer: re-install PYTHONPATH behavior Hooks and extensions can rely on PYTHONPATH value. Yet the pyoxidized binary ignore the variable. So we manually reinstall the behavior to fix various tests and restore the expected behavior. This positively affects: - test-extension.t - test-hook.t Differential Revision: https://phab.mercurial-scm.org/D11302
Wed, 18 Aug 2021 16:48:32 +0200 windows: add pytest-vcr to the dependencies stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 16:48:32 +0200] rev 47849
windows: add pytest-vcr to the dependencies This will lead to pyoxidizer including it in its binary. This fix test-phabricator.t Differential Revision: https://phab.mercurial-scm.org/D11301
Wed, 18 Aug 2021 16:02:46 +0200 pyoxidizer: wrap the pyoxidizer script on multiple line stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 16:02:46 +0200] rev 47848
pyoxidizer: wrap the pyoxidizer script on multiple line This is clearer and will help with future edition of the script. Differential Revision: https://phab.mercurial-scm.org/D11300
Wed, 18 Aug 2021 15:05:25 +0200 pyoxidized: silence the fuzzywuzzy warning about python-Levenshtein stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 15:05:25 +0200] rev 47847
pyoxidized: silence the fuzzywuzzy warning about python-Levenshtein I don't think we need the fast implementation for the test so lets ignore it for now. Differential Revision: https://phab.mercurial-scm.org/D11299
Wed, 18 Aug 2021 13:16:04 +0200 pyoxidized: install fuzzywuzzy too stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Aug 2021 13:16:04 +0200] rev 47846
pyoxidized: install fuzzywuzzy too This is necessary for some of the release note tooling. Differential Revision: https://phab.mercurial-scm.org/D11298
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 tip