Fixed #27432 -- Made app_label arguments limit showmigrations --plan output.

1 files changed, 18 insertions, 10 deletions

diff --git a/django/core/management/commands/showmigrations.py b/django/core/management/commands/showmigrations.py
index 767aca139d..890839b150 100644
--- a/django/core/management/commands/showmigrations.py
+++ b/django/core/management/commands/showmigrations.py
@@ -43,10 +43,18 @@ class Command(BaseCommand):
         connection = connections[db]
 
         if options['format'] == "plan":
-            return self.show_plan(connection)
+            return self.show_plan(connection, options['app_label'])
         else:
             return self.show_list(connection, options['app_label'])
 
+    def _validate_app_names(self, loader, app_names):
+        invalid_apps = []
+        for app_name in app_names:
+            if app_name not in loader.migrated_apps:
+                invalid_apps.append(app_name)
+        if invalid_apps:
+            raise CommandError('No migrations present for: %s' % (', '.join(sorted(invalid_apps))))
+
     def show_list(self, connection, app_names=None):
         """
         Shows a list of all migrations on the system, or only those of
@@ -57,12 +65,7 @@ class Command(BaseCommand):
         graph = loader.graph
         # If we were passed a list of apps, validate it
         if app_names:
-            invalid_apps = []
-            for app_name in app_names:
-                if app_name not in loader.migrated_apps:
-                    invalid_apps.append(app_name)
-            if invalid_apps:
-                raise CommandError("No migrations present for: %s" % (", ".join(invalid_apps)))
+            self._validate_app_names(loader, app_names)
         # Otherwise, show all apps in alphabetic order
         else:
             app_names = sorted(loader.migrated_apps)
@@ -88,14 +91,19 @@ class Command(BaseCommand):
             if not shown:
                 self.stdout.write(" (no migrations)", self.style.ERROR)
 
-    def show_plan(self, connection):
+    def show_plan(self, connection, app_names=None):
         """
-        Shows all known migrations in the order they will be applied
+        Shows all known migrations (or only those of the specified app_names)
+        in the order they will be applied.
         """
         # Load migrations from disk/DB
         loader = MigrationLoader(connection)
         graph = loader.graph
-        targets = graph.leaf_nodes()
+        if app_names:
+            self._validate_app_names(loader, app_names)
+            targets = [key for key in graph.leaf_nodes() if key[0] in app_names]
+        else:
+            targets = graph.leaf_nodes()
         plan = []
         seen = set()