Tue, 07 Dec 2021 15:14:08 +0100 share: make it possible to control the working copy format variant
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Dec 2021 15:14:08 +0100] rev 48466
share: make it possible to control the working copy format variant A share will use the same format as its source for the store, but there are no reason to not lets it control the working copy variant at creation time. So we make it so. Differential Revision: https://phab.mercurial-scm.org/D11892
Tue, 07 Dec 2021 14:51:45 +0100 share: move the requirement initialisation code around
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Dec 2021 14:51:45 +0100] rev 48465
share: move the requirement initialisation code around We will make this logic more flexible in the next patch. We start by moving it at the end of the function without any other change for clarity. Differential Revision: https://phab.mercurial-scm.org/D11891
Wed, 08 Dec 2021 05:35:32 +0100 test: use `hg debugrequires` instead of `cat` in some tests
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 08 Dec 2021 05:35:32 +0100] rev 48464
test: use `hg debugrequires` instead of `cat` in some tests This give the "same" result, while taking in account that the requirement file might be in different location, like what `share-safe` is doing. Differential Revision: https://phab.mercurial-scm.org/D11895
Wed, 08 Dec 2021 05:42:01 +0100 test: simplify `debugformat` matching in test-phases.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 08 Dec 2021 05:42:01 +0100] rev 48463
test: simplify `debugformat` matching in test-phases.t This will make the test less sensible to unrelated format changing. Differential Revision: https://phab.mercurial-scm.org/D11894
Tue, 07 Dec 2021 23:49:35 +0100 test: simplify `debugformat` matching in test-copies-chain-merge
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Dec 2021 23:49:35 +0100] rev 48462
test: simplify `debugformat` matching in test-copies-chain-merge This will make the test less sensible to unrelated format changing. Differential Revision: https://phab.mercurial-scm.org/D11893
Tue, 07 Dec 2021 15:53:55 -0800 status: when extracting arguments from `opts`, use the same default values
Kyle Lippincott <spectral@google.com> [Tue, 07 Dec 2021 15:53:55 -0800] rev 48461
status: when extracting arguments from `opts`, use the same default values Sometimes other code, such as commit when using `commands.commit.post-status`, calls `commands.status()` without going through the normal dispatch mechanism that would typically fill in the args to be something besides None. As a "defense in depth" mechanism for a bug where Mercurial would crash if both `commands.commit.post-status` and `experimental.directaccess` were enabled, let's sanitize these values to be identical to the values they would have when the user invoked this method from the commandline. Differential Revision: https://phab.mercurial-scm.org/D11884
Tue, 07 Dec 2021 15:48:22 -0800 directaccess: fix uses of commands.status() that don't go through flag parsing
Kyle Lippincott <spectral@google.com> [Tue, 07 Dec 2021 15:48:22 -0800] rev 48460
directaccess: fix uses of commands.status() that don't go through flag parsing When `commands.commit.post-status` is enabled, after commit/amend, commands.status() is called without any revs argument, which means that status gets None instead of an empty list like it would receive if the user had invoked this on the commandline. With the `experimental.directaccess` config enabled, this gets passed to `unhidehashlikerevs`, which didn't previously handle None, but now should. Differential Revision: https://phab.mercurial-scm.org/D11883
Sun, 07 Nov 2021 16:25:42 -0500 test: add test for a former race resulting in bad dirstate
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> [Sun, 07 Nov 2021 16:25:42 -0500] rev 48459
test: add test for a former race resulting in bad dirstate In 6.0 this used to result in the size being stored in the dirstate is wrong. This was fixed by other change to the mtime gathering logic. Differential Revision: https://phab.mercurial-scm.org/D11749
Tue, 07 Dec 2021 18:57:43 +0000 rhg: fix a crash on non-generaldelta revlogs
Arseniy Alekseyev <aalekseyev@janestreet.com> [Tue, 07 Dec 2021 18:57:43 +0000] rev 48458
rhg: fix a crash on non-generaldelta revlogs Differential Revision: https://phab.mercurial-scm.org/D11882
Tue, 07 Dec 2021 18:12:13 +0000 rhg: centralize index header parsing
Arseniy Alekseyev <aalekseyev@janestreet.com> [Tue, 07 Dec 2021 18:12:13 +0000] rev 48457
rhg: centralize index header parsing Centralize index header parsing, parse the generaldelta flag, and leave breadcrumbs to relate the code to python. Differential Revision: https://phab.mercurial-scm.org/D11881
Tue, 07 Dec 2021 17:50:19 +0000 rhg: demonstrate that rhg breaks on non-generaldelta revlogs
Arseniy Alekseyev <aalekseyev@janestreet.com> [Tue, 07 Dec 2021 17:50:19 +0000] rev 48456
rhg: demonstrate that rhg breaks on non-generaldelta revlogs Differential Revision: https://phab.mercurial-scm.org/D11880
Fri, 10 Dec 2021 23:08:25 +0100 tests: add a short `sleep` in test-status.t
Simon Sapin <simon.sapin@octobus.net> [Fri, 10 Dec 2021 23:08:25 +0100] rev 48455
tests: add a short `sleep` in test-status.t With dirstate-v2 and rhg both enabled, this test would sometimes fail for me with: ``` --- tests/test-status.t +++ tests/test-status.t#dirstate-v2.err @@ -943,7 +943,7 @@ $ rm subdir/unknown $ hg status $ hg debugdirstate --all --no-dates | grep '^ ' - 0 -1 set subdir + 0 -1 unset subdir ``` Meaning that `status` did not write a directory mtime in the dirstate as expected. This can happen if the observed mtime of the directory is the same as "current time" at the start of `status`. This current time is obtained by creating a temporary file and checking its mtime. Even with ext4 on my system being able to store nanosecond precision, identical mtime for successive but separate operations is still possible becuse the kernel may cache the current time: https://stackoverflow.com/a/14393315/1162888 0.1 second should be enough for this cache to be updated, without significantly slowing down the test. Differential Revision: https://phab.mercurial-scm.org/D11900
Fri, 10 Dec 2021 16:18:58 +0100 rhg: Add support for `rhg status --copies`
Simon Sapin <simon.sapin@octobus.net> [Fri, 10 Dec 2021 16:18:58 +0100] rev 48454
rhg: Add support for `rhg status --copies` Copy sources are collected during `status()` rather than after the fact like in Python, because `status()` takes a `&mut` exclusive reference to the dirstate map (in order to potentially mutate it for directory mtimes) and returns `Cow<'_, HgPath>` that borrow the dirstate map. Even though with `Cow` only some shared borrows remain, the still extend the same lifetime of the initial `&mut` so the dirstate map cannot be borrowed again to access copy sources after the fact: https://doc.rust-lang.org/nomicon/lifetime-mismatch.html#limits-of-lifetimes Additionally, collecting copy sources during the dirstate tree traversal that `status()` already does avoids the cost of another traversal or other lookups (though I haven’t benchmarked that cost). Differential Revision: https://phab.mercurial-scm.org/D11899
Fri, 10 Dec 2021 16:57:39 +0100 rhg: refactor relativize_path into a struct + method
Simon Sapin <simon.sapin@octobus.net> [Fri, 10 Dec 2021 16:57:39 +0100] rev 48453
rhg: refactor relativize_path into a struct + method … instead of a function that takes an iterator and a callback. Differential Revision: https://phab.mercurial-scm.org/D11898
Fri, 10 Dec 2021 16:31:16 +0100 rhg: refactor display_status_paths with a struct for common arguments
Simon Sapin <simon.sapin@octobus.net> [Fri, 10 Dec 2021 16:31:16 +0100] rev 48452
rhg: refactor display_status_paths with a struct for common arguments Differential Revision: https://phab.mercurial-scm.org/D11897
(0) -30000 -10000 -3000 -1000 -300 -100 -15 +15 +100 +300 +1000 +3000 tip