Django

Code

Show
Ignore:
Timestamp:
07/13/08 09:31:09 (4 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7837-7838,7842-7852,7856-7869,7871,7876-7877,7882-7891,7900-7917 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7835 to /django/trunk:1-7917

  • django/branches/gis/extras/django_bash_completion

    r7768 r7918  
    4343 
    4444    # Standalone options 
    45     opts="--help --settings --pythonpath --noinput --noreload --format --indent --verbosity --adminmedia --version" 
     45    opts="--help --settings --pythonpath --noinput --noreload --format --indent --verbosity --adminmedia --version --locale --domain" 
    4646    # Actions 
    47     actions="adminindex createcachetable createsuperuser dbshell diffsettings \ 
    48              dumpdata flush inspectdb loaddata reset runfcgi runserver \ 
    49              shell sql sqlall sqlclear sqlcustom sqlflush sqlindexes \ 
    50              sqlreset sqlsequencereset startapp startproject \ 
    51              syncdb test validate" 
     47    actions="adminindex createcachetable createsuperuser compilemessages \ 
     48             dbshell diffsettings dumpdata flush inspectdb loaddata \ 
     49             makemessages reset runfcgi runserver shell sql sqlall sqlclear \ 
     50             sqlcustom sqlflush sqlindexes sqlreset sqlsequencereset startapp \ 
     51             startproject syncdb test validate" 
    5252    # Action's options 
    5353    action_shell_opts="--plain" 
    …… 
    119119                ;; 
    120120 
    121             createcachetable|dbshell|diffsettings| \ 
    122             inspectdb|runserver|startapp|startproject|syncdb| \ 
     121            createcachetable|cleanup|compilemessages|dbshell| \ 
     122            diffsettings|inspectdb|makemessages| \ 
     123            runserver|startapp|startproject|syncdb| \ 
    123124            validate) 
    124125                COMPREPLY=()