filemerge.py
712 lines
| 24.6 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 | |||
|
r25949 | from __future__ import absolute_import | ||
import filecmp | ||||
import os | ||||
import re | ||||
import tempfile | ||||
from .i18n import _ | ||||
|
r26979 | from .node import nullid, short | ||
|
r25949 | |||
from . import ( | ||||
error, | ||||
|
r28955 | formatter, | ||
|
r25949 | match, | ||
|
r30073 | pycompat, | ||
|
r27651 | scmutil, | ||
|
r25949 | simplemerge, | ||
tagmerge, | ||||
templatekw, | ||||
templater, | ||||
util, | ||||
) | ||||
|
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) | ||||
|
r16126 | internals = {} | ||
|
r24099 | # Merge tools to document. | ||
internalsdoc = {} | ||||
|
r16125 | |||
|
r26525 | # internal tool merge types | ||
nomerge = None | ||||
mergeonly = 'mergeonly' # just the full merge, no premerge | ||||
fullmerge = 'fullmerge' # both premerge and merge | ||||
|
r26979 | class absentfilectx(object): | ||
"""Represents a file that's ostensibly in a context but is actually not | ||||
present in it. | ||||
This is here because it's very specific to the filemerge code for now -- | ||||
other code is likely going to break with the values this returns.""" | ||||
def __init__(self, ctx, f): | ||||
self._ctx = ctx | ||||
self._f = f | ||||
def path(self): | ||||
return self._f | ||||
def size(self): | ||||
return None | ||||
def data(self): | ||||
return None | ||||
def filenode(self): | ||||
return nullid | ||||
_customcmp = True | ||||
def cmp(self, fctx): | ||||
"""compare with other file context | ||||
returns True if different from fctx. | ||||
""" | ||||
return not (fctx.isabsent() and | ||||
fctx.ctx() == self.ctx() and | ||||
fctx.path() == self.path()) | ||||
def flags(self): | ||||
return '' | ||||
def changectx(self): | ||||
return self._ctx | ||||
def isbinary(self): | ||||
return False | ||||
def isabsent(self): | ||||
return True | ||||
|
r26526 | def internaltool(name, mergetype, onfailure=None, precheck=None): | ||
|
r16125 | '''return a decorator for populating internal merge tool table''' | ||
def decorator(func): | ||||
|
r22707 | fullname = ':' + name | ||
|
r30073 | func.__doc__ = (pycompat.sysstr("``%s``\n" % fullname) | ||
+ func.__doc__.strip()) | ||||
|
r16127 | internals[fullname] = func | ||
|
r22707 | internals['internal:' + name] = func | ||
|
r24099 | internalsdoc[fullname] = func | ||
|
r26526 | func.mergetype = mergetype | ||
|
r16125 | func.onfailure = onfailure | ||
|
r26513 | func.precheck = precheck | ||
|
r16125 | return func | ||
return decorator | ||||
|
r8830 | |||
|
r6004 | def _findtool(ui, tool): | ||
|
r16126 | if tool in internals: | ||
|
r6522 | return tool | ||
|
r23148 | return findexternaltool(ui, tool) | ||
def findexternaltool(ui, 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 | |||
|
r27039 | def _picktool(repo, ui, path, binary, symlink, changedelete): | ||
def supportscd(tool): | ||||
return tool in internals and internals[tool].mergetype == nomerge | ||||
def check(tool, pat, symlink, binary, changedelete): | ||||
|
r6004 | 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) | ||||
|
r27039 | elif changedelete and not supportscd(tool): | ||
# the nomerge tools are the only tools that support change/delete | ||||
# conflicts | ||||
pass | ||||
|
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 | ||||
|
r25835 | # internal config: ui.forcemerge | ||
|
r12788 | # forcemerge comes from command line arguments, highest priority | ||
force = ui.config('ui', 'forcemerge') | ||||
if force: | ||||
toolpath = _findtool(ui, force) | ||||
|
r27039 | if changedelete and not supportscd(toolpath): | ||
return ":prompt", None | ||||
|
r12788 | else: | ||
|
r27039 | if toolpath: | ||
return (force, util.shellquote(toolpath)) | ||||
else: | ||||
# mimic HGMERGE if given tool not found | ||||
return (force, force) | ||||
|
r12788 | |||
# HGMERGE takes next precedence | ||||
|
r6025 | hgmerge = os.environ.get("HGMERGE") | ||
if hgmerge: | ||||
|
r27039 | if changedelete and not supportscd(hgmerge): | ||
return ":prompt", None | ||||
else: | ||||
return (hgmerge, hgmerge) | ||||
|
r6004 | |||
# then patterns | ||||
|
r6016 | for pat, tool in ui.configitems("merge-patterns"): | ||
|
r8567 | mf = match.match(repo.root, '', [pat]) | ||
|
r27039 | if mf(path) and check(tool, pat, symlink, False, changedelete): | ||
|
r10339 | toolpath = _findtool(ui, tool) | ||
|
r17885 | return (tool, util.shellquote(toolpath)) | ||
|
r6004 | |||
# then merge tools | ||||
tools = {} | ||||
|
r26730 | disabled = set() | ||
|
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")) | ||||
|
r26730 | if _toolbool(ui, t, "disabled", False): | ||
disabled.add(t) | ||||
|
r6076 | names = tools.keys() | ||
|
r30388 | tools = sorted([(-p, tool) for tool, p in tools.items() | ||
if tool not in disabled]) | ||||
|
r6076 | uimerge = ui.config("ui", "merge") | ||
if uimerge: | ||||
|
r27039 | # external tools defined in uimerge won't be able to handle | ||
# change/delete conflicts | ||||
if uimerge not in names and not changedelete: | ||||
|
r6076 | 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: | ||
|
r27039 | if check(t, None, symlink, binary, changedelete): | ||
|
r7397 | toolpath = _findtool(ui, t) | ||
|
r17885 | return (t, util.shellquote(toolpath)) | ||
|
r16254 | |||
# internal merge or prompt as last resort | ||||
|
r27039 | if symlink or binary or changedelete: | ||
|
r22707 | return ":prompt", None | ||
return ":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 | |||
|
r26526 | @internaltool('prompt', nomerge) | ||
|
r29774 | def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | ||
|
r28640 | """Asks the user which of the local `p1()` or the other `p2()` version to | ||
keep as the merged version.""" | ||||
|
r16125 | ui = repo.ui | ||
fd = fcd.path() | ||||
|
r29774 | prompts = partextras(labels) | ||
prompts['fd'] = fd | ||||
|
r26898 | try: | ||
|
r27038 | if fco.isabsent(): | ||
index = ui.promptchoice( | ||||
|
r29775 | _("local%(l)s changed %(fd)s which other%(o)s deleted\n" | ||
|
r27163 | "use (c)hanged version, (d)elete, or leave (u)nresolved?" | ||
|
r29774 | "$$ &Changed $$ &Delete $$ &Unresolved") % prompts, 2) | ||
|
r27163 | choice = ['local', 'other', 'unresolved'][index] | ||
|
r27038 | elif fcd.isabsent(): | ||
index = ui.promptchoice( | ||||
|
r29775 | _("other%(o)s changed %(fd)s which local%(l)s deleted\n" | ||
|
r27163 | "use (c)hanged version, leave (d)eleted, or " | ||
"leave (u)nresolved?" | ||||
|
r29774 | "$$ &Changed $$ &Deleted $$ &Unresolved") % prompts, 2) | ||
|
r27163 | choice = ['other', 'local', 'unresolved'][index] | ||
|
r27038 | else: | ||
|
r27162 | index = ui.promptchoice( | ||
|
r29774 | _("no tool found to merge %(fd)s\n" | ||
"keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved?" | ||||
"$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) | ||||
|
r27162 | choice = ['local', 'other', 'unresolved'][index] | ||
|
r26851 | |||
|
r26898 | if choice == 'other': | ||
|
r29774 | return _iother(repo, mynode, orig, fcd, fco, fca, toolconf, | ||
labels) | ||||
|
r27162 | elif choice == 'local': | ||
|
r29774 | return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, | ||
labels) | ||||
|
r27162 | elif choice == 'unresolved': | ||
|
r29774 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, | ||
labels) | ||||
|
r26898 | except error.ResponseExpected: | ||
ui.write("\n") | ||||
|
r29774 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, | ||
labels) | ||||
|
r16125 | |||
|
r26526 | @internaltool('local', nomerge) | ||
|
r29774 | def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | ||
|
r28640 | """Uses the local `p1()` version of files as the merged version.""" | ||
|
r27036 | return 0, fcd.isabsent() | ||
|
r16125 | |||
|
r26526 | @internaltool('other', nomerge) | ||
|
r29774 | def _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | ||
|
r28640 | """Uses the other `p2()` version of files as the merged version.""" | ||
|
r27037 | if fco.isabsent(): | ||
# local changed, remote deleted -- 'deleted' picked | ||||
repo.wvfs.unlinkpath(fcd.path()) | ||||
deleted = True | ||||
else: | ||||
repo.wwrite(fcd.path(), fco.data(), fco.flags()) | ||||
deleted = False | ||||
return 0, deleted | ||||
|
r16125 | |||
|
r26526 | @internaltool('fail', nomerge) | ||
|
r29774 | def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None): | ||
|
r16127 | """ | ||
|
r16126 | Rather than attempting to merge files that were modified on both | ||
branches, it marks them as unresolved. The resolve command must be | ||||
used to resolve these conflicts.""" | ||||
|
r27123 | # for change/delete conflicts write out the changed version, then fail | ||
if fcd.isabsent(): | ||||
repo.wwrite(fcd.path(), fco.data(), fco.flags()) | ||||
|
r27032 | return 1, False | ||
|
r16125 | |||
|
r27041 | def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): | ||
|
r16125 | tool, toolpath, binary, symlink = toolconf | ||
|
r27041 | if symlink or fcd.isabsent() or fco.isabsent(): | ||
|
r18257 | return 1 | ||
|
r16125 | a, b, c, back = files | ||
ui = repo.ui | ||||
|
r22032 | validkeep = ['keep', 'keep-merge3'] | ||
|
r22031 | |||
|
r16125 | # do we attempt to simplemerge first? | ||
try: | ||||
|
r18257 | premerge = _toolbool(ui, tool, "premerge", not binary) | ||
|
r16125 | except error.ConfigError: | ||
premerge = _toolstr(ui, tool, "premerge").lower() | ||||
|
r22031 | if premerge not in validkeep: | ||
_valid = ', '.join(["'" + v + "'" for v in validkeep]) | ||||
|
r16125 | raise error.ConfigError(_("%s.premerge not valid " | ||
"('%s' is neither boolean nor %s)") % | ||||
(tool, premerge, _valid)) | ||||
if premerge: | ||||
|
r22032 | if premerge == 'keep-merge3': | ||
if not labels: | ||||
labels = _defaultconflictlabels | ||||
if len(labels) < 3: | ||||
labels.append('base') | ||||
|
r22023 | r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels) | ||
|
r16125 | if not r: | ||
ui.debug(" premerge successful\n") | ||||
return 0 | ||||
|
r22031 | if premerge not in validkeep: | ||
|
r16125 | util.copyfile(back, a) # restore from backup and try again | ||
return 1 # continue merging | ||||
|
r26948 | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | ||
|
r26515 | tool, toolpath, binary, symlink = toolconf | ||
if symlink: | ||||
|
r26518 | repo.ui.warn(_('warning: internal %s cannot merge symlinks ' | ||
'for %s\n') % (tool, fcd.path())) | ||||
|
r26515 | return False | ||
|
r27040 | if fcd.isabsent() or fco.isabsent(): | ||
repo.ui.warn(_('warning: internal %s cannot merge change/delete ' | ||||
'conflict for %s\n') % (tool, fcd.path())) | ||||
return False | ||||
|
r26515 | return True | ||
|
r26070 | def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode): | ||
|
r16127 | """ | ||
|
r16126 | Uses the internal non-interactive simple merge algorithm for merging | ||
files. It will fail if there are any conflicts and leave markers in | ||||
|
r22027 | the partially merged file. Markers will have two sections, one for each side | ||
|
r26070 | of merge, unless mode equals 'union' which suppresses the markers.""" | ||
|
r26572 | a, b, c, back = files | ||
|
r16125 | |||
|
r26572 | ui = repo.ui | ||
|
r16125 | |||
|
r26572 | r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode) | ||
|
r27033 | return True, r, False | ||
|
r16125 | |||
|
r26526 | @internaltool('union', fullmerge, | ||
|
r26614 | _("warning: conflicts while merging %s! " | ||
"(edit, then use 'hg resolve --mark')\n"), | ||||
|
r26948 | precheck=_mergecheck) | ||
|
r26071 | def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
""" | ||||
Uses the internal non-interactive simple merge algorithm for merging | ||||
files. It will use both left and right sides for conflict regions. | ||||
No markers are inserted.""" | ||||
return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, | ||||
files, labels, 'union') | ||||
|
r26526 | @internaltool('merge', fullmerge, | ||
|
r26614 | _("warning: conflicts while merging %s! " | ||
"(edit, then use 'hg resolve --mark')\n"), | ||||
|
r26948 | precheck=_mergecheck) | ||
|
r26070 | def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
""" | ||||
Uses the internal non-interactive simple merge algorithm for merging | ||||
files. It will fail if there are any conflicts and leave markers in | ||||
the partially merged file. Markers will have two sections, one for each side | ||||
of merge.""" | ||||
return _merge(repo, mynode, orig, fcd, fco, fca, toolconf, | ||||
files, labels, 'merge') | ||||
|
r26526 | @internaltool('merge3', fullmerge, | ||
|
r26614 | _("warning: conflicts while merging %s! " | ||
"(edit, then use 'hg resolve --mark')\n"), | ||||
|
r26948 | precheck=_mergecheck) | ||
|
r22028 | def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
""" | ||||
Uses the internal non-interactive simple merge algorithm for merging | ||||
files. It will fail if there are any conflicts and leave markers in | ||||
the partially merged file. Marker will have three sections, one from each | ||||
side of the merge and one for the base content.""" | ||||
if not labels: | ||||
labels = _defaultconflictlabels | ||||
if len(labels) < 3: | ||||
labels.append('base') | ||||
return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels) | ||||
|
r26224 | def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files, | ||
labels=None, localorother=None): | ||||
""" | ||||
Generic driver for _imergelocal and _imergeother | ||||
""" | ||||
assert localorother is not None | ||||
tool, toolpath, binary, symlink = toolconf | ||||
a, b, c, back = files | ||||
r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels, | ||||
localorother=localorother) | ||||
return True, r | ||||
|
r26948 | @internaltool('merge-local', mergeonly, precheck=_mergecheck) | ||
|
r26224 | def _imergelocal(*args, **kwargs): | ||
""" | ||||
Like :merge, but resolve all conflicts non-interactively in favor | ||||
|
r28640 | of the local `p1()` changes.""" | ||
|
r26224 | success, status = _imergeauto(localorother='local', *args, **kwargs) | ||
|
r27033 | return success, status, False | ||
|
r26224 | |||
|
r26948 | @internaltool('merge-other', mergeonly, precheck=_mergecheck) | ||
|
r26224 | def _imergeother(*args, **kwargs): | ||
""" | ||||
Like :merge, but resolve all conflicts non-interactively in favor | ||||
|
r28640 | of the other `p2()` changes.""" | ||
|
r26224 | success, status = _imergeauto(localorother='other', *args, **kwargs) | ||
|
r27033 | return success, status, False | ||
|
r26224 | |||
|
r26526 | @internaltool('tagmerge', mergeonly, | ||
|
r21922 | _("automatic tag merging of %s failed! " | ||
|
r22707 | "(use 'hg resolve --tool :merge' or another merge " | ||
|
r21922 | "tool of your choice)\n")) | ||
def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||||
""" | ||||
Uses the internal tag merge algorithm (experimental). | ||||
""" | ||||
|
r27033 | success, status = tagmerge.merge(repo, fcd, fco, fca) | ||
return success, status, False | ||||
|
r21922 | |||
|
r26526 | @internaltool('dump', fullmerge) | ||
|
r21273 | def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
|
r16127 | """ | ||
|
r16126 | Creates three versions of the files to merge, containing the | ||
contents of local, other and base. These files can then be used to | ||||
perform a merge manually. If the file to be merged is named | ||||
``a.txt``, these files will accordingly be named ``a.txt.local``, | ||||
``a.txt.other`` and ``a.txt.base`` and they will be placed in the | ||||
same directory as ``a.txt``.""" | ||||
|
r26573 | a, b, c, back = files | ||
fd = fcd.path() | ||||
|
r16125 | |||
|
r26573 | util.copyfile(a, a + ".local") | ||
repo.wwrite(fd + ".other", fco.data(), fco.flags()) | ||||
repo.wwrite(fd + ".base", fca.data(), fca.flags()) | ||||
|
r27033 | return False, 1, False | ||
|
r16125 | |||
|
r21273 | def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
|
r26574 | tool, toolpath, binary, symlink = toolconf | ||
|
r27042 | if fcd.isabsent() or fco.isabsent(): | ||
repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' | ||||
'for %s\n') % (tool, fcd.path())) | ||||
return False, 1, None | ||||
|
r26574 | a, b, c, back = files | ||
out = "" | ||||
env = {'HG_FILE': fcd.path(), | ||||
'HG_MY_NODE': short(mynode), | ||||
'HG_OTHER_NODE': str(fco.changectx()), | ||||
'HG_BASE_NODE': str(fca.changectx()), | ||||
'HG_MY_ISLINK': 'l' in fcd.flags(), | ||||
'HG_OTHER_ISLINK': 'l' in fco.flags(), | ||||
'HG_BASE_ISLINK': 'l' in fca.flags(), | ||||
} | ||||
|
r16125 | |||
|
r26574 | ui = repo.ui | ||
|
r16125 | |||
|
r26574 | args = _toolstr(ui, tool, "args", '$local $base $other') | ||
if "$output" in args: | ||||
out, a = a, back # read input from backup, write to original | ||||
replace = {'local': a, 'base': b, 'other': c, 'output': out} | ||||
args = util.interpolate(r'\$', replace, args, | ||||
lambda s: util.shellquote(util.localpath(s))) | ||||
cmd = toolpath + ' ' + args | ||||
repo.ui.debug('launching merge tool: %s\n' % cmd) | ||||
r = ui.system(cmd, cwd=repo.root, environ=env) | ||||
repo.ui.debug('merge tool returned: %s\n' % r) | ||||
|
r27033 | return True, r, False | ||
|
r16125 | |||
|
r21519 | def _formatconflictmarker(repo, ctx, template, label, pad): | ||
"""Applies the given template to the ctx, prefixed by the label. | ||||
Pad is the minimum width of the label prefix, so that multiple markers | ||||
can have aligned templated parts. | ||||
""" | ||||
if ctx.node() is None: | ||||
ctx = ctx.p1() | ||||
props = templatekw.keywords.copy() | ||||
props['templ'] = template | ||||
props['ctx'] = ctx | ||||
props['repo'] = repo | ||||
templateresult = template('conflictmarker', **props) | ||||
label = ('%s:' % label).ljust(pad + 1) | ||||
mark = '%s %s' % (label, templater.stringify(templateresult)) | ||||
|
r21864 | if mark: | ||
mark = mark.splitlines()[0] # split for safety | ||||
|
r21865 | # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') | ||
return util.ellipsis(mark, 80 - 8) | ||||
|
r21519 | |||
|
r29660 | _defaultconflictmarker = ('{node|short} ' | ||
'{ifeq(tags, "tip", "", "{tags} ")}' | ||||
'{if(bookmarks, "{bookmarks} ")}' | ||||
'{ifeq(branch, "default", "", "{branch} ")}' | ||||
'- {author|user}: {desc|firstline}') | ||||
|
r21519 | |||
|
r21524 | _defaultconflictlabels = ['local', 'other'] | ||
|
r22026 | def _formatlabels(repo, fcd, fco, fca, labels): | ||
|
r21519 | """Formats the given labels using the conflict marker template. | ||
Returns a list of formatted labels. | ||||
""" | ||||
cd = fcd.changectx() | ||||
co = fco.changectx() | ||||
|
r22026 | ca = fca.changectx() | ||
|
r21519 | |||
ui = repo.ui | ||||
template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker) | ||||
|
r28955 | tmpl = formatter.maketemplater(ui, 'conflictmarker', template) | ||
|
r21519 | |||
|
r22026 | pad = max(len(l) for l in labels) | ||
|
r21519 | |||
|
r22026 | newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad), | ||
_formatconflictmarker(repo, co, tmpl, labels[1], pad)] | ||||
if len(labels) > 2: | ||||
newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad)) | ||||
return newlabels | ||||
|
r21519 | |||
|
r29774 | def partextras(labels): | ||
"""Return a dictionary of extra labels for use in prompts to the user | ||||
Intended use is in strings of the form "(l)ocal%(l)s". | ||||
""" | ||||
if labels is None: | ||||
return { | ||||
"l": "", | ||||
"o": "", | ||||
} | ||||
return { | ||||
"l": " [%s]" % labels[0], | ||||
"o": " [%s]" % labels[1], | ||||
} | ||||
|
r26607 | def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None): | ||
|
r6003 | """perform a 3-way merge in the working directory | ||
|
r26607 | premerge = whether this is a premerge | ||
|
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 | ||||
|
r26606 | |||
|
r27034 | Returns whether the merge is complete, the return value of the merge, and | ||
a boolean indicating whether the file was deleted from disk.""" | ||||
|
r6003 | |||
|
r26608 | 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 | ||||
|
r26512 | |||
|
r26608 | if not fco.cmp(fcd): # files identical? | ||
|
r27034 | return True, None, False | ||
|
r26512 | |||
|
r26608 | ui = repo.ui | ||
fd = fcd.path() | ||||
binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() | ||||
symlink = 'l' in fcd.flags() + fco.flags() | ||||
|
r27039 | changedelete = fcd.isabsent() or fco.isabsent() | ||
tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) | ||||
|
r26608 | if tool in internals and tool.startswith('internal:'): | ||
# normalize to new-style names (':merge' etc) | ||||
tool = tool[len('internal'):] | ||||
|
r27161 | ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" | ||
% (tool, fd, binary, symlink, changedelete)) | ||||
|
r6003 | |||
|
r26608 | if tool in internals: | ||
func = internals[tool] | ||||
mergetype = func.mergetype | ||||
onfailure = func.onfailure | ||||
precheck = func.precheck | ||||
else: | ||||
func = _xmerge | ||||
mergetype = fullmerge | ||||
onfailure = _("merging %s failed!\n") | ||||
precheck = None | ||||
|
r26512 | |||
|
r26608 | toolconf = tool, toolpath, binary, symlink | ||
|
r6003 | |||
|
r26608 | if mergetype == nomerge: | ||
|
r29774 | r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | ||
|
r27034 | return True, r, deleted | ||
|
r26512 | |||
|
r26609 | if premerge: | ||
if orig != fco.path(): | ||||
ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd)) | ||||
else: | ||||
ui.status(_("merging %s\n") % fd) | ||||
|
r26528 | |||
|
r26608 | ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ||
|
r26528 | |||
|
r26608 | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, | ||
toolconf): | ||||
if onfailure: | ||||
ui.warn(onfailure % fd) | ||||
|
r27034 | return True, 1, False | ||
|
r26529 | |||
|
r26608 | a = repo.wjoin(fd) | ||
b = temp("base", fca) | ||||
c = temp("other", fco) | ||||
|
r27047 | if not fcd.isabsent(): | ||
|
r27651 | back = scmutil.origpath(ui, repo, a) | ||
|
r27047 | if premerge: | ||
util.copyfile(a, back) | ||||
else: | ||||
back = None | ||||
|
r26608 | files = (a, b, c, back) | ||
|
r26512 | |||
|
r26589 | r = 1 | ||
try: | ||||
|
r26529 | markerstyle = ui.config('ui', 'mergemarkers', 'basic') | ||
if not labels: | ||||
labels = _defaultconflictlabels | ||||
if markerstyle != 'basic': | ||||
labels = _formatlabels(repo, fcd, fco, fca, labels) | ||||
|
r6004 | |||
|
r26607 | if premerge and mergetype == fullmerge: | ||
|
r27041 | r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels) | ||
|
r26611 | # complete if premerge successful (r is 0) | ||
|
r27034 | return not r, r, False | ||
|
r26567 | |||
|
r27033 | needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca, | ||
toolconf, files, labels=labels) | ||||
|
r26575 | if needcheck: | ||
r = _check(r, ui, tool, fcd, files) | ||||
|
r21519 | |||
|
r16125 | if r: | ||
if onfailure: | ||||
ui.warn(onfailure % fd) | ||||
|
r26589 | |||
|
r27034 | return True, r, deleted | ||
|
r26589 | finally: | ||
|
r27047 | if not r and back is not None: | ||
|
r21100 | util.unlink(back) | ||
util.unlink(b) | ||||
util.unlink(c) | ||||
|
r6004 | |||
|
r26575 | def _check(r, ui, tool, fcd, files): | ||
fd = fcd.path() | ||||
a, b, c, back = files | ||||
if not r and (_toolbool(ui, tool, "checkconflicts") or | ||||
'conflicts' in _toollist(ui, tool, "check")): | ||||
if re.search("^(<<<<<<< .*|=======|>>>>>>> .*)$", fcd.data(), | ||||
re.MULTILINE): | ||||
r = 1 | ||||
checked = False | ||||
if 'prompt' in _toollist(ui, tool, "check"): | ||||
checked = True | ||||
if ui.promptchoice(_("was merge of '%s' successful (yn)?" | ||||
"$$ &Yes $$ &No") % fd, 1): | ||||
r = 1 | ||||
if not r and not checked and (_toolbool(ui, tool, "checkchanged") or | ||||
'changed' in | ||||
_toollist(ui, tool, "check")): | ||||
|
r27047 | if back is not None and filecmp.cmp(a, back): | ||
|
r26575 | if ui.promptchoice(_(" output file %s appears unchanged\n" | ||
"was merge successful (yn)?" | ||||
"$$ &Yes $$ &No") % fd, 1): | ||||
r = 1 | ||||
|
r27047 | if back is not None and _toolbool(ui, tool, "fixeol"): | ||
|
r26575 | _matcheol(a, back) | ||
return r | ||||
|
r26607 | def premerge(repo, mynode, orig, fcd, fco, fca, labels=None): | ||
return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels) | ||||
|
r26605 | def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None): | ||
|
r26611 | return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels) | ||
|
r26605 | |||
|
r16126 | # tell hggettext to extract docstrings from these functions: | ||
i18nfunctions = internals.values() | ||||