# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1275080517 18000
# Node ID 5cdac5c35e68471f00b3c42b179393db4a2b9c04
# Parent  b9e89fc5c7f11ab8e4a9f74b9c266d8f1d11b91f# Parent  054549ccb6803e48069b1615dd270ce0c692d9de
Merge with stable

diff -r b9e89fc5c7f1 -r 5cdac5c35e68 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu May 27 10:37:14 2010 +0200
+++ b/mercurial/localrepo.py	Fri May 28 16:01:57 2010 -0500
@@ -1041,7 +1041,9 @@
             match.bad = bad
 
         if working: # we need to scan the working dir
-            subrepos = ctx1.substate.keys()
+            subrepos = []
+            if '.hgsub' in self.dirstate:
+                subrepos = ctx1.substate.keys()
             s = self.dirstate.status(match, subrepos, listignored,
                                      listclean, listunknown)
             cmp, modified, added, removed, deleted, unknown, ignored, clean = s