~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass --directory to git-ls-files for stg status
[stgit]
/
stgit
/
config.py
diff --git
a/stgit/config.py
b/stgit/config.py
index
a124cb7
..
e28633d
100644
(file)
--- a/
stgit/config.py
+++ b/
stgit/config.py
@@
-20,11
+20,8
@@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os, ConfigParser
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 = ConfigParser.RawConfigParser()
@@
-32,6
+29,7
@@
config = ConfigParser.RawConfigParser()
config.add_section('stgit')
config.set('stgit', 'autoresolved', 'no')
config.set('stgit', 'smtpserver', 'localhost:25')
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', 'merger',
'diff3 -L local -L older -L remote -m -E ' \
'"%(branch1)s" "%(ancestor)s" "%(branch2)s" > "%(output)s"')
@@
-40,7
+38,7
@@
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'))
# 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
# [gitmergeonefile] section is deprecated. In case it exists copy the
# options/values to the [stgit] one