diff -r c8dc480142a8 -r 714849ba7836 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Tue Dec 29 23:58:30 2015 +0900
+++ b/mercurial/dirstate.py	Mon Dec 21 16:22:43 2015 -0800
@@ -49,6 +49,11 @@
         os.close(tmpfd)
         vfs.unlink(tmpname)
 
+def nonnormalentries(dmap):
+    '''Compute the nonnormal dirstate entries from the dmap'''
+    return set(fname for fname, e in dmap.iteritems()
+           if e[0] != 'n' or e[3] == -1)
+
 def _trypending(root, vfs, filename):
     '''Open  file to be read according to HG_PENDING environment variable