diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -59,6 +59,10 @@ class basectx(object):
     def __getitem__(self, key):
         return self.filectx(key)
 
+    def __iter__(self):
+        for f in sorted(self._manifest):
+            yield f
+
     @propertycache
     def substate(self):
         return subrepo.state(self, self._repo.ui)
@@ -203,10 +207,6 @@ class changectx(basectx):
             p = p[:-1]
         return [changectx(self._repo, x) for x in p]
 
-    def __iter__(self):
-        for f in sorted(self._manifest):
-            yield f
-
     def changeset(self):
         return self._changeset
     def manifest(self):