Hi!
Here is an update for devel/py-hg-git and devel/py-dulwich. Main news
is support for Mercurial 3.6 in hggit, which recently landed in ports.
OK?
--
Dmitrij D. Czarkoff
Index: py-dulwich//Makefile
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- py-dulwich//Makefile 23 Nov 2015 19:44:44 -0000 1.21
+++ py-dulwich//Makefile 21 Dec 2015 09:30:11 -0000
@@ -2,7 +2,7 @@
COMMENT = pure Python implementation of Git file formats and
protocols
-MODPY_EGG_VERSION = 0.11.2
+MODPY_EGG_VERSION = 0.12.0
DISTNAME = dulwich-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
Index: py-dulwich//distinfo
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- py-dulwich//distinfo 23 Nov 2015 19:44:44 -0000 1.7
+++ py-dulwich//distinfo 21 Dec 2015 09:30:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (dulwich-0.11.2.tar.gz) = pUPieY2lYA/nPtcUcPZ7zZJhH04kkdDtOjthwvkcv0A=
-SIZE (dulwich-0.11.2.tar.gz) = 290404
+SHA256 (dulwich-0.12.0.tar.gz) = j5Bw837sYXWqtg1wZCRrW2RTsvqzQliRAfHI/toKDMY=
+SIZE (dulwich-0.12.0.tar.gz) = 293900
Index: py-dulwich//pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-dulwich/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- py-dulwich//pkg/PLIST 23 Nov 2015 19:44:44 -0000 1.6
+++ py-dulwich//pkg/PLIST 21 Dec 2015 09:46:25 -0000
@@ -7,7 +7,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/dulwich-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
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
@@ -19,6 +18,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich/_objects.so
lib/python${MODPY_VERSION}/site-packages/dulwich/_pack.c
lib/python${MODPY_VERSION}/site-packages/dulwich/_pack.so
+lib/python${MODPY_VERSION}/site-packages/dulwich/archive.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/archive.pyc
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
@@ -66,6 +67,8 @@ lib/python${MODPY_VERSION}/site-packages
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/reflog.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/reflog.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
@@ -257,6 +260,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/trees/
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/trees/70/
lib/python${MODPY_VERSION}/site-packages/dulwich/tests/data/trees/70/c190eb48fa8bbb50ddc692a17b44cb781af7f6
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_archive.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_archive.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
@@ -295,6 +300,8 @@ lib/python${MODPY_VERSION}/site-packages
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_reflog.py
+lib/python${MODPY_VERSION}/site-packages/dulwich/tests/test_reflog.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
@@ -320,6 +327,7 @@ share/doc/dulwich/tutorial/file-format.t
share/doc/dulwich/tutorial/index.txt
share/doc/dulwich/tutorial/introduction.txt
share/doc/dulwich/tutorial/object-store.txt
+share/doc/dulwich/tutorial/porcelain.txt
share/doc/dulwich/tutorial/remote.txt
share/doc/dulwich/tutorial/repo.txt
share/doc/dulwich/tutorial/tag.txt
Index: py-hg-git//Makefile
===================================================================
RCS file: /cvs/ports/devel/py-hg-git/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- py-hg-git//Makefile 29 Sep 2015 10:51:54 -0000 1.19
+++ py-hg-git//Makefile 21 Dec 2015 09:52:25 -0000
@@ -2,9 +2,8 @@
COMMENT = mercurial extension to work with git repositories
-MODPY_EGG_VERSION = 0.8.2
+MODPY_EGG_VERSION = 0.8.3
DISTNAME = py-hg-git-${MODPY_EGG_VERSION}
-REVISION = 0
CATEGORIES = devel
@@ -21,7 +20,7 @@ DISTFILES = ${DISTNAME}{${MODPY_EGG_VER
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-WRKDIST = ${WRKDIR}/durin42-hg-git-e183fdc198f0
+WRKDIST = ${WRKDIR}/durin42-hg-git-d7ad67f850b2
RUN_DEPENDS = devel/py-dulwich>=0.10.1 \
devel/mercurial
Index: py-hg-git//distinfo
===================================================================
RCS file: /cvs/ports/devel/py-hg-git/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- py-hg-git//distinfo 23 Sep 2015 07:18:21 -0000 1.9
+++ py-hg-git//distinfo 21 Dec 2015 09:49:11 -0000
@@ -1,2 +1,2 @@
-SHA256 (py-hg-git-0.8.2.tar.gz) = 8mAoEkp2c+Mga3HJ71sd070yqYR+DBQxvmujvRT3Sz4=
-SIZE (py-hg-git-0.8.2.tar.gz) = 99762
+SHA256 (py-hg-git-0.8.3.tar.gz) = hJzKibWlm2CKNAs4SB10B+ld4W/k8TWIGkAspn/s0Co=
+SIZE (py-hg-git-0.8.3.tar.gz) = 100467
Index: py-hg-git//patches/patch-hggit__ssh_py
===================================================================
RCS file: py-hg-git//patches/patch-hggit__ssh_py
diff -N py-hg-git//patches/patch-hggit__ssh_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ py-hg-git//patches/patch-hggit__ssh_py 21 Dec 2015 11:22:08 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- hggit/_ssh.py.orig Mon Nov 9 06:41:43 2015
++++ hggit/_ssh.py Mon Dec 21 12:22:04 2015
+@@ -14,15 +14,10 @@ def generate_ssh_vendor(ui):
+
+ class _Vendor(SSHVendor):
+ def run_command(self, host, command, username=None, port=None):
+- # newer dulwich changes the way they pass command and parameters
+- # around, so we detect that here and reformat it back to what
+- # hg-git expects (e.g. "command 'arg1 arg2'")
+- if len(command) > 1:
+- command = ["%s '%s'" % (command[0], ' '.join(command[1:]))]
+ sshcmd = ui.config("ui", "ssh", "ssh")
+ args = util.sshargs(sshcmd, host, username, port)
+ cmd = '%s %s %s' % (sshcmd, args,
+- util.shellquote(' '.join(command)))
++ util.shellquote(command))
+ ui.debug('calling ssh: %s\n' % cmd)
+ proc = subprocess.Popen(util.quotecommand(cmd), shell=True,
+ stdin=subprocess.PIPE,
