##// END OF EJS Templates
inotify: inotify.server.walk() filetype is never used, do not yield it
Nicolas Dumazet -
r8334:0695288e default
parent child Browse files
Show More
@@ -74,7 +74,7 b' def walk(repo, root):'
74 else:
74 else:
75 dirs.append(name)
75 dirs.append(name)
76 elif kind in (stat.S_IFREG, stat.S_IFLNK):
76 elif kind in (stat.S_IFREG, stat.S_IFLNK):
77 files.append((name, kind))
77 files.append(name)
78 yield fullpath, dirs, files
78 yield fullpath, dirs, files
79
79
80 for subdir in dirs:
80 for subdir in dirs:
@@ -319,12 +319,12 b' class Watcher(object):'
319 self.handle_timeout()
319 self.handle_timeout()
320 ds = self.repo.dirstate._map.copy()
320 ds = self.repo.dirstate._map.copy()
321 self.add_watch(join(self.repo.root, topdir), self.mask)
321 self.add_watch(join(self.repo.root, topdir), self.mask)
322 for root, dirs, entries in walk(self.repo, topdir):
322 for root, dirs, files in walk(self.repo, topdir):
323 for d in dirs:
323 for d in dirs:
324 self.add_watch(join(root, d), self.mask)
324 self.add_watch(join(root, d), self.mask)
325 wroot = root[len(self.wprefix):]
325 wroot = root[len(self.wprefix):]
326 d = self.dir(self.tree, wroot)
326 d = self.dir(self.tree, wroot)
327 for fn, kind in entries:
327 for fn in files:
328 wfn = join(wroot, fn)
328 wfn = join(wroot, fn)
329 self.updatestatus(wfn, self.getstat(wfn))
329 self.updatestatus(wfn, self.getstat(wfn))
330 ds.pop(wfn, None)
330 ds.pop(wfn, None)
General Comments 0
You need to be logged in to leave comments. Login now