2 """Performs a 3-way merge for GIT files
6 Copyright (C) 2005, Catalin Marinas <catalin.marinas@gmail.com>
8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License version 2 as
10 published by the Free Software Foundation.
12 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details.
17 You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software
19 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24 # Try to detect where it is run from and set prefix and the search path.
25 # It is assumed that the user installed StGIT using the --prefix= option
26 prefix
, bin
= os
.path
.split(sys
.path
[0])
28 if bin
== 'bin' and prefix
!= sys
.prefix
:
29 major
, minor
= sys
.version_info
[0:2]
30 sys
.path
+= [os
.path
.join(prefix
, 'lib', 'python'),
31 os
.path
.join(prefix
, 'lib', 'python%s.%s' %
(major
, minor
)),
32 os
.path
.join(prefix
, 'lib', 'python%s.%s' %
(major
, minor
),
35 from stgit
.config
import config
36 from stgit
.utils
import append_string
43 merger
= config
.get('gitmergeonefile', 'merger')
44 except Exception, err
:
45 print >> sys
.stderr
, 'Configuration error: %s' % err
48 if config
.has_option('gitmergeonefile', 'keeporig'):
49 keeporig
= config
.get('gitmergeonefile', 'keeporig')
57 if 'GIT_DIR' in os
.environ
:
58 base_dir
= os
.environ
['GIT_DIR']
73 f
= os
.popen(cmd
, 'r')
74 string
= f
.readline().strip()
76 print >> sys
.stderr
, 'Error: failed to execute "%s"' % cmd
80 def __checkout_files():
81 """Check out the files passed as arguments
83 global orig
, src1
, src2
86 orig
= '%s.older' % path
87 tmp
= __output('git-unpack-file %s' % orig_hash
)
88 os
.chmod(tmp
, int(orig_mode
, 8))
91 src1
= '%s.local' % path
92 tmp
= __output('git-unpack-file %s' % file
1_hash
)
93 os
.chmod(tmp
, int(file1_mode
, 8))
96 src2
= '%s.remote' % path
97 tmp
= __output('git-unpack-file %s' % file
2_hash
)
98 os
.chmod(tmp
, int(file2_mode
, 8))
101 def __remove_files():
102 """Remove any temporary files
113 """Write the conflict file for the 'path' variable and exit
115 append_string(os
.path
.join(base_dir
, 'conflicts'), path
)
119 # $1 - original file SHA1 (or empty)
120 # $2 - file in branch1 SHA1 (or empty)
121 # $3 - file in branch2 SHA1 (or empty)
122 # $4 - pathname in repository
123 # $5 - orignal file mode (or empty)
124 # $6 - file in branch1 mode (or empty)
125 # $7 - file in branch2 mode (or empty)
127 #print 'gitmergeonefile.py "%s" "%s" "%s" "%s" "%s" "%s" "%s"' \
128 # % tuple(sys.argv[1:8])
129 orig_hash
, file1_hash
, file2_hash
, path
, orig_mode
, file1_mode
, file2_mode
= \
130 [__str2none(x
) for x
in sys
.argv
[1:8]]
138 # file exists in origin
141 if file1_hash
and file2_hash
:
142 # if modes are the same (git-read-tree probably dealed with it)
143 if file1_hash
== file2_hash
:
144 if os
.system('git-update-cache --cacheinfo %s %s %s'
145 %
(file1_mode
, file1_hash
, path
)) != 0:
146 print >> sys
.stderr
, 'Error: git-update-cache failed'
148 if os
.system('git-checkout-cache -u -f -- %s' % path
):
149 print >> sys
.stderr
, 'Error: git-checkout-cache failed'
151 if file1_mode
!= file2_mode
:
152 print >> sys
.stderr
, \
153 'Error: File added in both, permissions conflict'
157 merge_ok
= os
.system(merger %
{'branch1': src1
,
160 'output': path
}) == 0
163 os
.system('git-update-cache -- %s' % path
)
167 print >> sys
.stderr
, \
168 'Error: three-way merge tool failed for file "%s"' % path
169 # reset the cache to the first branch
170 os
.system('git-update-cache --cacheinfo %s %s %s'
171 %
(file1_mode
, file1_hash
, path
))
172 if keeporig
!= 'yes':
175 # file deleted in both or deleted in one and unchanged in the other
176 elif not (file1_hash
or file2_hash
) \
177 or file1_hash
== orig_hash
or file2_hash
== orig_hash
:
178 if os
.path
.exists(path
):
181 sys
.exit(os
.system('git-update-cache --remove -- %s' % path
))
182 # file does not exist in origin
185 if file1_hash
and file2_hash
:
187 if file1_hash
== file2_hash
:
188 if os
.system('git-update-cache --add --cacheinfo %s %s %s'
189 %
(file1_mode
, file1_hash
, path
)) != 0:
190 print >> sys
.stderr
, 'Error: git-update-cache failed'
192 if os
.system('git-checkout-cache -u -f -- %s' % path
):
193 print >> sys
.stderr
, 'Error: git-checkout-cache failed'
195 if file1_mode
!= file2_mode
:
196 print >> sys
.stderr
, \
197 'Error: File "s" added in both, permissions conflict' \
200 # files are different
202 print >> sys
.stderr
, \
203 'Error: File "%s" added in branches but different' % path
206 elif file1_hash
or file2_hash
:
213 if os
.system('git-update-cache --add --cacheinfo %s %s %s'
214 %
(mode
, obj
, path
)) != 0:
215 print >> sys
.stderr
, 'Error: git-update-cache failed'
218 sys
.exit(os
.system('git-checkout-cache -u -f -- %s' % path
))
221 print >> sys
.stderr
, 'Error: Un-handled merge conflict'
222 print >> sys
.stderr
, 'gitmergeonefile.py "%s" "%s" "%s" "%s" "%s" "%s" "%s"' \
223 %
tuple(sys
.argv
[1:8])