pacien <pacien.trangirard@pacien.net> [Fri, 10 Dec 2021 15:27:22 +0100] rev 48518
hg-cpython: implement vcsgraph::Graph for our Index
Differential Revision: https://phab.mercurial-scm.org/D11946
pacien <pacien.trangirard@pacien.net> [Fri, 10 Dec 2021 15:22:24 +0100] rev 48517
rust: add vcsgraph crate as dependency
Preparing the integration of the vcsgraph library, which will provide generic
algorithms for computations on version control graphs.
Differential Revision: https://phab.mercurial-scm.org/D11945
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 23:01:20 -0800] rev 48516
simplemerge: don't calculate conflict labels when resolving automatically
Differential Revision: https://phab.mercurial-scm.org/D11903
Martin von Zweigbergk <martinvonz@google.com> [Tue, 07 Dec 2021 22:45:31 -0800] rev 48515
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
Differential Revision: https://phab.mercurial-scm.org/D11902
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Matt Harbison <matt_harbison@yahoo.com> [Tue, 14 Dec 2021 17:06:32 -0500] rev 48486
pytype: stop excluding chgserver.py
This teaches pytype about some lazy initialization, and avoids the following:
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 666, in _checkextensions:
No attribute '_hashstate' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 672, in _checkextensions:
No attribute '_hashstate' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 677, in _bind:
No attribute '_realaddress' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 683, in _bind:
No attribute '_realaddress' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 686, in _createsymlink:
No attribute '_baseaddress' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 686, in _createsymlink:
No attribute '_realaddress' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 688, in _createsymlink:
No attribute '_baseaddress' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 689, in _createsymlink:
No attribute '_realaddress' on chgunixservicehandler [attribute-error]
File "/mnt/c/Users/Matt/hg/mercurial/chgserver.py", line 690, in _createsymlink:
No attribute '_baseaddress' on chgunixservicehandler [attribute-error]
Differential Revision: https://phab.mercurial-scm.org/D11926
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 22:46:43 -0500] rev 48485
pytype: stop excluding webcommands.py
I have no idea why, but asserting that each value added to `emptydirs` is not
None didn't fix this:
File "/mnt/c/Users/Matt/hg/mercurial/hgweb/webcommands.py", line 621, in dirlist:
Function bytes.join was called with the wrong arguments [wrong-arg-types]
Expected: (self, iterable: Iterable[bytes])
Actually passed: (self, iterable: List[None])
Differential Revision: https://phab.mercurial-scm.org/D11924
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 20:45:31 -0500] rev 48484
tests: drop an obsolete comment about a pytype failure
Differential Revision: https://phab.mercurial-scm.org/D11923
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 20:19:09 -0500] rev 48483
pytype: stop excluding patch.py
The underlying `email.generator.BytesGenerator` is documented as requiring an
`fp` that accepts bytes, so I'm not sure why pytype is getting confused:
File "/mnt/c/Users/Matt/hg/mercurial/patch.py", line 112, in msgfp:
Function Generator.__init__ was called with the wrong arguments [wrong-arg-types]
Expected: (self, outfp: TextIO, ...)
Actually passed: (self, outfp: io.BytesIO, ...)
Differential Revision: https://phab.mercurial-scm.org/D11922
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 19:34:06 -0500] rev 48482
pytype: stop excluding statprof.py
This seems to have worked fine before (at least on Linux). We could just add
suppression comments, but this file already imports from the mercurial package,
which seems to prevent this from running as a standalone program because of the
relative import of `pycompat`. PyCharm isn't happy either way.
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 501, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 1091, in main
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 501, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 431, in profile
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 522, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 1091, in main
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 522, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 431, in profile
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 523, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 1091, in main
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 523, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 431, in profile
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 524, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 1091, in main
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 524, in display:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Called from (traceback):
line 431, in profile
File "/mnt/c/Users/Matt/hg/mercurial/statprof.py", line 796, in _write:
Function TextIO.write was called with the wrong arguments [wrong-arg-types]
Expected: (self, s: str)
Actually passed: (self, s: bytes)
Differential Revision: https://phab.mercurial-scm.org/D11921
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 17:59:36 -0500] rev 48481
statprof: convert a few exception byte strings to str
That way these display without the b'' prefix.
Differential Revision: https://phab.mercurial-scm.org/D11920
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 16:42:36 -0500] rev 48480
pytype: stop excluding wireprotov2server.py
This fixes:
File "/mnt/c/Users/Matt/hg/mercurial/wireprotov2server.py", line 584, in _capabilitiesv2:
unsupported operand type(s) for item assignment: Set[bytes] [unsupported-operands]
No attribute '__setitem__' on Set[bytes]
File "/mnt/c/Users/Matt/hg/mercurial/wireprotov2server.py", line 611, in _capabilitiesv2:
No attribute 'append' on dict [attribute-error]
In Union[List[bytes], List[nothing], dict]
Called from (traceback):
line 543, in httpv2apidescriptor
Differential Revision: https://phab.mercurial-scm.org/D11919
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 14:43:10 -0500] rev 48479
pytype: stop excluding stringutil.py
This fixes the following:
File "/mnt/c/Users/Matt/hg/mercurial/utils/stringutil.py", line 267, in prettyrepr:
Function bytes.startswith expects 2 arg(s), got 3 [wrong-arg-count]
Expected: (self, prefix)
Actually passed: (self, prefix, _)
File "/mnt/c/Users/Matt/hg/mercurial/utils/stringutil.py", line 695, in escapestr:
No attribute 'escape_encode' on module 'codecs' [module-attr]
File "/mnt/c/Users/Matt/hg/mercurial/utils/stringutil.py", line 699, in unescapestr:
No attribute 'escape_decode' on module 'codecs' [module-attr]
Differential Revision: https://phab.mercurial-scm.org/D11918
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 00:25:38 -0500] rev 48478
pytype: stop excluding cmdutil.py
Whatever was broken here seems to have been previously fixed.
Differential Revision: https://phab.mercurial-scm.org/D11917
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 00:04:53 -0500] rev 48477
pytype: stop excluding copies.py
I can't prove that `targetrev` is always in `all_copies`, but it would have been
a runtime error before too if it's not.
Differential Revision: https://phab.mercurial-scm.org/D11916
Matt Harbison <matt_harbison@yahoo.com> [Sun, 12 Dec 2021 22:29:46 -0500] rev 48476
copies: fix some documentation typos
Differential Revision: https://phab.mercurial-scm.org/D11915
Matt Harbison <matt_harbison@yahoo.com> [Sun, 12 Dec 2021 22:24:16 -0500] rev 48475
copies: drop an unused variable
Differential Revision: https://phab.mercurial-scm.org/D11914
Matt Harbison <matt_harbison@yahoo.com> [Sun, 12 Dec 2021 22:09:13 -0500] rev 48474
pytype: stop excluding lsprof.py
Whatever was previously flagged in this file appears to have been fixed.
Differential Revision: https://phab.mercurial-scm.org/D11913
Matt Harbison <matt_harbison@yahoo.com> [Sun, 12 Dec 2021 21:10:02 -0500] rev 48473
pytype: stop excluding changegroup.py
The false positives that were detected seem to be related to what happens to the
variables after the local methods are used:
File "/mnt/c/Users/Matt/hg/mercurial/changegroup.py", line 353, in ondupchangelog:
No attribute 'append' on range [attribute-error]
In Union[List[nothing], range]
File "/mnt/c/Users/Matt/hg/mercurial/changegroup.py", line 357, in onchangelog:
No attribute 'update' on None [attribute-error]
Differential Revision: https://phab.mercurial-scm.org/D11912
Matt Harbison <matt_harbison@yahoo.com> [Sun, 12 Dec 2021 20:01:05 -0500] rev 48472
pytype: stop excluding upgrade.py
The sole failure here was this, which is fixed by simply creating a set like the
caller, instead of a dict:
File "/mnt/c/Users/Matt/hg/mercurial/upgrade.py", line 73, in upgraderepo:
No attribute 'discard' on Dict[nothing, nothing] [attribute-error]
In Union[Any, Dict[nothing, nothing]]
Differential Revision: https://phab.mercurial-scm.org/D11911
Simon Sapin <simon.sapin@octobus.net> [Tue, 14 Dec 2021 20:36:36 +0100] rev 48471
rhg: Skip reading the contents of ambiguous files in some cases
If the size of the file in the working directory does not match the length of
the filelog data, we know its contents will be different and don’t need to
read it.
rhg still decodes the filelog revision, which is not needed in some cases.
Differential Revision: https://phab.mercurial-scm.org/D11910
Simon Sapin <simon.sapin@octobus.net> [Tue, 14 Dec 2021 19:47:33 +0100] rev 48470
rhg: Mark it as expected that the
issue6528 bug is not reproduced
Differential Revision: https://phab.mercurial-scm.org/D11909
Martin von Zweigbergk <martinvonz@google.com> [Tue, 14 Dec 2021 13:41:34 -0800] rev 48469
filemerge: remove leftover documentation of removed argument
I removed the `premerge` argument in
https://phab.mercurial-scm.org/D11859.
Differential Revision: https://phab.mercurial-scm.org/D11925
Matt Harbison <matt_harbison@yahoo.com> [Mon, 13 Dec 2021 14:44:16 -0500] rev 48468
merge with stable
Simon Sapin <simon.sapin@octobus.net> [Mon, 13 Dec 2021 14:37:16 +0100] rev 48467
rhg: Print "bad match" errors in rhg status
Previously these would only be visible if enabled with some RUST_LOG
environment variable.
Differential Revision: https://phab.mercurial-scm.org/D11908
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
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
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
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
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
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
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
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