Tue, 16 Mar 2021 15:12:03 +0100 rhg: Initial support for the 'status' command
Georges Racinet <georges.racinet@octobus.net> [Tue, 16 Mar 2021 15:12:03 +0100] rev 46822
rhg: Initial support for the 'status' command Only comparing the working directory with its first parent revision is supported. The core logic of dirstate handling and `stat`’ing files was already in `hg-core` supporting Python-based hg with Rust extensions, so this is mostly plumbing to rhg’s CLI. For now the command is experimental and disabled by default, since it has some bugs that causes a number of tests to fail. These failures can be seen with: tests/run-tests.py --rhg --extra-config-opt rhg.status=true Differential Revision: https://phab.mercurial-scm.org/D10239
Tue, 23 Mar 2021 19:58:49 +0530 rhg: raise wdir specific error for `hg debugdata`
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 23 Mar 2021 19:58:49 +0530] rev 46821
rhg: raise wdir specific error for `hg debugdata` Helps remove the conditional in `test-debugcommands.t` for rhg. Differential Revision: https://phab.mercurial-scm.org/D10254
Sat, 20 Mar 2021 02:03:57 +0530 rhg: add support for detailed exit code for ConfigParseError
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 20 Mar 2021 02:03:57 +0530] rev 46820
rhg: add support for detailed exit code for ConfigParseError This patch adds basic support for detailed exit code to rhg with support for ConfigParseError. For now, if parsing the config results in error, we silently fallbacks to `false`. The python version in this case emits a traceback. Differential Revision: https://phab.mercurial-scm.org/D10253
Thu, 25 Mar 2021 18:02:08 +0100 contributor: change mentions of mpm to olivia
Raphaël Gomès <rgomes@octobus.net> [Thu, 25 Mar 2021 18:02:08 +0100] rev 46819
contributor: change mentions of mpm to olivia Matt Mackall is now Olivia Mackall. I reached out to her about changing the copyright notices to reflect this change and she gave me the green light, so I changed everything relevant. Differential Revision: https://phab.mercurial-scm.org/D10266
Mon, 22 Mar 2021 15:29:05 -0700 fuzz: use Python 3 in makefile
Martin von Zweigbergk <martinvonz@google.com> [Mon, 22 Mar 2021 15:29:05 -0700] rev 46818
fuzz: use Python 3 in makefile As in the previous patch, I copied the snippet defining `PYTHON` from the root Makefile. Differential Revision: https://phab.mercurial-scm.org/D10252
Mon, 22 Mar 2021 13:21:12 -0700 makefile: use Python 3 by default when building docs as well
Martin von Zweigbergk <martinvonz@google.com> [Mon, 22 Mar 2021 13:21:12 -0700] rev 46817
makefile: use Python 3 by default when building docs as well I copied the snippet defining `PYTHON` from the root Makefile. Differential Revision: https://phab.mercurial-scm.org/D10251
Mon, 22 Mar 2021 13:14:11 -0700 tests: replace some `python` by `"$PYTHON"` to not only use Python 2
Martin von Zweigbergk <martinvonz@google.com> [Mon, 22 Mar 2021 13:14:11 -0700] rev 46816
tests: replace some `python` by `"$PYTHON"` to not only use Python 2 I deleted my `python` binary as a test and a few tests started failing. Differential Revision: https://phab.mercurial-scm.org/D10250
Sat, 13 Mar 2021 03:17:00 +0100 copies: distinguish between merged and touched files during upgrade
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 13 Mar 2021 03:17:00 +0100] rev 46815
copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220
Mon, 15 Mar 2021 13:37:45 +0100 copies: detect files as `touched/salvaged` if they only existed on one side
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 15 Mar 2021 13:37:45 +0100] rev 46814
copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219
Tue, 02 Mar 2021 02:00:29 +0100 test-copies: add a test updating file content while salvaging it
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 02 Mar 2021 02:00:29 +0100] rev 46813
test-copies: add a test updating file content while salvaging it A deleted file is brought back during a merge. Its content is changed in the same go. This reveal some issue with the upgrade code. Differential Revision: https://phab.mercurial-scm.org/D10088
(0) -30000 -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 tip