Wed, 04 Jan 2023 13:47:10 -0500 setup: drop legacy osx compiler tuning to enable universal builds
Matt Harbison <matt_harbison@yahoo.com> [Wed, 04 Jan 2023 13:47:10 -0500] rev 49958
setup: drop legacy osx compiler tuning to enable universal builds This was triggering deprecation warnings about migrating to `packaging.version` from `distutils` Version classes with `make local`. But rather than migrate that code, let's just get rid of some ~10-12 year old workarounds. As a bonus, the cext libraries that are built are now universal binaries containing x86_64 and arm64 images (at least when built on macOS 11.4 with Xcode 12.5 and the universal version of Python 3.9.13). Several things to note here: - Apple dropped support for 10.15 in Nov 2022, and OS X Lion that is referenced is 10.7 (unsupported since late 2014) - `xcode4` was basically always True because of the `>=` check (10.8 used Xcode 5, and I have Xcode 10.2 on 10.14) - `xcode51` was always False for modern-ish Xcode, because of the exact version string matching - Python 3.8 only supports OS X 10.9+; the Python 3.9.1+ universal installer is macOS 11+ only, and Python 3.10 drops the x86_64 installer to deliver only the universal installer. All of this is to say, the only thing lost by dropping this code on modern Xcode is that `os.environ['ARCHFLAGS'] = ''` is no longer set. But we probably shouldn't be setting that anymore, as shown by the universal libraries now being generated. I was able to `make local` and `python3 run-tests.py --local` with python 3.9.9, Xcode 10.2, and macOS 10.14.6, and didn't incur any more than the usual few test errors, so this should still work on some older versions of macOS.
Wed, 04 Jan 2023 00:20:27 -0500 tests: simplify `(py3 no-py36 !)` output matching predicates to `(no-py36 !)`
Matt Harbison <matt_harbison@yahoo.com> [Wed, 04 Jan 2023 00:20:27 -0500] rev 49957
tests: simplify `(py3 no-py36 !)` output matching predicates to `(no-py36 !)` It's all py3 now.
Wed, 04 Jan 2023 00:16:52 -0500 tests: drop `(py3 !)` output matching predicates
Matt Harbison <matt_harbison@yahoo.com> [Wed, 04 Jan 2023 00:16:52 -0500] rev 49956
tests: drop `(py3 !)` output matching predicates Presumably these were paired with `(no-py3 !)` at one point, but now they were unconditionally true. test-check-code.t required a couple of `(glob)` markers on the changed lines in test-lfs-serve-access.t, because of the `$LOCALIP` usage on those lines. Not sure how those lines slipped through the checks previously.
Tue, 19 Jul 2022 16:46:37 -0400 run-tests: drop a workaround for python2
Matt Harbison <matt_harbison@yahoo.com> [Tue, 19 Jul 2022 16:46:37 -0400] rev 49955
run-tests: drop a workaround for python2 The problem is only on python3, but the awkward handling was because python2 didn't have this exception type. I've sporadically seen it running in WSL, but no clue what it means.
Tue, 03 Jan 2023 23:53:44 -0500 contrib: drop py2 support from testparseutil.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 23:53:44 -0500] rev 49954
contrib: drop py2 support from testparseutil.py
Tue, 03 Jan 2023 23:49:05 -0500 tests: drop py2 support from `f` utility
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 23:49:05 -0500] rev 49953
tests: drop py2 support from `f` utility
Tue, 03 Jan 2023 23:47:29 -0500 tests: drop py2 support from test-doctest.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 23:47:29 -0500] rev 49952
tests: drop py2 support from test-doctest.py
Tue, 03 Jan 2023 23:44:12 -0500 tests: drop py2 support from test-demandimport.py
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 23:44:12 -0500] rev 49951
tests: drop py2 support from test-demandimport.py
Fri, 06 Jan 2023 10:59:59 -0500 pytype: add coverage for parts of hgext
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 10:59:59 -0500] rev 49950
pytype: add coverage for parts of hgext There are tons of things to fix here (which have been blacklisted for now), but this should help prevent further regressions.
Fri, 06 Jan 2023 12:16:04 -0500 convert: stop passing str to the dateutil API in darcs
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 12:16:04 -0500] rev 49949
convert: stop passing str to the dateutil API in darcs I'm sure there's a bunch more stuff in here that's broken, but this was flagged by pytype.
Fri, 06 Jan 2023 10:56:53 -0500 typing: suppress a couple of attribute-errors in convert
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 10:56:53 -0500] rev 49948
typing: suppress a couple of attribute-errors in convert I thought these might be real issues, but they're not.
Fri, 06 Jan 2023 00:05:14 -0500 hooklib: force an exception wrapped by errors.Abort to bytestr
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 00:05:14 -0500] rev 49947
hooklib: force an exception wrapped by errors.Abort to bytestr Flagged by PyCharm and pytype.
Fri, 06 Jan 2023 00:04:46 -0500 notify: force an exception wrapped by errors.Abort to bytestr
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 00:04:46 -0500] rev 49946
notify: force an exception wrapped by errors.Abort to bytestr Flagged by PyCharm and pytype.
Thu, 05 Jan 2023 19:53:02 -0500 typing: disable a bogus attribute-error warning in phabricator
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 19:53:02 -0500] rev 49945
typing: disable a bogus attribute-error warning in phabricator In a local pytype run, this fixes: File "/mnt/c/Users/Matt/hg/hgext/phabricator.py", line 359, in <lambda>: No attribute 'items' on bytes [attribute-error] In Union[Any, bytes] Called from (traceback): line 363, in process The `bytes` case takes the previous `if` branch though.
Thu, 05 Jan 2023 19:47:35 -0500 sparse: fix a py2 based usage of `map()`
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 19:47:35 -0500] rev 49944
sparse: fix a py2 based usage of `map()` In a local pytype run, this fixes: File "/mnt/c/Users/Matt/hg/hgext/sparse.py", line 386, in debugsparse: unsupported operand type(s) for item retrieval: 'fcounts: Iterator[int]' and '0: int' [unsupported-operands] No attribute '__getitem__' on 'fcounts: Iterator[int]' File "/mnt/c/Users/Matt/hg/hgext/sparse.py", line 387, in debugsparse: unsupported operand type(s) for item retrieval: 'fcounts: Iterator[int]' and '1: int' [unsupported-operands] No attribute '__getitem__' on 'fcounts: Iterator[int]' File "/mnt/c/Users/Matt/hg/hgext/sparse.py", line 388, in debugsparse: unsupported operand type(s) for item retrieval: 'fcounts: Iterator[int]' and '2: int' [unsupported-operands] No attribute '__getitem__' on 'fcounts: Iterator[int]'
Thu, 05 Jan 2023 19:42:45 -0500 typing: adjust `mercurial.util.iterlines()` to accept any `Iterable`
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 19:42:45 -0500] rev 49943
typing: adjust `mercurial.util.iterlines()` to accept any `Iterable` In a local pytype run on the extensions, this fixes: File "/mnt/c/Users/Matt/hg/hgext/phabricator.py", line 788, in maketext: Function mercurial.util.iterlines was called with the wrong arguments [wrong-arg-types] Expected: (iterator: Iterator[bytes]) Actually passed: (iterator: list) Attributes of protocol Iterator[bytes] are not implemented on list: __next__
Thu, 05 Jan 2023 17:45:25 -0500 typing: disable an attribute-error warning in the journal extension
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:45:25 -0500] rev 49942
typing: disable an attribute-error warning in the journal extension The code is complicated enough that pytype doesn't realize that `name` can't be `None` if it is evaluated here.
Fri, 06 Jan 2023 12:20:09 -0500 remotefilelog: byteify the message for a few StorageErrors
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 12:20:09 -0500] rev 49941
remotefilelog: byteify the message for a few StorageErrors Flagged by pytype locally.
Thu, 05 Jan 2023 17:38:14 -0500 histedit: byteify the help for the multifold action
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:38:14 -0500] rev 49940
histedit: byteify the help for the multifold action While there's some allowance for str in `_()`, it's commented to be for "goofy unicode docstrings in test", so no idea how well that works, but it should at least come back as bytes. With HGPLAIN, however, the str isn't touched and is returned as-is, so this seems like a real bug.
Thu, 05 Jan 2023 17:31:11 -0500 typing: disable a few incorrect warnings in pywatchman
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:31:11 -0500] rev 49939
typing: disable a few incorrect warnings in pywatchman The module-attr warnings are for things that only exist on Windows, and the wrong-keyword-args warning is due to a special case for a specific constructor. Both of these are properly conditionalized.
Thu, 05 Jan 2023 17:28:33 -0500 watchman: refactor transport connecting to unconfuse pytype
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:28:33 -0500] rev 49938
watchman: refactor transport connecting to unconfuse pytype Pytype sees `self.proc` as potentially `None` here, even though it's set by the `_connect()` logic. Instead of asserting, simply use the process returned by that method (which it sets into `self.proc` before returning, so there's no functional change here).
Thu, 05 Jan 2023 17:24:11 -0500 watchman: refactor `ctypes.windll.kernel32` references to a local variable
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:24:11 -0500] rev 49937
watchman: refactor `ctypes.windll.kernel32` references to a local variable This is flagged by pytype as an attribute-error, and it's easier to disable that in a single place.
Thu, 05 Jan 2023 17:21:09 -0500 typing: disable [unsupported-operands] warning in the largefiles outgoing hook
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:21:09 -0500] rev 49936
typing: disable [unsupported-operands] warning in the largefiles outgoing hook For some reason, pytype thinks `toupload` is a set: No attribute '__setitem__' on Set[nothing] (It actually is a set in the subsequent `else` branch, but I'm not interested in trying to rewrite this to be consistent.)
Thu, 05 Jan 2023 17:15:27 -0500 typing: add some assertions that a variable isn't None
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:15:27 -0500] rev 49935
typing: add some assertions that a variable isn't None In the case of blackbox, there's a default limit if one isn't explicitly supplied. For the monotone regex, neither group is optional, so a match means it's not None.
Thu, 05 Jan 2023 17:09:41 -0500 largefiles: reference `mercurial.configitems.dynamicdefault` directly
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:09:41 -0500] rev 49934
largefiles: reference `mercurial.configitems.dynamicdefault` directly Pytype was unable to see `dynamicdefault` on `eh.configitem`. This is clearer anyway.
Thu, 05 Jan 2023 17:04:16 -0500 releasenotes: fix a typo in a comment
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:04:16 -0500] rev 49933
releasenotes: fix a typo in a comment
Thu, 05 Jan 2023 17:02:02 -0500 schemes: fix a broken check for drive letter conflicts
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 17:02:02 -0500] rev 49932
schemes: fix a broken check for drive letter conflicts Flagged by pytype locally. It appears to have regressed in 1863584f2fba (not yet released). This seems like an obvious typo- `dict.isalpha()` is nonsense. There's no crash though because `schemes` is pre-populated with 5 schemes (that are all now defunct), so the length of the dict is never 1, so it's impossible to abort.
Fri, 06 Jan 2023 13:04:50 -0500 typing: suppress a bunch of potential import-error cases in extensions
Matt Harbison <matt_harbison@yahoo.com> [Fri, 06 Jan 2023 13:04:50 -0500] rev 49931
typing: suppress a bunch of potential import-error cases in extensions As flagged by pytype locally. Either the ImportError is locally handled, or the imported module was previously determined to be present by `hgave` (for the phabricator extension), or is handled by the `hgext.convert.subversion` module when imported (for the `hgext.convert.transport` module).
Thu, 05 Jan 2023 00:09:48 -0500 watchman: drop some py2 compat code
Matt Harbison <matt_harbison@yahoo.com> [Thu, 05 Jan 2023 00:09:48 -0500] rev 49930
watchman: drop some py2 compat code The `unicode` reference was being flagged by pytype, even though it was never evaluated on py3. There's more that can be dropped and `compat.py` can probably be inlined if we don't care about minimizing the code changes from FB. But I don't feel like dealing with that.
Wed, 04 Jan 2023 17:15:19 -0500 pytype: add coverage for hgdemandimport
Matt Harbison <matt_harbison@yahoo.com> [Wed, 04 Jan 2023 17:15:19 -0500] rev 49929
pytype: add coverage for hgdemandimport This would have flagged what needed fixing in 48e38b179106 long ago.
Fri, 16 Dec 2022 17:46:20 +0100 hgweb: skip body creation of HEAD for most requests
Joerg Sonnenberger <joerg@bec.de> [Fri, 16 Dec 2022 17:46:20 +0100] rev 49928
hgweb: skip body creation of HEAD for most requests The body is thrown away anyway, so this just wastes a lot of CPU time. In the case of /archive/, this skips manifest processing and the actual file archiving, resulting in a huge difference. The most tricky part here is skipping the Content-Length creation as it would indicate the output size for the corresponding GET request.
Wed, 04 Jan 2023 16:02:22 +0100 branching: merge stable into default
Raphaël Gomès <rgomes@octobus.net> [Wed, 04 Jan 2023 16:02:22 +0100] rev 49927
branching: merge stable into default
Tue, 03 Jan 2023 11:53:35 -0500 urlutil: drop the deprecated `getpath()`
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 11:53:35 -0500] rev 49926
urlutil: drop the deprecated `getpath()` This was deprecated in 5.9.
Tue, 03 Jan 2023 11:51:56 -0500 ui: drop the deprecated `getpath()`
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 11:51:56 -0500] rev 49925
ui: drop the deprecated `getpath()` This was deprecated in 5.9.
Tue, 03 Jan 2023 11:48:21 -0500 ui: drop the deprecated `expandpath()`
Matt Harbison <matt_harbison@yahoo.com> [Tue, 03 Jan 2023 11:48:21 -0500] rev 49924
ui: drop the deprecated `expandpath()` This was deprecated since 5.8.
Thu, 22 Dec 2022 16:57:56 +0000 revlog: fix misleading comment about _maxinline
Arseniy Alekseyev <aalekseyev@janestreet.com> [Thu, 22 Dec 2022 16:57:56 +0000] rev 49923
revlog: fix misleading comment about _maxinline
Wed, 21 Dec 2022 12:26:00 +0100 verify: print short `p1` node in relevant dirstate messages
Raphaël Gomès <rgomes@octobus.net> [Wed, 21 Dec 2022 12:26:00 +0100] rev 49922
verify: print short `p1` node in relevant dirstate messages This will help with debugging.
Mon, 02 May 2022 11:27:20 +0200 verify: also check dirstate
Raphaël Gomès <rgomes@octobus.net> [Mon, 02 May 2022 11:27:20 +0200] rev 49921
verify: also check dirstate The dirstate already is capable of verifying its integrity (although v2 features are not yet checked), let's run that code in `hg verify`.
Mon, 02 May 2022 17:47:38 +0200 tests: use the `--quiet` flag for verify when applicable
Raphaël Gomès <rgomes@octobus.net> [Mon, 02 May 2022 17:47:38 +0200] rev 49920
tests: use the `--quiet` flag for verify when applicable This reduces a lot of the test output that was otherwise useless, and also makes it a lot easier to add things to verify without breaking the test suite because of additional output.
Wed, 21 Dec 2022 12:03:02 +0100 verify: format messages directly at the source
Raphaël Gomès <rgomes@octobus.net> [Wed, 21 Dec 2022 12:03:02 +0100] rev 49919
verify: format messages directly at the source
Mon, 02 May 2022 11:58:43 +0200 dirstate: update messages in verify to not use the old `state` API
Raphaël Gomès <rgomes@octobus.net> [Mon, 02 May 2022 11:58:43 +0200] rev 49918
dirstate: update messages in verify to not use the old `state` API
Mon, 02 May 2022 17:39:01 +0200 dirstate: add narrow support to `verify`
Raphaël Gomès <rgomes@octobus.net> [Mon, 02 May 2022 17:39:01 +0200] rev 49917
dirstate: add narrow support to `verify` This will be called later in the series by the `verify` command.
Mon, 02 May 2022 11:42:23 +0200 dirstate: stop using `entry.state()` for logic in `verify`
Raphaël Gomès <rgomes@octobus.net> [Mon, 02 May 2022 11:42:23 +0200] rev 49916
dirstate: stop using `entry.state()` for logic in `verify` Use the new API instead of the deprecated one. The next changeset will remove the use of `state` in this method altogether (currently still in the messages)
Mon, 02 May 2022 11:40:33 +0200 dirstate-entry: add `modified` property
Raphaël Gomès <rgomes@octobus.net> [Mon, 02 May 2022 11:40:33 +0200] rev 49915
dirstate-entry: add `modified` property This was already done in the Rust implementation and is a useful primitive. The C implementation had this called `merged`, but wasn't used anywhere. It will be used in the next changeset.
Mon, 19 Dec 2022 16:22:01 +0100 debug: add debug-revlog-stats command
Franck Bret <franck.bret@octobus.net> [Mon, 19 Dec 2022 16:22:01 +0100] rev 49914
debug: add debug-revlog-stats command Display statistics about revlogs in the store. Useful to get an approximate size of a repository, etc. More statistics will be added in the future.
Fri, 16 Dec 2022 22:24:05 -0500 typing: attempt to remove @overloads in the platform module for stdlib methods
Matt Harbison <matt_harbison@yahoo.com> [Fri, 16 Dec 2022 22:24:05 -0500] rev 49913
typing: attempt to remove @overloads in the platform module for stdlib methods This is mostly successful, as examining util.pyi, posix.pyi, and windows.pyi after a pytype run shows that the type overloads for `oslink`, `readlink`, `removedirs`, `rename`, `split`, and `unlink` have been removed. (Some of these still have an @overload, but the differences are the variable names, not the types.) However, @overloads remain for `abspath` and `normpath` for some reason. It's useful to redefine these methods for the type checking phase because in addition to excluding str and PathLike variants, some of these functions have optional args in stdlib that aren't implemented in the custom implementation on Windows, and we want the type checking to flag that instead of assuming it's an allowable overload everywhere. One last quirk I noticed that I can't explain- `pycompat.TYPE_CHECKING` is always False, so the conditionals need to check `typing.TYPE_CHECKING` directly. I tried dropping the custom code for assigning `pycompat.TYPE_CHECKING` and simply did `from typing import TYPE_CHECKING` directly in pycompat.py, and used `pycompat.TYPE_CHECKING` for the conditional here... and pytype complained that `pycompat` doesn't have the `TYPE_CHECKING` variable.
Fri, 16 Dec 2022 22:07:02 -0500 typing: add trivial type hints to rest of the windows platform module
Matt Harbison <matt_harbison@yahoo.com> [Fri, 16 Dec 2022 22:07:02 -0500] rev 49912
typing: add trivial type hints to rest of the windows platform module Skipping the file wrappers for now because there's interplay with C code, and making them subclass `typing.BinaryIO_Proxy` confuses PyCharm a bit.
Fri, 16 Dec 2022 18:27:15 -0500 typing: add type hints to the rest of the posix module
Matt Harbison <matt_harbison@yahoo.com> [Fri, 16 Dec 2022 18:27:15 -0500] rev 49911
typing: add type hints to the rest of the posix module These methods either don't have an analog in the windows module, or are aliased in the windows module from something else (like os.path.xxx).
(0) -30000 -10000 -3000 -1000 -300 -100 -48 +48 +100 +300 +1000 tip