Ticket #16445: better_help_patch.patch

django/core/management/__init__.py

@@ -2 +2 @@
 import sys
 from optparse import OptionParser, NO_DEFAULT
 import imp
+from collections import defaultdict
 
 import django
 from django.core.management.base import BaseCommand, CommandError, handle_default_options
@@ -233 +234 @@
     def main_help_text(self):
         """
         Returns the script's main help text, as a string.
-        """
+        """        
+        from django.core.management.commands.startapp import ProjectCommand
         usage = ['',"Type '%s help <subcommand>' for help on a specific subcommand." % self.prog_name,'']
         usage.append('Available subcommands:')
-        commands = get_commands().keys()
-        commands.sort()
-        for cmd in commands:
-            usage.append('  %s' % cmd)
+        
+        apps_to_commands = defaultdict(lambda: [])
+        for command, app in get_commands().items():
+            # 'startapp' command is mapped to ProjectCommand
+            # instead of 'django.core'.
+            if isinstance(app, ProjectCommand):
+                app = 'django.core'
+            apps_to_commands[app].append(command)
+
+        for app in sorted(apps_to_commands.keys()):
+            usage.append("%s:" % app)
+            for command in sorted(apps_to_commands[app]):
+                usage.append("\t%s" % command)
+            usage.append("") # Extra newline separaing apps.
+
         return '\n'.join(usage)
 
     def fetch_command(self, subcommand):