# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1210610228 18000
# Node ID eda3fd322a7f8dd3892de6444b55d45b8c0d16d3
# Parent  9f80e062d71c382ff735277972ad829452d0aba0
dirstate: minor status cleanups

diff -r 9f80e062d71c -r eda3fd322a7f mercurial/dirstate.py
--- a/mercurial/dirstate.py	Mon May 12 11:37:08 2008 -0500
+++ b/mercurial/dirstate.py	Mon May 12 11:37:08 2008 -0500
@@ -589,15 +589,16 @@
 
         for src, fn, st in self.statwalk(files, match, unknown=list_unknown,
                                          ignored=list_ignored):
-            if fn in dmap:
-                state, mode, size, time, foo = dmap[fn]
-            else:
+            if fn not in dmap:
                 if (list_ignored or fn in files) and self._dirignore(fn):
                     if list_ignored:
                         iadd(fn)
                 elif list_unknown:
                     uadd(fn)
                 continue
+
+            state, mode, size, time, foo = dmap[fn]
+
             if src == 'm':
                 nonexistent = True
                 if not st:
@@ -610,8 +611,6 @@
                     # We need to re-check that it is a valid file
                     if st and self._supported(fn, st.st_mode):
                         nonexistent = False
-                # XXX: what to do with file no longer present in the fs
-                # who are not removed in the dirstate ?
                 if nonexistent and state in "nma":
                     dadd(fn)
                     continue