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

3 files changed, 20 insertions, 14 deletions

diff --git a/mercurial/.footprint b/mercurial/.footprint
index b0cbb9d2d..5bfc4c862 100644
--- a/mercurial/.footprint
+++ b/mercurial/.footprint
@@ -8,10 +8,8 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgdemandimport/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgdemandimport/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/__pycache__/demandimportpy2.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/__pycache__/demandimportpy3.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/__pycache__/tracing.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/demandimportpy2.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/demandimportpy3.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/hgdemandimport/tracing.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/hgext/
@@ -345,11 +343,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.1.4-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1.4-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1.4-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1.4-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.1.4-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial-6.2-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.2-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.2-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.2-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial-6.2-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
@@ -744,6 +742,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/concurrency_checker.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/constants.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/debug.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/deltas.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/docket.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/flagutil.cpython-310.pyc
@@ -754,6 +753,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/__pycache__/sidedata.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/concurrency_checker.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/constants.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/debug.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/deltas.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/docket.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/revlogutils/flagutil.py
@@ -1011,7 +1011,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/__pycache__/selectors2.cpython-310.pyc
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/__pycache__/
@@ -1032,7 +1031,6 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/exceptions.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/filters.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/attr/validators.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/selectors2.py
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/sha1dc.cpython-310-x86_64-linux-gnu.so
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/zope/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/thirdparty/zope/__init__.py (EMPTY)
@@ -1078,8 +1076,10 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/__pycache__/__init__.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/__pycache__/actions.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/__pycache__/auto_upgrade.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/__pycache__/engine.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/actions.py
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/auto_upgrade.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/upgrade_utils/engine.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/url.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/mercurial/urllibcompat.py
@@ -1122,9 +1122,15 @@ 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/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/
+drwxr-xr-x	root/root	usr/share/bash-completion/
+drwxr-xr-x	root/root	usr/share/bash-completion/completions/
+-rw-r--r--	root/root	usr/share/bash-completion/completions/hg
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/hg.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/hgignore.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/hgrc.5.gz
+drwxr-xr-x	root/root	usr/share/zsh/
+drwxr-xr-x	root/root	usr/share/zsh/site-functions/
+-rw-r--r--	root/root	usr/share/zsh/site-functions/_hg
diff --git a/mercurial/.signature b/mercurial/.signature
index 4e2de0a2e..162206328 100644
--- a/mercurial/.signature
+++ b/mercurial/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37cm585ocBZTwa5tS/lsexH4TspCsYTruYWKR+ju4xdwFu1Agt8syyLN2OfRLCCy06EzFQBrB6daAPqRsz3B/w0=
-SHA256 (Pkgfile) = a0042d45ff20f702ced6589e872e6816d59a14f7d6df3975f4ea9179cc47602b
-SHA256 (.footprint) = bf4a83558f24293aebf09ddebc876a23d263eed80e62ce6cccfe4ba2ac30b17e
-SHA256 (mercurial-6.1.4.tar.gz) = f361f9802b36e357ac019ceb712ca11de8332b07deadeed8dfa904f05bf7ca78
+RWSagIOpLGJF3w/bfazKxfC3U8ZO/uIvT7FlVOzGoeKMTpPFNwHoxKQRnBlJJLHWWQjUxUrWBWNKOpgTP2OdVhlU3BW6X2R+SAI=
+SHA256 (Pkgfile) = e190fa01f8fc4d38d2386e41b7cf153d4d03783984ad5463f7cdc56d04c7203e
+SHA256 (.footprint) = 878fd8f53a131dbcb6944e00c243b18b9cc2cf00929958b5226e48c029059d39
+SHA256 (mercurial-6.2.tar.gz) = d382b5e3fab8931126013201731416574b35ae85787404bb2a0819f41bb88972
diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile
index 4326d1c09..e633fef11 100644
--- a/mercurial/Pkgfile
+++ b/mercurial/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python3-setuptools
 
 name=mercurial
-version=6.1.4
+version=6.2
 release=1
 source=(https://www.mercurial-scm.org/release/mercurial-$version.tar.gz)