Update devel/mercurial to 6.2

Matthew Martin Mon, 11 Jul 2022 20:39:16 -0700

Not a mercurial user, but passes a few quick checks. Tests fail in the
same way as they did for 5.8. Shell completers are installed correctly
now.



diff --git Makefile Makefile
index 28ad010a64c..022cc404225 100644
--- Makefile
+++ Makefile
@@ -1,12 +1,10 @@
 COMMENT-main =         fast, lightweight source control management
 COMMENT-x11 =          graphical tooling for mercurial
 
-MODPY_EGG_VERSION =    5.8
+MODPY_EGG_VERSION =    6.2
 DISTNAME =             mercurial-${MODPY_EGG_VERSION}
 CATEGORIES =           devel
 
-REVISION =             1
-
 HOMEPAGE =             https://www.mercurial-scm.org
 
 # GPLv2
@@ -36,8 +34,7 @@ RUN_DEPENDS-x11 +=    ${BASE_PKGPATH},-main \
 
 FILES =                        hgeditor hgweb.cgi
 
-CONTRIBFILES =         bash_completion mercurial.el \
-                       tcsh_completion zsh_completion \
+CONTRIBFILES =         mercurial.el tcsh_completion \
                        mq.el
 
 CONTRIBDIRS =          hgsh vim
diff --git distinfo distinfo
index a6fabe184d2..9a10d621347 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mercurial-5.8.tar.gz) = /F1qj2R42I74PN0Ktthq1o7nIrvfSWTmoLR8PGulMJ8=
-SIZE (mercurial-5.8.tar.gz) = 7985326
+SHA256 (mercurial-6.2.tar.gz) = 04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI=
+SIZE (mercurial-6.2.tar.gz) = 8053713
diff --git pkg/PLIST-main pkg/PLIST-main
index 72a6120b1c1..a0a03f97dd9 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -5,10 +5,8 @@ lib/python${MODPY_VERSION}/site-packages/hgdemandimport/
 lib/python${MODPY_VERSION}/site-packages/hgdemandimport/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy2.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}demandimportpy3.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/hgdemandimport/${MODPY_PYCACHE}tracing.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy2.py
 lib/python${MODPY_VERSION}/site-packages/hgdemandimport/demandimportpy3.py
 lib/python${MODPY_VERSION}/site-packages/hgdemandimport/tracing.py
 lib/python${MODPY_VERSION}/site-packages/hgext/
@@ -377,12 +375,12 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffhelper.${
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}diffutil.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstate.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstateguard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dirstatemap.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}discovery.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}dispatch.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchange.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exchangev2.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}exthelper.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}fancyopts.${MODPY_PYC_MAGIC_TAG}pyc
@@ -491,8 +489,6 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotoserv
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprototypes.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1peer.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov1server.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2peer.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}wireprotov2server.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/__version__.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/ancestor.py
@@ -554,13 +550,23 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/diffhelper.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/diffutil.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dirstate.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateguard.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstatemap.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/${MODPY_PYCACHE}docket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/${MODPY_PYCACHE}timestamp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/${MODPY_PYCACHE}v2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/docket.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/timestamp.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/dirstateutils/v2.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/discovery.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dispatch.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/dummycert.pem
 lib/python${MODPY_VERSION}/site-packages/mercurial/encoding.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/error.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/exchange.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/exchangev2.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/extensions.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/exthelper.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/fancyopts.py
@@ -585,6 +591,7 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/dates.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/deprecated.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/diffs.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/environment.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/evolution.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/extensions.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/filesets.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/flags.txt
@@ -606,6 +613,7 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/cbor.txt
 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/censor.txt
 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/changegroups.txt
 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/config.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/dirstate-v2.txt
 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/extensions.txt
 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/linelog.txt
 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/internals/mergestate.txt
@@ -619,6 +627,7 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/pager.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/patterns.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/phases.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/revisions.txt
+lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/rust.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/scripting.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/subrepos.txt
 lib/python${MODPY_VERSION}/site-packages/mercurial/helptext/templates.txt
@@ -761,15 +770,25 @@ 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/$
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}concurrency_checker.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}deltas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}docket.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}flagutil.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}nodemap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}randomaccessfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}revlogv0.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/${MODPY_PYCACHE}sidedata.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/concurrency_checker.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/constants.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/debug.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/deltas.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/docket.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/flagutil.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/nodemap.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/randomaccessfile.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/revlogv0.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/rewrite.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revlogutils/sidedata.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revset.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/revsetlang.py
@@ -1020,7 +1039,6 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/
 lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/${MODPY_PYCACHE}selectors2.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/
 lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/${MODPY_PYCACHE}/
@@ -1041,7 +1059,6 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/converters.py
 
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/filters.py
 
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/attr/validators.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/selectors2.py
 @so 
lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/sha1dc.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/zope/
 lib/python${MODPY_VERSION}/site-packages/mercurial/thirdparty/zope/__init__.py
@@ -1087,8 +1104,10 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/${MODPY_PYCACHE}auto_upgrade.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/actions.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/auto_upgrade.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/upgrade_utils/engine.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/url.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/urllibcompat.py
@@ -1128,14 +1147,15 @@ 
lib/python${MODPY_VERSION}/site-packages/mercurial/wireprotoserver.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/wireprototypes.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/wireprotov1peer.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/wireprotov1server.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/wireprotov2peer.py
-lib/python${MODPY_VERSION}/site-packages/mercurial/wireprotov2server.py
 lib/python${MODPY_VERSION}/site-packages/mercurial/worker.py
 @so 
lib/python${MODPY_VERSION}/site-packages/mercurial/zstd.${MODPY_PYC_MAGIC_TAG}so
 @man man/man1/chg.1
 @man man/man1/hg.1
 @man man/man5/hgignore.5
 @man man/man5/hgrc.5
+share/bash-completion/
+share/bash-completion/completions/
+share/bash-completion/completions/hg
 share/examples/mercurial/
 @sample ${SYSCONFDIR}/mercurial/
 share/examples/mercurial/hgrc.d/
@@ -1143,7 +1163,6 @@ share/examples/mercurial/hgrc.d/
 share/examples/mercurial/hgrc.d/openbsd-security.rc
 @sample ${SYSCONFDIR}/mercurial/hgrc.d/openbsd-security.rc
 share/mercurial/
-share/mercurial/bash_completion
 share/mercurial/dumprevlog
 share/mercurial/hg-ssh
 share/mercurial/hgeditor
@@ -1164,4 +1183,6 @@ share/mercurial/vim/hgcommand.vim
 share/mercurial/vim/hgtest.vim
 share/mercurial/vim/patchreview.txt
 share/mercurial/vim/patchreview.vim
-share/mercurial/zsh_completion
+share/zsh/
+share/zsh/site-functions/
+share/zsh/site-functions/_hg

Update devel/mercurial to 6.2

Reply via email to