<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/19969b7398d3d88727e539f25eb5e6a52143f107">https://github.com/macports/macports-ports/commit/19969b7398d3d88727e539f25eb5e6a52143f107</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19969b7398d3d88727e539f25eb5e6a52143f107
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Tue Mar 15 17:28:42 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> mercurial, tortoisehg: update to 6.1
</span>---
devel/mercurial/Portfile | 27 +++++++++++++++++----------
devel/mercurial/files/patch-rust.diff | 23 -----------------------
devel/tortoisehg/Portfile | 10 +++++-----
3 files changed, 22 insertions(+), 38 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 62759f0307e..cfb496e9196 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;'>@@ -11,7 +11,7 @@ if {[variant_isset rust]} {
</span> 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 6.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.1
</span> revision 0
categories devel python
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,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 ae19886b5e238c9bd6b2388db1d8a3ee9242d085 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 05fd0b480389c96547f5a6c769e90ee00f1d13f7ac0d465e40a381c6cf3a56e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8072365
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 71f464d948657dded24d3c8f4b9ad2de3bc9dbc8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8061104
</span>
python.default_version 310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,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 patch-rust.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-setup.py.diff
</span>
build.cmd make
build.env-append FORCE_SETUPTOOLS=1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,12 +160,14 @@ variant rust description {Enable experimental Rust optimizations} {
</span> either 1.6.1 e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457 \
env_logger 0.7.1 44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36 \
flate2 1.0.19 7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- format-bytes 0.2.2 1c4e89040c7fd7b4e6ba2820ac705a45def8a0c098ec78d170ae88f1ef1d5762 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- format-bytes-macros 0.3.0 b05089e341a0460449e2210c3bf7b61597860b07f0deae58da38dbed0a4c6b6d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ format-bytes 0.3.0 48942366ef93975da38e175ac9e10068c6fc08ca9e85930d4f098f4d5b14c2fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ format-bytes-macros 0.4.0 203aadebefcc73d12038296c228eabf830f99cba991b0032adf20e9fa6ce7e4f \
</span> generic-array 0.14.4 501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817 \
getrandom 0.1.15 fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ getrandom 0.2.4 418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c \
</span> glob 0.3.0 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574 \
hermit-abi 0.1.17 5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ hex 0.4.3 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70 \
</span> home 0.5.3 2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654 \
humantime 1.3.0 df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f \
im-rc 15.0.0 3ca8957e71f04a205cb162508f9326aea04676c8dfd0711220190d6b83664f3f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,6 +175,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span> jobserver 0.1.21 5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2 \
lazy_static 1.4.0 e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 \
libc 0.2.81 1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ libm 0.2.1 c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a \
</span> libz-sys 1.1.2 602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655 \
log 0.4.11 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b \
maybe-uninit 2.0.0 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,18 +194,21 @@ variant rust description {Enable experimental Rust optimizations} {
</span> pkg-config 0.3.19 3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c \
ppv-lite86 0.2.10 ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857 \
pretty_assertions 0.6.1 3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- proc-macro-hack 0.5.19 dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5 \
</span> proc-macro2 1.0.24 1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71 \
python27-sys 0.7.0 94670354e264300dde81a5864cbb6bfc9d56ac3dcf3a278c32cb52f816f4dfd1 \
python3-sys 0.7.0 b18b32e64c103d5045f44644d7ddddd65336f7a0521f6fde673240a9ecceb77e \
quick-error 1.2.3 a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0 \
quote 1.0.7 aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37 \
rand 0.7.3 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ rand 0.8.4 2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8 \
</span> rand_chacha 0.2.2 f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ rand_chacha 0.3.1 e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88 \
</span> rand_core 0.5.1 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rand_distr 0.2.2 96977acbdd3a6576fb1d27391900035bf3863d4a16422973a409b488cf29ffb2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rand_core 0.6.3 d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rand_distr 0.4.2 964d548f8e7d12e102ef183a0de7e98180c9f8729f555897a857b96e48122d2f \
</span> rand_hc 0.2.0 ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rand_pcg 0.2.1 16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rand_hc 0.3.1 d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rand_pcg 0.3.1 59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e \
</span> rand_xoshiro 0.4.0 a9fcdd2e881d02f1d9390ae47ad8e5696a9e4be7b547a1da2afbc61973217004 \
rayon 1.5.0 8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674 \
rayon-core 1.9.0 9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -229,6 +235,7 @@ variant rust description {Enable experimental Rust optimizations} {
</span> unicode-xid 0.2.1 f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564 \
users 0.11.0 24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032 \
vcpkg 0.2.11 b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ vcsgraph 0.2.0 4cb68c231e2575f7503a7c19213875f9d4ec2e84e963a56ce3de4b6bee351ef7 \
</span> vec_map 0.8.2 f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191 \
version_check 0.9.2 b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed \
wasi 0.9.0+wasi-snapshot-preview1 cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519 \
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index de1f5f7ba5b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mercurial/files/patch-rust.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>---- a/rust/hg-core/src/dirstate_tree/on_disk.rs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/rust/hg-core/src/dirstate_tree/on_disk.rs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,7 +353,7 @@ impl Node {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0o644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file_type | permisions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (file_type | permisions).into()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fn assume_entry(&self) -> Result<DirstateEntry, DirstateV2ParseError> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -454,8 +454,8 @@ impl Node {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags.set(Flags::P1_TRACKED, p1_tracked);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags.set(Flags::P2_INFO, p2_info);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- let size = if let Some((m, s)) = mode_size_opt {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- let exec_perm = m & libc::S_IXUSR != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- let is_symlink = m & libc::S_IFMT == libc::S_IFLNK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ let exec_perm: bool = m & (libc::S_IXUSR as u32) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ let is_symlink: bool = m & (libc::S_IFMT as u32) != 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags.set(Flags::MODE_EXEC_PERM, exec_perm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags.set(Flags::MODE_IS_SYMLINK, is_symlink);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags.insert(Flags::HAS_MODE_AND_SIZE);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/tortoisehg/Portfile b/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7822409c87..ab6f0dd5d9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/tortoisehg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup app 1.0
</span> PortGroup gitlab 1.0
gitlab.instance https://foss.heptapod.net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup mercurial/tortoisehg thg 6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup mercurial/tortoisehg thg 6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
name tortoisehg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ description A set of graphical tools for Mercurial
</span> long_description A set of graphical tools for the Mercurial distributed \
source control management system.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4a137b4401a7b114ec0e1729ebc48fd3c5bc846f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3ec86bf9202ed1c23d0a1d890f461d4db582c669f0d5d2e4a60754404e1dcd29 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7523751
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d8c3f1efb85ba82f37c63eb40a92bab03ce7cb10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 49c3cf48b2ace9196d0aff11d7474c64cd7577cd9b1c6c862f4c98261ad4c0fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7531242
</span>
python.default_version 310
</pre><pre style='margin:0'>
</pre>