Add option to automatically invoke the interactive merger
[stgit/ydirson.git] / stgit / config.py
blobf5fbdabec3ed85c68cfdf2116df85656836cb084
1 """Handles the Stacked GIT configuration files
2 """
4 __copyright__ = """
5 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
7 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License version 2 as
9 published by the Free Software Foundation.
11 This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details.
16 You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software
18 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 """
21 import os, ConfigParser
22 from StringIO import StringIO
23 from stgit import basedir
25 config = ConfigParser.RawConfigParser()
27 def git_config(filename):
28 """Open a git config file and convert it to be understood by
29 Python."""
30 try:
31 f = file(filename)
32 cont = False
33 lines = []
34 for line in f:
35 line = line.strip()
37 if cont:
38 # continued line, add a space at the beginning
39 line = ' ' + line
41 if line and line[-1] == '\\':
42 line = line[:-1].rstrip()
43 cont = True
44 else:
45 line = line + '\n'
46 cont = False
48 lines.append(line)
50 f.close()
51 cfg_str = ''.join(lines)
52 except IOError:
53 cfg_str = ''
55 strio = StringIO(cfg_str)
56 strio.name = filename
58 return strio
60 def config_setup():
61 global config
63 # Set the defaults
64 config.add_section('stgit')
65 config.set('stgit', 'autoresolved', 'no')
66 config.set('stgit', 'smtpserver', 'localhost:25')
67 config.set('stgit', 'smtpdelay', '5')
68 config.set('stgit', 'pullcmd', 'git-pull')
69 config.set('stgit', 'merger',
70 'diff3 -L current -L ancestor -L patched -m -E ' \
71 '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
72 config.set('stgit', 'autoimerge', 'no')
73 config.set('stgit', 'keeporig', 'yes')
74 config.set('stgit', 'keepoptimized', 'no')
75 config.set('stgit', 'extensions', '.ancestor .current .patched')
77 # Read the configuration files (if any) and override the default settings
78 # stgitrc are read for backward compatibility
79 config.read('/etc/stgitrc')
80 config.read(os.path.expanduser('~/.stgitrc'))
81 config.read(os.path.join(basedir.get(), 'stgitrc'))
83 # GIT configuration files can have a [stgit] section
84 try:
85 global_config = os.environ['GIT_CONFIG']
86 except KeyError:
87 global_config = os.path.expanduser('~/.gitconfig')
88 try:
89 local_config = os.environ['GIT_CONFIG_LOCAL']
90 except KeyError:
91 local_config = os.path.join(basedir.get(), 'config')
92 config.readfp(git_config(global_config))
93 config.readfp(git_config(local_config))
95 # Set the PAGER environment to the config value (if any)
96 if config.has_option('stgit', 'pager'):
97 os.environ['PAGER'] = config.get('stgit', 'pager')
99 # [gitmergeonefile] section is deprecated. In case it exists copy the
100 # options/values to the [stgit] one
101 if config.has_section('gitmergeonefile'):
102 for option, value in config.items('gitmergeonefile'):
103 config.set('stgit', option, value)
106 class ConfigOption:
107 """Delayed cached reading of a configuration option.
109 def __init__(self, section, option):
110 self.__section = section
111 self.__option = option
112 self.__value = None
114 def __str__(self):
115 if not self.__value:
116 self.__value = config.get(self.__section, self.__option)
117 return self.__value
120 # cached extensions
121 __extensions = None
123 def file_extensions():
124 """Returns a dictionary with the conflict file extensions
126 global __extensions
128 if not __extensions:
129 cfg_ext = config.get('stgit', 'extensions').split()
130 if len(cfg_ext) != 3:
131 raise CmdException, '"extensions" configuration error'
133 __extensions = { 'ancestor': cfg_ext[0],
134 'current': cfg_ext[1],
135 'patched': cfg_ext[2] }
137 return __extensions