dirstate: reorder "state" checking conditional

This is easier to read and will make this simpler to update in the next
changeset.

Differential Revision: https://phab.mercurial-scm.org/D10975

mercurial/dirstate.py

@@ -1315,6 +1315,12 b' class dirstate(object):'
 
             if not st and t.tracked:
                 dadd(fn)
+            elif t.merged:
+                madd(fn)
+            elif t.added:
+                aadd(fn)
+            elif t.removed:
+                radd(fn)
             elif state == b'n':
                 if (
                     size >= 0
@@ -1344,12 +1350,6 b' class dirstate(object):'
                     ladd(fn)
                 elif listclean:
                     cadd(fn)
-            elif t.merged:
-                madd(fn)
-            elif t.added:
-                aadd(fn)
-            elif t.removed:
-                radd(fn)
         status = scmutil.status(
             modified, added, removed, deleted, unknown, ignored, clean
         )