D11452: pyoxidizer: add the user site to `sys.path` on macOS

2021-09-17 Thread mharbison72 (Matt Harbison) 
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This allows 3rd party extensions that are installed with `pip` to be picked 
up,
  similar to what we do on Windows.  PyOxidizer has a bug that prevents this 
from
  working without this extra help (see 95af358fcdfe 
), 
though it appears there's
  another wrinkle here with `sys._framework` too.
  
  I needed this to see if the problem[1] loading the keyring extension on 
Windows
  also occurs on macOS (it doesn't).
  
  [1] https://github.com/indygreg/PyOxidizer/issues/445

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11452

AFFECTED FILES
  rust/hgcli/pyoxidizer.bzl

CHANGE DETAILS

diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl
--- a/rust/hgcli/pyoxidizer.bzl
+++ b/rust/hgcli/pyoxidizer.bzl
@@ -58,6 +58,20 @@
 'site-packages',
 )
 )
+elif sys.platform == "darwin":
+vi = sys.version_info
+
+def joinuser(*args):
+return os.path.expanduser(os.path.join(*args))
+
+# Note: site.py uses `sys._framework` instead of hardcoding "Python" as the
+#   3rd arg, but that is set to an empty string in an oxidized binary.  It
+#   has a fallback to ~/.local when `sys._framework` isn't set, but we want
+#   to match what the system python uses, so it sees pip installed stuff.
+usersite = joinuser("~", "Library", "Python",
+"%d.%d" % vi[:2], "lib/python/site-packages")
+
+sys.path.append(usersite)
 import hgdemandimport;
 hgdemandimport.enable();
 from mercurial import dispatch;



To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11451: pyoxidizer: don't use in-memory for resources on macOS

2021-09-17 Thread mharbison72 (Matt Harbison) 
mharbison72 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  When trying to debug something else on macOS, pyoxidized builds were failing
  with the following message about pywatchman (and then cext.base85 when I
  commented out pywatchman):
  
"cannot be loaded from memory but memory loading required"
  
  I don't have any immediate plans to do more work on macOS, but maybe this will
  save someone else time debugging this.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11451

AFFECTED FILES
  rust/hgcli/pyoxidizer.bzl

CHANGE DETAILS

diff --git a/rust/hgcli/pyoxidizer.bzl b/rust/hgcli/pyoxidizer.bzl
--- a/rust/hgcli/pyoxidizer.bzl
+++ b/rust/hgcli/pyoxidizer.bzl
@@ -33,6 +33,7 @@
 TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", 
"http://timestamp.digicert.com;)
 
 IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE
+IS_MACOS = "darwin" in BUILD_TARGET_TRIPLE
 
 # Code to run in Python interpreter.
 RUN_CODE = """
@@ -69,7 +70,7 @@
 return default_python_distribution(python_version = "3.9")
 
 def resource_callback(policy, resource):
-if not IS_WINDOWS:
+if not (IS_WINDOWS or IS_MACOS):
 resource.add_location = "in-memory"
 return
 
@@ -100,7 +101,7 @@
 # extensions.
 packaging_policy.extension_module_filter = "all"
 packaging_policy.resources_location = "in-memory"
-if IS_WINDOWS:
+if IS_WINDOWS or IS_MACOS:
 packaging_policy.resources_location_fallback = 
"filesystem-relative:lib"
 packaging_policy.register_resource_callback(resource_callback)
 



To: mharbison72, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11450: check-code: make it possible to ignore the PWD check in some situation

2021-09-17 Thread marmoute (Pierre-Yves David) 
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The check-code script does not motivate the banning of $PWD so I am not sure
  what it is about. And I will needs to use the env variable in the next tests. 
So
  I am adding a way to make an exception.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11450

AFFECTED FILES
  contrib/check-code.py

CHANGE DETAILS

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -195,7 +195,7 @@
 [
 (r'^function', "don't use 'function', use old style"),
 (r'^diff.*-\w*N', "don't use 'diff -N'"),
-(r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`"),
+(r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`", "no-pwd-check"),
 (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"),
 (r'kill (`|\$\()', "don't use kill, use killdaemons.py"),
 ],



To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

mercurial-devel | Failed pipeline for branch/default | 067a8a44

2021-09-17 Thread Heptapod 


Pipeline #26891 has failed!

Project: mercurial-devel ( https://foss.heptapod.net/octobus/mercurial-devel )
Branch: branch/default ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/commits/branch/default )

Commit: 067a8a44 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/commit/067a8a44c0115c35d563df79359b17d28cf25416
 )
Commit Message: dirstate: fix compilation warnings in `dirstate...
Commit Author: Martin von Zweigbergk ( https://foss.heptapod.net/martinvonz )

Pipeline #26891 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/pipelines/26891 ) triggered 
by Administrator ( https://foss.heptapod.net/root )
had 1 failed job.

Job #246513 ( 
https://foss.heptapod.net/octobus/mercurial-devel/-/jobs/246513/raw )

Stage: tests
Name: check-pytype-py3

-- 
You're receiving this email because of your account on foss.heptapod.net.



___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11449: tests: make removeemptydirs more portable

2021-09-17 Thread marmoute (Pierre-Yves David) 
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The behavior of pwd change from one system (i.e. default shell/sh) from one
  system to another so we use fuzzy matching for the output we do not care and 
we
  use narrower command call to highlight what we are trying to test here.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11449

AFFECTED FILES
  contrib/check-code.py
  tests/test-removeemptydirs.t

CHANGE DETAILS

diff --git a/tests/test-removeemptydirs.t b/tests/test-removeemptydirs.t
--- a/tests/test-removeemptydirs.t
+++ b/tests/test-removeemptydirs.t
@@ -1,5 +1,13 @@
 Tests for experimental.removeemptydirs
 
+  $ cat >> pwd.py << EOF
+  > import os
+  > try:
+  > print(os.getcwd())
+  > except OSError:
+  > print("")
+  > EOF
+
   $ NO_RM=--config=experimental.removeemptydirs=0
   $ DO_RM=--config=experimental.removeemptydirs=1
   $ isdir() { if [ -d $1 ]; then echo yes; else echo no; fi }
@@ -132,8 +140,15 @@
   r1
   r2
   somedir
-  $ pwd
+#if windows
+  $ "$PYTHON" "$TESTTMP/pwd.py"
   $TESTTMP/hghistedit/somedir
+#else
+  $ echo ${PWD} # no-pwd-check
+  $TESTTMP/hghistedit/somedir
+  $ "$PYTHON" "$TESTTMP/pwd.py"
+  
+#endif
   $ ls -1 $TESTTMP/hghistedit/somedir
   foo
   $ ls -1
@@ -142,6 +157,7 @@
 Get out of the doomed directory
 
   $ cd $TESTTMP/hghistedit
+  chdir: error retrieving current directory: getcwd: cannot access parent 
directories: $ENOENT$ (?)
   $ hg files --rev . | grep somedir/
   somedir/foo
 
diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -195,7 +195,7 @@
 [
 (r'^function', "don't use 'function', use old style"),
 (r'^diff.*-\w*N', "don't use 'diff -N'"),
-(r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`"),
+(r'\$PWD|\${PWD}', "don't use $PWD, use `pwd`", "no-pwd-check"),
 (r'^([^"\'\n]|("[^"\n]*")|(\'[^\'\n]*\'))*\^', "^ must be quoted"),
 (r'kill (`|\$\()', "don't use kill, use killdaemons.py"),
 ],



To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7177: rebase: introduce optional parent mapping

2021-09-17 Thread marmoute (Pierre-Yves David) 
marmoute added a comment.


  In D7177#175507 , 
@joerg.sonnenberger wrote:
  
  > From the VC call today: The use case can be addressed by marking parents as 
to-be-preserved, so that for merge commits rebase can decide on the parent link 
is should operate on. It covers a general DAG and is somewhat easier to use in 
terms of UX than the parentmap, but can provide the same functionality with a 
multi-step rebase.
  
  Yeah, something like `--preserve-parent XXX` where XXX is a set a revs to 
"preserve". When rebasing a revision, if it has parents in XXX we keep them 
(and rebase the other). if no parent are in XXX, we don't care.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7177/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7177

To: joerg.sonnenberger, martinvonz, #hg-reviewers, baymax
Cc: mercurial-patches, marmoute, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D7177: rebase: introduce optional parent mapping

2021-09-17 Thread joerg.sonnenberger (Joerg Sonnenberger) 
joerg.sonnenberger added a comment.


  From the VC call today: The use case can be addressed by marking parents as 
to-be-preserved, so that for merge commits rebase can decide on the parent link 
is should operate on. It covers a general DAG and is somewhat easier to use in 
terms of UX than the parentmap, but can provide the same functionality with a 
multi-step rebase.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7177/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7177

To: joerg.sonnenberger, martinvonz, #hg-reviewers, baymax
Cc: mercurial-patches, marmoute, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

feature proposal, display grafted change set when using the -G option

2021-09-17 Thread Uwe Brauer 


Hi 

I know that when using the --log option the summary show that a change
set has been grafted as in 
@ Branch:  default
│  tag: tip
│  Author:  Bernhard Riemann 
│  Date:Sat, 04 Sep 2021 09:50:00 +0200
│  Phase:   draft
│  Summary: Third
│  (grafted from 62efcd62cb99c6d805f35b9e1f94bdd5393418e4)

Whoever tortoisehg displays this operation nicely by a dashed lines (see
the attached screenshot).

Regards

Uwe Brauer 

___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11448: relnotes: update next

2021-09-17 Thread Raphaël Gomès 
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11448

AFFECTED FILES
  relnotes/next

CHANGE DETAILS

diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -1,51 +1,42 @@
 == New Features ==
-
- * `hg config` now has a `--source` option to show where each
-   configuration value comes from.
+  * `debugrebuildfncache` now has an option to rebuild only the index files
 
 
 == Default Format Change ==
 
 These changes affects newly created repositories (or new clone) done with
-Mercurial 5.8.
+Mercurial 6.0.
 
 
 == New Experimental Features ==
 
+ * Added a new `web.full-garbage-collection-rate` to control performance. See
+   de2e04fe4897a554b9ef433167f11ea4feb2e09c for more information
 
 == Bug Fixes ==
 
+ * `hg fix --working-dir` now correctly works when in an uncommitted merge 
state
+ * `rhg` (Rust fast-path for `hg`) now supports the full config list syntax
+ * `rhg` now parses some corner-cases for revsets correctly
+ * Lots of Windows fixes
+ * Lots of miscellaneous other fixes
 
 == Backwards Compatibility Changes ==
 
 
 == Internal API Changes ==
 
-The Dirstate API have been updated as the previous function leaked some
-internal details and did not distinct between two important cases: "We are
-changing parent and need to adjust the dirstate" and "some command is changing
-which file is tracked". To clarify the situation:
-
-* the following functions have been deprecated,
+The following functions have been removed:
 
-  - dirstate.add,
-  - dirstate.normal,
-  - dirstate.normallookup,
-  - dirstate.merge,
-  - dirstate.otherparent,
-  - dirstate.remove,
-  - dirstate.drop,
-
-* these new functions are added for the "adjusting parents" use-case:
+  * `dirstate.normal`
+  * `dirstate.normallookup`
+  * `dirstate.otherparent`
+  * `dirstate.add`
+  * `dirstate.remove`
+  * `dirstate.drop`
+  * `dirstate.__getitem__`
 
-  - dirstate.update_file,
-  - dirstate.update_file_p1,
-
-* these new function are added for the "adjusting wc file" use-case":
+Miscellaneous:
 
-  - dirstate.set_tracked,
-  - dirstate.set_untracked,
-  - dirstate.set_clean,
-  - dirstate.set_possibly_dirty,
-
-See inline documentation of the new functions for details.
+ * `wireprotov1peer`'s `batchable` is now a simple function and not a generator
+   anymore
\ No newline at end of file



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11447: relnotes: add release notes for 5.9

2021-09-17 Thread Raphaël Gomès 
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D11447

AFFECTED FILES
  relnotes/5.9

CHANGE DETAILS

diff --git a/relnotes/5.9 b/relnotes/5.9
new file mode 100644
--- /dev/null
+++ b/relnotes/5.9
@@ -0,0 +1,85 @@
+== New Features ==
+
+ * `hg config` now has a `--source` option to show where each
+   configuration value comes from.
+ * Introduced a command (debug-repair-issue6533) to repair repositories 
affected
+   by issue6528
+
+== Default Format Change ==
+
+These changes affects newly created repositories (or new clone) done with
+Mercurial 5.8.
+
+
+== New Experimental Features ==
+
+ * A `changelogv2` format has been introduced. It is not ready for use yet, but
+   will be used later to address some of the weaknesses of the current revlog
+   format.
+ * Initial experiment and support for `dirstatev2`, a new dirstate format that
+   addresses some of the weaknesses of the current dirstate format. Python + C
+   and Rust support are being implemented, but the Rust solution is the one
+   currently getting the attention for performance.
+ * Initial support for `rhg status`. `rhg` is the Rust wrapper executable for 
hg
+   that shortcuts some commands for faster execution speed.
+
+== Bug Fixes ==
+
+ * Fixed a regression (in 5.9.1) introduced in 5.9 when cloning repos with
+   deep filenames
+ * Fixed detection of directories becoming symlinks, but only when using the
+   Rust extensions.
+ * Fixed ignore and include not composing in the Rust status
+ * `hg commit --interactive` now handles deselecting edits of a rename
+ * Fixed a case where `hg evolve` gives different results when interrupted
+ * Fixed a memory leak in phases computation
+ * `histedit` and `shelve` don't swallow errors when updating the working copy
+   anymore
+ * Improve error message when detecting content-divergence with a hidden
+   common predecessor
+ * No longer re-order parents in filelog, see issue6533
+ * Fix revisions affected by issue6533 on the fly during exchange
+ * Many Windows fixes for stability and py3 compatibility improvements
+ * Many other miscellaneous fixes
+
+== Backwards Compatibility Changes ==
+
+
+== Internal API Changes ==
+
+The Dirstate API have been updated as the previous function leaked some
+internal details and did not distinct between two important cases: "We are
+changing parent and need to adjust the dirstate" and "some command is changing
+which file is tracked". To clarify the situation:
+
+* the following functions have been deprecated,
+
+  - `dirstate.add`,
+  - `dirstate.normal`,
+  - `dirstate.normallookup`,
+  - `dirstate.merge`,
+  - `dirstate.otherparent`,
+  - `dirstate.remove`,
+  - `dirstate.drop`,
+  - `dirstateitem.__getitem__`,
+
+* these new functions are added for the "adjusting parents" use-case:
+
+  - `dirstate.update_file`,
+  - `dirstate.update_file_p1`,
+
+* these new function are added for the "adjusting wc file" use-case":
+
+  - `dirstate.set_tracked`,
+  - `dirstate.set_untracked`,
+  - `dirstate.set_clean`,
+  - `dirstate.set_possibly_dirty`,
+
+See inline documentation of the new functions for details.
+
+* Additionally, the following have been deprecated:
+  - `urlutil.getpath` function
+  - `localrepository.updatecaches`' `full` argument
+
+* The following have been removed:
+  - `revlog.revlogio` has been removed



To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: Octobus monthly mini-sprints

2021-09-17 Thread Raphaël Gomès 

Here is the VC link : https://meet.jit.si/Mercurial6.0MiniSprint

We can also talk in the #mercurial IRC channel over at libera.

Raphaël

On 9/16/21 3:24 PM, Raphaël Gomès wrote:


Hi all,

Reminder that the Mercurial mini-sprint is coming up soon, see the 
info in the mail I'm replying to


Raphaël

On 8/31/21 4:04 PM, Raphaël Gomès wrote:

Hi all,

The next Mercurial minisprint will be held on Friday September 17th 
in place of the planned Evolve September 3rd.
For those of you who would like to join us, we (Octobus) will be 
present during the entire day, Paris time. This is a good opportunity 
to fix bugs, work on features, discuss themandget help in general.


A video-conferencing link will be sent as a reply to this email on 
the day of the sprint.


On behalf of the Octobus team,
Raphaël

On 6/1/21 2:35 PM, Georges Racinet wrote:

Hi everybody,

In order to keep on improving our coordination with the community,
Octobus will organize periodic mini-sprints, starting next month.

We'll dedicate one day per month to work with whomever is interested on
one of the three areas we're active in: Mercurial core, Evolve and
Heptapod. Of course, in the current context, these will be held entirely
in virtual.

The sprints will happen every first Friday of the month.

The whole thing will start next month. Here's our schedule for the next
three mini-sprints:

- 2021-07-02: Heptapod [1]

- 2021-08-06: Mercurial core (early in development cycle after 5.9)

- 2021-09-03: Evolve

Since we're trying to start a routine, we'll try and keep the same
rotation for a while after that.

The backbone of communication should be provided by the chat systems
[2], and of course we can add videoconferencing on the fly when needed,
but we can work out the details until then.

Hope to "see" you there, we're looking forward for your feedback, ideas
of things to discuss etc.

Best,

[1] I'll be organizing that one, more about it soon to come.

[2] should be
https://mattermost.heptapod.net/heptapod/channels/development  for
Heptapod and IRC channels in other cases.



___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D11446: rust: Update the memmap2 crate to version 0.4.0

2021-09-17 Thread SimonSapin 
SimonSapin created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This version:
  
  - Optionally implements the `StableDeref` trait, removing the need for a 
wrapper type doing that
  - Adds support for mapping empty files, which can routinely happen for 
dirstate-v2 data files. This was a cause of some failing tests when running 
with `run-tests.py --rhg --extra-config-opt rhg.status=1`

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11446

AFFECTED FILES
  rust/Cargo.lock
  rust/hg-core/Cargo.toml
  rust/hg-core/src/repo.rs

CHANGE DETAILS

diff --git a/rust/hg-core/src/repo.rs b/rust/hg-core/src/repo.rs
--- a/rust/hg-core/src/repo.rs
+++ b/rust/hg-core/src/repo.rs
@@ -290,7 +290,7 @@
 .mmap_open(docket.data_filename())
 .io_not_found_as_none()?
 {
-OwningDirstateMap::new_empty(MmapWrapper(data_mmap))
+OwningDirstateMap::new_empty(data_mmap)
 } else {
 OwningDirstateMap::new_empty(Vec::new())
 };
@@ -407,16 +407,3 @@
 Ok(RefMut::map(borrowed, |option| option.as_mut().unwrap()))
 }
 }
-
-// TODO: remove this when https://github.com/RazrFalcon/memmap2-rs/pull/22 is 
on crates.io
-struct MmapWrapper(memmap2::Mmap);
-
-impl std::ops::Deref for MmapWrapper {
-type Target = [u8];
-
-fn deref() -> &[u8] {
-self.0.deref()
-}
-}
-
-unsafe impl stable_deref_trait::StableDeref for MmapWrapper {}
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,7 +29,7 @@
 crossbeam-channel = "0.4"
 micro-timer = "0.3.0"
 log = "0.4.8"
-memmap2 = "0.3.1"
+memmap2 = {version = "0.4", features = ["stable_deref_trait"]}
 zstd = "0.5.3"
 format-bytes = "0.2.2"
 
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "adler"
 version = "0.2.3"
@@ -511,11 +513,12 @@
 
 [[package]]
 name = "memmap2"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index;
-checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
+checksum = "de5d3112c080d58ce560081baeaab7e1e864ca21795ddbf533d5b1842bb1ecf8"
 dependencies = [
  "libc",
+ "stable_deref_trait",
 ]
 
 [[package]]



To: SimonSapin, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel