Make StGIT aware of the STGIT_DEBUG_LEVEL environment variable

[stgit] / stgit / main.py

diff --git a/stgit/main.py b/stgit/main.py
index d0e7230ad7933f46006320c81b295c6d1486a0d3..933f12717cb61e0ba7bfbd762a0faa537a069bb8 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -22,10 +22,6 @@ import sys, os
 from optparse import OptionParser
 
 import stgit.commands
 from optparse import OptionParser
 
 import stgit.commands

-from stgit.stack import Series, StackException
-from stgit.git import GitException
-from stgit.commands.common import CmdException
-from stgit.gitmergeonefile import GitMergeException

 
 #
 # The commands map
 
 #
 # The commands map


@@ -33,8 +29,32 @@ from stgit.gitmergeonefile import GitMergeException
 class Commands(dict):
     """Commands class. It performs on-demand module loading
     """
 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:
+            print >> sys.stderr, 'Unknown command: %s' % key
+            print >> sys.stderr, '  Try "%s help" for a list of ' \
+                  'supported commands' % prog
+            sys.exit(1)
+        elif len(candidates) > 1:
+            print >> sys.stderr, 'Ambiguous command: %s' % key
+            print >> sys.stderr, '  Candidates are: %s' \
+                  % ', '.join(candidates)
+            sys.exit(1)
+
+        return candidates[0]
+        

     def __getitem__(self, key):
     def __getitem__(self, key):

-        cmd_mod = self.get(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)
 
         __import__('stgit.commands.' + cmd_mod)
         return getattr(stgit.commands, cmd_mod)
 


@@ -53,6 +73,7 @@ commands = Commands({
     'float':            'float',
     'fold':             'fold',
     'goto':             'goto',
     'float':            'float',
     'fold':             'fold',
     'goto':             'goto',

+    'hide':             'hide',

     'id':               'id',
     'import':           'imprt',
     'init':             'init',
     'id':               'id',
     'import':           'imprt',
     'init':             'init',


@@ -64,6 +85,7 @@ commands = Commands({
     'pop':              'pop',
     'pull':             'pull',
     'push':             'push',
     'pop':              'pop',
     'pull':             'pull',
     'push':             'push',

+    'rebase':           'rebase',

     'refresh':          'refresh',
     'rename':           'rename',
     'resolved':         'resolved',
     'refresh':          'refresh',
     'rename':           'rename',
     'resolved':         'resolved',


@@ -71,9 +93,11 @@ commands = Commands({
     'series':           'series',
     'show':             'show',
     'status':           'status',
     'series':           'series',
     'show':             'show',
     'status':           'status',

+    'sync':             'sync',

     'top':              'top',
     'unapplied':        'unapplied',
     'top':              'top',
     'unapplied':        'unapplied',

-    'uncommit':         'uncommit'
+    'uncommit':         'uncommit',
+    'unhide':           'unhide'

     })
 
 # classification: repository, stack, patch, working copy
     })
 
 # classification: repository, stack, patch, working copy


@@ -90,13 +114,16 @@ stackcommands = (
     'commit',
     'float',
     'goto',
     'commit',
     'float',
     'goto',

+    'hide',

     'init',
     'pop',
     'push',
     'init',
     'pop',
     'push',

+    'rebase',

     'series',
     'top',
     'unapplied',
     'series',
     'top',
     'unapplied',

-    'uncommit'
+    'uncommit',
+    'unhide'

     )
 patchcommands = (
     'delete',
     )
 patchcommands = (
     'delete',


@@ -110,7 +137,8 @@ patchcommands = (
     'pick',
     'refresh',
     'rename',
     'pick',
     'refresh',
     'rename',

-    'show'
+    'show',
+    'sync'

     )
 wccommands = (
     'add',
     )
 wccommands = (
     'add',


@@ -165,6 +193,8 @@ 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:


@@ -176,15 +206,15 @@ def main():
     cmd = sys.argv[1]
 
     if cmd in ['-h', '--help']:
     cmd = sys.argv[1]
 
     if cmd in ['-h', '--help']:

-        if len(sys.argv) >= 3 and sys.argv[2] in commands:
-            cmd = sys.argv[2]
+        if len(sys.argv) >= 3:
+            cmd = commands.canonical_cmd(sys.argv[2])

             sys.argv[2] = '--help'
         else:
             print_help()
             sys.exit(0)
     if cmd == 'help':
         if len(sys.argv) == 3 and not sys.argv[2] in ['-h', '--help']:
             sys.argv[2] = '--help'
         else:
             print_help()
             sys.exit(0)
     if cmd == 'help':
         if len(sys.argv) == 3 and not sys.argv[2] in ['-h', '--help']:

-            cmd = sys.argv[2]
+            cmd = commands.canonical_cmd(sys.argv[2])

             if not cmd in commands:
                 print >> sys.stderr, '%s help: "%s" command unknown' \
                       % (prog, cmd)
             if not cmd in commands:
                 print >> sys.stderr, '%s help: "%s" command unknown' \
                       % (prog, cmd)


@@ -194,7 +224,8 @@ def main():
             command = commands[cmd]
             parser = OptionParser(usage = command.usage,
                                   option_list = command.options)
             command = commands[cmd]
             parser = OptionParser(usage = command.usage,
                                   option_list = command.options)

-            parser.print_help()
+            from pydoc import pager
+            pager(parser.format_help())

         else:
             print_help()
         sys.exit(0)
         else:
             print_help()
         sys.exit(0)


@@ -207,21 +238,36 @@ def main():
     if cmd in ['copyright']:
         print __copyright__
         sys.exit(0)
     if cmd in ['copyright']:
         print __copyright__
         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)

 
     # re-build the command line arguments
 
     # re-build the command line arguments

-    sys.argv[0] += ' %s' % cmd
+    sys.argv[0] += ' %s' % commands.canonical_cmd(cmd)

     del(sys.argv[1])
 
     command = commands[cmd]
     usage = command.usage.split('\n')[0].strip()
     parser = OptionParser(usage = usage, option_list = command.options)
     options, args = parser.parse_args()
     del(sys.argv[1])
 
     command = commands[cmd]
     usage = command.usage.split('\n')[0].strip()
     parser = OptionParser(usage = usage, option_list = command.options)
     options, args = parser.parse_args()

+
+    # These modules are only used from this point onwards and do not
+    # need to be imported earlier
+    from stgit.config import config_setup
+    from ConfigParser import ParsingError, NoSectionError
+    from stgit.stack import Series, StackException
+    from stgit.git import GitException
+    from stgit.commands.common import CmdException
+    from stgit.gitmergeonefile import GitMergeException
+
+    try:
+        debug_level = int(os.environ['STGIT_DEBUG_LEVEL'])
+    except KeyError:
+        debug_level = 0
+    except ValueError:
+        print >> sys.stderr, 'Invalid STGIT_DEBUG_LEVEL environment variable'
+        sys.exit(1)
+

     try:
     try:

+        config_setup()
+

         # 'clone' doesn't expect an already initialised GIT tree. A Series
         # object will be created after the GIT tree is cloned
         if cmd != 'clone':
         # 'clone' doesn't expect an already initialised GIT tree. A Series
         # object will be created after the GIT tree is cloned
         if cmd != 'clone':


@@ -232,10 +278,13 @@ def main():
             stgit.commands.common.crt_series = command.crt_series
 
         command.func(parser, options, args)
             stgit.commands.common.crt_series = command.crt_series
 
         command.func(parser, options, args)

-    except (IOError, CmdException, StackException, GitException,
-            GitMergeException), err:
+    except (IOError, ParsingError, NoSectionError, CmdException,
+            StackException, GitException, GitMergeException), err:

         print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
         print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)

-        sys.exit(2)
+        if debug_level:
+            raise
+        else:
+            sys.exit(2)

     except KeyboardInterrupt:
         sys.exit(1)
 
     except KeyboardInterrupt:
         sys.exit(1)