Ticket #17037: django_manage_py_diffsettings_all_v2.diff

django/core/management/commands/diffsettings.py

@@ +1 @@
+from optparse import make_option
+
 from django.core.management.base import NoArgsCommand
 
 def module_to_dict(module, omittable=lambda k: k.startswith('_')):
@@ -9 +11 @@
     default settings. Settings that don't appear in the defaults are
     followed by "###"."""
 
+    option_list = NoArgsCommand.option_list + (
+        make_option('--all', action='store_true', dest='all',
+            default=False, help='Display all settings; not just ones '
+                'that differ from Django defaults. Settings that equal '
+                'the defaults are prefixed with "# (Default)".'),
+    )
+
     requires_model_validation = False
 
     def handle_noargs(self, **options):
@@ -29 +38 @@
                 output.append("%s = %s  ###" % (key, user_settings[key]))
             elif user_settings[key] != default_settings[key]:
                 output.append("%s = %s" % (key, user_settings[key]))
+            elif options.get('all', False):
+                output.append("# (Default) %s = %s" % (key, user_settings[key]))
         return '\n'.join(output)