Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/dirstate.py @ 1543:93a9298367e0
Merge with Thomas Waldmann
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 14 Nov 2005 15:09:34 +0100 |
parents | bf4e7ef08741 |
children | 59b3639df0a9 |
comparison
equal
deleted
inserted
replaced
1539:5e47e42b14ba | 1543:93a9298367e0 |
---|---|
211 def filterfiles(self, files): | 211 def filterfiles(self, files): |
212 ret = {} | 212 ret = {} |
213 unknown = [] | 213 unknown = [] |
214 | 214 |
215 for x in files: | 215 for x in files: |
216 if x is '.': | 216 if x == '.': |
217 return self.map.copy() | 217 return self.map.copy() |
218 if x not in self.map: | 218 if x not in self.map: |
219 unknown.append(x) | 219 unknown.append(x) |
220 else: | 220 else: |
221 ret[x] = self.map[x] | 221 ret[x] = self.map[x] |
294 # directly by this function, but might be modified by your statmatch call. | 294 # directly by this function, but might be modified by your statmatch call. |
295 # | 295 # |
296 def walkhelper(self, files, statmatch, dc): | 296 def walkhelper(self, files, statmatch, dc): |
297 # recursion free walker, faster than os.walk. | 297 # recursion free walker, faster than os.walk. |
298 def findfiles(s): | 298 def findfiles(s): |
299 retfiles = [] | |
300 work = [s] | 299 work = [s] |
301 while work: | 300 while work: |
302 top = work.pop() | 301 top = work.pop() |
303 names = os.listdir(top) | 302 names = os.listdir(top) |
304 names.sort() | 303 names.sort() |