mercurial-devel merge requestshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests2022-05-17T10:11:59Zhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/104try to fix the CI2022-05-17T10:11:59ZPierre-Yves Davidtry to fix the CIPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/113tests: make sure .js files stay in ASCII encoding (issue6559)2022-05-27T10:57:08ZAnton Shestakovtests: make sure .js files stay in ASCII encoding (issue6559)https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/127Draft: worker: fix handling of EINTR2022-05-28T19:42:36ZManuel JacobDraft: worker: fix handling of EINTRhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/129Enforce narrowacl in narrow_widen2022-05-26T16:44:30ZidlsoftEnforce narrowacl in narrow_widenDifferential Revision: https://phab.mercurial-scm.org/D12600Differential Revision: https://phab.mercurial-scm.org/D12600https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/131Enforce narrowacl in narrow_widen2022-05-26T22:33:34ZidlsoftEnforce narrowacl in narrow_widenDifferential Revision: https://phab.mercurial-scm.org/D12600Differential Revision: https://phab.mercurial-scm.org/D12600https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/132Enforce narrowacl in narrow_widen2022-05-26T23:14:09ZidlsoftEnforce narrowacl in narrow_widenDifferential Revision: https://phab.mercurial-scm.org/D12600Differential Revision: https://phab.mercurial-scm.org/D12600https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/151Python 3 cleanups2022-06-08T15:15:09ZManuel JacobPython 3 cleanupsIt’s not clear to me how to best submit this series. For now, I submit the series as one merge request. Feel free to merge parts of it.
I sent a mail to the mailing list, but it doesn’t seem to work currently. Here is a copy of it:
> I...It’s not clear to me how to best submit this series. For now, I submit the series as one merge request. Feel free to merge parts of it.
I sent a mail to the mailing list, but it doesn’t seem to work currently. Here is a copy of it:
> I have a branch with Python 3 cleanups (https://foss.heptapod.net/mercurial/mercurial-devel/-/compare/default...py3-cleanups). It consists of more than 30 changesets already and will grow larger.
>
> Phabricator has a strong focus on single patches. There, I would submit each patch shortly after creating them. Each can be reviewed and approved individually.
>
> On Heptapod, the focus is more on whole merge request. The Wiki page says that review should be done on single changesets, but it seems like only the whole merge request can be approved and merged (in the UI).
>
> If I create a single merge request when the series is finished (which is whenever I don’t feel to continue), it will be very large and hard to review in one pass. Also, it would mean that I would get feedback on the first changesets later, increasing the chance of getting merge conflicts when changing later changesets (in this case, it hopefully wouldn’t be an issue, because the changes are not very complex).
>
> If I create a single merge request and continue to add changesets to it, feedback on the first changesets will possibly be earlier, but CI can temporarily break for newer changesets while I keep working on it.
>
> If I create a merge request for each changeset, it will be many and each merge request will contain the unmerged ancestors. Also, I think it would require that each changeset is in its own topic, which complicates matters when working with them locally.
>
> I could split them in smaller batches, but it’s not clear how large they should be, and it would combine disadvantages of the two other approaches (although less pronounced).
>
> Thoughts?https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/169convert: get test-convert-darcs.t passing under py32022-06-21T18:28:14ZIan Moodyconvert: get test-convert-darcs.t passing under py3With these changes it now passes locally for me.
The globals check and associated check in the test could probably go too (unless a distro is likely to rip out the ElementTree module?), but I figured that could be done later if need be....With these changes it now passes locally for me.
The globals check and associated check in the test could probably go too (unless a distro is likely to rip out the ElementTree module?), but I figured that could be done later if need be.
This won't make a difference in CI though, since darcs is currently missing from the images.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/193Draft: rhg: support tweakdefaults in rhg status2022-08-24T16:57:54ZArseniy AlekseyevDraft: rhg: support tweakdefaults in rhg statusArseniy AlekseyevArseniy Alekseyevhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/212Draft: commands: add whereami command2023-03-29T19:41:42ZArun KulshreshthaDraft: commands: add whereami commandThis commit adds a new `hg whereami` command that prints the hashes of the
working directory parents. This is similar to the `hg identify` command (or
`hg log -r . -T '{node}'`), except unlike `hg identify`, this command does not
compute...This commit adds a new `hg whereami` command that prints the hashes of the
working directory parents. This is similar to the `hg identify` command (or
`hg log -r . -T '{node}'`), except unlike `hg identify`, this command does not
compute the status or any other information. The goal of this command is to
provide the hash of the current commit with minimal latency, which in turns
allows this information to be used in latency-sensitive contexts (e.g., when
rendering the user's shell prompt). This is similar to using the equivalent git
command (`git rev-parse HEAD`), which has extremely low latency.
The command name and behavior were inspired by the [equivalent command](https://github.com/facebookexperimental/eden/blob/main/eden/scm/lib/hgcommands/src/commands/whereami.rs) from Facebook's
EdenSCM CLI.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/214Draft: rhg: support tweakdefaults in rhg status (try 2)2022-10-13T12:34:31ZArseniy AlekseyevDraft: rhg: support tweakdefaults in rhg status (try 2)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...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/Heptapodhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/230phase: Backed out changeset 74fb1842f8b92022-09-13T21:03:51ZJason R. Coombsphase: Backed out changeset 74fb1842f8b9`format.internal-phase` and the `internal-phase` requirement are already in use to enable internal phase functionality in production environments. Renaming those breaks backward compatibility. Restore those names.
Ref !204.`format.internal-phase` and the `internal-phase` requirement are already in use to enable internal phase functionality in production environments. Renaming those breaks backward compatibility. Restore those names.
Ref !204.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/245Draft: rhg: demonstrate a bug where repeated [hg status] is needed to cache e...2022-10-24T16:01:17ZArseniy AlekseyevDraft: rhg: demonstrate a bug where repeated [hg status] is needed to cache everythingWelcome 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...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/HeptapodArseniy AlekseyevArseniy Alekseyevhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/254Draft: perf-unbundle: do a quick and dirty fix to make it run on more comit2022-11-04T03:52:08ZPierre-Yves DavidDraft: perf-unbundle: do a quick and dirty fix to make it run on more comitWithout this change, the perf commands fails within the
f67741e8264b::18415fc918a1 range (boundary excluded).
Check inline comment for details.Without this change, the perf commands fails within the
f67741e8264b::18415fc918a1 range (boundary excluded).
Check inline comment for details.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/262Draft: shelve: handle empty parents and nodestoremove in shelvedstate (issue6...2022-11-05T23:49:47ZJason R. CoombsDraft: shelve: handle empty parents and nodestoremove in shelvedstate (issue6748)<!--
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
-->Jason R. CoombsJason R. Coombshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/310tests: run most tests with dirstate v22023-02-24T16:06:14ZArseniy Alekseyevtests: run most tests with dirstate v2The commit "dirstate-v2: do not put the dirstate data file in a transaction" is duplicated with MR#309.
If the new CI variant is not desired, I'm happy to remove it, but I still want to keep the test tweaks.The commit "dirstate-v2: do not put the dirstate data file in a transaction" is duplicated with MR#309.
If the new CI variant is not desired, I'm happy to remove it, but I still want to keep the test tweaks.Arseniy AlekseyevArseniy Alekseyevhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/329Draft: Rust fixes around dirstate-v22023-03-06T10:45:22ZRaphaël GomèsDraft: Rust fixes around dirstate-v2<!--
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/359Draft: debugtemplate: allow using working directory context and template file2023-04-26T04:32:26ZLudovic ChabantDraft: debugtemplate: allow using working directory context and template fileThis makes it possible to run `hg debugtemplate -w` and get a commit template for the pending changes in the working directory, similar to how `hg debugtemplate -r` does it for an already commited changeset.This makes it possible to run `hg debugtemplate -w` and get a commit template for the pending changes in the working directory, similar to how `hg debugtemplate -r` does it for an already commited changeset.Ludovic ChabantLudovic Chabanthttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/361resourceutil: suppress DeprecationWarning (issue6731)2023-01-24T10:35:22ZJason R. Coombsresourceutil: suppress DeprecationWarning (issue6731)https://bz.mercurial-scm.org/show_bug.cgi?id=6731
<!--
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 descripti...https://bz.mercurial-scm.org/show_bug.cgi?id=6731
<!--
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/377faster checks around a large [hg update]2023-01-12T13:17:22ZArseniy Alekseyevfaster checks around a large [hg update]
<!--
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 informati...
<!--
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
-->