Only read the config files when running a command

This reduces the time to display the help by about 12ms (on my PC).

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/config.py b/stgit/config.py
index a2e29bb326eb62e1974df473fa557dd1252301ad..6679668e378346b0f471e626690d2d2c5931f65e 100644 (file)
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -25,33 +25,50 @@ from stgit import basedir
 
 config = ConfigParser.RawConfigParser()
 
 
 config = ConfigParser.RawConfigParser()
 

-# Set the defaults
-config.add_section('stgit')
-config.set('stgit', 'autoresolved', 'no')
-config.set('stgit', 'smtpserver', 'localhost:25')
-config.set('stgit', 'smtpdelay', '5')
-config.set('stgit', 'pullcmd', 'git-pull')
-config.set('stgit', 'merger',
-           'diff3 -L current -L ancestor -L patched -m -E ' \
-           '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
-config.set('stgit', 'keeporig', 'yes')
-config.set('stgit', 'keepoptimized', 'no')
-config.set('stgit', 'extensions', '.ancestor .current .patched')
-
-# Read the configuration files (if any) and override the default settings
-config.read('/etc/stgitrc')
-config.read(os.path.expanduser('~/.stgitrc'))
-config.read(os.path.join(basedir.get(), 'stgitrc'))
-
-# Set the PAGER environment to the config value (if any)
-if config.has_option('stgit', 'pager'):
-    os.environ['PAGER'] = config.get('stgit', 'pager')
-
-# [gitmergeonefile] section is deprecated. In case it exists copy the
-# options/values to the [stgit] one
-if config.has_section('gitmergeonefile'):
-    for option, value in config.items('gitmergeonefile'):
-        config.set('stgit', option, value)
+def config_setup():
+    global config
+
+    # Set the defaults
+    config.add_section('stgit')
+    config.set('stgit', 'autoresolved', 'no')
+    config.set('stgit', 'smtpserver', 'localhost:25')
+    config.set('stgit', 'smtpdelay', '5')
+    config.set('stgit', 'pullcmd', 'git-pull')
+    config.set('stgit', 'merger',
+               'diff3 -L current -L ancestor -L patched -m -E ' \
+               '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
+    config.set('stgit', 'keeporig', 'yes')
+    config.set('stgit', 'keepoptimized', 'no')
+    config.set('stgit', 'extensions', '.ancestor .current .patched')
+
+    # Read the configuration files (if any) and override the default settings
+    config.read('/etc/stgitrc')
+    config.read(os.path.expanduser('~/.stgitrc'))
+    config.read(os.path.join(basedir.get(), 'stgitrc'))
+
+    # Set the PAGER environment to the config value (if any)
+    if config.has_option('stgit', 'pager'):
+        os.environ['PAGER'] = config.get('stgit', 'pager')
+
+    # [gitmergeonefile] section is deprecated. In case it exists copy the
+    # options/values to the [stgit] one
+    if config.has_section('gitmergeonefile'):
+        for option, value in config.items('gitmergeonefile'):
+            config.set('stgit', option, value)
+
+
+class ConfigOption:
+    """Delayed cached reading of a configuration option.
+    """
+    def __init__(self, section, option):
+        self.__section = section
+        self.__option = option
+        self.__value = None
+
+    def __str__(self):
+        if not self.__value:
+            self.__value = config.get(self.__section, self.__option)
+        return self.__value

 
 
 # cached extensions
 
 
 # cached extensions

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index 47ad8b802340a8b5e8267f32ad527ded04302fdf..39915fbd28a11af5b03ab9486bc73b14a18cae4c 100644 (file)
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 import sys, os
 from stgit import basedir
 
 import sys, os
 from stgit import basedir

-from stgit.config import config, file_extensions
+from stgit.config import file_extensions, ConfigOption

 from stgit.utils import append_string
 
 
 from stgit.utils import append_string
 
 


@@ -31,12 +31,8 @@ class GitMergeException(Exception):
 #
 # Options
 #
 #
 # Options
 #

-try:
-    merger = config.get('stgit', 'merger')
-    keeporig = config.get('stgit', 'keeporig')
-except Exception, err:
-    raise GitMergeException, 'Configuration error: %s' % err
-
+merger = ConfigOption('stgit', 'merger')
+keeporig = ConfigOption('stgit', 'keeporig')

 
 #
 # Utility functions
 
 #
 # Utility functions

diff --git a/stgit/main.py b/stgit/main.py
index 60df5ef9f40789688b65694e092b6c58a68065d8..c2797c9766b32552d597d72d3819e1202b47e67e 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -220,12 +220,16 @@ def main():
 
     # 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.config import config_setup
+    from ConfigParser import ParsingError

     from stgit.stack import Series, StackException
     from stgit.git import GitException
     from stgit.commands.common import CmdException
     from stgit.gitmergeonefile import GitMergeException
 
     try:
     from stgit.stack import Series, StackException
     from stgit.git import GitException
     from stgit.commands.common import CmdException
     from stgit.gitmergeonefile import GitMergeException
 
     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':


@@ -236,7 +240,7 @@ 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,
+    except (IOError, ParsingError, CmdException, StackException, GitException,

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