X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/41a6d8591d5962dbfe8e372fff10c60e06718083..2c02c3b72d10e45f331e1276caccfa1b3d7c58d5:/stgit/config.py

diff --git a/stgit/config.py b/stgit/config.py
index 3bbbd0d..e28633d 100644
--- a/stgit/config.py
+++ b/stgit/config.py
@@ -20,14 +20,28 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 import os, ConfigParser
 
+from stgit import basedir
 
-if 'GIT_DIR' in os.environ:
-    __git_dir = os.environ['GIT_DIR']
-else:
-    __git_dir = '.git'
 
 config = ConfigParser.RawConfigParser()
 
-config.readfp(file('/etc/stgitrc'))
+# Set the defaults
+config.add_section('stgit')
+config.set('stgit', 'autoresolved', 'no')
+config.set('stgit', 'smtpserver', 'localhost:25')
+config.set('stgit', 'smtpdelay', '2')
+config.set('stgit', 'merger',
+           'diff3 -L local -L older -L remote -m -E ' \
+           '"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
+config.set('stgit', 'keeporig', 'yes')
+
+# 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(__git_dir, 'stgitrc'))
+config.read(os.path.join(basedir.get(), 'stgitrc'))
+
+# [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)