##// END OF EJS Templates
Fix walkhelper on windows....
Christian Boos -
r1562:2f97af0b default
parent child Browse files
Show More
@@ -305,7 +305,7 class dirstate(object):
305 nd = util.normpath(top[len(self.root) + 1:])
305 nd = util.normpath(top[len(self.root) + 1:])
306 if nd == '.': nd = ''
306 if nd == '.': nd = ''
307 for f in names:
307 for f in names:
308 np = os.path.join(nd, f)
308 np = util.pconvert(os.path.join(nd, f))
309 if seen(np):
309 if seen(np):
310 continue
310 continue
311 p = os.path.join(top, f)
311 p = os.path.join(top, f)
@@ -316,12 +316,12 class dirstate(object):
316 if statmatch(ds, st):
316 if statmatch(ds, st):
317 work.append(p)
317 work.append(p)
318 if statmatch(np, st) and np in dc:
318 if statmatch(np, st) and np in dc:
319 yield 'm', util.pconvert(np), st
319 yield 'm', np, st
320 elif statmatch(np, st):
320 elif statmatch(np, st):
321 if self.supported_type(np, st):
321 if self.supported_type(np, st):
322 yield 'f', util.pconvert(np), st
322 yield 'f', np, st
323 elif np in dc:
323 elif np in dc:
324 yield 'm', util.pconvert(np), st
324 yield 'm', np, st
325
325
326 known = {'.hg': 1}
326 known = {'.hg': 1}
327 def seen(fn):
327 def seen(fn):
General Comments 0
You need to be logged in to leave comments. Login now