[PATCH stable] rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
# HG changeset patch
# User Mads Kiilerich
# Date 1657572476 -7200
# Mon Jul 11 22:47:56 2022 +0200
# Branch stable
# Node ID f1713e81437e894fab0658e4f410184e10d35e5e
# Parent 55adff8105464f6247983940ba109684d36b689d
rust: bump to memmap2 0.5.3, micro-timer 0.4.0, and crossbeam-channel 0.5.0
The merge in 12adf8c695ed had conflicts in rust/Cargo.lock and
rust/hg-core/Cargo.toml . Let's ignore rust/Cargo.lock - it is regenerated.
For rust/hg-core/Cargo.toml, stable had dd6b67d5c256 "rust: fix unsound
`OwningDirstateMap`" which introduced ouroboros (and dropped
stable_deref_trait).
Default had ec8d9b5a5e7c "rust-hg-core: upgrade dependencies" which had a lot
of churn bumping minimum versions - also patch versions. It is indeed a good
idea to bump to *allow* use of latest package. That means that major versions
should be bumped for packages after 1.0, and for packages below 1.0 minor
versions should be bumped too. But it doesn't work to try enforce a policy of
using latest patch by bumping versions at arbitrary times.
For good or bad, the merge doesn't seem to have resolved the conflicts
correctly, and many of the minor "upgrade dependencies" were lost again.
Unfortunately, it also lost the bump of memmap2 to 0.5.3, which is needed for
Fedora packaging where 0.4 isn't available. Same with micro-timer bump to 0.4
(which already is used in rhg). crossbeam-channel bump was also lost.
This change fixes that regression by redoing these "important" lines of the
merge "correctly".
I propose this for stable, even though dependency changes on stable branches
are annoying.
diff --git a/rust/hg-core/Cargo.toml b/rust/hg-core/Cargo.toml
--- a/rust/hg-core/Cargo.toml
+++ b/rust/hg-core/Cargo.toml
@@ -29,10 +29,10 @@ sha-1 = "0.10.0"
twox-hash = "1.6.2"
same-file = "1.0.6"
tempfile = "3.1.0"
-crossbeam-channel = "0.4"
-micro-timer = "0.3.0"
+crossbeam-channel = "0.5.0"
+micro-timer = "0.4.0"
log = "0.4.8"
-memmap2 = {version = "0.4", features = ["stable_deref_trait"]}
+memmap2 = { version = "0.5.3", features = ["stable_deref_trait"] }
zstd = "0.5.3"
format-bytes = "0.3.0"
___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH] run-tests: fix typo in log message
# HG changeset patch
# User Julien Cristau
# Date 1657546880 -7200
# Mon Jul 11 15:41:20 2022 +0200
# Node ID 7c7341e2be5faaa6cf59373844e8d0d6d33e690f
# Parent 259df3e3152c1fbb4d95c2fab682ca93581cf9ca
run-tests: fix typo in log message
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -306,17 +306,17 @@ def Popen4(cmd, wd, timeout, env=None):
p.timeout = False
if timeout:
def t():
start = time.time()
while time.time() - start < timeout and p.returncode is None:
time.sleep(0.1)
p.timeout = True
-vlog('# Timout reached for process %d' % p.pid)
+vlog('# Timeout reached for process %d' % p.pid)
if p.returncode is None:
terminate(p)
threading.Thread(target=t).start()
return p
___
Mercurial-devel mailing list
Mercurial-devel@lists.mercurial-scm.org
https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@49381: new changeset
New changeset in mercurial: https://www.mercurial-scm.org/repo/hg/rev/259df3e3152c changeset: 49381:259df3e3152c bookmark:@ tag: tip parent: 49365:79b2c98ab7b4 parent: 49380:55adff810546 user:Raphaël Gomès date:Mon Jul 11 09:54:40 2022 +0200 summary: branching: merge stable into default -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
mercurial@49380: 2 new changesets (2 on stable)
2 new changesets (2 on stable) in mercurial: https://www.mercurial-scm.org/repo/hg/rev/b0ab20f24171 changeset: 49379:b0ab20f24171 branch: stable user:Raphaël Gomès date:Mon Jul 11 09:50:13 2022 +0200 summary: Added tag 6.2 for changeset 094a5fa3cf52 https://www.mercurial-scm.org/repo/hg/rev/55adff810546 changeset: 49380:55adff810546 branch: stable tag: tip user:Raphaël Gomès date:Mon Jul 11 09:50:32 2022 +0200 summary: Added signature for changeset 094a5fa3cf52 -- Repository URL: https://www.mercurial-scm.org/repo/hg ___ Mercurial-devel mailing list Mercurial-devel@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial-devel
