Received: by mail.netbsd.org (Postfix, from userid 605) id C2BB484D88; Fri, 20 Sep 2019 10:55:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4609584D84 for ; Fri, 20 Sep 2019 10:55:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 5LBmY-m58EOy for ; Fri, 20 Sep 2019 10:55:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7101984CDC for ; Fri, 20 Sep 2019 10:55:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 667FDFBF4; Fri, 20 Sep 2019 10:55:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156897695598830" MIME-Version: 1.0 Date: Fri, 20 Sep 2019 10:55:55 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/devel/py-tortoisehg To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20190920105555.667FDFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156897695598830 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Fri Sep 20 10:55:55 UTC 2019 Modified Files: pkgsrc/devel/py-tortoisehg: Makefile PLIST distinfo Added Files: pkgsrc/devel/py-tortoisehg/patches: patch-tortoisehg_util_hgversion.py Log Message: Update py-tortoisehg to version 5.0.2 Update py-tortoisehg so that it runs with current version of mercurial from pkgsrc. Tested with mercurial 5.1 . Also includes alot of bugfixes. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/py-tortoisehg/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-tortoisehg/PLIST cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/py-tortoisehg/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156897695598830 Content-Disposition: inline Content-Length: 7111 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-tortoisehg/Makefile diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.54 pkgsrc/devel/py-tortoisehg/Makefile:1.55 --- pkgsrc/devel/py-tortoisehg/Makefile:1.54 Mon Sep 2 13:19:35 2019 +++ pkgsrc/devel/py-tortoisehg/Makefile Fri Sep 20 10:55:55 2019 @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.54 2019/09/02 13:19:35 adam Exp $ +# $NetBSD: Makefile,v 1.55 2019/09/20 10:55:55 nros Exp $ -DISTNAME= tortoisehg-4.5.3 +DISTNAME= tortoisehg-5.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= devel python MASTER_SITES= http://bitbucket.org/tortoisehg/targz/downloads/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://bitbucket.org/tortoisehg/thg/wiki/Home +HOMEPAGE= https://tortoisehg.bitbucket.io/ COMMENT= GUI for Mercurial LICENSE= gnu-gpl-v2 @@ -15,7 +15,7 @@ REPLACE_PYTHON+= thg BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.3.4nb1:../../textproc/py-sphinx DEPENDS+= ${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse DEPENDS+= ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments -DEPENDS+= ${PYPKGPREFIX}-mercurial>=2.8.1:../../devel/py-mercurial +DEPENDS+= ${PYPKGPREFIX}-mercurial>=5.0.0:../../devel/py-mercurial PYTHON_VERSIONS_ACCEPTED= 27 # py-iniparse, py-mercurial Index: pkgsrc/devel/py-tortoisehg/PLIST diff -u pkgsrc/devel/py-tortoisehg/PLIST:1.15 pkgsrc/devel/py-tortoisehg/PLIST:1.16 --- pkgsrc/devel/py-tortoisehg/PLIST:1.15 Sun Apr 22 22:21:09 2018 +++ pkgsrc/devel/py-tortoisehg/PLIST Fri Sep 20 10:55:55 2019 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2018/04/22 22:21:09 wiz Exp $ +@comment $NetBSD: PLIST,v 1.16 2019/09/20 10:55:55 nros Exp $ bin/thg ${PYSITELIB}/hgext3rd/thg.py ${PYSITELIB}/hgext3rd/thg.pyc @@ -151,6 +151,12 @@ ${PYSITELIB}/tortoisehg/hgqt/p4pending.p ${PYSITELIB}/tortoisehg/hgqt/pbranch.py ${PYSITELIB}/tortoisehg/hgqt/pbranch.pyc ${PYSITELIB}/tortoisehg/hgqt/pbranch.pyo +${PYSITELIB}/tortoisehg/hgqt/phabreview.py +${PYSITELIB}/tortoisehg/hgqt/phabreview.pyc +${PYSITELIB}/tortoisehg/hgqt/phabreview.pyo +${PYSITELIB}/tortoisehg/hgqt/phabreview_ui.py +${PYSITELIB}/tortoisehg/hgqt/phabreview_ui.pyc +${PYSITELIB}/tortoisehg/hgqt/phabreview_ui.pyo ${PYSITELIB}/tortoisehg/hgqt/postreview.py ${PYSITELIB}/tortoisehg/hgqt/postreview.pyc ${PYSITELIB}/tortoisehg/hgqt/postreview.pyo @@ -169,9 +175,6 @@ ${PYSITELIB}/tortoisehg/hgqt/qdelete.pyo ${PYSITELIB}/tortoisehg/hgqt/qfold.py ${PYSITELIB}/tortoisehg/hgqt/qfold.pyc ${PYSITELIB}/tortoisehg/hgqt/qfold.pyo -${PYSITELIB}/tortoisehg/hgqt/qrename.py -${PYSITELIB}/tortoisehg/hgqt/qrename.pyc -${PYSITELIB}/tortoisehg/hgqt/qrename.pyo ${PYSITELIB}/tortoisehg/hgqt/qsci.py ${PYSITELIB}/tortoisehg/hgqt/qsci.pyc ${PYSITELIB}/tortoisehg/hgqt/qsci.pyo @@ -286,6 +289,9 @@ ${PYSITELIB}/tortoisehg/hgqt/thgrepo.pyo ${PYSITELIB}/tortoisehg/hgqt/thgstrip.py ${PYSITELIB}/tortoisehg/hgqt/thgstrip.pyc ${PYSITELIB}/tortoisehg/hgqt/thgstrip.pyo +${PYSITELIB}/tortoisehg/hgqt/topics.py +${PYSITELIB}/tortoisehg/hgqt/topics.pyc +${PYSITELIB}/tortoisehg/hgqt/topics.pyo ${PYSITELIB}/tortoisehg/hgqt/update.py ${PYSITELIB}/tortoisehg/hgqt/update.pyc ${PYSITELIB}/tortoisehg/hgqt/update.pyo @@ -464,6 +470,7 @@ share/doc/tortoisehg/html/_static/down.p share/doc/tortoisehg/html/_static/file.png share/doc/tortoisehg/html/_static/jquery-3.2.1.js share/doc/tortoisehg/html/_static/jquery.js +share/doc/tortoisehg/html/_static/language_data.js share/doc/tortoisehg/html/_static/minus.png share/doc/tortoisehg/html/_static/plus.png share/doc/tortoisehg/html/_static/pygments.css @@ -516,6 +523,7 @@ share/locale/en_GB/LC_MESSAGES/tortoiseh share/locale/es/LC_MESSAGES/tortoisehg.mo share/locale/et/LC_MESSAGES/tortoisehg.mo share/locale/fa/LC_MESSAGES/tortoisehg.mo +share/locale/fi/LC_MESSAGES/tortoisehg.mo share/locale/fr/LC_MESSAGES/tortoisehg.mo share/locale/he/LC_MESSAGES/tortoisehg.mo share/locale/hr/LC_MESSAGES/tortoisehg.mo @@ -643,6 +651,7 @@ share/pixmaps/tortoisehg/icons/scalable/ share/pixmaps/tortoisehg/icons/scalable/actions/hg-status.svg share/pixmaps/tortoisehg/icons/scalable/actions/hg-strip.svg share/pixmaps/tortoisehg/icons/scalable/actions/hg-tag.svg +share/pixmaps/tortoisehg/icons/scalable/actions/hg-topics.svg share/pixmaps/tortoisehg/icons/scalable/actions/hg-transplant.svg share/pixmaps/tortoisehg/icons/scalable/actions/hg-unbundle.svg share/pixmaps/tortoisehg/icons/scalable/actions/hg-undo.svg @@ -689,6 +698,7 @@ share/pixmaps/tortoisehg/icons/scalable/ share/pixmaps/tortoisehg/icons/scalable/apps/help-browser.svg share/pixmaps/tortoisehg/icons/scalable/apps/help-readme.svg share/pixmaps/tortoisehg/icons/scalable/apps/hg.svg +share/pixmaps/tortoisehg/icons/scalable/apps/phabricator.svg share/pixmaps/tortoisehg/icons/scalable/apps/preferences-desktop-font.svg share/pixmaps/tortoisehg/icons/scalable/apps/system-file-manager.svg share/pixmaps/tortoisehg/icons/scalable/apps/thg.svg Index: pkgsrc/devel/py-tortoisehg/distinfo diff -u pkgsrc/devel/py-tortoisehg/distinfo:1.44 pkgsrc/devel/py-tortoisehg/distinfo:1.45 --- pkgsrc/devel/py-tortoisehg/distinfo:1.44 Sun Apr 22 22:21:09 2018 +++ pkgsrc/devel/py-tortoisehg/distinfo Fri Sep 20 10:55:55 2019 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.44 2018/04/22 22:21:09 wiz Exp $ +$NetBSD: distinfo,v 1.45 2019/09/20 10:55:55 nros Exp $ -SHA1 (tortoisehg-4.5.3.tar.gz) = 4714d31f40c527ba285dc94a4cbde77be0faad2d -RMD160 (tortoisehg-4.5.3.tar.gz) = e7644368a94d956df407ca5d486fb118c301a398 -SHA512 (tortoisehg-4.5.3.tar.gz) = 0c6c512f7a46a084904a5e66912deb8ef4abb99a6a97c46b6b058537332f091395f4b9b8a4b645d7c42637abbb4e8abe16f5040fd694bb43ea8b4c6ddb1e18f6 -Size (tortoisehg-4.5.3.tar.gz) = 7929645 bytes +SHA1 (tortoisehg-5.0.2.tar.gz) = 776860a157a6883b7a3cd004d5e38a1f4eebea63 +RMD160 (tortoisehg-5.0.2.tar.gz) = 4416c61f2854d74682e14c9d079109b9f34cd524 +SHA512 (tortoisehg-5.0.2.tar.gz) = d33916cf3215360cada06de62db46e70c555b1f4cd509f0b863e2baa633e2c5df99f09f3a103444c30aa0a6e15e2acd7134f045cb3846cccc7b727482d94e650 +Size (tortoisehg-5.0.2.tar.gz) = 8002109 bytes SHA1 (patch-setup.py) = 8a8f2df84ed99481af7c95327a05354099c1c7c5 +SHA1 (patch-tortoisehg_util_hgversion.py) = 17ea2a2f90395a007e4a3841908d652bf33a0956 SHA1 (patch-tortoisehg_util_paths.py) = 0fbe6b583b3d6d60f4c8d96f81d633f454230f81 Added files: Index: pkgsrc/devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py diff -u /dev/null pkgsrc/devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py:1.1 --- /dev/null Fri Sep 20 10:55:55 2019 +++ pkgsrc/devel/py-tortoisehg/patches/patch-tortoisehg_util_hgversion.py Fri Sep 20 10:55:55 2019 @@ -0,0 +1,13 @@ +$NetBSD: patch-tortoisehg_util_hgversion.py,v 1.1 2019/09/20 10:55:55 nros Exp $ +* make tortosiehg run with mercurial 5.1 +--- tortoisehg/util/hgversion.py.orig 2019-09-19 21:06:02.537267989 +0000 ++++ tortoisehg/util/hgversion.py +@@ -16,7 +16,7 @@ except AttributeError: + from mercurial import version + hgversion = version.get_version() + +-testedwith = '4.9 5.0' ++testedwith = '4.9 5.0 5.1' + + def checkhgversion(v): + """range check the Mercurial version""" --_----------=_156897695598830--