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
#
# 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
return 1
# 3-way merge
else:
- merge_ok = os.system(merger % {'branch1': src1,
- 'ancestor': orig,
- 'branch2': src2,
- 'output': path }) == 0
+ merge_ok = os.system(str(merger) % {'branch1': src1,
+ 'ancestor': orig,
+ 'branch2': src2,
+ 'output': path }) == 0
if merge_ok:
os.system('git-update-index -- %s' % path)
# reset the cache to the first branch
os.system('git-update-index --cacheinfo %s %s %s'
% (file1_mode, file1_hash, path))
- if keeporig != 'yes':
+ if str(keeporig) != 'yes':
__remove_files(orig_hash, file1_hash, file2_hash)
__conflict(path)
return 1