Преглед на файлове

Fixed #26150 -- Sorted app_labels in migrate command output

Markus Holtermann преди 9 години
родител
ревизия
4b0118465b
променени са 3 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 2 2
      django/core/management/commands/migrate.py
  2. 1 1
      docs/intro/tutorial02.txt
  3. 1 1
      docs/ref/contrib/gis/tutorial.txt

+ 2 - 2
django/core/management/commands/migrate.py

@@ -122,12 +122,12 @@ class Command(BaseCommand):
             if run_syncdb:
                 self.stdout.write(
                     self.style.MIGRATE_LABEL("  Synchronize unmigrated apps: ") +
-                    (", ".join(executor.loader.unmigrated_apps))
+                    (", ".join(sorted(executor.loader.unmigrated_apps)))
                 )
             if target_app_labels_only:
                 self.stdout.write(
                     self.style.MIGRATE_LABEL("  Apply all migrations: ") +
-                    (", ".join(set(a for a, n in targets)) or "(none)")
+                    (", ".join(sorted(set(a for a, n in targets))) or "(none)")
                 )
             else:
                 if targets[0][1] is None:

+ 1 - 1
docs/intro/tutorial02.txt

@@ -328,7 +328,7 @@ Now, run :djadmin:`migrate` again to create those model tables in your database:
 
     $ python manage.py migrate
     Operations to perform:
-      Apply all migrations: admin, contenttypes, polls, auth, sessions
+      Apply all migrations: admin, auth, contenttypes, polls, sessions
     Running migrations:
       Rendering model states... DONE
       Applying polls.0001_initial... OK

+ 1 - 1
docs/ref/contrib/gis/tutorial.txt

@@ -283,7 +283,7 @@ database:
 
     $ python manage.py migrate
     Operations to perform:
-      Apply all migrations: admin, world, contenttypes, auth, sessions
+      Apply all migrations: admin, auth, contenttypes, sessions, world
     Running migrations:
       ...
       Applying world.0001_initial... OK