diff --git a/hgext/inotify/server.py b/hgext/inotify/server.py
--- a/hgext/inotify/server.py
+++ b/hgext/inotify/server.py
@@ -265,10 +265,7 @@
         return type_
 
     def updatestatus(self, wfn, st=None, status=None, oldstatus=None):
-        if st:
-            status = self.filestatus(wfn, st)
-        else:
-            self.statcache.pop(wfn, None)
+        status = self.filestatus(wfn, st)
         root, fn = self.split(wfn)
         d = self.dir(self.tree, root)
         if oldstatus is None:
@@ -380,9 +377,13 @@
         # But it's easier to do nothing than to open that can of
         # worms.
 
-        if self.repo.dirstate.ignorefunc is not None:
-            self.repo.dirstate.ignorefunc = None
+        try:
+            del self.repo.dirstate._ignore
+        except AttributeError:
+            pass
+        else:
             self.ui.note(_('rescanning due to .hgignore change\n'))
+            self.statustrees['?'].clear()
             self.scan()
 
     def getstat(self, wpath):