mercurial-devel merge requestshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests2023-05-25T00:59:23Zhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/568zstd: hack include order to ensure that our zstd.h is found2023-05-25T00:59:23ZJörg Sonnenbergerzstd: hack include order to ensure that our zstd.h is foundThis was on phab before (https://phab.mercurial-scm.org/D12207). Since even with Python 3.10, the situation is still as annoying, I'd like to go ahead with it.This was on phab before (https://phab.mercurial-scm.org/D12207). Since even with Python 3.10, the situation is still as annoying, I'd like to go ahead with it.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/479write race fix2023-03-02T13:35:12ZPierre-Yves Davidwrite race fix<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/482write branch in the transaction when applicable2023-03-02T21:42:31ZPierre-Yves Davidwrite branch in the transaction when applicable<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/603wrapfunction pass str to warpfunction2023-07-12T14:55:18ZPierre-Yves Davidwrapfunction pass str to warpfunction<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/120workflow: add a default template for Merge Request2022-05-25T11:28:45ZPierre-Yves Davidworkflow: add a default template for Merge RequestIntroduce a first basic template to try the feature.Introduce a first basic template to try the feature.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/125worker.py improvements2022-05-30T07:53:04ZManuel Jacobworker.py improvementshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/388worker: avoid reading 1 byte at a time from the OS pipe2023-01-13T22:12:13ZArseniy Alekseyevworker: avoid reading 1 byte at a time from the OS pipe<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/146worker: avoid potential partial write of pickled data2022-06-07T11:06:35ZManuel Jacobworker: avoid potential partial write of pickled datahttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/115worker: adapt _blockingreader to work around a python3.8.[0-1] bug (issue6444)2022-05-25T13:10:00ZMatt Harbisonworker: adapt _blockingreader to work around a python3.8.[0-1] bug (issue6444)Python 3.8.0 is the latest I can load on Ubuntu 18.04, and I regularly hit the
TypeError because this function is missing. While it can be avoided by
disabling worker usage via config option, that's a bit obscure.
I'm limiting the func...Python 3.8.0 is the latest I can load on Ubuntu 18.04, and I regularly hit the
TypeError because this function is missing. While it can be avoided by
disabling worker usage via config option, that's a bit obscure.
I'm limiting the function definition to the narrow range of affected pythons
because there were other bugs in this area that were worked around, that I don't
fully understand. See the bug report for discussions on why the narrow range,
and related commits working around other bugs.
Differential Revision: https://phab.mercurial-scm.org/D12627https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/29WIP: fixing filelog recording with copy overwrite2020-05-05T00:00:31ZPierre-Yves DavidWIP: fixing filelog recording with copy overwriteThese changesets introduce test case for situation where a new file overwrite an older one during a merge.
The current implementation (in the first commit) is pretty awful and we would like something cleaner.
The situation is properly ...These changesets introduce test case for situation where a new file overwrite an older one during a merge.
The current implementation (in the first commit) is pretty awful and we would like something cleaner.
The situation is properly detected at **merge time**, so it is mostly a matters of carrying this information to **commit time**. To do so, adding a new optional entry in the merge state (at merge time) and reading later (at commit time). Seems like a good option.Pulkit GoyalPulkit Goyalhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/162Windows py3 fixes2022-06-14T09:13:56ZMatt HarbisonWindows py3 fixeshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/253windows: gracefully handle when the username cannot be determined2022-10-17T08:31:42ZMatt Harbisonwindows: gracefully handle when the username cannot be determinedMatt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/632win32mbcs: unbyteify some strings for py3 support2023-07-05T08:38:30ZMatt Harbisonwin32mbcs: unbyteify some strings for py3 supportI never got any feedback on this from the original reporter, and have no idea how to test it myself (this wasn't a simple case of crashing just because the extension is loaded). While this is being checked by pytype, it wasn't finding t...I never got any feedback on this from the original reporter, and have no idea how to test it myself (this wasn't a simple case of crashing just because the extension is loaded). While this is being checked by pytype, it wasn't finding the errors before. But I guess this is better than it was before.
<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/660various test stabilization2023-09-06T09:23:51ZPierre-Yves Davidvarious test stabilization<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/178Various improvement to bundle and new related perf command2022-08-16T11:57:36ZPierre-Yves DavidVarious improvement to bundle and new related perf commandPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/720various fixes to perf-tags2023-12-05T10:16:43ZPierre-Yves Davidvarious fixes to perf-tags<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/505various fixes from Mads Killerich2023-03-20T22:53:54ZPierre-Yves Davidvarious fixes from Mads Killerich<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/190Various debugdiscovery fix (and improvement)2022-07-27T18:01:23ZPierre-Yves DavidVarious debugdiscovery fix (and improvement)The second option should be `--remote-…` as we just talked about `--local-…`
already.The second option should be `--remote-…` as we just talked about `--local-…`
already.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/612Various cleanup and finalization around inline clone bundle2023-06-20T14:18:04ZPierre-Yves DavidVarious cleanup and finalization around inline clone bundleLet us make sure we are in a good spot before releasing wireprotocol changes.
<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your cha...Let us make sure we are in a good spot before releasing wireprotocol changes.
<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/682usage: add a `usage.repository-role` config2024-01-02T23:34:08ZPierre-Yves Davidusage: add a `usage.repository-role` config<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant informatio...<!--
Welcome to the Mercurial Merge Request creation process:
* Set a simple title for your MR,
* All important information should be contained in your changesets' content or description,
* You can add some workflow-relevant information here (eg: when this depends on another MR),
* If your changes are not ready for review yet, click `Start the title with Draft:` under the title.
More details here:
* https://www.mercurial-scm.org/wiki/ContributingChanges
* https://www.mercurial-scm.org/wiki/Heptapod
-->Pierre-Yves DavidPierre-Yves David