PORTREVISION=	1

From 63312517680e285e8d7cfaf8154fca059a35e4ee Mon Sep 17 00:00:00 2001

From: Siddharth Agarwal <sid0@fb.com>

Date: Fri, 3 Apr 2015 10:27:04 -0700

Subject: [PATCH] gitdirstate: use normalized path from _walkexplicit

Since 2bb13f2b778c in Mercurial, _walkexplicit returns a tuple, so ensure

we are up to date and take the normalized path which is the first part of the

tuple.

Based on a patch by David Soria Parra <davidsp@fb.com>.

---

 hggit/gitdirstate.py | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hggit/gitdirstate.py b/hggit/gitdirstate.py

index 2cf1e34..4d8cdf4 100644

--- a/hggit/gitdirstate.py

+++ b/hggit/gitdirstate.py

@@ -163,7 +163,11 @@ def fwarn(f, msg):

         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

From 63312517680e285e8d7cfaf8154fca059a35e4ee Mon Sep 17 00:00:00 2001

From: Siddharth Agarwal <sid0@fb.com>

Date: Fri, 3 Apr 2015 10:27:04 -0700

Subject: [PATCH] gitdirstate: use normalized path from _walkexplicit

Since 2bb13f2b778c in Mercurial, _walkexplicit returns a tuple, so ensure

we are up to date and take the normalized path which is the first part of the

tuple.

Based on a patch by David Soria Parra <davidsp@fb.com>.

---

 hggit/gitdirstate.py | 6 +++++-

 1 file changed, 5 insertions(+), 1 deletion(-)

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