Le 23-02-2015 18:31, Matthew Clarke a écrit :
Hi.
[ Sent this to the devel/tortoisehg maintainer a week ago yesterday. ]
[ No response yet. Is this too late for 5.7? ]
Since the Mercurial update from 3.0 to 3.2.3, TortoiseHg 3.0 refuses
to run, saying it requires Mercurial 3.0.n or 3.1.n. Here's a diff to
update TortoiseHg to version 3.3, which requires Mercurial 3.2.n or
3.3.n.
Lightly tested on i386.
Hi,
sorry for the delay...
I don't understand why you need the config.py part?
This is the diff, does it works fine for you?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile 19 May 2014 19:16:17 -0000 1.16
+++ Makefile 26 Feb 2015 10:10:52 -0000
@@ -2,7 +2,7 @@
COMMENT = series of applications for Mercurial
-MODPY_EGG_VERSION = 3.0
+MODPY_EGG_VERSION = 3.3
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 19 May 2014 19:16:17 -0000 1.13
+++ distinfo 26 Feb 2015 10:10:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-3.0.tar.gz) = ylNx0NcgsPViEBNhLlReo4b+krXfSpxpa3LbvnFupKc=
-SIZE (tortoisehg-3.0.tar.gz) = 8237239
+SHA256 (tortoisehg-3.3.tar.gz) = CHrwKLtUohYqMaLdgaFKPx8eEurd5CiQpImrEfcgHNs=
+SIZE (tortoisehg-3.3.tar.gz) = 8210712
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 PLIST
--- pkg/PLIST 19 May 2014 19:16:17 -0000 1.10
+++ pkg/PLIST 26 Feb 2015 10:10:52 -0000
@@ -80,16 +80,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/htmldelegate.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/htmlui.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/htmlui.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/i18n.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/i18n.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/icons_rc.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/icons_rc.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/infobar.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/infobar.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/lexers.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/lexers.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/lfprompt.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/lfprompt.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/license.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/license.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/manifestmodel.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/manifestmodel.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/matching.py
@@ -102,8 +100,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/modeltest.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mq.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mq.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mqutil.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/mqutil.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/p4pending.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/p4pending.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pbranch.py
@@ -112,6 +108,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/postreview.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/postreview_ui.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/postreview_ui.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/prune.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/prune.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/purge.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/purge.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/qdelete.py
@@ -140,6 +138,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/repomodel.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/reporegistry.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/reporegistry.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/repotab.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/repotab.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/repotreeitem.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/repotreeitem.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/repotreemodel.py
@@ -186,14 +186,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/thgrepo.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/thgstrip.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/thgstrip.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/thread.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/thread.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/update.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/update.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/visdiff.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/visdiff.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/wctxactions.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/wctxactions.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/wctxcleaner.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/wctxcleaner.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/webconf.py
@@ -221,6 +217,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/editor.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/gpg.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/gpg.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hgcommands.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hgcommands.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hgdispatch.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hgdispatch.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hglib.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hglib.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/hgversion.py
@@ -460,6 +460,7 @@ share/pixmaps/tortoisehg/icons/scalable/
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-applied.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-guarded.svg
share/pixmaps/tortoisehg/icons/scalable/status/hg-patch-unguarded.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-sharedrepo.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-added-subrepo.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-error.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-git-subrepo.svg
