1 """Performs a 3-way merge for GIT files
5 Copyright (C) 2006, Catalin Marinas <catalin.marinas@gmail.com>
7 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License version 2 as
9 published by the Free Software Foundation.
11 This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details.
16 You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software
18 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 from stgit import basedir
23 from stgit.config import config, file_extensions, ConfigOption
24 from stgit.utils import append_string, out
27 class GitMergeException(Exception):
34 merger = ConfigOption('stgit', 'merger')
35 keeporig = ConfigOption('stgit', 'keeporig')
47 f = os.popen(cmd, 'r')
48 string = f.readline().rstrip()
50 raise GitMergeException, 'Error: failed to execute "%s"' % cmd
53 def __checkout_files(orig_hash, file1_hash, file2_hash,
55 orig_mode, file1_mode, file2_mode):
56 """Check out the files passed as arguments
58 global orig, src1, src2
60 extensions = file_extensions()
63 orig = path + extensions['ancestor']
64 tmp = __output('git-unpack-file %s' % orig_hash)
65 os.chmod(tmp, int(orig_mode, 8))
68 src1 = path + extensions['current']
69 tmp = __output('git-unpack-file %s' % file1_hash)
70 os.chmod(tmp, int(file1_mode, 8))
73 src2 = path + extensions['patched']
74 tmp = __output('git-unpack-file %s' % file2_hash)
75 os.chmod(tmp, int(file2_mode, 8))
78 if file1_hash and not os.path.exists(path):
79 # the current file might be removed by GIT when it is a new
80 # file added in both branches. Just re-generate it
81 tmp = __output('git-unpack-file %s' % file1_hash)
82 os.chmod(tmp, int(file1_mode, 8))
85 def __remove_files(orig_hash, file1_hash, file2_hash):
86 """Remove any temporary files
96 """Write the conflict file for the 'path' variable and exit
98 append_string(os.path.join(basedir.get(), 'conflicts'), path)
101 def interactive_merge(filename):
102 """Run the interactive merger on the given file. Note that the
103 index should not have any conflicts.
105 extensions = file_extensions()
107 ancestor = filename + extensions['ancestor']
108 current = filename + extensions['current']
109 patched = filename + extensions['patched']
111 if os.path.isfile(ancestor):
113 files_dict = {'branch1': current,
114 'ancestor': ancestor,
117 imerger = config.get('stgit.i3merge')
120 files_dict = {'branch1': current,
123 imerger = config.get('stgit.i2merge')
126 raise GitMergeException, 'No interactive merge command configured'
128 # check whether we have all the files for the merge
129 for fn in [filename, current, patched]:
130 if not os.path.isfile(fn):
131 raise GitMergeException, \
132 'Cannot run the interactive merge: "%s" missing' % fn
134 mtime = os.path.getmtime(filename)
136 out.info('Trying the interactive %s merge'
137 % (three_way and 'three-way' or 'two-way'))
139 err = os.system(imerger % files_dict)
141 raise GitMergeException, 'The interactive merge failed: %d' % err
142 if not os.path.isfile(filename):
143 raise GitMergeException, 'The "%s" file is missing' % filename
144 if mtime == os.path.getmtime(filename):
145 raise GitMergeException, 'The "%s" file was not modified' % filename
151 def merge(orig_hash, file1_hash, file2_hash,
153 orig_mode, file1_mode, file2_mode):
154 """Three-way merge for one file algorithm
156 __checkout_files(orig_hash, file1_hash, file2_hash,
158 orig_mode, file1_mode, file2_mode)
160 # file exists in origin
163 if file1_hash and file2_hash:
164 # if modes are the same (git-read-tree probably dealt with it)
165 if file1_hash == file2_hash:
166 if os.system('git-update-index --cacheinfo %s %s %s'
167 % (file1_mode, file1_hash, path)) != 0:
168 out.error('git-update-index failed')
171 if os.system('git-checkout-index -u -f -- %s' % path):
172 out.error('git-checkout-index failed')
175 if file1_mode != file2_mode:
176 out.error('File added in both, permissions conflict')
181 merge_ok = os.system(str(merger) % {'branch1': src1,
184 'output': path }) == 0
187 os.system('git-update-index -- %s' % path)
188 __remove_files(orig_hash, file1_hash, file2_hash)
191 out.error('Three-way merge tool failed for file "%s"'
193 # reset the cache to the first branch
194 os.system('git-update-index --cacheinfo %s %s %s'
195 % (file1_mode, file1_hash, path))
197 if config.get('stgit.autoimerge') == 'yes':
199 interactive_merge(path)
200 except GitMergeException, ex:
201 # interactive merge failed
203 if str(keeporig) != 'yes':
204 __remove_files(orig_hash, file1_hash,
208 # successful interactive merge
209 os.system('git-update-index -- %s' % path)
210 __remove_files(orig_hash, file1_hash, file2_hash)
213 # no interactive merge, just mark it as conflict
214 if str(keeporig) != 'yes':
215 __remove_files(orig_hash, file1_hash, file2_hash)
219 # file deleted in both or deleted in one and unchanged in the other
220 elif not (file1_hash or file2_hash) \
221 or file1_hash == orig_hash or file2_hash == orig_hash:
222 if os.path.exists(path):
224 __remove_files(orig_hash, file1_hash, file2_hash)
225 return os.system('git-update-index --remove -- %s' % path)
226 # file deleted in one and changed in the other
228 # Do something here - we must at least merge the entry in
229 # the cache, instead of leaving it in U(nmerged) state. In
230 # fact, stg resolved does not handle that.
232 # Do the same thing cogito does - remove the file in any case.
233 os.system('git-update-index --remove -- %s' % path)
236 ## file deleted upstream and changed in the patch. The
237 ## patch is probably going to move the changes
240 #os.system('git-update-index --remove -- %s' % path)
242 ## file deleted in the patch and changed upstream. We
243 ## could re-delete it, but for now leave it there -
244 ## and let the user check if he still wants to remove
247 ## reset the cache to the first branch
248 #os.system('git-update-index --cacheinfo %s %s %s'
249 # % (file1_mode, file1_hash, path))
253 # file does not exist in origin
256 if file1_hash and file2_hash:
258 if file1_hash == file2_hash:
259 if os.system('git-update-index --add --cacheinfo %s %s %s'
260 % (file1_mode, file1_hash, path)) != 0:
261 out.error('git-update-index failed')
264 if os.system('git-checkout-index -u -f -- %s' % path):
265 out.error('git-checkout-index failed')
268 if file1_mode != file2_mode:
269 out.error('File "s" added in both, permissions conflict'
273 # files added in both but different
275 out.error('File "%s" added in branches but different' % path)
276 # reset the cache to the first branch
277 os.system('git-update-index --cacheinfo %s %s %s'
278 % (file1_mode, file1_hash, path))
280 if config.get('stgit.autoimerge') == 'yes':
282 interactive_merge(path)
283 except GitMergeException, ex:
284 # interactive merge failed
286 if str(keeporig) != 'yes':
287 __remove_files(orig_hash, file1_hash,
291 # successful interactive merge
292 os.system('git-update-index -- %s' % path)
293 __remove_files(orig_hash, file1_hash, file2_hash)
296 # no interactive merge, just mark it as conflict
297 if str(keeporig) != 'yes':
298 __remove_files(orig_hash, file1_hash, file2_hash)
302 elif file1_hash or file2_hash:
309 if os.system('git-update-index --add --cacheinfo %s %s %s'
310 % (mode, obj, path)) != 0:
311 out.error('git-update-index failed')
314 __remove_files(orig_hash, file1_hash, file2_hash)
315 return os.system('git-checkout-index -u -f -- %s' % path)
318 out.error('Unhandled merge conflict: "%s" "%s" "%s" "%s" "%s" "%s" "%s"'
319 % (orig_hash, file1_hash, file2_hash,
321 orig_mode, file1_mode, file2_mode))