mercurial-devel merge requestshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests2022-10-03T09:01:52Zhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/246rhg: fix bugs around [use-dirstate-tracked-hint] and auto-upgrade2022-10-03T09:01:52ZArseniy Alekseyevrhg: fix bugs around [use-dirstate-tracked-hint] and auto-upgrade- make rhg support the [dirstate-tracked-key-v1] requirement.
I believe rhg never changes the tracked file set, so it's OK that it
doesn't have any logic for writing this file.
- fix the name of [format.use-dirstate-v2.automatic-upgrade...- make rhg support the [dirstate-tracked-key-v1] requirement.
I believe rhg never changes the tracked file set, so it's OK that it
doesn't have any logic for writing this file.
- fix the name of [format.use-dirstate-v2.automatic-upgrade-of-mismatching-repositories]
config option in rhg, which makes rhg actually honor the auto-upgrade.
These two issues cancelled each other out in tests (auto-upgrade was happening
because [dirstate-tracked-key-v1] forced the fallback, not because of the config),
which is I think why they went unnoticed earlier.Raphaël GomèsRaphaël Gomèshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/191sort-revset: introduce a `random` variant2022-10-03T09:38:03ZPierre-Yves Davidsort-revset: introduce a `random` variantThis new `sort` variant allows to shuffle any revset. It also allow for
randomly picking element using `first`.This new `sort` variant allows to shuffle any revset. It also allow for
randomly picking element using `first`.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/248tests: migrate the pytype test to a shell script for easier CI processing2022-10-03T12:21:15ZMatt Harbisontests: migrate the pytype test to a shell script for easier CI processingWe can probably do more in the script (e.g. setup a venv and install pytype), but the CI file is currently installing pytype already. I didn't disable the *.t run because there's already a CI target for running pytype, so I assume swapp...We can probably do more in the script (e.g. setup a venv and install pytype), but the CI file is currently installing pytype already. I didn't disable the *.t run because there's already a CI target for running pytype, so I assume swapping in this script is pretty simple for someone who understands the `heptapod-ci.yml` file. Depending on how the hookup with CI goes, we can drop the *.t test. But I'm waiting to see if the script gets CI specific tentacles, because I still want a convenient way to run it locally.Matt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/249mergetools.rc: don't let meld open all changed files on startup2022-10-05T18:33:07ZMathias De Maremergetools.rc: don't let meld open all changed files on startupIn meld 3.16, a multi-file change with option '-a' results in
an overview list being opened.
In meld 3.20, a multi-file change with option '-a' results in
an overview list AND every changed file being opened.
Simply removing '-a' seems ...In meld 3.16, a multi-file change with option '-a' results in
an overview list being opened.
In meld 3.20, a multi-file change with option '-a' results in
an overview list AND every changed file being opened.
Simply removing '-a' seems to work fine for both cases
and also behaves the same as before for single-file changes.
As per the release notes, this is due to the following change
in meld 3.19.0:
"Make the --auto-compare command line flag work again (Kai Willadsen)"
See also https://gitlab.gnome.org/GNOME/meld/-/issues/516Mathias De MareMathias De Marehttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/251shelve: do not add the dirstate backup to the transaction2022-10-06T20:20:44ZPierre-Yves Davidshelve: do not add the dirstate backup to the transactionPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/196contrib: add pull_logger extension2022-10-07T09:56:57ZPacien TRAN-GIRARDcontrib: add pull_logger extensionThis extension logs the pull parameters, i.e. the remote and common heads,
when pulling from the local repository.
The collected data should give an idea of the state of a pair of repositories
and allow replaying past synchronisations b...This extension logs the pull parameters, i.e. the remote and common heads,
when pulling from the local repository.
The collected data should give an idea of the state of a pair of repositories
and allow replaying past synchronisations between them. This is particularly
useful for working on data exchange, bundling and caching-related
optimisations.Pacien TRAN-GIRARDPacien TRAN-GIRARDhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/250revset: handle wdir() in `roots()`2022-10-07T16:55:16ZMatt Harbisonrevset: handle wdir() in `roots()`Matt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/252rhg: parallellize computation of [unsure_is_modified]2022-10-07T22:22:28ZArseniy Alekseyevrhg: parallellize computation of [unsure_is_modified][unsure_is_modified] is called for every file for which we can't
determine its status based on its size and mtime alone.
In particular, this happens if the mtime of the file changes
without its contents changing.
Parallellizing this im...[unsure_is_modified] is called for every file for which we can't
determine its status based on its size and mtime alone.
In particular, this happens if the mtime of the file changes
without its contents changing.
Parallellizing this improves performance significantly when
we have many of these files.
Here's an example run (on a repo with ~400k files after dropping FS caches)
```
before:
real 0m53.901s
user 0m27.806s
sys 0m31.325s
after:
real 0m32.017s
user 0m34.277s
sys 1m26.250s
```
Another example run (a different FS):
```
before:
real 3m28.479s
user 0m31.800s
sys 0m25.324s
after:
real 0m29.751s
user 0m41.814s
sys 1m15.387s
```Arseniy AlekseyevArseniy Alekseyevhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/238rhg: support tweakdefaults in rhg status (try 3)2022-10-10T15:25:52ZArseniy Alekseyevrhg: support tweakdefaults in rhg status (try 3)This is a yet-another variant of https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/214.This is a yet-another variant of https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/214.https://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/244dirstate-v2: skip evaluation of hgignore regex on cached directories2022-10-19T12:15:22ZArseniy Alekseyevdirstate-v2: skip evaluation of hgignore regex on cached directoriesBy making the computation of [has_ignored_ancestor] lazy we're eliding
its computation in the common case when none of its descendants have
changed on disk.By making the computation of [has_ignored_ancestor] lazy we're eliding
its computation in the common case when none of its descendants have
changed on disk.Arseniy AlekseyevArseniy Alekseyevhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/261shelve: avoid setting overloading tmpwctx2022-10-19T21:19:49ZJason R. Coombsshelve: avoid setting overloading tmpwctxJason R. CoombsJason R. Coombshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/257configitems: change the `verify.skipflags` default value to avoid a py3 crash2022-10-24T09:31:21ZMatt Harbisonconfigitems: change the `verify.skipflags` default value to avoid a py3 crashMatt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/258tests: fix test-https.t message in case of 404 (issue6726)2022-10-24T12:06:48ZAnton Shestakovtests: fix test-https.t message in case of 404 (issue6726)Anton ShestakovAnton Shestakovhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/264lfs: fix interpolation of int and %s in an exception case2022-10-24T13:13:39ZMatt Harbisonlfs: fix interpolation of int and %s in an exception caseMatt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/267merge default into stable2022-10-24T15:15:02ZRaphaël Gomèsmerge default into stableRaphaël GomèsRaphaël Gomèshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/268merge stable into default2022-10-24T18:37:05ZRaphaël Gomèsmerge stable into defaultRaphaël GomèsRaphaël Gomèshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/265lfs: improve an exception message for blob corruption detected on transfer2022-10-26T16:54:52ZMatt Harbisonlfs: improve an exception message for blob corruption detected on transferThis might generate a trivial merge conflict with MR#264, which is on stable. I wasn't sure how to handle that, since I didn't want to push a merge commit as part of this MR.This might generate a trivial merge conflict with MR#264, which is on stable. I wasn't sure how to handle that, since I didn't want to push a merge commit as part of this MR.Matt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/263Display user friendly name during verification failure2022-10-26T17:59:04ZMatt HarbisonDisplay user friendly name during verification failureMatt HarbisonMatt Harbisonhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/260mr-template: wrap the instructions inside a comment block2022-10-26T19:55:34ZMatt Harbisonmr-template: wrap the instructions inside a comment blockI commented out the instructions manually here. I hoped that creating the MR on this would use the updated template to prove it works, but I guess it also makes sense that it wouldn't automatically use an unapproved template. Not sure ...I commented out the instructions manually here. I hoped that creating the MR on this would use the updated template to prove it works, but I guess it also makes sense that it wouldn't automatically use an unapproved template. Not sure what it takes to use it (and prove it works).
<!--
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
-->Matt HarbisonMatt Harbison