Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1500740185225230"
MIME-Version: 1.0
Date: Sat, 22 Jul 2017 16:16:25 +0000
From: "Joerg Sonnenberger" <joerg@netbsd.org>
Subject: CVS commit: pkgsrc/devel/py-hg-fastimport
To: pkgsrc-changes@NetBSD.org
Reply-To: joerg@netbsd.org
Message-Id: <20170722161625.536DDFACD@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1500740185225230
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	joerg
Date:		Sat Jul 22 16:16:25 UTC 2017

Modified Files:
	pkgsrc/devel/py-hg-fastimport: Makefile PLIST distinfo
Added Files:
	pkgsrc/devel/py-hg-fastimport/patches: patch-hgfastimport_hgimport.py

Log Message:
Update to py27-hg-fastimport-20170211 to work with newer Mercurial.
Include a small hack to ignore deleteall as used by Fossil.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-hg-fastimport/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-hg-fastimport/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-hg-fastimport/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-hg-fastimport/patches/patch-hgfastimport_hgimport.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1500740185225230
Content-Disposition: inline
Content-Length: 4488
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/py-hg-fastimport/Makefile
diff -u pkgsrc/devel/py-hg-fastimport/Makefile:1.4 pkgsrc/devel/py-hg-fastimport/Makefile:1.5
--- pkgsrc/devel/py-hg-fastimport/Makefile:1.4	Sun Jan  1 14:43:33 2017
+++ pkgsrc/devel/py-hg-fastimport/Makefile	Sat Jul 22 16:16:25 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2017/01/01 14:43:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2017/07/22 16:16:25 joerg Exp $
 
-DISTNAME=	v20150518
-PKGNAME=	${PYPKGPREFIX}-hg-fastimport-${DISTNAME:S/v//}
+DISTNAME=	danielj7-hg-fastimport-d41a42894dfa
+PKGNAME=	${PYPKGPREFIX}-hg-fastimport-20170211
 CATEGORIES=	devel
-MASTER_SITES=	https://bitbucket.org/danielj7/hg-fastimport/get/
+MASTER_SITES=	-https://bitbucket.org/danielj7/hg-fastimport/get/v20170211.tar.bz2
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 DEPENDS+=	${PYPKGPREFIX}-fastimport-[0-9]*:../../devel/py-fastimport
 DEPENDS+=	${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
-WRKSRC=		${WRKDIR}/danielj7-hg-fastimport-b947b2283dc8
 USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS+=	${PYSITELIB}/hgfastimport share/doc/py-hg-fastimport
@@ -25,8 +24,9 @@ PY_PATCHPLIST=			yes
 do-build:
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/hgfastimport/* ${DESTDIR}${PREFIX}/${PYSITELIB}/hgfastimport
+	${INSTALL_SCRIPT} ${WRKSRC}/hgfastimport/*.py ${DESTDIR}${PREFIX}/${PYSITELIB}/hgfastimport
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/py-hg-fastimport
+	${PY_COMPILE_ALL} ${DESTDIR}${PREFIX}/${PYSITELIB}/hgfastimport
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-hg-fastimport/PLIST
diff -u pkgsrc/devel/py-hg-fastimport/PLIST:1.1 pkgsrc/devel/py-hg-fastimport/PLIST:1.2
--- pkgsrc/devel/py-hg-fastimport/PLIST:1.1	Sun Jun  7 08:19:36 2015
+++ pkgsrc/devel/py-hg-fastimport/PLIST	Sat Jul 22 16:16:25 2017
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/07 08:19:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/07/22 16:16:25 joerg Exp $
 ${PYSITELIB}/hgfastimport/__init__.py
+${PYSITELIB}/hgfastimport/__init__.pyc
 ${PYSITELIB}/hgfastimport/hgechoprocessor.py
+${PYSITELIB}/hgfastimport/hgechoprocessor.pyc
 ${PYSITELIB}/hgfastimport/hgimport.py
+${PYSITELIB}/hgfastimport/hgimport.pyc
 share/doc/py-hg-fastimport/README.txt

Index: pkgsrc/devel/py-hg-fastimport/distinfo
diff -u pkgsrc/devel/py-hg-fastimport/distinfo:1.2 pkgsrc/devel/py-hg-fastimport/distinfo:1.3
--- pkgsrc/devel/py-hg-fastimport/distinfo:1.2	Tue Nov  3 03:29:08 2015
+++ pkgsrc/devel/py-hg-fastimport/distinfo	Sat Jul 22 16:16:25 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:29:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/07/22 16:16:25 joerg Exp $
 
-SHA1 (v20150518.tar.bz2) = 619e0d70ac848c6ab48e39e3ce50fec0a913fef5
-RMD160 (v20150518.tar.bz2) = 44f4725fb35382357a2af188d517e167cfbac74d
-SHA512 (v20150518.tar.bz2) = 9f0a9af3cc11de0b2e80b6d4e7f0fd1320aafaa84dd41c846fa127b17e08616b95d3715edeea95157b7e4d6fd2dfa0fe08d4a58fcb117f9e7d55ad97493dd60f
-Size (v20150518.tar.bz2) = 30558 bytes
+SHA1 (danielj7-hg-fastimport-d41a42894dfa.tar.bz2) = 8820358107c9de776d6250052a3f15ecccfbcd44
+RMD160 (danielj7-hg-fastimport-d41a42894dfa.tar.bz2) = c6d0f6654509632f3b8266f7a4da519ff6789542
+SHA512 (danielj7-hg-fastimport-d41a42894dfa.tar.bz2) = fc207c90721dc5f32d477bfbd5c4d7634f9a16c28d6e21254bbd942cd4ad7053dbcfd3f0fed91ee797759203f4196985d5bc3132618c58331c06a8fa764124b3
+Size (danielj7-hg-fastimport-d41a42894dfa.tar.bz2) = 30701 bytes
+SHA1 (patch-hgfastimport_hgimport.py) = 42eb4f8e637cf24e52f3cabf6f499ebab9803fa7

Added files:

Index: pkgsrc/devel/py-hg-fastimport/patches/patch-hgfastimport_hgimport.py
diff -u /dev/null pkgsrc/devel/py-hg-fastimport/patches/patch-hgfastimport_hgimport.py:1.1
--- /dev/null	Sat Jul 22 16:16:25 2017
+++ pkgsrc/devel/py-hg-fastimport/patches/patch-hgfastimport_hgimport.py	Sat Jul 22 16:16:25 2017
@@ -0,0 +1,11 @@
+$NetBSD: patch-hgfastimport_hgimport.py,v 1.1 2017/07/22 16:16:25 joerg Exp $
+
+--- hgfastimport/hgimport.py.orig	2017-07-22 14:10:21.608040482 +0000
++++ hgfastimport/hgimport.py
+@@ -449,3 +452,6 @@ class HgImportCommitHandler(processor.Co
+         # copy oldname to newname and delete oldname
+         self.copies[filecmd.new_path] = filecmd.old_path
+         self.modified.append((filecmd.old_path, None))
++
++    def deleteall_handler(self, filecmd):
++        pass # Drop it for now, used by fossil when no parent exists.


--_----------=_1500740185225230--