Mercurial > hg > pyhgsh
diff mercurial/dirstate.py @ 1562:2f97af0b522c
Fix walkhelper on windows.
The ''seen'' dictionary stores paths in canonical form,
so the walkhelp must also provide paths in that form,
otherwise the changed files are listed twice.
| author | Christian Boos <cboos@neuf.fr> |
|---|---|
| date | Thu, 01 Dec 2005 10:48:18 -0600 |
| parents | 59b3639df0a9 |
| children | 34579a67fa71 |
line wrap: on
line diff
--- a/mercurial/dirstate.py Tue Nov 29 22:29:14 2005 +0100 +++ b/mercurial/dirstate.py Thu Dec 01 10:48:18 2005 -0600 @@ -305,7 +305,7 @@ nd = util.normpath(top[len(self.root) + 1:]) if nd == '.': nd = '' for f in names: - np = os.path.join(nd, f) + np = util.pconvert(os.path.join(nd, f)) if seen(np): continue p = os.path.join(top, f) @@ -316,12 +316,12 @@ if statmatch(ds, st): work.append(p) if statmatch(np, st) and np in dc: - yield 'm', util.pconvert(np), st + yield 'm', np, st elif statmatch(np, st): if self.supported_type(np, st): - yield 'f', util.pconvert(np), st + yield 'f', np, st elif np in dc: - yield 'm', util.pconvert(np), st + yield 'm', np, st known = {'.hg': 1} def seen(fn):