"""
import sys, os
-from stgit.config import config
+from stgit import basedir
+from stgit.config import config, file_extensions
from stgit.utils import append_string
"""
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
# 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)