Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

Commit

Permalink
gitdirstate: use normalized path from _walkexplicit
Browse files Browse the repository at this point in the history
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>.
  • Loading branch information
sunshowers committed Apr 3, 2015
1 parent 4ae5fa7 commit 6331251
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion hggit/gitdirstate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6331251

Please sign in to comment.