facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Fix walkhelper on windows.

Browse Source 
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.
This commit is contained in:
Christian Boos 2005-12-01 10:48:18 -06:00
parent da5f24688e
commit b837e9f668
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mercurial/dirstate.py
View File

@ -305,7 +305,7 @@ class dirstate(object):
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 @@ class dirstate(object):
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):