<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/f84866286bce4cb3d40d8c823ba89720238558f7">https://github.com/macports/macports-ports/commit/f84866286bce4cb3d40d8c823ba89720238558f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f84866286bce4cb3d40d8c823ba89720238558f7
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Thu Dec 30 12:56:18 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    mercurial: update to 6.0
</span>---
 devel/mercurial/Portfile              | 24 +++++++++++++-----------
 devel/mercurial/files/patch-rust.diff | 23 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 11 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 fdaf677d8ec..6aacd180a73 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;'>@@ -2,15 +2,17 @@
</span> 
 PortSystem          1.0
 PortGroup           python 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset rust]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # see https://trac.macports.org/ticket/63834
</span>     PortGroup       cargo_fetch 1.0
 }
 
 name                mercurial
 # don't forget to update dependents for mercurial:
 # port echo rdepends:mercurial and \( name:hg or name:mercurial \) | grep -v 'py[[:digit:]]'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             5.9.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> categories          devel python
 platforms           darwin
 license             GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +37,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  99d4a3a244a2c721a9ec88e6955aec607628e452 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  3b43f68977ad0fa75aa7f1e5c8f0a83ba935621ab2396129abb498e56d1be08e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    8126023
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    rmd160  d1870617bf321557a64aa9a9d6dc980912149e2e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  53b68b7e592adce3a4e421da3bffaacfc7721f403aac319e6d2c5122574de62f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    8137797
</span> 
 python.default_version 39
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +52,7 @@ depends_run         path:share/curl/curl-ca-bundle.crt:curl-ca-bundle \
</span>                     port:py${python.version}-gnureadline
 
 patch.pre_args      -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-setup.py.diff patch-rust.diff
</span> 
 build.cmd           make
 build.env-append    FORCE_SETUPTOOLS=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +123,6 @@ post-activate {
</span> }
 
 variant rust description {Enable experimental Rust optimizations} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     build.env-append HGWITHRUSTEXT=cpython CARGO_BUILD_TARGET=
     destroot.env-append HGWITHRUSTEXT=cpython CARGO_BUILD_TARGET=
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,7 +145,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span>     clap                            2.33.3  37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002 \
     const_fn                         0.4.4  cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826 \
     cpufeatures                      0.1.4  ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    cpython                          0.6.0  8094679a4e9bfc8035572162624bc800eda35b5f9eff2537b9cd9aacc3d9782e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    cpython                          0.7.0  b7d46ba8ace7f3a1d204ac5060a706d0a68de6b42eafb6a586cc08bebcffe664 \
</span>     crc32fast                        1.2.1  81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a \
     crossbeam-channel                0.4.4  b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87 \
     crossbeam-channel                0.5.0  dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +177,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span>     log                             0.4.11  4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b \
     maybe-uninit                     2.0.0  60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00 \
     memchr                           2.3.4  0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    memmap                           0.7.0  6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    memmap2                          0.4.0  de5d3112c080d58ce560081baeaab7e1e864ca21795ddbf533d5b1842bb1ecf8 \
</span>     memoffset                        0.6.1  157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87 \
     micro-timer                      0.3.1  2620153e1d903d26b72b89f0e9c48d8c4756cba941c185461dddc234980c298c \
     micro-timer-macros               0.3.1  e28a3473e6abd6e9aab36aaeef32ad22ae0bd34e79f376643594c2b152ec1c5d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,8 +193,8 @@ variant rust description {Enable experimental Rust optimizations} {
</span>     pretty_assertions                0.6.1  3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427 \
     proc-macro-hack                 0.5.19  dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5 \
     proc-macro2                     1.0.24  1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    python27-sys                     0.6.0  5826ddbc5366eb0b0492040fdc25bf50bb49092c192bd45e80fb7a24dc6832ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    python3-sys                      0.6.0  b78af21b29594951a47fc3dac9b9eff0a3f077dec2f780ee943ae16a668f3b6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    python27-sys                     0.7.0  94670354e264300dde81a5864cbb6bfc9d56ac3dcf3a278c32cb52f816f4dfd1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    python3-sys                      0.7.0  b18b32e64c103d5045f44644d7ddddd65336f7a0521f6fde673240a9ecceb77e \
</span>     quick-error                      1.2.3  a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 \
     quote                            1.0.7  aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37 \
     rand                             0.7.3  6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -213,6 +214,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span>     scopeguard                       1.1.0  d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd \
     sha-1                            0.9.6  8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16 \
     sized-chunks                     0.6.2  1ec31ceca5644fa6d444cc77548b88b67f46db6f7c71683b0f9336e671830d2f \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    stable_deref_trait               1.2.0  a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 \
</span>     static_assertions                1.1.0  a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f \
     strsim                           0.8.0  8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a \
     syn                             1.0.54  9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mercurial/files/patch-rust.diff b/devel/mercurial/files/patch-rust.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..de1f5f7ba5b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mercurial/files/patch-rust.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/rust/hg-core/src/dirstate_tree/on_disk.rs b/rust/hg-core/src/dirstate_tree/on_disk.rs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rust/hg-core/src/dirstate_tree/on_disk.rs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rust/hg-core/src/dirstate_tree/on_disk.rs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -353,7 +353,7 @@ impl Node {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             0o644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        file_type | permisions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        (file_type | permisions).into()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     fn assume_entry(&self) -> Result<DirstateEntry, DirstateV2ParseError> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -454,8 +454,8 @@ impl Node {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         flags.set(Flags::P1_TRACKED, p1_tracked);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         flags.set(Flags::P2_INFO, p2_info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         let size = if let Some((m, s)) = mode_size_opt {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            let exec_perm = m & libc::S_IXUSR != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            let is_symlink = m & libc::S_IFMT == libc::S_IFLNK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            let exec_perm: bool = m & (libc::S_IXUSR as u32) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            let is_symlink: bool = m & (libc::S_IFMT as u32) != 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             flags.set(Flags::MODE_EXEC_PERM, exec_perm);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             flags.set(Flags::MODE_IS_SYMLINK, is_symlink);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             flags.insert(Flags::HAS_MODE_AND_SIZE);
</span></pre><pre style='margin:0'>

</pre>