svn commit: r385234 - in head/devel/hg-git: . files

[Jan Beich]

Author: jbeich
Date: Sun May  3 07:30:32 2015
New Revision: 385234
URL: https://svnweb.freebsd.org/changeset/ports/385234

Log:
  devel/hg-git: fix when using with mercurial >= 3.3.3
  
  PR:		199262
  Submitted by:	Quentin Schwerkolt <schwer_q.lists at outlook.com>
  Approved by:	Marco Bröder <marco.broeder at posteo.eu> (maintainer)
  Obtained from:	https://github.com/schacon/hg-git/commit/6331251

Added:
  head/devel/hg-git/files/
  head/devel/hg-git/files/patch-hggit_gitdirstate.py   (contents, props changed)
Modified:
  head/devel/hg-git/Makefile   (contents, props changed)

Modified: head/devel/hg-git/Makefile
==============================================================================
--- head/devel/hg-git/Makefile	Sun May  3 07:30:18 2015	(r385233)
+++ head/devel/hg-git/Makefile	Sun May  3 07:30:32 2015	(r385234)
@@ -3,6 +3,7 @@
 
 PORTNAME=	hg-git
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Added: head/devel/hg-git/files/patch-hggit_gitdirstate.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/hg-git/files/patch-hggit_gitdirstate.py	Sun May  3 07:30:32 2015	(r385234)
@@ -0,0 +1,15 @@
+--- hggit/gitdirstate.py.orig	2014-05-09 14:26:29 UTC
++++ hggit/gitdirstate.py
+@@ -161,7 +161,11 @@ class gitdirstate(dirstate.dirstate):
+         results, work, dirsnotfound = self._walkexplicit(match, subrepos)
+ 
+         skipstep3 = skipstep3 and not (work or dirsnotfound)
+-        work = [d for d in work if not dirignore(d)]
++        if work and isinstance(work[0], tuple):
++            # Mercurial >= 3.3.3
++            work = [nd for nd, d in work if not dirignore(d)]
++        else:
++            work = [d for d in work if not dirignore(d)]
+         wadd = work.append
+ 
+         # step 2: visit subdirectories