Check bottom and invariants

[stgit] / stgit / main.py

diff --git a/stgit/main.py b/stgit/main.py
index 2c8716b2d850c070597c1b4ca987a299c7b69330..95e25f8795648d33052b2607ebb73d79ec7999a6 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -23,6 +23,7 @@ from optparse import OptionParser
 
 import stgit.commands
 from stgit.out import *
 
 import stgit.commands
 from stgit.out import *

+from stgit import utils

 
 #
 # The commands map
 
 #
 # The commands map


@@ -39,11 +40,11 @@ class Commands(dict):
         if not candidates:
             out.error('Unknown command: %s' % key,
                       'Try "%s help" for a list of supported commands' % prog)
         if not candidates:
             out.error('Unknown command: %s' % key,
                       'Try "%s help" for a list of supported commands' % prog)

-            sys.exit(1)
+            sys.exit(utils.STGIT_GENERAL_ERROR)

         elif len(candidates) > 1:
             out.error('Ambiguous command: %s' % key,
                       'Candidates are: %s' % ', '.join(candidates))
         elif len(candidates) > 1:
             out.error('Ambiguous command: %s' % key,
                       'Candidates are: %s' % ', '.join(candidates))

-            sys.exit(1)
+            sys.exit(utils.STGIT_GENERAL_ERROR)

 
         return candidates[0]
         
 
         return candidates[0]
         


@@ -60,7 +61,6 @@ class Commands(dict):
 commands = Commands({
     'add':              'add',
     'applied':          'applied',
 commands = Commands({
     'add':              'add',
     'applied':          'applied',

-    'assimilate':       'assimilate',

     'branch':           'branch',
     'delete':           'delete',
     'diff':             'diff',
     'branch':           'branch',
     'delete':           'delete',
     'diff':             'diff',


@@ -89,6 +89,7 @@ commands = Commands({
     'rebase':           'rebase',
     'refresh':          'refresh',
     'rename':           'rename',
     'rebase':           'rebase',
     'refresh':          'refresh',
     'rename':           'rename',

+    'repair':           'repair',

     'resolved':         'resolved',
     'rm':               'rm',
     'series':           'series',
     'resolved':         'resolved',
     'rm':               'rm',
     'series':           'series',


@@ -109,7 +110,6 @@ repocommands = (
     )
 stackcommands = (
     'applied',
     )
 stackcommands = (
     'applied',

-    'assimilate',

     'branch',
     'clean',
     'commit',
     'branch',
     'clean',
     'commit',


@@ -122,6 +122,7 @@ stackcommands = (
     'pull',
     'push',
     'rebase',
     'pull',
     'push',
     'rebase',

+    'repair',

     'series',
     'sink',
     'top',
     'series',
     'sink',
     'top',


@@ -206,7 +207,7 @@ def main():
         print >> sys.stderr, 'usage: %s <command>' % prog
         print >> sys.stderr, \
               '  Try "%s --help" for a list of supported commands' % prog
         print >> sys.stderr, 'usage: %s <command>' % prog
         print >> sys.stderr, \
               '  Try "%s --help" for a list of supported commands' % prog

-        sys.exit(1)
+        sys.exit(utils.STGIT_GENERAL_ERROR)

 
     cmd = sys.argv[1]
 
 
     cmd = sys.argv[1]
 


@@ -216,13 +217,13 @@ def main():
             sys.argv[2] = '--help'
         else:
             print_help()
             sys.argv[2] = '--help'
         else:
             print_help()

-            sys.exit(0)
+            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))
     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(1)
+                sys.exit(utils.STGIT_GENERAL_ERROR)

 
             sys.argv[0] += ' %s' % cmd
             command = commands[cmd]
 
             sys.argv[0] += ' %s' % cmd
             command = commands[cmd]


@@ -232,16 +233,16 @@ def main():
             pager(parser.format_help())
         else:
             print_help()
             pager(parser.format_help())
         else:
             print_help()

-        sys.exit(0)
+        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
     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(0)
+        sys.exit(utils.STGIT_SUCCESS)

     if cmd in ['copyright']:
         print __copyright__
     if cmd in ['copyright']:
         print __copyright__

-        sys.exit(0)
+        sys.exit(utils.STGIT_SUCCESS)

 
     # re-build the command line arguments
     cmd = commands.canonical_cmd(cmd)
 
     # re-build the command line arguments
     cmd = commands.canonical_cmd(cmd)


@@ -252,47 +253,40 @@ def main():
     usage = command.usage.split('\n')[0].strip()
     parser = OptionParser(usage = usage, option_list = command.options)
     options, args = parser.parse_args()
     usage = command.usage.split('\n')[0].strip()
     parser = OptionParser(usage = usage, option_list = command.options)
     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
 
     # 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.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
-    from stgit.utils import EditorException
+    from stgit.stack import Series

 
     try:
 
     try:

-        debug_level = int(os.environ['STGIT_DEBUG_LEVEL'])
-    except KeyError:
-        debug_level = 0
+        debug_level = int(os.environ.get('STGIT_DEBUG_LEVEL', 0))

     except ValueError:
         out.error('Invalid STGIT_DEBUG_LEVEL environment variable')
     except ValueError:
         out.error('Invalid STGIT_DEBUG_LEVEL environment variable')

-        sys.exit(1)
+        sys.exit(utils.STGIT_GENERAL_ERROR)

 
     try:
 
     try:

+        directory.setup()

         config_setup()
 
         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':
+        # 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()
             if hasattr(options, 'branch') and options.branch:
                 command.crt_series = Series(options.branch)
             else:
                 command.crt_series = Series()

-            stgit.commands.common.crt_series = command.crt_series

 
         command.func(parser, options, args)
 
         command.func(parser, options, args)

-    except (IOError, ParsingError, NoSectionError, CmdException,
-            StackException, GitException, GitMergeException,
-            EditorException), err:
-        print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
+    except (StgException, IOError, ParsingError, NoSectionError), err:
+        out.error(str(err), title = '%s %s' % (prog, cmd))

         if debug_level > 0:
             raise
         else:
         if debug_level > 0:
             raise
         else:

-            sys.exit(2)
+            sys.exit(utils.STGIT_COMMAND_ERROR)

     except KeyboardInterrupt:
     except KeyboardInterrupt:

-        sys.exit(1)
+        sys.exit(utils.STGIT_GENERAL_ERROR)

 
 

-    sys.exit(0)
+    sys.exit(utils.STGIT_SUCCESS)