Show More
@@ -248,20 +248,21 b' def _xmerge(repo, mynode, orig, fcd, fco' | |||||
248 | tool, toolpath, binary, symlink = toolconf |
|
248 | tool, toolpath, binary, symlink = toolconf | |
249 | a, b, c, back = files |
|
249 | a, b, c, back = files | |
250 | out = "" |
|
250 | out = "" | |
251 |
env = |
|
251 | env = {'HG_FILE': fcd.path(), | |
252 |
|
|
252 | 'HG_MY_NODE': short(mynode), | |
253 |
|
|
253 | 'HG_OTHER_NODE': str(fco.changectx()), | |
254 |
|
|
254 | 'HG_BASE_NODE': str(fca.changectx()), | |
255 |
|
|
255 | 'HG_MY_ISLINK': 'l' in fcd.flags(), | |
256 |
|
|
256 | 'HG_OTHER_ISLINK': 'l' in fco.flags(), | |
257 |
|
|
257 | 'HG_BASE_ISLINK': 'l' in fca.flags(), | |
|
258 | } | |||
258 |
|
259 | |||
259 | ui = repo.ui |
|
260 | ui = repo.ui | |
260 |
|
261 | |||
261 | args = _toolstr(ui, tool, "args", '$local $base $other') |
|
262 | args = _toolstr(ui, tool, "args", '$local $base $other') | |
262 | if "$output" in args: |
|
263 | if "$output" in args: | |
263 | out, a = a, back # read input from backup, write to original |
|
264 | out, a = a, back # read input from backup, write to original | |
264 |
replace = |
|
265 | replace = {'local': a, 'base': b, 'other': c, 'output': out} | |
265 | args = util.interpolate(r'\$', replace, args, |
|
266 | args = util.interpolate(r'\$', replace, args, | |
266 | lambda s: util.shellquote(util.localpath(s))) |
|
267 | lambda s: util.shellquote(util.localpath(s))) | |
267 | r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, |
|
268 | r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, |
General Comments 0
You need to be logged in to leave comments.
Login now