"""
import sys, os
-from stgit.config import config
+from stgit import basedir
+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
"""
global orig, src1, src2
+ extensions = file_extensions()
+
if orig_hash:
- orig = '%s.older' % path
+ orig = path + extensions['ancestor']
tmp = __output('git-unpack-file %s' % orig_hash)
os.chmod(tmp, int(orig_mode, 8))
os.renames(tmp, orig)
if file1_hash:
- src1 = '%s.local' % path
+ src1 = path + extensions['current']
tmp = __output('git-unpack-file %s' % file1_hash)
os.chmod(tmp, int(file1_mode, 8))
os.renames(tmp, src1)
if file2_hash:
- src2 = '%s.remote' % path
+ src2 = path + extensions['patched']
tmp = __output('git-unpack-file %s' % file2_hash)
os.chmod(tmp, int(file2_mode, 8))
os.renames(tmp, src2)
os.remove(src2)
pass
-# GIT_DIR value cached
-__base_dir = None
-
def __conflict(path):
"""Write the conflict file for the 'path' variable and exit
"""
- global __base_dir
-
- if not __base_dir:
- if 'GIT_DIR' in os.environ:
- __base_dir = os.environ['GIT_DIR']
- else:
- __base_dir = __output('git-rev-parse --git-dir')
-
- append_string(os.path.join(__base_dir, 'conflicts'), path)
+ append_string(os.path.join(basedir.get(), 'conflicts'), path)
#
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
return 1
# files are different
else:
+ # reset the index to the current file
+ os.system('git-update-index -- %s' % path)
print >> sys.stderr, \
'Error: File "%s" added in branches but different' % path
__conflict(path)