filemerge.py
274 lines
| 9.4 KiB
| text/x-python
|
PythonLexer
/ mercurial / filemerge.py
|
r6003 | # filemerge.py - file-level merge handling for Mercurial | ||
# | ||||
# Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
|
r8225 | # This software may be used and distributed according to the terms of the | ||
|
r10263 | # GNU General Public License version 2 or any later version. | ||
|
r6003 | |||
|
r7873 | from node import short | ||
|
r6003 | from i18n import _ | ||
|
r11146 | import util, simplemerge, match, error | ||
|
r8312 | import os, tempfile, re, filecmp | ||
|
r6004 | |||
|
r6013 | def _toolstr(ui, tool, part, default=""): | ||
|
r6004 | return ui.config("merge-tools", tool + "." + part, default) | ||
def _toolbool(ui, tool, part, default=False): | ||||
return ui.configbool("merge-tools", tool + "." + part, default) | ||||
|
r11148 | def _toollist(ui, tool, part, default=[]): | ||
return ui.configlist("merge-tools", tool + "." + part, default) | ||||
|
r8831 | _internal = ['internal:' + s | ||
for s in 'fail local other merge prompt dump'.split()] | ||||
|
r8830 | |||
|
r6004 | def _findtool(ui, tool): | ||
|
r8830 | if tool in _internal: | ||
|
r6522 | return tool | ||
|
r13565 | for kn in ("regkey", "regkeyalt"): | ||
k = _toolstr(ui, tool, kn) | ||||
if not k: | ||||
continue | ||||
|
r14230 | p = util.lookupreg(k, _toolstr(ui, tool, "regname")) | ||
|
r6006 | if p: | ||
|
r14271 | p = util.findexe(p + _toolstr(ui, tool, "regappend")) | ||
|
r6006 | if p: | ||
return p | ||||
|
r15264 | exe = _toolstr(ui, tool, "executable", tool) | ||
return util.findexe(util.expandpath(exe)) | ||||
|
r6004 | |||
def _picktool(repo, ui, path, binary, symlink): | ||||
def check(tool, pat, symlink, binary): | ||||
tmsg = tool | ||||
if pat: | ||||
tmsg += " specified for " + pat | ||||
|
r7397 | if not _findtool(ui, tool): | ||
if pat: # explicitly requested tool deserves a warning | ||||
ui.warn(_("couldn't find merge tool %s\n") % tmsg) | ||||
else: # configured but non-existing tools are more silent | ||||
ui.note(_("couldn't find merge tool %s\n") % tmsg) | ||||
|
r6004 | elif symlink and not _toolbool(ui, tool, "symlink"): | ||
ui.warn(_("tool %s can't handle symlinks\n") % tmsg) | ||||
elif binary and not _toolbool(ui, tool, "binary"): | ||||
ui.warn(_("tool %s can't handle binary\n") % tmsg) | ||||
|
r6007 | elif not util.gui() and _toolbool(ui, tool, "gui"): | ||
ui.warn(_("tool %s requires a GUI\n") % tmsg) | ||||
|
r6004 | else: | ||
return True | ||||
return False | ||||
|
r12788 | # forcemerge comes from command line arguments, highest priority | ||
force = ui.config('ui', 'forcemerge') | ||||
if force: | ||||
toolpath = _findtool(ui, force) | ||||
if toolpath: | ||||
return (force, '"' + toolpath + '"') | ||||
else: | ||||
# mimic HGMERGE if given tool not found | ||||
return (force, force) | ||||
# HGMERGE takes next precedence | ||||
|
r6025 | hgmerge = os.environ.get("HGMERGE") | ||
if hgmerge: | ||||
return (hgmerge, hgmerge) | ||||
|
r6004 | |||
# then patterns | ||||
|
r6016 | for pat, tool in ui.configitems("merge-patterns"): | ||
|
r8567 | mf = match.match(repo.root, '', [pat]) | ||
|
r6004 | if mf(path) and check(tool, pat, symlink, False): | ||
|
r10339 | toolpath = _findtool(ui, tool) | ||
return (tool, '"' + toolpath + '"') | ||||
|
r6004 | |||
# then merge tools | ||||
tools = {} | ||||
|
r10282 | for k, v in ui.configitems("merge-tools"): | ||
|
r6004 | t = k.split('.')[0] | ||
if t not in tools: | ||||
tools[t] = int(_toolstr(ui, t, "priority", "0")) | ||||
|
r6076 | names = tools.keys() | ||
|
r10282 | tools = sorted([(-p, t) for t, p in tools.items()]) | ||
|
r6076 | uimerge = ui.config("ui", "merge") | ||
if uimerge: | ||||
if uimerge not in names: | ||||
return (uimerge, uimerge) | ||||
tools.insert(0, (None, uimerge)) # highest priority | ||||
|
r6004 | tools.append((None, "hgmerge")) # the old default, if found | ||
|
r10282 | for p, t in tools: | ||
|
r7397 | if check(t, None, symlink, binary): | ||
toolpath = _findtool(ui, t) | ||||
|
r6025 | return (t, '"' + toolpath + '"') | ||
|
r16254 | |||
# internal merge or prompt as last resort | ||||
if symlink or binary: | ||||
return "internal:prompt", None | ||||
return "internal:merge", None | ||||
|
r6003 | |||
|
r6005 | def _eoltype(data): | ||
"Guess the EOL type of a file" | ||||
if '\0' in data: # binary | ||||
return None | ||||
if '\r\n' in data: # Windows | ||||
return '\r\n' | ||||
if '\r' in data: # Old Mac | ||||
return '\r' | ||||
if '\n' in data: # UNIX | ||||
return '\n' | ||||
return None # unknown | ||||
def _matcheol(file, origfile): | ||||
"Convert EOL markers in a file to match origfile" | ||||
|
r14168 | tostyle = _eoltype(util.readfile(origfile)) | ||
|
r6005 | if tostyle: | ||
|
r14168 | data = util.readfile(file) | ||
|
r6005 | style = _eoltype(data) | ||
if style: | ||||
newdata = data.replace(style, tostyle) | ||||
if newdata != data: | ||||
|
r14168 | util.writefile(file, newdata) | ||
|
r6005 | |||
|
r6512 | def filemerge(repo, mynode, orig, fcd, fco, fca): | ||
|
r6003 | """perform a 3-way merge in the working directory | ||
|
r6512 | mynode = parent node before merge | ||
orig = original local filename before merge | ||||
fco = other file context | ||||
fca = ancestor file context | ||||
fcd = local file context for current/destination file | ||||
|
r6003 | """ | ||
def temp(prefix, ctx): | ||||
pre = "%s~%s." % (os.path.basename(ctx.path()), prefix) | ||||
(fd, name) = tempfile.mkstemp(prefix=pre) | ||||
data = repo.wwritedata(ctx.path(), ctx.data()) | ||||
f = os.fdopen(fd, "wb") | ||||
f.write(data) | ||||
f.close() | ||||
return name | ||||
|
r11702 | if not fco.cmp(fcd): # files identical? | ||
|
r6003 | return None | ||
|
r6004 | ui = repo.ui | ||
|
r6512 | fd = fcd.path() | ||
|
r15738 | binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() | ||
|
r6744 | symlink = 'l' in fcd.flags() + fco.flags() | ||
|
r6512 | tool, toolpath = _picktool(repo, ui, fd, binary, symlink) | ||
|
r9467 | ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" % | ||
|
r6512 | (tool, fd, binary, symlink)) | ||
|
r6004 | |||
|
r8830 | if not tool or tool == 'internal:prompt': | ||
|
r6004 | tool = "internal:local" | ||
|
r9048 | if ui.promptchoice(_(" no tool found to merge %s\n" | ||
|
r9049 | "keep (l)ocal or take (o)ther?") % fd, | ||
(_("&Local"), _("&Other")), 0): | ||||
|
r6004 | tool = "internal:other" | ||
if tool == "internal:local": | ||||
return 0 | ||||
if tool == "internal:other": | ||||
|
r6743 | repo.wwrite(fd, fco.data(), fco.flags()) | ||
|
r6004 | return 0 | ||
if tool == "internal:fail": | ||||
return 1 | ||||
# do the actual merge | ||||
|
r6003 | a = repo.wjoin(fd) | ||
b = temp("base", fca) | ||||
c = temp("other", fco) | ||||
|
r6004 | out = "" | ||
back = a + ".orig" | ||||
util.copyfile(a, back) | ||||
|
r6003 | |||
|
r6512 | if orig != fco.path(): | ||
|
r8615 | ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) | ||
|
r6003 | else: | ||
|
r8615 | ui.status(_("merging %s\n") % fd) | ||
|
r6512 | |||
|
r9467 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ||
|
r6003 | |||
|
r6004 | # do we attempt to simplemerge first? | ||
|
r11146 | try: | ||
premerge = _toolbool(ui, tool, "premerge", not (binary or symlink)) | ||||
except error.ConfigError: | ||||
premerge = _toolstr(ui, tool, "premerge").lower() | ||||
valid = 'keep'.split() | ||||
if premerge not in valid: | ||||
_valid = ', '.join(["'" + v + "'" for v in valid]) | ||||
raise error.ConfigError(_("%s.premerge not valid " | ||||
"('%s' is neither boolean nor %s)") % | ||||
(tool, premerge, _valid)) | ||||
if premerge: | ||||
|
r8269 | r = simplemerge.simplemerge(ui, a, b, c, quiet=True) | ||
|
r6004 | if not r: | ||
|
r9467 | ui.debug(" premerge successful\n") | ||
|
r6004 | os.unlink(back) | ||
os.unlink(b) | ||||
os.unlink(c) | ||||
return 0 | ||||
|
r11146 | if premerge != 'keep': | ||
util.copyfile(back, a) # restore from backup and try again | ||||
|
r6004 | |||
env = dict(HG_FILE=fd, | ||||
|
r6512 | HG_MY_NODE=short(mynode), | ||
HG_OTHER_NODE=str(fco.changectx()), | ||||
|
r9709 | HG_BASE_NODE=str(fca.changectx()), | ||
|
r6744 | HG_MY_ISLINK='l' in fcd.flags(), | ||
HG_OTHER_ISLINK='l' in fco.flags(), | ||||
HG_BASE_ISLINK='l' in fca.flags()) | ||||
|
r6004 | |||
if tool == "internal:merge": | ||||
|
r8269 | r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other']) | ||
|
r8831 | elif tool == 'internal:dump': | ||
a = repo.wjoin(fd) | ||||
util.copyfile(a, a + ".local") | ||||
|
r8861 | repo.wwrite(fd + ".other", fco.data(), fco.flags()) | ||
repo.wwrite(fd + ".base", fca.data(), fca.flags()) | ||||
|
r16205 | os.unlink(b) | ||
os.unlink(c) | ||||
|
r8831 | return 1 # unresolved | ||
|
r6004 | else: | ||
args = _toolstr(ui, tool, "args", '$local $base $other') | ||||
if "$output" in args: | ||||
out, a = a, back # read input from backup, write to original | ||||
replace = dict(local=a, base=b, other=c, output=out) | ||||
|
r11988 | args = util.interpolate(r'\$', replace, args, | ||
lambda s: '"%s"' % util.localpath(s)) | ||||
|
r14749 | r = util.system(toolpath + ' ' + args, cwd=repo.root, environ=env, | ||
out=ui.fout) | ||||
|
r6004 | |||
|
r11148 | if not r and (_toolbool(ui, tool, "checkconflicts") or | ||
'conflicts' in _toollist(ui, tool, "check")): | ||||
|
r12046 | if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), | ||
re.MULTILINE): | ||||
|
r6004 | r = 1 | ||
|
r11149 | checked = False | ||
if 'prompt' in _toollist(ui, tool, "check"): | ||||
checked = True | ||||
if ui.promptchoice(_("was merge of '%s' successful (yn)?") % fd, | ||||
(_("&Yes"), _("&No")), 1): | ||||
r = 1 | ||||
if not r and not checked and (_toolbool(ui, tool, "checkchanged") or | ||||
'changed' in _toollist(ui, tool, "check")): | ||||
|
r6075 | if filecmp.cmp(repo.wjoin(fd), back): | ||
|
r9048 | if ui.promptchoice(_(" output file %s appears unchanged\n" | ||
|
r9049 | "was merge successful (yn)?") % fd, | ||
(_("&Yes"), _("&No")), 1): | ||||
|
r6075 | r = 1 | ||
|
r6005 | if _toolbool(ui, tool, "fixeol"): | ||
|
r6015 | _matcheol(repo.wjoin(fd), back) | ||
|
r6005 | |||
|
r6003 | if r: | ||
|
r15501 | if tool == "internal:merge": | ||
ui.warn(_("merging %s incomplete! " | ||||
"(edit conflicts, then use 'hg resolve --mark')\n") % fd) | ||||
else: | ||||
ui.warn(_("merging %s failed!\n") % fd) | ||||
|
r6004 | else: | ||
os.unlink(back) | ||||
|
r6003 | |||
os.unlink(b) | ||||
os.unlink(c) | ||||
return r | ||||