Show More
@@ -22,6 +22,7 b' class dirstate:' | |||
|
22 | 22 | self.pl = None |
|
23 | 23 | self.copies = {} |
|
24 | 24 | self.ignorefunc = None |
|
25 | self.blockignore = False | |
|
25 | 26 | |
|
26 | 27 | def wjoin(self, f): |
|
27 | 28 | return os.path.join(self.root, f) |
@@ -32,6 +33,8 b' class dirstate:' | |||
|
32 | 33 | return cwd[len(self.root) + 1:] |
|
33 | 34 | |
|
34 | 35 | def ignore(self, f): |
|
36 | if self.blockignore: | |
|
37 | return False | |
|
35 | 38 | if not self.ignorefunc: |
|
36 | 39 | bigpat = [] |
|
37 | 40 | try: |
@@ -214,11 +217,55 b' class dirstate:' | |||
|
214 | 217 | elif not dc: |
|
215 | 218 | dc = self.filterfiles(files) |
|
216 | 219 | |
|
220 | def statmatch(file, stat): | |
|
221 | if file not in dc and self.ignore(file): | |
|
222 | return False | |
|
223 | return match(file) | |
|
224 | return self.walkhelper(files=files, statmatch=statmatch, dc=dc) | |
|
225 | ||
|
226 | # walk recursively through the directory tree, finding all files | |
|
227 | # matched by the statmatch function | |
|
228 | # | |
|
229 | # results are yielded in a tuple (src, filename), where src is one of: | |
|
230 | # 'f' the file was found in the directory tree | |
|
231 | # 'm' the file was only in the dirstate and not in the tree | |
|
232 | # | |
|
233 | # dc is an optional arg for the current dirstate. dc is not modified | |
|
234 | # directly by this function, but might be modified by your statmatch call. | |
|
235 | # | |
|
236 | def walkhelper(self, files, statmatch, dc): | |
|
237 | # recursion free walker, faster than os.walk. | |
|
238 | def findfiles(s): | |
|
239 | retfiles = [] | |
|
240 | work = [s] | |
|
241 | while work: | |
|
242 | top = work.pop() | |
|
243 | names = os.listdir(top) | |
|
244 | names.sort() | |
|
245 | # nd is the top of the repository dir tree | |
|
246 | nd = util.normpath(top[len(self.root) + 1:]) | |
|
247 | if nd == '.': nd = '' | |
|
248 | for f in names: | |
|
249 | np = os.path.join(nd, f) | |
|
250 | if seen(np): | |
|
251 | continue | |
|
252 | p = os.path.join(top, f) | |
|
253 | st = os.stat(p) | |
|
254 | if stat.S_ISDIR(st.st_mode): | |
|
255 | ds = os.path.join(nd, f +'/') | |
|
256 | if statmatch(ds, st): | |
|
257 | work.append(p) | |
|
258 | else: | |
|
259 | if statmatch(np, st): | |
|
260 | yield np | |
|
261 | ||
|
217 | 262 | known = {'.hg': 1} |
|
218 | 263 | def seen(fn): |
|
219 | 264 | if fn in known: return True |
|
220 | 265 | known[fn] = 1 |
|
221 | def traverse(): | |
|
266 | ||
|
267 | # step one, find all files that match our criteria | |
|
268 | files.sort() | |
|
222 | 269 |
|
|
223 | 270 |
|
|
224 | 271 |
|
@@ -229,23 +276,20 b' class dirstate:' | |||
|
229 | 276 |
|
|
230 | 277 |
|
|
231 | 278 |
|
|
232 | for dir, subdirs, fl in os.walk(f): | |
|
233 | d = dir[len(self.root) + 1:] | |
|
234 | nd = util.normpath(d) | |
|
235 |
|
|
|
236 | if seen(nd): | |
|
237 | subdirs[:] = [] | |
|
279 | sorted = [ x for x in findfiles(f) ] | |
|
280 | sorted.sort() | |
|
281 | for fl in sorted: | |
|
282 | yield 'f', fl | |
|
283 | elif stat.S_ISREG(st.st_mode): | |
|
284 | ff = util.normpath(ff) | |
|
285 | if seen(ff): | |
|
238 | 286 |
|
|
239 |
|
|
|
240 | ds = os.path.join(nd, sd +'/') | |
|
241 | if self.ignore(ds) or not match(ds): | |
|
242 | subdirs.remove(sd) | |
|
243 | subdirs.sort() | |
|
244 |
|
|
|
245 | for fn in fl: | |
|
246 | fn = util.pconvert(os.path.join(d, fn)) | |
|
247 | yield 'f', fn | |
|
248 | elif stat.S_ISREG(st.st_mode): | |
|
287 | found = False | |
|
288 | self.blockignore = True | |
|
289 | if statmatch(ff, st): | |
|
290 | found = True | |
|
291 | self.blockignore = False | |
|
292 | if found: | |
|
249 | 293 | yield 'f', ff |
|
250 | 294 |
|
|
251 | 295 |
|
@@ -258,54 +302,68 b' class dirstate:' | |||
|
258 | 302 |
|
|
259 | 303 |
|
|
260 | 304 | |
|
305 | # step two run through anything left in the dc hash and yield | |
|
306 | # if we haven't already seen it | |
|
261 | 307 |
|
|
262 | 308 |
|
|
263 | 309 |
|
|
310 | if not seen(k) and (statmatch(k, None)): | |
|
264 | 311 | yield 'm', k |
|
265 | 312 | |
|
266 | # yield only files that match: all in dirstate, others only if | |
|
267 | # not in .hgignore | |
|
268 | ||
|
269 | for src, fn in util.unique(traverse()): | |
|
270 | fn = util.normpath(fn) | |
|
271 | if seen(fn): continue | |
|
272 | if fn not in dc and self.ignore(fn): | |
|
273 | continue | |
|
274 | if match(fn): | |
|
275 | yield src, fn | |
|
276 | ||
|
277 | 313 | def changes(self, files=None, match=util.always): |
|
278 | 314 | self.read() |
|
279 | 315 | if not files: |
|
316 | files = [self.root] | |
|
280 | 317 | dc = self.map.copy() |
|
281 | 318 | else: |
|
282 | 319 | dc = self.filterfiles(files) |
|
283 | 320 | lookup, modified, added, unknown = [], [], [], [] |
|
284 | 321 | removed, deleted = [], [] |
|
285 | 322 | |
|
286 | for src, fn in self.walk(files, match, dc=dc): | |
|
287 | try: | |
|
288 | s = os.stat(os.path.join(self.root, fn)) | |
|
289 | except OSError: | |
|
290 | continue | |
|
323 | # statmatch function to eliminate entries from the dirstate copy | |
|
324 | # and put files into the appropriate array. This gets passed | |
|
325 | # to the walking code | |
|
326 | def statmatch(fn, s): | |
|
327 | def checkappend(l, fn): | |
|
328 | if match is util.always or match(fn): | |
|
329 | l.append(fn) | |
|
330 | ||
|
331 | if not s or stat.S_ISDIR(s.st_mode): | |
|
332 | return self.ignore(fn) and False or match(fn) | |
|
333 | ||
|
291 | 334 | if not stat.S_ISREG(s.st_mode): |
|
292 |
|
|
|
293 |
c = dc. |
|
|
335 | return False | |
|
336 | c = dc.pop(fn, None) | |
|
294 | 337 | if c: |
|
295 | del dc[fn] | |
|
296 | if c[0] == 'm': | |
|
297 |
|
|
|
298 | elif c[0] == 'a': | |
|
299 |
|
|
|
300 |
elif |
|
|
338 | type, mode, size, time = c | |
|
339 | # check the common case first | |
|
340 | if type == 'n': | |
|
341 | if size != s.st_size or (mode ^ s.st_mode) & 0100: | |
|
342 | checkappend(modified, fn) | |
|
343 | elif time != s.st_mtime: | |
|
344 | checkappend(lookup, fn) | |
|
345 | elif type == 'm': | |
|
346 | checkappend(modified, fn) | |
|
347 | elif type == 'a': | |
|
348 | checkappend(added, fn) | |
|
349 | elif type == 'r': | |
|
350 | checkappend(unknown, fn) | |
|
351 | else: | |
|
352 | if not self.ignore(fn) and match(fn): | |
|
301 | 353 | unknown.append(fn) |
|
302 | elif c[2] != s.st_size or (c[1] ^ s.st_mode) & 0100: | |
|
303 | modified.append(fn) | |
|
304 | elif c[3] != s.st_mtime: | |
|
305 | lookup.append(fn) | |
|
306 | else: | |
|
307 | unknown.append(fn) | |
|
354 | # return false because we've already handled all cases above. | |
|
355 | # there's no need for the walking code to process the file | |
|
356 | # any further. | |
|
357 | return False | |
|
308 | 358 | |
|
359 | # because our statmatch always returns false, self.walk will only | |
|
360 | # return files in the dirstate map that are not present in the FS. | |
|
361 | # But, we still need to iterate through the results to force the | |
|
362 | # walk to complete | |
|
363 | for src, fn in self.walkhelper(files, statmatch, dc): | |
|
364 | pass | |
|
365 | ||
|
366 | # anything left in dc didn't exist in the filesystem | |
|
309 | 367 | for fn, c in [(fn, c) for fn, c in dc.items() if match(fn)]: |
|
310 | 368 | if c[0] == 'r': |
|
311 | 369 | removed.append(fn) |
General Comments 0
You need to be logged in to leave comments.
Login now