Mercurial > hg-git

changeset 872:da01212cd53a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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>.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 03 Apr 2015 10:27:04 -0700
parents c1c2af8aecb3
children 517cf1b5e626
files hggit/gitdirstate.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/gitdirstate.py	Fri Apr 03 10:25:18 2015 -0700
+++ b/hggit/gitdirstate.py	Fri Apr 03 10:27:04 2015 -0700
@@ -163,7 +163,11 @@
         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