comparison hgext/inotify/server.py @ 8599:1f706b1b62f3

inotify: server: refactor updatestatus()

* Instead of one entry point, use two entry points, updatefile()
  and deletefile(), both internally calling the helper function _updatestatus
* Do not rely on TypeError to detect the type of oldstatus: use isinstance
* The call updatestatus(wpath, None) in deleted() was a bit particular:
  because no osstat and no newstatus was given, the newstatus was determined
  using the data stored internally. To replace this exact behavior with the
  new code, one would use:
    root, fn = self.split(wpath)
    d = self.dir(self.tree, root)
    self.filedeleted(wpath, d.get(fn))
  This, however, duplicates code with _updatestatus(), which led us to an
  interesting question: why are we basing ourselves on repowatcher data to
  update the status, where everywhere else, we are comparing against dirsate?
  There is no reason to do this, which is why the new code is:
    self.filedeleted(wpath, self.repo.dirstate[wpath])
  Incidentally, after this, the test for issue1371 passes again.

8557:67f76a4463ef

            return 'n'
        if type_ == '?' and self.repo.dirstate._ignore(fn):
            return 'i'
        return type_

    def updatestatus(self, wfn, osstat=None, newstatus=None):
        '''
        Update the stored status of a file or directory.

        osstat: (mode, size, time) tuple, as returned by os.lstat(wfn)

        newstatus: char in statuskeys, new status to apply.
        '''
        if osstat:
            newstatus = self.filestatus(wfn, osstat)
        else:
            self.statcache.pop(wfn, None)
        root, fn = self.split(wfn)
        d = self.dir(self.tree, root)
        oldstatus = d.get(fn)
        isdir = False
        if oldstatus:
            try:
                if not newstatus:
                    if oldstatus in 'almn':
                        newstatus = '!'
                    elif oldstatus == 'r':
                        newstatus = 'r'
            except TypeError:
                # oldstatus may be a dict left behind by a deleted
                # directory
                isdir = True
            else:
                if oldstatus in self.statuskeys and oldstatus != newstatus:
                    del self.dir(self.statustrees[oldstatus], root)[fn]
        if self.ui.debugflag and oldstatus != newstatus:
            if isdir:
                self.ui.note(_('status: %r dir(%d) -> %s\n') %
                             (wfn, len(oldstatus), newstatus))
            else:
                self.ui.note(_('status: %r %s -> %s\n') %
                             (wfn, oldstatus, newstatus))
        if not isdir:
            if newstatus and newstatus != 'i':
                d[fn] = newstatus
                if newstatus in self.statuskeys:
                    dd = self.dir(self.statustrees[newstatus], root)
                    if oldstatus != newstatus or fn not in dd:

            else:
                d.pop(fn, None)
        elif not newstatus:
            # a directory is being removed, check its contents
            for subfile, b in oldstatus.copy().iteritems():
                self.updatestatus(wfn + '/' + subfile, None)


    def check_deleted(self, key):
        # Files that had been deleted but were present in the dirstate
        # may have vanished from the dirstate; we must clean them up.

                self.add_watch(join(root, d), self.mask)
            wroot = root[len(self.wprefix):]
            d = self.dir(self.tree, wroot)
            for fn in files:
                wfn = join(wroot, fn)
                self.updatestatus(wfn, self.getstat(wfn))
                ds.pop(wfn, None)
        wtopdir = topdir
        if wtopdir and wtopdir[-1] != '/':
            wtopdir += '/'
        for wfn, state in ds.iteritems():

                continue
            try:
                st = self.stat(wfn)
            except OSError:
                status = state[0]
                self.updatestatus(wfn, None, newstatus=status)
            else:
                self.updatestatus(wfn, st)
        self.check_deleted('!')
        self.check_deleted('r')

    def check_dirstate(self):
        ds_info = self.dirstate_info()

        if wpath == '.hgignore':
            self.update_hgignore()
        try:
            st = self.stat(wpath)
            if stat.S_ISREG(st[0]):
                self.updatestatus(wpath, st)
        except OSError:
            pass

    def modified(self, wpath):
        if wpath == '.hgignore':
            self.update_hgignore()
        try:
            st = self.stat(wpath)
            if stat.S_ISREG(st[0]):
                if self.repo.dirstate[wpath] in 'lmn':
                    self.updatestatus(wpath, st)
        except OSError:
            pass

    def deleted(self, wpath):
        if wpath == '.hgignore':

        elif wpath.startswith('.hg/'):
            if wpath == '.hg/wlock':
                self.check_dirstate()
            return

        self.updatestatus(wpath, None)

    def schedule_work(self, wpath, evt):
        prev = self.eventq.setdefault(wpath, [])
        try:
            if prev and evt == 'm' and prev[-1] in 'cm':

8599:1f706b1b62f3

            return 'n'
        if type_ == '?' and self.repo.dirstate._ignore(fn):
            return 'i'
        return type_

    def updatefile(self, wfn, osstat):
        '''
        update the file entry of an existing file.

        osstat: (mode, size, time) tuple, as returned by os.lstat(wfn)
        '''

        self._updatestatus(wfn, self.filestatus(wfn, osstat))

    def deletefile(self, wfn, oldstatus):
        '''
        update the entry of a file which has been deleted.

        oldstatus: char in statuskeys, status of the file before deletion
        '''
        if oldstatus == 'r':
            newstatus = 'r'
        elif oldstatus in 'almn':
            newstatus = '!'
        else:
            newstatus = None

        self.statcache.pop(wfn, None)
        self._updatestatus(wfn, newstatus)

    def _updatestatus(self, wfn, newstatus):
        '''
        Update the stored status of a file or directory.

        newstatus: - char in (statuskeys + 'ni'), new status to apply.
                   - or None, to stop tracking wfn
        '''
        root, fn = self.split(wfn)
        d = self.dir(self.tree, root)

        oldstatus = d.get(fn)
        # oldstatus can be either:
        # - None : fn is new
        # - a char in statuskeys: fn is a (tracked) file
        # - a dict: fn is a directory
        isdir = isinstance(oldstatus, dict)

        if self.ui.debugflag and oldstatus != newstatus:
            if isdir:
                self.ui.note(_('status: %r dir(%d) -> %s\n') %
                             (wfn, len(oldstatus), newstatus))
            else:
                self.ui.note(_('status: %r %s -> %s\n') %
                             (wfn, oldstatus, newstatus))
        if not isdir:
            if oldstatus and oldstatus in self.statuskeys \
                and oldstatus != newstatus:
                del self.dir(self.statustrees[oldstatus], root)[fn]
            if newstatus and newstatus != 'i':
                d[fn] = newstatus
                if newstatus in self.statuskeys:
                    dd = self.dir(self.statustrees[newstatus], root)
                    if oldstatus != newstatus or fn not in dd:

            else:
                d.pop(fn, None)
        elif not newstatus:
            # a directory is being removed, check its contents
            for subfile, b in oldstatus.copy().iteritems():
                self._updatestatus(wfn + '/' + subfile, None)


    def check_deleted(self, key):
        # Files that had been deleted but were present in the dirstate
        # may have vanished from the dirstate; we must clean them up.

                self.add_watch(join(root, d), self.mask)
            wroot = root[len(self.wprefix):]
            d = self.dir(self.tree, wroot)
            for fn in files:
                wfn = join(wroot, fn)
                self.updatefile(wfn, self.getstat(wfn))
                ds.pop(wfn, None)
        wtopdir = topdir
        if wtopdir and wtopdir[-1] != '/':
            wtopdir += '/'
        for wfn, state in ds.iteritems():

                continue
            try:
                st = self.stat(wfn)
            except OSError:
                status = state[0]
                self.deletefile(wfn, status)
            else:
                self.updatefile(wfn, st)
        self.check_deleted('!')
        self.check_deleted('r')

    def check_dirstate(self):
        ds_info = self.dirstate_info()

        if wpath == '.hgignore':
            self.update_hgignore()
        try:
            st = self.stat(wpath)
            if stat.S_ISREG(st[0]):
                self.updatefile(wpath, st)
        except OSError:
            pass

    def modified(self, wpath):
        if wpath == '.hgignore':
            self.update_hgignore()
        try:
            st = self.stat(wpath)
            if stat.S_ISREG(st[0]):
                if self.repo.dirstate[wpath] in 'lmn':
                    self.updatefile(wpath, st)
        except OSError:
            pass

    def deleted(self, wpath):
        if wpath == '.hgignore':

        elif wpath.startswith('.hg/'):
            if wpath == '.hg/wlock':
                self.check_dirstate()
            return

        self.deletefile(wpath, self.repo.dirstate[wpath])

    def schedule_work(self, wpath, evt):
        prev = self.eventq.setdefault(wpath, [])
        try:
            if prev and evt == 'm' and prev[-1] in 'cm':