<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/61da3e2b930c381b73d48371c1ed00bfdb170edb">https://github.com/macports/macports-ports/commit/61da3e2b930c381b73d48371c1ed00bfdb170edb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 61da3e2b930c381b73d48371c1ed00bfdb170edb
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Tue Dec 5 20:26:34 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> mercurial: update to 6.6
</span>---
devel/mercurial/Portfile | 27 +++++++++++++++++----------
devel/mercurial/files/hg.diff | 10 +++++-----
devel/mercurial/files/makefile.diff | 4 ++--
devel/mercurial/files/setup_py.diff | 10 +++++-----
4 files changed, 29 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mercurial/Portfile b/devel/mercurial/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16e4b91805b..e3ccc969653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mercurial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mercurial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ name mercurial
</span> # port echo rdepends:mercurial and \( name:hg or name:mercurial \) | grep -v 'py[[:digit:]]'
# also, please remember that the rust variant needs love too:
# cargo2port rust/Cargo.lock | pbcopy
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.6
</span> revision 0
categories devel python
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,9 +39,9 @@ long_description Mercurial is a fast, lightweight Source Control Management \
</span> homepage https://www.mercurial-scm.org
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7036c5bd2f2506bfb86fd0a8bd02cdedfc051179 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bb985397cb7470ee0158bee237097e2fddffad327e645a49497a33471e78a910 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8182450
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7dc2825a8bb65fa537e9081d2c87848dd7fd70b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6bfd71cba0df3b18de424216b30e2a541cca6e0104853d3334be80a2ab09a4ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8250065
</span>
python.default_version 311
python.pep517 no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,11 +146,9 @@ variant rust description {Enable experimental Rust optimizations} {
</span> install-rhg
cargo.crates \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Inflector 0.11.4 fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3 \
</span> adler 1.0.2 f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe \
ahash 0.8.2 bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107 \
aho-corasick 0.7.19 b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aliasable 0.1.3 250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd \
</span> android_system_properties 0.1.5 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311 \
atty 0.2.14 d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 \
autocfg 1.1.0 d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,6 +195,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span> generic-array 0.14.6 bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9 \
getrandom 0.1.16 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce \
getrandom 0.2.8 c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ hashbrown 0.12.3 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888 \
</span> hashbrown 0.13.1 33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038 \
heck 0.4.0 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9 \
hermit-abi 0.1.19 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,6 +205,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span> iana-time-zone 0.1.53 64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765 \
iana-time-zone-haiku 0.1.1 0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca \
im-rc 15.1.0 af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ indexmap 1.9.2 1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399 \
</span> instant 0.1.12 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c \
itertools 0.10.5 b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 \
jobserver 0.1.25 068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,14 +222,13 @@ variant rust description {Enable experimental Rust optimizations} {
</span> memmap2 0.5.8 4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc \
memoffset 0.6.5 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce \
miniz_oxide 0.5.4 96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ nom8 0.2.0 ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8 \
</span> num-integer 0.1.45 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9 \
num-traits 0.2.15 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd \
num_cpus 1.14.0 f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5 \
once_cell 1.16.0 86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860 \
opaque-debug 0.3.0 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5 \
os_str_bytes 6.4.0 7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ouroboros 0.15.5 dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ouroboros_macro 0.15.5 4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d \
</span> output_vt100 0.1.3 628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66 \
paste 1.0.9 b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1 \
pkg-config 0.3.26 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,23 +259,29 @@ variant rust description {Enable experimental Rust optimizations} {
</span> same-file 1.0.6 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502 \
scopeguard 1.1.0 d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd \
scratch 1.0.2 9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ self_cell 1.0.0 4a3926e239738d36060909ffe6f511502f92149a45a1fade7fe031cb2d33e88b \
</span> semver 1.0.14 e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ serde 1.0.152 bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serde_derive 1.0.152 af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serde_spanned 0.6.1 0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4 \
</span> sha-1 0.9.8 99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6 \
sha-1 0.10.0 028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f \
sized-chunks 0.6.5 16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e \
stable_deref_trait 1.2.0 a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 \
static_assertions 1.1.0 a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f \
strsim 0.10.0 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- syn 1.0.103 a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ syn 1.0.109 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237 \
</span> tempfile 3.3.0 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4 \
termcolor 1.1.3 bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755 \
thread_local 1.1.4 5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180 \
time 0.1.44 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ toml 0.6.0 4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toml_datetime 0.5.1 4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ toml_edit 0.18.1 56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b \
</span> twox-hash 1.6.3 97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675 \
typenum 1.15.0 dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987 \
unicode-ident 1.0.5 6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3 \
unicode-width 0.1.10 c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- users 0.11.0 24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032 \
</span> vcpkg 0.2.15 accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426 \
vcsgraph 0.2.0 4cb68c231e2575f7503a7c19213875f9d4ec2e84e963a56ce3de4b6bee351ef7 \
version_check 0.9.4 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,7 +293,9 @@ variant rust description {Enable experimental Rust optimizations} {
</span> wasm-bindgen-macro 0.2.83 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810 \
wasm-bindgen-macro-support 0.2.83 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c \
wasm-bindgen-shared 0.2.83 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ web-sys 0.3.60 bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f \
</span> which 4.3.0 1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ whoami 1.4.0 2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68 \
</span> winapi 0.3.9 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 \
winapi-i686-pc-windows-gnu 0.4.0 ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 \
winapi-util 0.1.5 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mercurial/files/hg.diff b/devel/mercurial/files/hg.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0079eabce42..17003d22744 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mercurial/files/hg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mercurial/files/hg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> # Date 1678122146 -3600
# Mon Mar 06 18:02:26 2023 +0100
# Branch stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 97f73ce73a5993b50dd60b98e19897b40c773598
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 05de4896508e8ec387b33eb30d8aab78d1c8e9e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID a070a7c3dbf8d0c6b5085785d6ffa0206f1622ce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 26c57e7a0890b96e2c473b394de380d6753c9230
</span> # EXP-Topic patches
hg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,6 @@ diff --git a/hg b/hg
</span> - )
- )
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- from hgdemandimport import tracing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- with tracing.log('hg script'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from hgdemandimport import tracing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except ImportError:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mercurial/files/makefile.diff b/devel/mercurial/files/makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1bce1b60d15..0975284e0e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mercurial/files/makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mercurial/files/makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> # Date 1678122147 -3600
# Mon Mar 06 18:02:27 2023 +0100
# Branch stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 0e53656c4ed0867d413b5349de67b6cdac324cdd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 97f73ce73a5993b50dd60b98e19897b40c773598
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID 506edb8dbf983280ec1f7a7635eb8d4931422666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent a070a7c3dbf8d0c6b5085785d6ffa0206f1622ce
</span> # EXP-Topic patches
makefile
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mercurial/files/setup_py.diff b/devel/mercurial/files/setup_py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e51a9908abe..8648a7b55fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mercurial/files/setup_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mercurial/files/setup_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,15 +3,15 @@
</span> # Date 1678122149 -3600
# Mon Mar 06 18:02:29 2023 +0100
# Branch stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID bd9df7f3c1ec03f0564b71aa82b0c84fff111d81
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 0e53656c4ed0867d413b5349de67b6cdac324cdd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID 7b2f5582042517cfe414f93580db0102ddbf92a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 506edb8dbf983280ec1f7a7635eb8d4931422666
</span> # EXP-Topic patches
setup_py
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1102,61 +1102,6 @@ class hginstallscripts(install_scripts):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1121,61 +1121,6 @@ class hginstallscripts(install_scripts):
</span> install_scripts.finalize_options(self)
self.set_undefined_options('install', ('install_lib', 'install_lib'))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ diff --git a/setup.py b/setup.py
</span> class hginstallcompletion(Command):
description = 'Install shell completion'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1413,7 +1358,9 @@ class RustCompilationError(CCompilerErro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1434,7 +1379,9 @@ class RustCompilationError(CCompilerErro
</span> class RustExtension(Extension):
"""Base classes for concrete Rust Extension classes."""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ diff --git a/setup.py b/setup.py
</span>
def __init__(self, mpath, sources, rustlibname, subcrate, **kw):
Extension.__init__(self, mpath, sources, **kw)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1461,7 +1408,7 @@ class RustExtension(Extension):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1482,7 +1429,7 @@ class RustExtension(Extension):
</span>
env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir
</pre><pre style='margin:0'>
</pre>