Mercurial > public > mercurial-scm > hg-stable

changeset 52432:0030bb6864ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 06 Dec 2024 00:58:45 -0500
parents 5ff6fba7c4c5 (current diff) 0c4832bf517a (diff)
children 6673cec8605c
files
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/check-pytype.sh	Thu Dec 05 23:22:40 2024 -0500
+++ b/contrib/check-pytype.sh	Fri Dec 06 00:58:45 2024 -0500
@@ -1,7 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 set -u
+set -o pipefail
 
 cd "$(hg root)"
 
--- a/contrib/heptapod-ci.yml	Thu Dec 05 23:22:40 2024 -0500
+++ b/contrib/heptapod-ci.yml	Fri Dec 06 00:58:45 2024 -0500
@@ -442,7 +442,7 @@
       - ./contrib/setup-pytype.sh
     script:
       - echo "Entering script section"
-      - sh contrib/check-pytype.sh
+      - bash contrib/check-pytype.sh
 
 # `sh.exe --login` sets a couple of extra environment variables that are defined
 # in the MinGW shell, but switches CWD to /home/$username.  The previous value
--- a/mercurial/manifest.py	Thu Dec 05 23:22:40 2024 -0500
+++ b/mercurial/manifest.py	Fri Dec 06 00:58:45 2024 -0500
@@ -10,10 +10,10 @@
 import heapq
 import itertools
 import struct
+import typing
 import weakref
 
 from typing import (
-    ByteString,
     Callable,
     Collection,
     Dict,
@@ -51,6 +51,12 @@
     constants as revlog_constants,
 )
 
+if typing.TYPE_CHECKING:
+    from typing import (
+        ByteString,
+    )
+
+
 parsers = policy.importmod('parsers')
 propertycache = util.propertycache