Attachment #155338 for bug #199262

Lines 3-8 Link Here

(-)b/devel/hg-git/Makefile (+1 lines)
3		3
4	PORTNAME= hg-git	4	PORTNAME= hg-git
5	PORTVERSION= 0.8.0	5	PORTVERSION= 0.8.0
		6	PORTREVISION= 1
6	CATEGORIES= devel python	7	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	9	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}




--- 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

Return to bug 199262

Added Link Here

(-)b/devel/hg-git/files/patch-hggit_gitdirstate.py (+15 lines)
1	--- hggit/gitdirstate.py.orig 2014-05-09 14:26:29 UTC
2	+++ hggit/gitdirstate.py
3	@@ -161,7 +161,11 @@ class gitdirstate(dirstate.dirstate):
4	results, work, dirsnotfound = self._walkexplicit(match, subrepos)
5
6	skipstep3 = skipstep3 and not (work or dirsnotfound)
7	- work = [d for d in work if not dirignore(d)]
8	+ if work and isinstance(work[0], tuple):
9	+ # Mercurial >= 3.3.3
10	+ work = [nd for nd, d in work if not dirignore(d)]
11	+ else:
12	+ work = [d for d in work if not dirignore(d)]
13	wadd = work.append
14
15	# step 2: visit subdirectories