On Sun, May 18, 2014 at 10:10:20AM -0400, Seth Jackson wrote:
> This updates TortoiseHg from 2.10.2 to 3.0.
> This requires my previous patch that updates to Mercurial 3.0.
> RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 8 Nov 2013 11:45:26 -0000 1.9
> +++ pkg/PLIST 18 May 2014 13:31:06 -0000
> @@ -1,8 +1,8 @@
> @comment $OpenBSD: PLIST,v 1.9 2013/11/08 11:45:26 rpointel Exp $
> bin/thg
> lib/nautilus/
> -lib/nautilus/extensions-3.0/
> -lib/nautilus/extensions-3.0/nautilus-thg.py
> +lib/nautilus/extensions-${MODPY_EGG_VERSION}/
> +lib/nautilus/extensions-${MODPY_EGG_VERSION}/nautilus-thg.py
That changes doesnt really make sense since 3.0 is nautilus api version,
and i dont think it matches the thg version. Better keep 3.0 here imo.
testing this and hg update on amd64.
i've attached the applying diff for both, from devel subdir.
Remi, can you have a look at it too ?
Landry
Index: mercurial/Makefile
===================================================================
RCS file: /cvs/ports/devel/mercurial/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- mercurial/Makefile 19 Jan 2014 17:52:47 -0000 1.59
+++ mercurial/Makefile 18 May 2014 20:59:25 -0000
@@ -3,7 +3,7 @@
COMMENT-main = fast, lightweight source control management
COMMENT-x11 = graphical tooling for mercurial
-MODPY_EGG_VERSION = 2.8.2
+MODPY_EGG_VERSION = 3.0
DISTNAME = mercurial-${MODPY_EGG_VERSION}
CATEGORIES = devel
Index: mercurial/distinfo
===================================================================
RCS file: /cvs/ports/devel/mercurial/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- mercurial/distinfo 19 Jan 2014 17:52:47 -0000 1.41
+++ mercurial/distinfo 18 May 2014 20:59:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.8.2.tar.gz) = yKW6ohFAxs1nScO1K15eShS2uO58UY2dneCbGVLvvm8=
-SIZE (mercurial-2.8.2.tar.gz) = 3839304
+SHA256 (mercurial-3.0.tar.gz) = ZAyWVWpFJN8hacZwak9omXxb9YYrWXGzwu4T7Uw0nPs=
+SIZE (mercurial-3.0.tar.gz) = 3903047
Index: mercurial/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/mercurial/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- mercurial/pkg/PLIST-main 8 Nov 2013 11:45:03 -0000 1.2
+++ mercurial/pkg/PLIST-main 18 May 2014 20:59:25 -0000
@@ -68,8 +68,6 @@
lib/python${MODPY_VERSION}/site-packages/hgext/highlight/highlight.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/histedit.py
lib/python${MODPY_VERSION}/site-packages/hgext/histedit.pyc
-lib/python${MODPY_VERSION}/site-packages/hgext/interhg.py
-lib/python${MODPY_VERSION}/site-packages/hgext/interhg.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/keyword.py
lib/python${MODPY_VERSION}/site-packages/hgext/keyword.pyc
lib/python${MODPY_VERSION}/site-packages/hgext/largefiles/
@@ -148,6 +146,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/bookmarks.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.py
lib/python${MODPY_VERSION}/site-packages/mercurial/branchmap.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/bundle2.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/bundle2.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.py
lib/python${MODPY_VERSION}/site-packages/mercurial/bundlerepo.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/byterange.py
@@ -187,6 +187,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/encoding.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/error.py
lib/python${MODPY_VERSION}/site-packages/mercurial/error.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/exchange.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/exchange.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/extensions.py
lib/python${MODPY_VERSION}/site-packages/mercurial/extensions.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/fancyopts.py
@@ -338,6 +340,8 @@
lib/python${MODPY_VERSION}/site-packages/mercurial/parsers.so
lib/python${MODPY_VERSION}/site-packages/mercurial/patch.py
lib/python${MODPY_VERSION}/site-packages/mercurial/patch.pyc
+lib/python${MODPY_VERSION}/site-packages/mercurial/pathutil.py
+lib/python${MODPY_VERSION}/site-packages/mercurial/pathutil.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/peer.py
lib/python${MODPY_VERSION}/site-packages/mercurial/peer.pyc
lib/python${MODPY_VERSION}/site-packages/mercurial/phases.py
Index: tortoisehg/Makefile
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- tortoisehg/Makefile 19 Jan 2014 17:53:40 -0000 1.15
+++ tortoisehg/Makefile 18 May 2014 20:59:25 -0000
@@ -2,7 +2,7 @@
COMMENT = series of applications for Mercurial
-MODPY_EGG_VERSION = 2.10.2
+MODPY_EGG_VERSION = 3.0
DISTNAME = tortoisehg-${MODPY_EGG_VERSION}
CATEGORIES = devel
@@ -23,7 +23,7 @@
RUN_DEPENDS = ${BUILD_DEPENDS} \
editors/py-qscintilla \
- devel/mercurial>=2.8.2 \
+ devel/mercurial>=3.0 \
devel/py-iniparse
NO_TEST = Yes
Index: tortoisehg/distinfo
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- tortoisehg/distinfo 19 Jan 2014 17:53:40 -0000 1.12
+++ tortoisehg/distinfo 18 May 2014 20:59:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (tortoisehg-2.10.2.tar.gz) =
7M7T+oa+mc4UJP4w7+wexYPyIne10wrCZlaHXhDNgu8=
-SIZE (tortoisehg-2.10.2.tar.gz) = 8623834
+SHA256 (tortoisehg-3.0.tar.gz) = ylNx0NcgsPViEBNhLlReo4b+krXfSpxpa3LbvnFupKc=
+SIZE (tortoisehg-3.0.tar.gz) = 8237239
Index: tortoisehg/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/tortoisehg/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- tortoisehg/pkg/PLIST 8 Nov 2013 11:45:26 -0000 1.9
+++ tortoisehg/pkg/PLIST 18 May 2014 20:59:25 -0000
@@ -44,8 +44,6 @@
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/cslist.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/customtools.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/customtools.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/decorators.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/decorators.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/docklog.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/docklog.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filectxactions.py
@@ -54,12 +52,10 @@
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filedata.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filedialogs.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filedialogs.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filelistmodel.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filelistmodel.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/fileencoding.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/fileencoding.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filelistview.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filelistview.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filerevmodel.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/filerevmodel.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/fileview.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/fileview.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/graft.py
@@ -94,10 +90,6 @@
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/logcolumns.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/logcolumns.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/manifestdialog.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/manifestdialog.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
@@ -114,10 +106,6 @@
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/partialcommit.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/partialcommit.pyc
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pathedit.py
-lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pathedit.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pbranch.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/pbranch.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/hgqt/postreview.py
@@ -243,10 +231,14 @@
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/menuthg.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/obsoleteutil.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/obsoleteutil.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/partialcommit.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/partialcommit.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/patchctx.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/patchctx.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/paths.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/paths.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/pipeui.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/pipeui.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/shlib.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/shlib.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/terminal.py
@@ -259,6 +251,8 @@
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/version.pyc
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/wconfig.py
lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/wconfig.pyc
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/win32ill.py
+lib/python${MODPY_VERSION}/site-packages/tortoisehg/util/win32ill.pyc
share/locale/ar/LC_MESSAGES/tortoisehg.mo
share/locale/ca/LC_MESSAGES/tortoisehg.mo
share/locale/cs/LC_MESSAGES/tortoisehg.mo
@@ -303,6 +297,8 @@
share/pixmaps/tortoisehg/icons/16x16/apps/gnupg.png
share/pixmaps/tortoisehg/icons/16x16/apps/kiln.png
share/pixmaps/tortoisehg/icons/16x16/apps/reviewboard.png
+share/pixmaps/tortoisehg/icons/16x16/mimetypes/
+share/pixmaps/tortoisehg/icons/16x16/mimetypes/text-x-generic.png
share/pixmaps/tortoisehg/icons/22x22/
share/pixmaps/tortoisehg/icons/22x22/actions/
share/pixmaps/tortoisehg/icons/22x22/actions/window-close.png
@@ -458,14 +454,14 @@
share/pixmaps/tortoisehg/icons/scalable/apps/tools-spanner-hammer.svg
share/pixmaps/tortoisehg/icons/scalable/apps/utilities-terminal.svg
share/pixmaps/tortoisehg/icons/scalable/status/
+share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-both.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p1.svg
+share/pixmaps/tortoisehg/icons/scalable/status/hg-merged-p2.svg
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/thg-added-subrepo.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-error.svg
-share/pixmaps/tortoisehg/icons/scalable/status/thg-file-merged.svg
-share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p0.svg
-share/pixmaps/tortoisehg/icons/scalable/status/thg-file-p1.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-git-subrepo.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-remote-repo.svg
share/pixmaps/tortoisehg/icons/scalable/status/thg-removed-subrepo.svg
