chiark / gitweb /
~mdw / stgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Check bottom and invariants
[stgit] / stgit / main.py
diff --git a/stgit/main.py b/stgit/main.py
index 3fd11a1ef2741fe3b5bbd4209de76ee587e562c2..95e25f8795648d33052b2607ebb73d79ec7999a6 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -19,77 +19,179 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 """
 
 import sys, os
 """
 
 import sys, os
-from optparse import OptionParser, make_option
-
-from stgit.utils import *
-from stgit import stack, git
-from stgit.version import version
-from stgit.config import config
-from stgit.commands.common import *
-
-# The commands
-import stgit.commands.add
-import stgit.commands.applied
-import stgit.commands.delete
-import stgit.commands.diff
-import stgit.commands.clean
-import stgit.commands.export
-import stgit.commands.files
-import stgit.commands.imprt
-import stgit.commands.init
-import stgit.commands.mail
-import stgit.commands.new
-import stgit.commands.pop
-import stgit.commands.pull
-import stgit.commands.push
-import stgit.commands.refresh
-import stgit.commands.rename
-import stgit.commands.resolved
-import stgit.commands.rm
-import stgit.commands.series
-import stgit.commands.status
-import stgit.commands.top
-import stgit.commands.unapplied
+from optparse import OptionParser
 
 
+import stgit.commands
+from stgit.out import *
+from stgit import utils
 
 #
 # The commands map
 #
 
 #
 # The commands map
 #
-commands = {
-    'add':      stgit.commands.add,
-    'applied':  stgit.commands.applied,
-    'delete':   stgit.commands.delete,
-    'diff':     stgit.commands.diff,
-    'clean':    stgit.commands.clean,
-    'export':   stgit.commands.export,
-    'files':    stgit.commands.files,
-    'import':   stgit.commands.imprt,
-    'init':     stgit.commands.init,
-    'mail':     stgit.commands.mail,
-    'new':      stgit.commands.new,
-    'pop':      stgit.commands.pop,
-    'pull':     stgit.commands.pull,
-    'push':     stgit.commands.push,
-    'refresh':  stgit.commands.refresh,
-    'rename':   stgit.commands.rename,
-    'resolved': stgit.commands.resolved,
-    'rm':       stgit.commands.rm,
-    'series':   stgit.commands.series,
-    'status':   stgit.commands.status,
-    'top':      stgit.commands.top,
-    'unapplied':stgit.commands.unapplied,
-    }
+class Commands(dict):
+    """Commands class. It performs on-demand module loading
+    """
+    def canonical_cmd(self, key):
+        """Return the canonical name for a possibly-shortenned
+        command name.
+        """
+        candidates = [cmd for cmd in self.keys() if cmd.startswith(key)]
+
+        if not candidates:
+            out.error('Unknown command: %s' % key,
+                      'Try "%s help" for a list of supported commands' % prog)
+            sys.exit(utils.STGIT_GENERAL_ERROR)
+        elif len(candidates) > 1:
+            out.error('Ambiguous command: %s' % key,
+                      'Candidates are: %s' % ', '.join(candidates))
+            sys.exit(utils.STGIT_GENERAL_ERROR)
+
+        return candidates[0]
+        
+    def __getitem__(self, key):
+        """Return the command python module name based.
+        """
+        global prog
+
+        cmd_mod = self.get(key) or self.get(self.canonical_cmd(key))
+            
+        __import__('stgit.commands.' + cmd_mod)
+        return getattr(stgit.commands, cmd_mod)
+
+commands = Commands({
+    'add':              'add',
+    'applied':          'applied',
+    'branch':           'branch',
+    'delete':           'delete',
+    'diff':             'diff',
+    'clean':            'clean',
+    'clone':            'clone',
+    'commit':           'commit',
+    'cp':              'copy',
+    'edit':             'edit',
+    'export':           'export',
+    'files':            'files',
+    'float':            'float',
+    'fold':             'fold',
+    'goto':             'goto',
+    'hide':             'hide',
+    'id':               'id',
+    'import':           'imprt',
+    'init':             'init',
+    'log':              'log',
+    'mail':             'mail',
+    'new':              'new',
+    'patches':          'patches',
+    'pick':             'pick',
+    'pop':              'pop',
+    'pull':             'pull',
+    'push':             'push',
+    'rebase':           'rebase',
+    'refresh':          'refresh',
+    'rename':           'rename',
+    'repair':           'repair',
+    'resolved':         'resolved',
+    'rm':               'rm',
+    'series':           'series',
+    'show':             'show',
+    'sink':             'sink',
+    'status':           'status',
+    'sync':             'sync',
+    'top':              'top',
+    'unapplied':        'unapplied',
+    'uncommit':         'uncommit',
+    'unhide':           'unhide'
+    })
+
+# classification: repository, stack, patch, working copy
+repocommands = (
+    'clone',
+    'id',
+    )
+stackcommands = (
+    'applied',
+    'branch',
+    'clean',
+    'commit',
+    'float',
+    'goto',
+    'hide',
+    'init',
+    'patches',
+    'pop',
+    'pull',
+    'push',
+    'rebase',
+    'repair',
+    'series',
+    'sink',
+    'top',
+    'unapplied',
+    'uncommit',
+    'unhide',
+    )
+patchcommands = (
+    'delete',
+    'edit',
+    'export',
+    'files',
+    'fold',
+    'import',
+    'log',
+    'mail',
+    'new',
+    'pick',
+    'refresh',
+    'rename',
+    'show',
+    'sync',
+    )
+wccommands = (
+    'add',
+    'cp',
+    'diff',
+    'resolved',
+    'rm',
+    'status',
+    )
 
 
+def _print_helpstring(cmd):
+    print '  ' + cmd + ' ' * (12 - len(cmd)) + commands[cmd].help
+    
 def print_help():
     print 'usage: %s <command> [options]' % os.path.basename(sys.argv[0])
     print
 def print_help():
     print 'usage: %s <command> [options]' % os.path.basename(sys.argv[0])
     print
-    print 'commands:'
-    print '  help        print this message'
-
+    print 'Generic commands:'
+    print '  help        print the detailed command usage'
+    print '  version     display version information'
+    print '  copyright   display copyright information'
+    # unclassified commands if any
     cmds = commands.keys()
     cmds.sort()
     for cmd in cmds:
     cmds = commands.keys()
     cmds.sort()
     for cmd in cmds:
-        print '  ' + cmd + ' ' * (12 - len(cmd)) + commands[cmd].help
+        if not cmd in repocommands and not cmd in stackcommands \
+               and not cmd in patchcommands and not cmd in wccommands:
+            _print_helpstring(cmd)
+    print
+
+    print 'Repository commands:'
+    for cmd in repocommands:
+        _print_helpstring(cmd)
+    print
+    
+    print 'Stack commands:'
+    for cmd in stackcommands:
+        _print_helpstring(cmd)
+    print
+
+    print 'Patch commands:'
+    for cmd in patchcommands:
+        _print_helpstring(cmd)
+    print
+
+    print 'Working-copy commands:'
+    for cmd in wccommands:
+        _print_helpstring(cmd)
 
 #
 # The main function (command dispatcher)
 
 #
 # The main function (command dispatcher)
@@ -97,46 +199,94 @@ def print_help():
 def main():
     """The main function
     """
 def main():
     """The main function
     """
+    global prog
+
     prog = os.path.basename(sys.argv[0])
 
     if len(sys.argv) < 2:
     prog = os.path.basename(sys.argv[0])
 
     if len(sys.argv) < 2:
-        print >> sys.stderr, 'Unknown command'
+        print >> sys.stderr, 'usage: %s <command>' % prog
         print >> sys.stderr, \
         print >> sys.stderr, \
-              '  Try "%s help" for a list of supported commands' % prog
-        sys.exit(1)
+              '  Try "%s --help" for a list of supported commands' % prog
+        sys.exit(utils.STGIT_GENERAL_ERROR)
 
     cmd = sys.argv[1]
 
 
     cmd = sys.argv[1]
 
-    if cmd in ['-h', '--help', 'help']:
-        print_help()
-        sys.exit(0)
-    if cmd in ['-v', '--version']:
-        print '%s %s' % (prog, version)
-        sys.exit(0)
-    if not cmd in commands:
-        print >> sys.stderr, 'Unknown command: %s' % cmd
-        print >> sys.stderr, '  Try "%s help" for a list of supported commands' \
-              % prog
-        sys.exit(1)
+    if cmd in ['-h', '--help']:
+        if len(sys.argv) >= 3:
+            cmd = commands.canonical_cmd(sys.argv[2])
+            sys.argv[2] = '--help'
+        else:
+            print_help()
+            sys.exit(utils.STGIT_SUCCESS)
+    if cmd == 'help':
+        if len(sys.argv) == 3 and not sys.argv[2] in ['-h', '--help']:
+            cmd = commands.canonical_cmd(sys.argv[2])
+            if not cmd in commands:
+                out.error('%s help: "%s" command unknown' % (prog, cmd))
+                sys.exit(utils.STGIT_GENERAL_ERROR)
+
+            sys.argv[0] += ' %s' % cmd
+            command = commands[cmd]
+            parser = OptionParser(usage = command.usage,
+                                  option_list = command.options)
+            from pydoc import pager
+            pager(parser.format_help())
+        else:
+            print_help()
+        sys.exit(utils.STGIT_SUCCESS)
+    if cmd in ['-v', '--version', 'version']:
+        from stgit.version import version
+        print 'Stacked GIT %s' % version
+        os.system('git --version')
+        print 'Python version %s' % sys.version
+        sys.exit(utils.STGIT_SUCCESS)
+    if cmd in ['copyright']:
+        print __copyright__
+        sys.exit(utils.STGIT_SUCCESS)
 
     # re-build the command line arguments
 
     # re-build the command line arguments
+    cmd = commands.canonical_cmd(cmd)
     sys.argv[0] += ' %s' % cmd
     del(sys.argv[1])
 
     command = commands[cmd]
     sys.argv[0] += ' %s' % cmd
     del(sys.argv[1])
 
     command = commands[cmd]
-    parser = OptionParser(usage = command.usage,
-                          option_list = command.options)
+    usage = command.usage.split('\n')[0].strip()
+    parser = OptionParser(usage = usage, option_list = command.options)
     options, args = parser.parse_args()
     options, args = parser.parse_args()
+    directory = command.directory
+
+    # These modules are only used from this point onwards and do not
+    # need to be imported earlier
+    from stgit.exception import StgException
+    from stgit.config import config_setup
+    from ConfigParser import ParsingError, NoSectionError
+    from stgit.stack import Series
+
     try:
     try:
-        # the lines below are a simple way to avoid an exception when
-        # stgit is run outside an initialised tree
-        stgit.commands.common.crt_series = stack.Series()
-        setattr(command, 'crt_series', stgit.commands.common.crt_series)
+        debug_level = int(os.environ.get('STGIT_DEBUG_LEVEL', 0))
+    except ValueError:
+        out.error('Invalid STGIT_DEBUG_LEVEL environment variable')
+        sys.exit(utils.STGIT_GENERAL_ERROR)
+
+    try:
+        directory.setup()
+        config_setup()
+
+        # Some commands don't (always) need an initialized series.
+        if directory.needs_current_series:
+            if hasattr(options, 'branch') and options.branch:
+                command.crt_series = Series(options.branch)
+            else:
+                command.crt_series = Series()
 
         command.func(parser, options, args)
 
         command.func(parser, options, args)
-    except (IOError, CmdException, stack.StackException, git.GitException), \
-               err:
-        print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
-        sys.exit(2)
+    except (StgException, IOError, ParsingError, NoSectionError), err:
+        out.error(str(err), title = '%s %s' % (prog, cmd))
+        if debug_level > 0:
+            raise
+        else:
+            sys.exit(utils.STGIT_COMMAND_ERROR)
+    except KeyboardInterrupt:
+        sys.exit(utils.STGIT_GENERAL_ERROR)
 
 
-    sys.exit(0)
+    sys.exit(utils.STGIT_SUCCESS)
GIT patch-maintenance porcelain (local modifications)