diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile
index 087b92203705..496e4b0cee55 100644
--- a/devel/tortoisehg/Makefile
+++ b/devel/tortoisehg/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	tortoisehg
-DISTVERSION=	6.2.2
+DISTVERSION=	6.3.1
 CATEGORIES=	devel
 MASTER_SITES=	https://www.mercurial-scm.org/release/tortoisehg/targz/
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	GUI for Mercurial VCS
 WWW=		https://tortoisehg.bitbucket.io/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 BUILD_DEPENDS=	${PY_MERCURIAL}
 RUN_DEPENDS=	${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR}
 
 USES=		pyqt:5 python:3.5+
 USE_PYQT=	qscintilla2 pyqt5
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	NAUTILUS NLS
 NAUTILUS_DESC=	Install TortoiseHG Nautilus extension
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 # Do not conflict with devel/mercurial, which also installs hgext3rd/__init__.py
 EXTRACT_AFTER_ARGS=    --exclude ${PORTNAME}-${DISTVERSION}/hgext3rd/__init__.py
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-patch-NLS-on:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP}
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-on:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%//' ${WRKSRC}/${PYSETUP}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${PYSETUP}
 
 post-patch-NAUTILUS-off:
 	@${REINPLACE_CMD} -e 's/^%%NAUTILUS%%/# /' ${WRKSRC}/${PYSETUP}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/tortoisehg
 	${INSTALL_DATA} ${WRKSRC}/contrib/thg.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/contrib/mergetools.rc ${STAGEDIR}${PREFIX}/share/tortoisehg/
 
 .include <bsd.port.post.mk>
diff --git a/devel/tortoisehg/distinfo b/devel/tortoisehg/distinfo
index df343d8f3b2f..f7d2a0bd40fc 100644
--- a/devel/tortoisehg/distinfo
+++ b/devel/tortoisehg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662560200
-SHA256 (tortoisehg-6.2.2.tar.gz) = 5dbbe0fc572e5ff00bdab796b1a336a1a1722dbcb7f870c27d8b51cacc04ec30
-SIZE (tortoisehg-6.2.2.tar.gz) = 8928012
+TIMESTAMP = 1669285988
+SHA256 (tortoisehg-6.3.1.tar.gz) = cc3d9c747c5b9804b0cb7af5ff6b3a16b75331e3ed0d973bcc9a931e4c970103
+SIZE (tortoisehg-6.3.1.tar.gz) = 8931552
diff --git a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
index 7f7cdaa8cdb4..681cc076f024 100644
--- a/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
+++ b/devel/tortoisehg/files/patch-tortoisehg_util_hgversion.py
@@ -1,19 +1,19 @@
---- tortoisehg/util/hgversion.py.orig	2022-03-06 02:33:21 UTC
+--- tortoisehg/util/hgversion.py.orig	2022-11-13 03:06:49 UTC
 +++ tortoisehg/util/hgversion.py
-@@ -33,15 +33,7 @@ def checkhgversion(v):
+@@ -39,15 +39,7 @@ def checkhgversion(v: bytes) -> Optional[bytes]:
      return vers
  
- def checkhgversion(v):
+ def checkhgversion(v: bytes) -> Optional[bytes]:
 -    """range check the Mercurial version"""
 -    reqvers = testedwith.split()
 -    vers = _splitversion(v)
 -    if not vers:
 -        return
 -    if b'.'.join(vers) in reqvers:
 -        return
 -    return (b'This version of TortoiseHg requires Mercurial version %s.n to '
 -            b'%s.n, but found %s') % (reqvers[0], reqvers[-1], v)
 +    return
  
- def checkminhgversion(v):
+ def checkminhgversion(v: bytes) -> Optional[bytes]:
      """Check if the given Mercurial version is not lower than the minimum