Merge remote-tracking branch 'origin/3.6' into 3.7

3 files changed, 10 insertions, 16 deletions

diff --git a/mercurial/.footprint b/mercurial/.footprint
index 1f4638520..edb3b39ce 100644
--- a/mercurial/.footprint
+++ b/mercurial/.footprint
@@ -345,11 +345,11 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgext3rd/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgext3rd/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgext3rd/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgext3rd/__pycache__/__init__.cpython-310.pyc
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.0.3-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial-6.1-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__init__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__modulepolicy__.py
@@ -392,7 +392,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/encoding.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/error.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/exchange.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/exchangev2.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/extensions.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/exthelper.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/fancyopts.cpython-310.pyc
@@ -501,8 +500,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/wireprototypes.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/wireprotov1peer.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/wireprotov1server.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/wireprotov2peer.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/wireprotov2server.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__pycache__/worker.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/__version__.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/ancestor.py
@@ -581,7 +578,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/dirstateutils/__
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/encoding.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/error.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/exchange.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/exchangev2.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/extensions.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/exthelper.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/fancyopts.py
@@ -1123,8 +1119,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/utils/__pycache_
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/wireprototypes.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/wireprotov1peer.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/wireprotov1server.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/wireprotov2peer.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/wireprotov2server.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/worker.py
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/zstd.cpython-310-x86_64-linux-gnu.so
 drwxr-xr-x	root/root	usr/share/
diff --git a/mercurial/.signature b/mercurial/.signature
index a1a1e6024..8fefb3684 100644
--- a/mercurial/.signature
+++ b/mercurial/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34aWGxAeEtfFV4eyXYvBXDWBOrBrxTwXPvd0coXuN6mB0eXHSVP4kAAM1Wu6eXjfR1POnprQ5zasPW/HiqmyOAI=
-SHA256 (Pkgfile) = e85670445c498f640a8870e99e6774b883bce653423979030753cb3c42f7e188
-SHA256 (.footprint) = baa0d0b5558bd483fdb0b10bf0e85b76e7a407223779bf7bfc7146c828d154fb
-SHA256 (mercurial-6.0.3.tar.gz) = 67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
+RWSagIOpLGJF35hL0SBO0K/s4nxCkLZhccSlrQoOVjE5yT7tuyNamNR/Sf8fqjeB8y4KTJpNTfxU8KV2LDPU0zXXE1sM8w+hPQE=
+SHA256 (Pkgfile) = a7e1f40f2e572f052a7bf011a4ed59e17960508aed236beb987010fb17883188
+SHA256 (.footprint) = 78e53c5b968b761e87da81d085dabfe303b7b143c62933fe6df5136a8ecd662b
+SHA256 (mercurial-6.1.tar.gz) = 86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f
diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile
index 408a7a607..e1221ba69 100644
--- a/mercurial/Pkgfile
+++ b/mercurial/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python3-setuptools
 
 name=mercurial
-version=6.0.3
+version=6.1
 release=1
 source=(https://www.mercurial-scm.org/release/mercurial-$version.tar.gz)