Tue, 07 Dec 2021 22:33:18 -0800 simplemerge: add a specialized function for "union", "local", "other"
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 22:33:18 -0800] rev 48514
simplemerge: add a specialized function for "union", "local", "other" Differential Revision: https://phab.mercurial-scm.org/D11901
Sat, 18 Dec 2021 11:47:03 +0100 rhg: Fall back to Python if verbose status is requested by config
Simon Sapin <simon.sapin@octobus.net> [Sat, 18 Dec 2021 11:47:03 +0100] rev 48513
rhg: Fall back to Python if verbose status is requested by config Differential Revision: https://phab.mercurial-scm.org/D11943
Fri, 17 Dec 2021 17:56:13 +0100 rhg: Accept different "invalid ignore pattern" error message formatting
Simon Sapin <simon.sapin@octobus.net> [Fri, 17 Dec 2021 17:56:13 +0100] rev 48512
rhg: Accept different "invalid ignore pattern" error message formatting At the moment rhg compiles all patterns into a single big regular expression, so it’s not practical to find out which file the invalid bit of syntax came from. Differential Revision: https://phab.mercurial-scm.org/D11942
Fri, 17 Dec 2021 16:54:22 +0100 rhg: Properly format warnings related to ignore patterns
Simon Sapin <simon.sapin@octobus.net> [Fri, 17 Dec 2021 16:54:22 +0100] rev 48511
rhg: Properly format warnings related to ignore patterns Differential Revision: https://phab.mercurial-scm.org/D11941
Tue, 09 Nov 2021 18:17:52 +0100 rhg: Sub-repositories are not supported
Simon Sapin <simon.sapin@octobus.net> [Tue, 09 Nov 2021 18:17:52 +0100] rev 48510
rhg: Sub-repositories are not supported Differential Revision: https://phab.mercurial-scm.org/D11940
Tue, 07 Dec 2021 17:48:50 -0800 simplemerge: make `localorother` a "mode" instead of a separate thing
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 17:48:50 -0800] rev 48509
simplemerge: make `localorother` a "mode" instead of a separate thing `simplemerge()` takes a `mode` argument, which can be "union", "merge" or "mergediff", and a `localorother` argument, which can be `None`, "local", or "other". The two options are not at all orthogonal -- most combinations don't make sense. Also, at least "union", "local", and "other" are very closely related. Therefore, it makes sense to combine them into one. It probably makes sense to split the `mode` argument into `resolve` and `marker_style`, where the former can be `None`, "union", "local", or "other", and the latter can be "merge", "merge3", "mergediff", or "minimize". This is a good step in that direction whether or not we end up doing that. Differential Revision: https://phab.mercurial-scm.org/D11887
Tue, 07 Dec 2021 14:11:58 -0800 simplemerge: avoid a call to `pycompat.strkwargs()`
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 14:11:58 -0800] rev 48508
simplemerge: avoid a call to `pycompat.strkwargs()` Differential Revision: https://phab.mercurial-scm.org/D11886
Mon, 06 Dec 2021 23:17:43 -0800 simplemerge: stop merging file flags
Martin von Zweigbergk <martinvonz@google.com> [Mon, 06 Dec 2021 23:17:43 -0800] rev 48507
simplemerge: stop merging file flags As 384df4db6520 (merge: merge file flags together with file content, 2013-01-09) explains, we shouldn't do a 3-way merge of the symlink. However, since 84614212ae39 (flags: actually merge flags in simplemerge, 2020-05-16), we do that in `simplemerge.simplemerge()`. What's more, the merging of the executable flag there isn't actually necessary; it was made a no-op by the very next commit, i.e. 4234c9af515d (flags: read flag from dirstate/disk for workingcopyctx (issue5743), 2020-05-16). I found the overall flag-merging code (not the bit in `simplemerge.py`) very hard to follow, but I think I now finally understand how it works. `mergestate.resolve()` calculates the merged file flags and sets them on the local side of the merge (confusingly by calling `_restore_backup()`). Then it calls `filemerge.filemerge()`, which in turn calls `simplemerge.simplemerge()` (if premerge is enabled). That means that the flags on the local side `fcs.flags()` are already correct when the flag-merging code in `simplemerge.simplemerge()` runs. Interestingly, that code still works when the local side already has the merged value, it just doesn't change the value. Here's a truth table to explain why: ``` BLOMCAR 0000000 0011111 0101011 0111111 1000000 1010000 1100000 1111101 ``` B: Base L: Local O: Other M: Merged flags from `mergestate.resolve()`, i.e. what's called "local" when we get to `simplemerge.simplemerge()` C: `commonflags` in `simplemerge.simplemerge()`, i.e. `M & O` A: `addedflags` in `simplemerge.simplemerge()`, i.e. `(M ^ O) - B` R: Re-merged flags `simplemerge.simplemerge()`, i.e. `C | A` As you can see, the re-merged flags are always unchanged compared to the initial merged flags (R equals M). Therefore, this patch effectively backs out 84614212ae39. (I might later refactor this code to have the flags explicitly passed in.) `simplemerge.simplemerge()` is also called from `contrib/simplemerge.py`, but that code never passes any flags. Differential Revision: https://phab.mercurial-scm.org/D11879
Tue, 07 Dec 2021 21:17:18 -0800 filemerge: stop returning always-`True` value
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 21:17:18 -0800] rev 48506
filemerge: stop returning always-`True` value Now that we've removed some more leftovers from "merge driver", it's clear that the first element of `filemerge()`'s return value is always `True`. Differential Revision: https://phab.mercurial-scm.org/D11885
Mon, 06 Dec 2021 13:43:00 -0800 filemerge: remove unused `orig` argument from tool functions
Martin von Zweigbergk <martinvonz@google.com> [Mon, 06 Dec 2021 13:43:00 -0800] rev 48505
filemerge: remove unused `orig` argument from tool functions Differential Revision: https://phab.mercurial-scm.org/D11878
Mon, 06 Dec 2021 12:48:01 -0800 filemerge: stop passing around 3 unused `None` values in `files` argument
Martin von Zweigbergk <martinvonz@google.com> [Mon, 06 Dec 2021 12:48:01 -0800] rev 48504
filemerge: stop passing around 3 unused `None` values in `files` argument Since 67cfffbfb6a0 (filemerge: eliminate most uses of tempfiles, 2017-08-31), we have used only the last entry in the `files` tuple that gets passed around to various functions. That commit said "Emphasize that they're unused so we can more easily remove them later.". It's now "later". Differential Revision: https://phab.mercurial-scm.org/D11877
Mon, 06 Dec 2021 13:15:40 -0800 filemerge: rename backup variables from `back` to `backup`
Martin von Zweigbergk <martinvonz@google.com> [Mon, 06 Dec 2021 13:15:40 -0800] rev 48503
filemerge: rename backup variables from `back` to `backup` `backup` seems like an obviously clearer name for something containing something related to a backup. Differential Revision: https://phab.mercurial-scm.org/D11876
Sat, 18 Dec 2021 20:56:52 -0500 setup.py: fix some documentation typos
Matt Harbison <matt_harbison@yahoo.com> [Sat, 18 Dec 2021 20:56:52 -0500] rev 48502
setup.py: fix some documentation typos Differential Revision: https://phab.mercurial-scm.org/D11944
Fri, 17 Dec 2021 14:15:08 +0100 dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too
Simon Sapin <simon.sapin@octobus.net> [Fri, 17 Dec 2021 14:15:08 +0100] rev 48501
dirstate-v2: Apply SECOND_AMBIGUOUS to directory mtimes too This would only be relevant in contrived scenarios such as a dirstate file being written with a libc that supports sub-second precision in mtimes, then transfered (at the filesystem level, not `hg clone`) to another system where libc *doesn’t* have sub-second precision and truncates the stored mtime of a directory to integer seconds. Differential Revision: https://phab.mercurial-scm.org/D11939
Wed, 15 Dec 2021 15:28:41 +0100 rank: actually persist revision's rank in changelog-v2
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Dec 2021 15:28:41 +0100] rev 48500
rank: actually persist revision's rank in changelog-v2 The changelog v2 format is now persisting whatever "rank" value is recorded. However keep in mind that for we do not record any value. Differential Revision: https://phab.mercurial-scm.org/D11937
Tue, 14 Dec 2021 23:56:38 +0100 rank: add a "rank" value to the revlog-entry tuple
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Dec 2021 23:56:38 +0100] rev 48499
rank: add a "rank" value to the revlog-entry tuple The rank of a revision is the size of sub-graph it defines as a head. In other words, the rank of X is the size of `ancestors(X)` (X included). This is a property that can help various algorithm and we intend to store it in changelog-v2. We start with adding this new information to the "entry tuple", with a default value. We will start to compute and persist the rank later. Differential Revision: https://phab.mercurial-scm.org/D11936
Wed, 15 Dec 2021 14:50:07 +0100 changelog-v2: fix an assertion error to display the right data
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Dec 2021 14:50:07 +0100] rev 48498
changelog-v2: fix an assertion error to display the right data We were checking on thing and displaying the other. Differential Revision: https://phab.mercurial-scm.org/D11935
Tue, 14 Dec 2021 19:24:24 +0100 changelog-v2: use helper constant in the code to pack/unpack entries
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Dec 2021 19:24:24 +0100] rev 48497
changelog-v2: use helper constant in the code to pack/unpack entries This makes the code simpler to read and modify. This is probably less efficient, but we are talking about the Python implementation here, so performance is concerne secondary to readability. Differential Revision: https://phab.mercurial-scm.org/D11934
Wed, 15 Dec 2021 15:28:30 +0100 revlog: add some information about the revision we cannot find
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Dec 2021 15:28:30 +0100] rev 48496
revlog: add some information about the revision we cannot find Parameter to Exception are good, use them. Differential Revision: https://phab.mercurial-scm.org/D11933
Thu, 16 Dec 2021 17:34:51 +0100 rhg: Use binary search in manifest lookup
Simon Sapin <simon.sapin@octobus.net> [Thu, 16 Dec 2021 17:34:51 +0100] rev 48495
rhg: Use binary search in manifest lookup … instead of linear scan, when looking for a single entry based on its path. Manifest entries are sorted by path, but are variable-size so we can’t use the standard library’s `[T]::binary_search`. We can still jump to a byte index and then look around for entry boundaries. Differential Revision: https://phab.mercurial-scm.org/D11932
Mon, 29 Nov 2021 12:27:33 +0000 sparse: lock the store when updating requirements config stable
Arseniy Alekseyev <aalekseyev@janestreet.com> [Mon, 29 Nov 2021 12:27:33 +0000] rev 48494
sparse: lock the store when updating requirements config Differential Revision: https://phab.mercurial-scm.org/D11817
Tue, 16 Nov 2021 17:35:57 +0000 sparse: demonstrate a bug when used with safe-share stable
Arseniy Alekseyev <aalekseyev@janestreet.com> [Tue, 16 Nov 2021 17:35:57 +0000] rev 48493
sparse: demonstrate a bug when used with safe-share sparse: lock the store when updating requirements config Differential Revision: https://phab.mercurial-scm.org/D11766
Fri, 17 Dec 2021 11:46:30 +0100 rust: Upgrade to format-bytes 0.3
Simon Sapin <simon.sapin@octobus.net> [Fri, 17 Dec 2021 11:46:30 +0100] rev 48492
rust: Upgrade to format-bytes 0.3 This removes use of the proc-macro-hack crate, which is possible now that we don’t support Rust 1.41 to 1.44 anymore. This in turn fixes spurious errors reported by rust-analyser: https://github.com/rust-analyzer/rust-analyzer/issues/9606#issuecomment-919240134 Differential Revision: https://phab.mercurial-scm.org/D11938
Tue, 14 Dec 2021 20:13:10 -0500 pytype: stop excluding ssutil.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Dec 2021 20:13:10 -0500] rev 48491
pytype: stop excluding ssutil.py Pytype simply can't distinguish the type for this one entry's value from the other values: File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 142, in _hostsettings: No attribute 'append' on None [attribute-error] In Optional[Union[Any, List[nothing], bool, bytes]] File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 142, in _hostsettings: No attribute 'append' on bool [attribute-error] In Optional[Union[Any, List[nothing], bool, bytes]] File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 142, in _hostsettings: No attribute 'append' on bytes [attribute-error] In Optional[Union[Any, List[nothing], bool, bytes]] File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 147, in _hostsettings: No attribute 'append' on None [attribute-error] In Optional[Union[Any, List[Tuple[Any, Any]], bool, bytes]] File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 147, in _hostsettings: No attribute 'append' on bool [attribute-error] In Optional[Union[Any, List[Tuple[Any, Any]], bool, bytes]] File "/mnt/c/Users/Matt/hg/mercurial/sslutil.py", line 147, in _hostsettings: No attribute 'append' on bytes [attribute-error] In Optional[Union[Any, List[Tuple[Any, Any]], bool, bytes]] Differential Revision: https://phab.mercurial-scm.org/D11931
Tue, 14 Dec 2021 19:13:30 -0500 pytype: stop excluding wireprotoserver.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Dec 2021 19:13:30 -0500] rev 48490
pytype: stop excluding wireprotoserver.py The `config` entry is a 2 part tuple, which has `__iter__()`: File "/mnt/c/Users/Matt/hg/mercurial/wireprotoserver.py", line 253, in _availableapis: No attribute '__iter__' on Callable[[Any, Any], Any] [attribute-error] In Union[Callable[[Any, Any, Any, Any, Any], None], Callable[[Any, Any], Any]] File "/mnt/c/Users/Matt/hg/mercurial/wireprotoserver.py", line 253, in _availableapis: No attribute '__iter__' on Callable[[Any, Any, Any, Any, Any], None] [attribute-error] In Union[Callable[[Any, Any, Any, Any, Any], None], Callable[[Any, Any], Any]] Differential Revision: https://phab.mercurial-scm.org/D11930
Tue, 14 Dec 2021 18:36:07 -0500 pytype: stop excluding pycompat.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Dec 2021 18:36:07 -0500] rev 48489
pytype: stop excluding pycompat.py Whatever issues were here seem to have been previously fixed. Differential Revision: https://phab.mercurial-scm.org/D11929
Tue, 14 Dec 2021 17:29:30 -0500 procutil: avoid an uninitialized variable usage on tempfile exception
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Dec 2021 17:29:30 -0500] rev 48488
procutil: avoid an uninitialized variable usage on tempfile exception If `pycompat.unnamedtempfile()` raises an exception, it would have called `stdin.close()` in the `finally` block without it being initialized first. Differential Revision: https://phab.mercurial-scm.org/D11928
Tue, 14 Dec 2021 17:25:46 -0500 pytype: stop excluding procutil.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Dec 2021 17:25:46 -0500] rev 48487
pytype: stop excluding procutil.py This avoids these false warnings: File "/mnt/c/Users/Matt/hg/mercurial/utils/procutil.py", line 78, in <module>: No attribute 'register' on Type[io.BufferedIOBase] [attribute-error] File "/mnt/c/Users/Matt/hg/mercurial/utils/procutil.py", line 117, in <module>: No attribute 'register' on Type[io.IOBase] [attribute-error] File "/mnt/c/Users/Matt/hg/mercurial/utils/procutil.py", line 770, in runbgcommandpy3: No attribute 'close' on int [attribute-error] In Union[IO[Union[bytes, str]], int] Differential Revision: https://phab.mercurial-scm.org/D11927
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -28 +28 +50 +100 +300 +1000 +3000 tip