Hello!
I'm reposting this set of patches, as I find them quite important - at
least for me the current devel/py-hg-git port was broken (I don't recall
particular problem I was facing though), and this update fixes it.
devel/py-hg-git depends on devel/py-dulwich, and current version of
hggit doesn't work with outdated version of dulwich we currently have in
ports.
The patches for devel/py-dulwich are only needed for tests. Several
tests fail for devel/py-hg-git, seemingly because git developers have
changed wording for some diagnostic messages.
Both ports have no MAINTAINER string. I use them daily and I could
maintain them if it is desired.
Index: devel/py-dulwich/Makefile
===================================================================
RCS file: /var/cvs/ports/devel/py-dulwich/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/py-dulwich/Makefile 3 Oct 2013 16:37:15 -0000 1.11
+++ devel/py-dulwich/Makefile 26 Feb 2014 13:41:40 -0000
@@ -2,10 +2,9 @@
COMMENT = pure Python implementation of Git file formats and protocols
-MODPY_EGG_VERSION = 0.6.1
+MODPY_EGG_VERSION = 0.9.5
DISTNAME = dulwich-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 4
CATEGORIES = devel
@@ -14,7 +13,7 @@ HOMEPAGE = http://samba.org/~jelmer/dul
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = ${HOMEPAGE}
+MASTER_SITES = ${MASTER_SITE_PYPI:=d/dulwich/}
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
Index: devel/py-dulwich/distinfo
===================================================================
RCS file: /var/cvs/ports/devel/py-dulwich/distinfo,v
retrieving revision 1.1
diff -u -p -r1.1 distinfo
--- devel/py-dulwich/distinfo 2 Sep 2010 20:55:37 -0000 1.1
+++ devel/py-dulwich/distinfo 26 Feb 2014 13:19:48 -0000
@@ -1,5 +1,2 @@
-MD5 (dulwich-0.6.1.tar.gz) = VwE3dTcfhRKqlWji5Lq4Yg==
-RMD160 (dulwich-0.6.1.tar.gz) = Syq+85hhax7W9izgYTvDzXfl6Wo=
-SHA1 (dulwich-0.6.1.tar.gz) = cMiVWFe/2mJZabPujpEFpPpqEY0=
-SHA256 (dulwich-0.6.1.tar.gz) = RSy9RseYsQ8B3MHaFsOMQFVK5UNAGLmHT0BvrfzcXOk=
-SIZE (dulwich-0.6.1.tar.gz) = 131372
+SHA256 (dulwich-0.9.5.tar.gz) = dR/p4dMrYeIfCGtPoHypa2kWWnrSTFzrrvT4gD9RLAs=
+SIZE (dulwich-0.9.5.tar.gz) = 237255
Index: devel/py-dulwich/patches/patch-dulwich_tests_test_hooks_py
===================================================================
RCS file: devel/py-dulwich/patches/patch-dulwich_tests_test_hooks_py
diff -N devel/py-dulwich/patches/patch-dulwich_tests_test_hooks_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/py-dulwich/patches/patch-dulwich_tests_test_hooks_py 26 Feb 2014
13:29:49 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dulwich/tests/test_hooks.py.orig Wed Feb 26 14:27:41 2014
++++ dulwich/tests/test_hooks.py Wed Feb 26 14:29:07 2014
+@@ -113,7 +113,7 @@ exit 0
+
+ (fd, path) = tempfile.mkstemp()
+ post_commit_msg = """#!/bin/sh
+-unlink %(file)s
++rm %(file)s
+ """ % {'file': path}
+
+ post_commit_msg_fail = """#!/bin/sh
Index: devel/py-dulwich/patches/patch-dulwich_tests_test_repository_py
===================================================================
RCS file: devel/py-dulwich/patches/patch-dulwich_tests_test_repository_py
diff -N devel/py-dulwich/patches/patch-dulwich_tests_test_repository_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/py-dulwich/patches/patch-dulwich_tests_test_repository_py 26 Feb
2014 13:29:49 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- dulwich/tests/test_repository.py.orig Wed Feb 26 14:29:28 2014
++++ dulwich/tests/test_repository.py Wed Feb 26 14:29:38 2014
+@@ -448,7 +448,7 @@ exit 0
+
+ (fd, path) = tempfile.mkstemp(dir=repo_dir)
+ post_commit_msg = """#!/bin/sh
+-unlink %(file)s
++rm %(file)s
+ """ % {'file': path}
+
+ root_sha = r.do_commit(
Index: devel/py-dulwich/pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/devel/py-dulwich/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- devel/py-dulwich/pkg/PLIST 2 Sep 2010 20:55:37 -0000 1.1
+++ devel/py-dulwich/pkg/PLIST 26 Feb 2014 13:34:27 -0000
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1 2010/09/02 20:55:37 millert Exp $
bin/dul-daemon
+bin/dul-receive-pack
+bin/dul-upload-pack
bin/dul-web
bin/dulwich
lib/python${MODPY_VERSION}/site-packages/dulwich/
@@ -10,34 +12,47 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/dulwich/__init__.py
lib/python${MODPY_VERSION}/site-packages/dulwich/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/_compat.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/_compat.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/_diff_tree.so
lib/python${MODPY_VERSION}/site-packages/dulwich/_objects.so
lib/python${MODPY_VERSION}/site-packages/dulwich/_pack.so
lib/python${MODPY_VERSION}/site-packages/dulwich/client.py
lib/python${MODPY_VERSION}/site-packages/dulwich/client.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/config.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/config.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/diff_tree.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/diff_tree.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/errors.py
lib/python${MODPY_VERSION}/site-packages/dulwich/errors.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/fastexport.py
lib/python${MODPY_VERSION}/site-packages/dulwich/fastexport.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/file.py
lib/python${MODPY_VERSION}/site-packages/dulwich/file.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/hooks.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/hooks.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/index.py
lib/python${MODPY_VERSION}/site-packages/dulwich/index.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/log_utils.py
lib/python${MODPY_VERSION}/site-packages/dulwich/log_utils.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/lru_cache.py
lib/python${MODPY_VERSION}/site-packages/dulwich/lru_cache.pyc
-lib/python${MODPY_VERSION}/site-packages/dulwich/misc.py
-lib/python${MODPY_VERSION}/site-packages/dulwich/misc.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/object_store.py
lib/python${MODPY_VERSION}/site-packages/dulwich/object_store.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/objects.py
lib/python${MODPY_VERSION}/site-packages/dulwich/objects.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/objectspec.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/objectspec.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/pack.py
lib/python${MODPY_VERSION}/site-packages/dulwich/pack.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/patch.py
lib/python${MODPY_VERSION}/site-packages/dulwich/patch.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/porcelain.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/porcelain.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/protocol.py
lib/python${MODPY_VERSION}/site-packages/dulwich/protocol.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/refs.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/refs.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/repo.py
lib/python${MODPY_VERSION}/site-packages/dulwich/repo.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/server.py
@@ -45,33 +60,76 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/__init__.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/__init__.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/server_utils.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/server_utils.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_client.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_client.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_pack.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_pack.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_repository.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_repository.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_server.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_server.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_utils.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_utils.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_web.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/test_web.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/utils.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/compat/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_blackbox.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_blackbox.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_client.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_client.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_config.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_config.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_diff_tree.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_diff_tree.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_fastexport.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_fastexport.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_file.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_file.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_grafts.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_grafts.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_hooks.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_hooks.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_index.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_index.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_lru_cache.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_lru_cache.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_missing_obj_finder.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_missing_obj_finder.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_object_store.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_object_store.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_objects.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_objects.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_objectspec.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_objectspec.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_pack.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_pack.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_patch.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_patch.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_porcelain.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_porcelain.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_protocol.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_protocol.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_refs.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_refs.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_repository.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_repository.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_server.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_server.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_utils.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_utils.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_walk.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_walk.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_web.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_web.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/utils.py
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/utils.pyc
+lib/python${MODPY_VERSION}/site-packages/dulwich/walk.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/walk.pyc
lib/python${MODPY_VERSION}/site-packages/dulwich/web.py
lib/python${MODPY_VERSION}/site-packages/dulwich/web.pyc
Index: devel/py-hg-git/Makefile
===================================================================
RCS file: /var/cvs/ports/devel/py-hg-git/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- devel/py-hg-git/Makefile 3 Oct 2013 16:37:16 -0000 1.13
+++ devel/py-hg-git/Makefile 9 Mar 2014 13:49:36 -0000
@@ -2,7 +2,7 @@
COMMENT = push/pull from a Git server repository using Mercurial
-MODPY_EGG_VERSION = 0.3.4
+MODPY_EGG_VERSION = 0.5.0
DISTNAME = py-hg-git-${MODPY_EGG_VERSION}
REVISION = 0
@@ -13,19 +13,20 @@ HOMEPAGE = http://hg-git.github.com/
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-# Ugly gymnastics to give a more sensible filename than "0.3.4.tar.gz"..
-MASTER_SITES =
https://bitbucket.org/durin42/hg-git/get/${MODPY_EGG_VERSION}${EXTRACT_SUFX}?dummy=/
+MASTER_SITES = https://bitbucket.org/durin42/hg-git/get/
+DISTFILES = ${DISTNAME}{${MODPY_EGG_VERSION}}${EXTRACT_SUFX}
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-WRKDIST = ${WRKDIR}/durin42-hg-git-586b7aa96466
+WRKDIST = ${WRKDIR}/durin42-hg-git-ef41e87ea11a
RUN_DEPENDS = devel/py-dulwich \
devel/mercurial
-TEST_DEPENDS = ${RUN_DEPENDS} \
+TEST_DEPENDS = ${RUN_DEPENDS} \
archivers/bzip2 \
archivers/unzip \
+ devel/py-nose \
devel/git,-main
pre-test:
@@ -34,6 +35,6 @@ pre-test:
do-test:
cd ${WRKSRC}/tests && ${MODPY_BIN} run-tests.py \
- --with-hg=${LOCALBASE}/hg
+ --with-hg=${LOCALBASE}/bin/hg
.include <bsd.port.mk>
Index: devel/py-hg-git/distinfo
===================================================================
RCS file: /var/cvs/ports/devel/py-hg-git/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- devel/py-hg-git/distinfo 4 Jan 2013 01:30:47 -0000 1.4
+++ devel/py-hg-git/distinfo 26 Feb 2014 13:39:04 -0000
@@ -1,2 +1,2 @@
-SHA256 (py-hg-git-0.3.4.tar.gz) = FJFOG0RNwrbxxWOLWq9wNCGDhpx/K9d6MJZ9EFhEr20=
-SIZE (py-hg-git-0.3.4.tar.gz) = 51141
+SHA256 (py-hg-git-0.5.0.tar.gz) = 6ztcYyesAFDeAYSg4tqboavfeuTrgBDDiJArQPpJMBk=
+SIZE (py-hg-git-0.5.0.tar.gz) = 72786
Index: devel/py-hg-git/pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/devel/py-hg-git/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- devel/py-hg-git/pkg/PLIST 4 Jan 2013 01:30:47 -0000 1.3
+++ devel/py-hg-git/pkg/PLIST 26 Feb 2014 14:24:15 -0000
@@ -12,10 +12,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/hggit/_ssh.pyc
lib/python${MODPY_VERSION}/site-packages/hggit/git_handler.py
lib/python${MODPY_VERSION}/site-packages/hggit/git_handler.pyc
+lib/python${MODPY_VERSION}/site-packages/hggit/gitdirstate.py
+lib/python${MODPY_VERSION}/site-packages/hggit/gitdirstate.pyc
lib/python${MODPY_VERSION}/site-packages/hggit/gitrepo.py
lib/python${MODPY_VERSION}/site-packages/hggit/gitrepo.pyc
lib/python${MODPY_VERSION}/site-packages/hggit/help/
lib/python${MODPY_VERSION}/site-packages/hggit/help/git.rst
+lib/python${MODPY_VERSION}/site-packages/hggit/hg2git.py
+lib/python${MODPY_VERSION}/site-packages/hggit/hg2git.pyc
lib/python${MODPY_VERSION}/site-packages/hggit/hgrepo.py
lib/python${MODPY_VERSION}/site-packages/hggit/hgrepo.pyc
lib/python${MODPY_VERSION}/site-packages/hggit/overlay.py
--
Dmitrij D. Czarkoff
