mercurial-crew-with-dirclash: comparison mercurial/dirstate.py

equal deleted inserted replaced

-:fb9b84c91222
+:f56f38a1a85f
 else:
 break
 bs += 1
 return ret
-def walk(self, files=None, match=util.always, dc=None):
+def statwalk(self, files=None, match=util.always, dc=None):
 self.read()
 # walk all files by default
 if not files:
 files = [self.root]
 return False
 return match(file)
 return self.walkhelper(files=files, statmatch=statmatch, dc=dc)
+def walk(self, files=None, match=util.always, dc=None):
+# filter out the stat
+for src, f, st in self.statwalk(files, match, dc):
+yield src, f
 # walk recursively through the directory tree, finding all files
 # matched by the statmatch function
 #
-# results are yielded in a tuple (src, filename), where src is one of:
+# results are yielded in a tuple (src, filename, st), where src
+# is one of:
 # 'f' the file was found in the directory tree
 # 'm' the file was only in the dirstate and not in the tree
+# and st is the stat result if the file was found in the directory.
 #
 # dc is an optional arg for the current dirstate.  dc is not modified
 # directly by this function, but might be modified by your statmatch call.
 #
 def walkhelper(self, files, statmatch, dc):
 if stat.S_ISDIR(st.st_mode):
 ds = os.path.join(nd, f +'/')
 if statmatch(ds, st):
 work.append(p)
 elif statmatch(np, st) and supported_type(np, st):
-yield util.pconvert(np)
+yield util.pconvert(np), st
 known = {'.hg': 1}
 def seen(fn):
 if fn in known: return True
 if ff not in dc: self.ui.warn('%s: %s\n' % (
 util.pathto(self.getcwd(), ff),
 inst.strerror))
 continue
 if stat.S_ISDIR(st.st_mode):
+cmp0 = (lambda x, y: cmp(x[0], y[0]))
 sorted = [ x for x in findfiles(f) ]
-sorted.sort()
+sorted.sort(cmp0)
-for fl in sorted:
+for fl, stl in sorted:
-yield 'f', fl
+yield 'f', fl, stl
 else:
 ff = util.normpath(ff)
 if seen(ff):
 continue
 found = False
 self.blockignore = True
 if statmatch(ff, st) and supported_type(ff, st):
 found = True
 self.blockignore = False
 if found:
-yield 'f', ff
+yield 'f', ff, st
 # step two run through anything left in the dc hash and yield
 # if we haven't already seen it
 ks = dc.keys()
 ks.sort()
 for k in ks:
 if not seen(k) and (statmatch(k, None)):
-yield 'm', k
+yield 'm', k, None
 def changes(self, files=None, match=util.always):
-self.read()
-if not files:
-files = [self.root]
-dc = self.map.copy()
-else:
-dc = self.filterfiles(files)
 lookup, modified, added, unknown = [], [], [], []
 removed, deleted = [], []
-# statmatch function to eliminate entries from the dirstate copy
+for src, fn, st in self.statwalk(files, match):
-# and put files into the appropriate array.  This gets passed
+try:
-# to the walking code
+type, mode, size, time = self[fn]
-def statmatch(fn, s):
+except KeyError:
-fn = util.pconvert(fn)
-def checkappend(l, fn):
-if match is util.always or match(fn):
-l.append(fn)
-if not s or stat.S_ISDIR(s.st_mode):
-if self.ignore(fn): return False
-return match(fn)
-c = dc.pop(fn, None)
-if c:
-type, mode, size, time = c
-# check the common case first
-if type == 'n':
-if size != s.st_size or (mode ^ s.st_mode) & 0100:
-checkappend(modified, fn)
-elif time != s.st_mtime:
-checkappend(lookup, fn)
-elif type == 'm':
-checkappend(modified, fn)
-elif type == 'a':
-checkappend(added, fn)
-elif type == 'r':
-checkappend(unknown, fn)
-elif not self.ignore(fn) and match(fn):
 unknown.append(fn)
-# return false because we've already handled all cases above.
+continue
-# there's no need for the walking code to process the file
+# XXX: what to do with file no longer present in the fs
-# any further.
+# who are not removed in the dirstate ?
-return False
+if src == 'm' and not type == 'r':
+deleted.append(fn)
-# because our statmatch always returns false, self.walk will only
+continue
-# return files in the dirstate map that are not present in the FS.
+# check the common case first
-# But, we still need to iterate through the results to force the
+if type == 'n':
-# walk to complete
+if not st:
-for src, fn in self.walkhelper(files, statmatch, dc):
+st = os.stat(fn)
-pass
+if size != st.st_size or (mode ^ st.st_mode) & 0100:
+modified.append(fn)
-# there may be patterns in the .hgignore file that prevent us
+elif time != st.st_mtime:
-# from examining entire directories in the dirstate map, so we
+lookup.append(fn)
-# go back and explicitly examine any matching files we've
+elif type == 'm':
-# ignored
+modified.append(fn)
-unexamined = [fn for fn in dc.iterkeys()
+elif type == 'a':
-if self.ignore(fn) and match(fn)]
+added.append(fn)
+elif type == 'r':
-for src, fn in self.walkhelper(unexamined, statmatch, dc):
-pass
-# anything left in dc didn't exist in the filesystem
-for fn, c in dc.iteritems():
-if not match(fn): continue
-if c[0] == 'r':
 removed.append(fn)
-else:
-deleted.append(fn)
 return (lookup, modified, added, removed + deleted, unknown)

changeset 1471	f56f38a1a85f
parent 1402	9d2c2e6b32b5
child 1476	17e8c70fb670