Mercurial > hg
diff hgext/inotify/server.py @ 9349:56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
self.wprefix = self.repo.root + '/' = self.repo.wjoin('') + '/'
Since we'll eventually get rid of self.repo, keep only the first form.
use self.prefixlen to compute only once the root prefix size.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Mon, 29 Jun 2009 01:05:06 +0900 |
parents | 954f7a879495 |
children | b789ea382fc0 |
line wrap: on
line diff
--- a/hgext/inotify/server.py Sun Jun 28 19:46:36 2009 +0900 +++ b/hgext/inotify/server.py Mon Jun 29 01:05:06 2009 +0900 @@ -312,7 +312,8 @@ def __init__(self, ui, repo): self.ui = ui self.repo = repo - self.wprefix = self.repo.wjoin('') + self.wprefix = join(repo.root, '') + self.prefixlen = len(self.wprefix) try: self.watcher = watcher.watcher() except OSError, err: @@ -363,7 +364,7 @@ return if self.watcher.path(path) is None: if self.ui.debugflag: - self.ui.note(_('watching %r\n') % path[len(self.wprefix):]) + self.ui.note(_('watching %r\n') % path[self.prefixlen:]) try: self.watcher.add(path, mask) except OSError, err: @@ -374,7 +375,7 @@ _explain_watch_limit(self.ui, self.repo) def setup(self): - self.ui.note(_('watching directories under %r\n') % self.repo.root) + self.ui.note(_('watching directories under %r\n') % self.wprefix) self.add_watch(self.repo.path, inotify.IN_DELETE) self.check_dirstate() @@ -466,11 +467,11 @@ def scan(self, topdir=''): ds = self.repo.dirstate._map.copy() - self.add_watch(join(self.repo.root, topdir), self.mask) + self.add_watch(join(self.wprefix, topdir), self.mask) for root, dirs, files in walk(self.repo, topdir): for d in dirs: self.add_watch(join(root, d), self.mask) - wroot = root[len(self.wprefix):] + wroot = root[self.prefixlen:] for fn in files: wfn = join(wroot, fn) self.updatefile(wfn, self.getstat(wfn)) @@ -633,7 +634,7 @@ (self.event_time(), len(events))) for evt in events: assert evt.fullpath.startswith(self.wprefix) - wpath = evt.fullpath[len(self.wprefix):] + wpath = evt.fullpath[self.prefixlen:] # paths have been normalized, wpath never ends with a '/' @@ -671,7 +672,7 @@ Returns a sorted list of relatives paths currently watched, for debugging purposes. """ - return sorted(tuple[0][len(self.wprefix):] for tuple in self.watcher) + return sorted(tuple[0][self.prefixlen:] for tuple in self.watcher) class server(pollable): """