mercurial-devel merge requestshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests2020-05-05T00:00:31Zhttps://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/101branchmap: use a context manager when writing the branchmap2022-05-24T15:22:59ZPierre-Yves Davidbranchmap: use a context manager when writing the branchmapThis is cleaner and safer. The previous code date from long before we had
context manager available.This is cleaner and safer. The previous code date from long before we had
context manager available.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/102manifest: improve error message in case for tree manifest2022-05-24T16:00:53ZPierre-Yves Davidmanifest: improve error message in case for tree manifestIn the case where tree manifest is not enabled but we still receive an sub
directory information for the manifest. The error now inform which sub-directory
was passed.In the case where tree manifest is not enabled but we still receive an sub
directory information for the manifest. The error now inform which sub-directory
was passed.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/105Fix the `chg` failure to the narrow test2022-05-17T11:37:10ZPierre-Yves DavidFix the `chg` failure to the narrow testSee the changesets description.See the changesets description.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/106inherit "all" for the rust step2022-05-19T08:46:56ZPierre-Yves Davidinherit "all" for the rust stepFix an over enthousiastic deletion in 0ddd5e1f5f67.Fix an over enthousiastic deletion in 0ddd5e1f5f67.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/107ci: do not trigger phabricator for merge-request2022-05-17T10:58:14ZRaphaël Gomèsci: do not trigger phabricator for merge-requestThe fast the phabricator steps has a `rules` entry makes it selected for the
special `merge_requests` pipelines. The other ones behave as default and are not
selected tot the mrege_request pipelines.
This result in a second pipeline to ...The fast the phabricator steps has a `rules` entry makes it selected for the
special `merge_requests` pipelines. The other ones behave as default and are not
selected tot the mrege_request pipelines.
This result in a second pipeline to be created, with only the phabricator
pipeline in it. Which usually succeed fast (since there is nothing to do).
This is harmful as this create a false sense of "the series is passing" and
Gitlab will use this simplistic pipeline for validation.
By explicitly preventing the pipeline to be created in the merge-request case,
we prevent this situation to happens
Note that the job will be dropped (alonside phabricator) in the next two weeks
anyway.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/108make it possible to create cg03 bundles2022-06-14T13:34:01ZPierre-Yves Davidmake it possible to create cg03 bundlesWork in progressWork in progressPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/109rhg: align the dirstate v2 writing algorithm with python2022-05-24T14:53:28ZArseniy Alekseyevrhg: align the dirstate v2 writing algorithm with pythonApparently it's not sufficient to modify a file to force the dirstate
write-out, so the append code path was untested.
By removing a file instead of changing we're forcing append to happen.
We also change the dirstate writing code to d...Apparently it's not sufficient to modify a file to force the dirstate
write-out, so the append code path was untested.
By removing a file instead of changing we're forcing append to happen.
We also change the dirstate writing code to do the same thing python does, to avoid bugs related to ZFS.https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/110debugdeltachain various improvement2022-05-25T15:04:22ZPierre-Yves Daviddebugdeltachain various improvementPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/111rhg: correctly handle the case where diffs are encoded relative to nullrev2022-05-24T17:43:51ZArseniy Alekseyevrhg: correctly handle the case where diffs are encoded relative to nullrevhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/112revlog: use %d to format int instead of %lu (issue6565)2022-05-24T20:10:13ZAnton Shestakovrevlog: use %d to format int instead of %lu (issue6565)The issue says gcc warns that the data types don't match. I couldn't reproduce
the warning locally for some reason, but this patch shouldn't break things.
Maybe %lu was simply a copy-paste error from 6b1eae313b2f
(https://phab.mercurial-...The issue says gcc warns that the data types don't match. I couldn't reproduce
the warning locally for some reason, but this patch shouldn't break things.
Maybe %lu was simply a copy-paste error from 6b1eae313b2f
(https://phab.mercurial-scm.org/D10625).https://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/114check-py3-compat: use an absolute path in sys.path2022-05-24T15:55:22ZAnton Shestakovcheck-py3-compat: use an absolute path in sys.pathThe idea and rationale is similar to https://phab.mercurial-scm.org/D12599
(landed as 1b6e381521c5).The idea and rationale is similar to https://phab.mercurial-scm.org/D12599
(landed as 1b6e381521c5).https://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/116copies-sdc: improve upgrade2022-05-19T07:41:01ZPierre-Yves Davidcopies-sdc: improve upgradePierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/117test: update `test-sparse-revlog` output2022-05-26T13:58:24ZPierre-Yves Davidtest: update `test-sparse-revlog` outputThis got changed at some point.This got changed at some point.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/118revlog delta debugging2022-05-26T13:58:25ZPierre-Yves Davidrevlog delta debuggingA series of change to make it simpler to inspect revlog deltaA series of change to make it simpler to inspect revlog deltaPierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/119run-tests: fix some race condition2022-05-25T09:44:59ZPierre-Yves Davidrun-tests: fix some race conditionPierre-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/121Queuing two commits from phabricator2022-05-24T13:35:52ZRaphaël GomèsQueuing two commits from phabricatorThis workflow will disappear at the end of this month.This workflow will disappear at the end of this month.Raphaël GomèsRaphaël Gomèshttps://foss.heptapod.net/mercurial/mercurial-devel/-/merge_requests/122Queuing a series from phabricator2022-05-24T14:34:23ZRaphaël GomèsQueuing a series from phabricatorThis workflow will disappear at the end of the monthThis workflow will disappear at the end of the monthRaphaël GomèsRaphaël Gomès