--- a/mercurial/dirstate.py	Mon Dec 21 16:22:43 2015 -0800
+++ b/mercurial/dirstate.py	Wed Dec 23 13:13:22 2015 -0800
@@ -137,6 +137,10 @@
         return self._copymap
 
     @propertycache
+    def _nonnormalset(self):
+        return nonnormalentries(self._map)
+
+    @propertycache
     def _filefoldmap(self):
         try:
             makefilefoldmap = parsers.make_file_foldmap