filemerge.py
1324 lines
| 42.6 KiB
| text/x-python
|
PythonLexer
/ mercurial / filemerge.py
|
r6003 | # filemerge.py - file-level merge handling for Mercurial | ||
# | ||||
|
r47575 | # Copyright 2006, 2007, 2008 Olivia Mackall <olivia@selenic.com> | ||
|
r6003 | # | ||
|
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 | ||
|
r37016 | import contextlib | ||
|
r25949 | import os | ||
import re | ||||
|
r37017 | import shutil | ||
|
r25949 | |||
from .i18n import _ | ||||
|
r40512 | from .node import ( | ||
hex, | ||||
short, | ||||
) | ||||
|
r43359 | from .pycompat import ( | ||
getattr, | ||||
open, | ||||
) | ||||
|
r25949 | |||
from . import ( | ||||
|
r30636 | encoding, | ||
|
r25949 | error, | ||
|
r28955 | formatter, | ||
|
r25949 | match, | ||
|
r30073 | pycompat, | ||
|
r33663 | registrar, | ||
|
r27651 | scmutil, | ||
|
r25949 | simplemerge, | ||
tagmerge, | ||||
templatekw, | ||||
templater, | ||||
|
r40512 | templateutil, | ||
|
r25949 | util, | ||
) | ||||
|
r6004 | |||
|
r37102 | from .utils import ( | ||
|
r37138 | procutil, | ||
|
r37102 | stringutil, | ||
) | ||||
|
r43346 | |||
|
r34827 | def _toolstr(ui, tool, part, *args): | ||
|
r43347 | return ui.config(b"merge-tools", tool + b"." + part, *args) | ||
|
r6004 | |||
|
r43346 | |||
def _toolbool(ui, tool, part, *args): | ||||
|
r43347 | return ui.configbool(b"merge-tools", tool + b"." + part, *args) | ||
|
r6004 | |||
|
r43346 | |||
|
r34827 | def _toollist(ui, tool, part): | ||
|
r43347 | return ui.configlist(b"merge-tools", tool + b"." + part) | ||
|
r11148 | |||
|
r43346 | |||
|
r16126 | internals = {} | ||
|
r24099 | # Merge tools to document. | ||
internalsdoc = {} | ||||
|
r16125 | |||
|
r33663 | internaltool = registrar.internalmerge() | ||
|
r26525 | # internal tool merge types | ||
|
r33663 | nomerge = internaltool.nomerge | ||
|
r43346 | mergeonly = internaltool.mergeonly # just the full merge, no premerge | ||
fullmerge = internaltool.fullmerge # both premerge and merge | ||||
|
r26525 | |||
|
r42765 | # IMPORTANT: keep the last line of this prompt very short ("What do you want to | ||
# do?") because of issue6158, ideally to <40 English characters (to allow other | ||||
# languages that may take more columns to still have a chance to fit in an | ||||
# 80-column screen). | ||||
|
r32318 | _localchangedotherdeletedmsg = _( | ||
|
r43347 | b"file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n" | ||
b"You can use (c)hanged version, (d)elete, or leave (u)nresolved.\n" | ||||
b"What do you want to do?" | ||||
b"$$ &Changed $$ &Delete $$ &Unresolved" | ||||
|
r43346 | ) | ||
|
r32318 | |||
_otherchangedlocaldeletedmsg = _( | ||||
|
r43347 | b"file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n" | ||
b"You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.\n" | ||||
b"What do you want to do?" | ||||
b"$$ &Changed $$ &Deleted $$ &Unresolved" | ||||
|
r43346 | ) | ||
|
r32318 | |||
|
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.""" | ||||
|
r43346 | |||
|
r26979 | def __init__(self, ctx, f): | ||
self._ctx = ctx | ||||
self._f = f | ||||
|
r45408 | def __bytes__(self): | ||
return b'absent file %s@%s' % (self._f, self._ctx) | ||||
|
r26979 | def path(self): | ||
return self._f | ||||
def size(self): | ||||
return None | ||||
def data(self): | ||||
return None | ||||
def filenode(self): | ||||
|
r47771 | return self._ctx.repo().nullid | ||
|
r26979 | |||
_customcmp = True | ||||
|
r43346 | |||
|
r26979 | def cmp(self, fctx): | ||
"""compare with other file context | ||||
returns True if different from fctx. | ||||
""" | ||||
|
r43346 | return not ( | ||
fctx.isabsent() | ||||
|
r44305 | and fctx.changectx() == self.changectx() | ||
|
r43346 | and fctx.path() == self.path() | ||
) | ||||
|
r26979 | |||
def flags(self): | ||||
|
r43347 | return b'' | ||
|
r26979 | |||
def changectx(self): | ||||
return self._ctx | ||||
def isbinary(self): | ||||
return False | ||||
def isabsent(self): | ||||
return True | ||||
|
r43346 | |||
|
r6004 | def _findtool(ui, tool): | ||
|
r16126 | if tool in internals: | ||
|
r6522 | return tool | ||
|
r43347 | cmd = _toolstr(ui, tool, b"executable", tool) | ||
if cmd.startswith(b'python:'): | ||||
|
r38052 | return cmd | ||
|
r23148 | return findexternaltool(ui, tool) | ||
|
r43346 | |||
|
r38052 | def _quotetoolpath(cmd): | ||
|
r43347 | if cmd.startswith(b'python:'): | ||
|
r38052 | return cmd | ||
return procutil.shellquote(cmd) | ||||
|
r43346 | |||
|
r23148 | def findexternaltool(ui, tool): | ||
|
r43347 | for kn in (b"regkey", b"regkeyalt"): | ||
|
r13565 | k = _toolstr(ui, tool, kn) | ||
if not k: | ||||
continue | ||||
|
r43347 | p = util.lookupreg(k, _toolstr(ui, tool, b"regname")) | ||
|
r6006 | if p: | ||
|
r43347 | p = procutil.findexe(p + _toolstr(ui, tool, b"regappend", b"")) | ||
|
r6006 | if p: | ||
return p | ||||
|
r43347 | exe = _toolstr(ui, tool, b"executable", tool) | ||
|
r37138 | return procutil.findexe(util.expandpath(exe)) | ||
|
r6004 | |||
|
r43346 | |||
|
r27039 | def _picktool(repo, ui, path, binary, symlink, changedelete): | ||
|
r43347 | strictcheck = ui.configbool(b'merge', b'strict-capability-check') | ||
|
r39161 | |||
|
r39159 | def hascapability(tool, capability, strict=False): | ||
|
r39302 | if tool in internals: | ||
return strict and internals[tool].capabilities.get(capability) | ||||
|
r39159 | return _toolbool(ui, tool, capability) | ||
|
r27039 | def supportscd(tool): | ||
return tool in internals and internals[tool].mergetype == nomerge | ||||
def check(tool, pat, symlink, binary, changedelete): | ||||
|
r6004 | tmsg = tool | ||
if pat: | ||||
|
r43347 | tmsg = _(b"%s (for pattern %s)") % (tool, pat) | ||
|
r7397 | if not _findtool(ui, tool): | ||
|
r43346 | if pat: # explicitly requested tool deserves a warning | ||
|
r43347 | ui.warn(_(b"couldn't find merge tool %s\n") % tmsg) | ||
|
r43346 | else: # configured but non-existing tools are more silent | ||
|
r43347 | ui.note(_(b"couldn't find merge tool %s\n") % tmsg) | ||
elif symlink and not hascapability(tool, b"symlink", strictcheck): | ||||
ui.warn(_(b"tool %s can't handle symlinks\n") % tmsg) | ||||
elif binary and not hascapability(tool, b"binary", strictcheck): | ||||
ui.warn(_(b"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 | ||||
|
r43347 | elif not procutil.gui() and _toolbool(ui, tool, b"gui"): | ||
ui.warn(_(b"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 | ||
|
r43347 | force = ui.config(b'ui', b'forcemerge') | ||
|
r12788 | if force: | ||
toolpath = _findtool(ui, force) | ||||
|
r27039 | if changedelete and not supportscd(toolpath): | ||
|
r43347 | return b":prompt", None | ||
|
r12788 | else: | ||
|
r27039 | if toolpath: | ||
|
r38052 | return (force, _quotetoolpath(toolpath)) | ||
|
r27039 | else: | ||
# mimic HGMERGE if given tool not found | ||||
return (force, force) | ||||
|
r12788 | |||
# HGMERGE takes next precedence | ||||
|
r43347 | hgmerge = encoding.environ.get(b"HGMERGE") | ||
|
r6025 | if hgmerge: | ||
|
r27039 | if changedelete and not supportscd(hgmerge): | ||
|
r43347 | return b":prompt", None | ||
|
r27039 | else: | ||
return (hgmerge, hgmerge) | ||||
|
r6004 | |||
# then patterns | ||||
|
r39161 | |||
# whether binary capability should be checked strictly | ||||
binarycap = binary and strictcheck | ||||
|
r43347 | for pat, tool in ui.configitems(b"merge-patterns"): | ||
mf = match.match(repo.root, b'', [pat]) | ||||
|
r39161 | if mf(path) and check(tool, pat, symlink, binarycap, changedelete): | ||
|
r43347 | if binary and not hascapability(tool, b"binary", strict=True): | ||
|
r43346 | ui.warn( | ||
_( | ||||
|
r43347 | b"warning: check merge-patterns configurations," | ||
b" if %r for binary file %r is unintentional\n" | ||||
b"(see 'hg help merge-tools'" | ||||
b" for binary files capability)\n" | ||||
|
r43346 | ) | ||
% (pycompat.bytestr(tool), pycompat.bytestr(path)) | ||||
) | ||||
|
r10339 | toolpath = _findtool(ui, tool) | ||
|
r38052 | return (tool, _quotetoolpath(toolpath)) | ||
|
r6004 | |||
# then merge tools | ||||
tools = {} | ||||
|
r26730 | disabled = set() | ||
|
r43347 | for k, v in ui.configitems(b"merge-tools"): | ||
t = k.split(b'.')[0] | ||||
|
r6004 | if t not in tools: | ||
|
r43347 | tools[t] = int(_toolstr(ui, t, b"priority")) | ||
if _toolbool(ui, t, b"disabled"): | ||||
|
r26730 | disabled.add(t) | ||
|
r6076 | names = tools.keys() | ||
|
r43346 | tools = sorted( | ||
[(-p, tool) for tool, p in tools.items() if tool not in disabled] | ||||
) | ||||
|
r43347 | uimerge = ui.config(b"ui", b"merge") | ||
|
r6076 | if uimerge: | ||
|
r27039 | # external tools defined in uimerge won't be able to handle | ||
# change/delete conflicts | ||||
|
r38987 | if check(uimerge, path, symlink, binary, changedelete): | ||
if uimerge not in names and not changedelete: | ||||
return (uimerge, uimerge) | ||||
|
r43346 | tools.insert(0, (None, uimerge)) # highest priority | ||
|
r43347 | tools.append((None, b"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) | ||
|
r38052 | return (t, _quotetoolpath(toolpath)) | ||
|
r16254 | |||
# internal merge or prompt as last resort | ||||
|
r27039 | if symlink or binary or changedelete: | ||
|
r32253 | if not changedelete and len(tools): | ||
# any tool is rejected by capability for symlink or binary | ||||
|
r43347 | ui.warn(_(b"no tool found to merge %s\n") % path) | ||
return b":prompt", None | ||||
return b":merge", None | ||||
|
r6003 | |||
|
r43346 | |||
|
r6005 | def _eoltype(data): | ||
|
r44226 | """Guess the EOL type of a file""" | ||
|
r43347 | if b'\0' in data: # binary | ||
|
r6005 | return None | ||
|
r43347 | if b'\r\n' in data: # Windows | ||
return b'\r\n' | ||||
if b'\r' in data: # Old Mac | ||||
return b'\r' | ||||
if b'\n' in data: # UNIX | ||||
return b'\n' | ||||
|
r43346 | return None # unknown | ||
|
r6005 | |||
|
r34783 | def _matcheol(file, back): | ||
|
r44226 | """Convert EOL markers in a file to match origfile""" | ||
|
r43346 | tostyle = _eoltype(back.data()) # No repo.wread filters? | ||
|
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 | |||
|
r43346 | |||
|
r43347 | @internaltool(b'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() | ||||
|
r41651 | uipathfn = scmutil.getuipathfn(repo) | ||
|
r16125 | |||
|
r35283 | # Avoid prompting during an in-memory merge since it doesn't support merge | ||
# conflicts. | ||||
if fcd.changectx().isinmemory(): | ||||
|
r43346 | raise error.InMemoryMergeConflictsError( | ||
|
r43387 | b'in-memory merge does not support file conflicts' | ||
|
r43346 | ) | ||
|
r35283 | |||
|
r29774 | prompts = partextras(labels) | ||
|
r43347 | prompts[b'fd'] = uipathfn(fd) | ||
|
r26898 | try: | ||
|
r27038 | if fco.isabsent(): | ||
|
r43346 | index = ui.promptchoice(_localchangedotherdeletedmsg % prompts, 2) | ||
|
r43347 | choice = [b'local', b'other', b'unresolved'][index] | ||
|
r27038 | elif fcd.isabsent(): | ||
|
r43346 | index = ui.promptchoice(_otherchangedlocaldeletedmsg % prompts, 2) | ||
|
r43347 | choice = [b'other', b'local', b'unresolved'][index] | ||
|
r27038 | else: | ||
|
r42765 | # IMPORTANT: keep the last line of this prompt ("What do you want to | ||
# do?") very short, see comment next to _localchangedotherdeletedmsg | ||||
# at the top of the file for details. | ||||
|
r27162 | index = ui.promptchoice( | ||
|
r43346 | _( | ||
|
r43347 | b"file '%(fd)s' needs to be resolved.\n" | ||
b"You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave " | ||||
b"(u)nresolved.\n" | ||||
b"What do you want to do?" | ||||
b"$$ &Local $$ &Other $$ &Unresolved" | ||||
|
r43346 | ) | ||
% prompts, | ||||
2, | ||||
) | ||||
|
r43347 | choice = [b'local', b'other', b'unresolved'][index] | ||
|
r26851 | |||
|
r43347 | if choice == b'other': | ||
|
r43346 | return _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | ||
|
r43347 | elif choice == b'local': | ||
|
r43346 | return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | ||
|
r43347 | elif choice == b'unresolved': | ||
|
r43346 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | ||
|
r26898 | except error.ResponseExpected: | ||
|
r43347 | ui.write(b"\n") | ||
|
r43346 | return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels) | ||
|
r16125 | |||
|
r43347 | @internaltool(b'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 | |||
|
r43346 | |||
|
r43347 | @internaltool(b'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 | ||||
|
r33152 | _underlyingfctxifabsent(fcd).remove() | ||
|
r27037 | deleted = True | ||
else: | ||||
|
r33152 | _underlyingfctxifabsent(fcd).write(fco.data(), fco.flags()) | ||
|
r27037 | deleted = False | ||
return 0, deleted | ||||
|
r16125 | |||
|
r43346 | |||
|
r43347 | @internaltool(b'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(): | ||||
|
r33152 | _underlyingfctxifabsent(fcd).write(fco.data(), fco.flags()) | ||
|
r27032 | return 1, False | ||
|
r16125 | |||
|
r43346 | |||
|
r33152 | def _underlyingfctxifabsent(filectx): | ||
"""Sometimes when resolving, our fcd is actually an absentfilectx, but | ||||
we want to write to it (to do the resolve). This helper returns the | ||||
underyling workingfilectx in that case. | ||||
""" | ||||
if filectx.isabsent(): | ||||
return filectx.changectx()[filectx.path()] | ||||
else: | ||||
return filectx | ||||
|
r43346 | |||
|
r27041 | def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None): | ||
|
r38052 | tool, toolpath, binary, symlink, scriptfn = toolconf | ||
|
r27041 | if symlink or fcd.isabsent() or fco.isabsent(): | ||
|
r18257 | return 1 | ||
|
r34034 | unused, unused, unused, back = files | ||
|
r16125 | |||
ui = repo.ui | ||||
|
r46755 | validkeep = [b'keep', b'keep-merge3', b'keep-mergediff'] | ||
|
r22031 | |||
|
r16125 | # do we attempt to simplemerge first? | ||
try: | ||||
|
r43347 | premerge = _toolbool(ui, tool, b"premerge", not binary) | ||
|
r16125 | except error.ConfigError: | ||
|
r43347 | premerge = _toolstr(ui, tool, b"premerge", b"").lower() | ||
|
r22031 | if premerge not in validkeep: | ||
|
r43347 | _valid = b', '.join([b"'" + v + b"'" for v in validkeep]) | ||
|
r43346 | raise error.ConfigError( | ||
|
r43387 | _(b"%s.premerge not valid ('%s' is neither boolean nor %s)") | ||
|
r43346 | % (tool, premerge, _valid) | ||
) | ||||
|
r16125 | |||
if premerge: | ||||
|
r46755 | mode = b'merge' | ||
if premerge in {b'keep-merge3', b'keep-mergediff'}: | ||||
|
r22032 | if not labels: | ||
labels = _defaultconflictlabels | ||||
if len(labels) < 3: | ||||
|
r43347 | labels.append(b'base') | ||
|
r46755 | if premerge == b'keep-mergediff': | ||
mode = b'mergediff' | ||||
r = simplemerge.simplemerge( | ||||
ui, fcd, fca, fco, quiet=True, label=labels, mode=mode | ||||
) | ||||
|
r16125 | if not r: | ||
|
r43347 | ui.debug(b" premerge successful\n") | ||
|
r16125 | return 0 | ||
|
r22031 | if premerge not in validkeep: | ||
|
r34034 | # restore from backup and try again | ||
|
r34038 | _restorebackup(fcd, back) | ||
|
r43346 | return 1 # continue merging | ||
|
r16125 | |||
|
r26948 | def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf): | ||
|
r38052 | tool, toolpath, binary, symlink, scriptfn = toolconf | ||
|
r41651 | uipathfn = scmutil.getuipathfn(repo) | ||
|
r26515 | if symlink: | ||
|
r43346 | repo.ui.warn( | ||
|
r43387 | _(b'warning: internal %s cannot merge symlinks for %s\n') | ||
|
r43346 | % (tool, uipathfn(fcd.path())) | ||
) | ||||
|
r26515 | return False | ||
|
r27040 | if fcd.isabsent() or fco.isabsent(): | ||
|
r43346 | repo.ui.warn( | ||
_( | ||||
|
r43347 | b'warning: internal %s cannot merge change/delete ' | ||
b'conflict for %s\n' | ||||
|
r43346 | ) | ||
% (tool, uipathfn(fcd.path())) | ||||
) | ||||
|
r27040 | return False | ||
|
r26515 | return True | ||
|
r43346 | |||
|
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 | ui = repo.ui | ||
|
r16125 | |||
|
r34051 | r = simplemerge.simplemerge(ui, fcd, fca, fco, label=labels, mode=mode) | ||
|
r27033 | return True, r, False | ||
|
r16125 | |||
|
r43346 | |||
@internaltool( | ||||
|
r43347 | b'union', | ||
|
r43346 | fullmerge, | ||
_( | ||||
|
r43347 | b"warning: conflicts while merging %s! " | ||
b"(edit, then use 'hg resolve --mark')\n" | ||||
|
r43346 | ), | ||
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.""" | ||||
|
r43346 | return _merge( | ||
|
r43347 | repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, b'union' | ||
|
r43346 | ) | ||
|
r26071 | |||
|
r43346 | @internaltool( | ||
|
r43347 | b'merge', | ||
|
r43346 | fullmerge, | ||
_( | ||||
|
r43347 | b"warning: conflicts while merging %s! " | ||
b"(edit, then use 'hg resolve --mark')\n" | ||||
|
r43346 | ), | ||
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.""" | ||||
|
r43346 | return _merge( | ||
|
r43347 | repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, b'merge' | ||
|
r43346 | ) | ||
|
r26070 | |||
|
r43346 | @internaltool( | ||
|
r43347 | b'merge3', | ||
|
r43346 | fullmerge, | ||
_( | ||||
|
r43347 | b"warning: conflicts while merging %s! " | ||
b"(edit, then use 'hg resolve --mark')\n" | ||||
|
r43346 | ), | ||
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: | ||||
|
r43347 | labels.append(b'base') | ||
|
r22028 | return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels) | ||
|
r43346 | |||
|
r46724 | @internaltool( | ||
|
r47072 | b'merge3-lie-about-conflicts', | ||
fullmerge, | ||||
b'', | ||||
precheck=_mergecheck, | ||||
) | ||||
def _imerge3alwaysgood(*args, **kwargs): | ||||
# Like merge3, but record conflicts as resolved with markers in place. | ||||
# | ||||
|
r47246 | # This is used for `diff.merge` to show the differences between | ||
|
r47072 | # the auto-merge state and the committed merge state. It may be | ||
# useful for other things. | ||||
b1, junk, b2 = _imerge3(*args, **kwargs) | ||||
# TODO is this right? I'm not sure what these return values mean, | ||||
# but as far as I can tell this will indicate to callers tha the | ||||
# merge succeeded. | ||||
return b1, False, b2 | ||||
@internaltool( | ||||
|
r46724 | b'mergediff', | ||
fullmerge, | ||||
_( | ||||
b"warning: conflicts while merging %s! " | ||||
b"(edit, then use 'hg resolve --mark')\n" | ||||
), | ||||
precheck=_mergecheck, | ||||
) | ||||
def _imerge_diff( | ||||
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. The marker will have two sections, one with the | ||||
content from one side of the merge, and one with a diff from the base | ||||
content to the content on the other side. (experimental)""" | ||||
if not labels: | ||||
labels = _defaultconflictlabels | ||||
if len(labels) < 3: | ||||
labels.append(b'base') | ||||
return _merge( | ||||
repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, b'mergediff' | ||||
) | ||||
|
r43346 | def _imergeauto( | ||
repo, | ||||
mynode, | ||||
orig, | ||||
fcd, | ||||
fco, | ||||
fca, | ||||
toolconf, | ||||
files, | ||||
labels=None, | ||||
localorother=None, | ||||
): | ||||
|
r26224 | """ | ||
Generic driver for _imergelocal and _imergeother | ||||
""" | ||||
assert localorother is not None | ||||
|
r43346 | r = simplemerge.simplemerge( | ||
repo.ui, fcd, fca, fco, label=labels, localorother=localorother | ||||
) | ||||
|
r26224 | return True, r | ||
|
r43346 | |||
|
r43347 | @internaltool(b'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.""" | ||
|
r43347 | success, status = _imergeauto(localorother=b'local', *args, **kwargs) | ||
|
r27033 | return success, status, False | ||
|
r26224 | |||
|
r43346 | |||
|
r43347 | @internaltool(b'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.""" | ||
|
r43347 | success, status = _imergeauto(localorother=b'other', *args, **kwargs) | ||
|
r27033 | return success, status, False | ||
|
r26224 | |||
|
r43346 | |||
@internaltool( | ||||
|
r43347 | b'tagmerge', | ||
|
r43346 | mergeonly, | ||
_( | ||||
|
r43347 | b"automatic tag merging of %s failed! " | ||
b"(use 'hg resolve --tool :merge' or another merge " | ||||
b"tool of your choice)\n" | ||||
|
r43346 | ), | ||
) | ||||
|
r21922 | 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 | |||
|
r43346 | |||
|
r43347 | @internaltool(b'dump', fullmerge, binary=True, symlink=True) | ||
|
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 | ||||
|
r32255 | same directory as ``a.txt``. | ||
|
r34916 | This implies premerge. Therefore, files aren't dumped, if premerge | ||
|
r32255 | runs successfully. Use :forcedump to forcibly write files out. | ||
""" | ||||
|
r34036 | a = _workingpath(repo, fcd) | ||
|
r26573 | fd = fcd.path() | ||
|
r16125 | |||
|
r34786 | from . import context | ||
|
r43346 | |||
|
r34786 | if isinstance(fcd, context.overlayworkingfilectx): | ||
|
r43346 | raise error.InMemoryMergeConflictsError( | ||
|
r43387 | b'in-memory merge does not support the :dump tool.' | ||
|
r43346 | ) | ||
|
r34786 | |||
|
r43347 | util.writefile(a + b".local", fcd.decodeddata()) | ||
repo.wwrite(fd + b".other", fco.data(), fco.flags()) | ||||
repo.wwrite(fd + b".base", fca.data(), fca.flags()) | ||||
|
r27033 | return False, 1, False | ||
|
r16125 | |||
|
r43346 | |||
|
r43347 | @internaltool(b'forcedump', mergeonly, binary=True, symlink=True) | ||
|
r43346 | def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
|
r32255 | """ | ||
Creates three versions of the files as same as :dump, but omits premerge. | ||||
""" | ||||
|
r43346 | return _idump( | ||
repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=labels | ||||
) | ||||
|
r32255 | |||
|
r35479 | def _xmergeimm(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): | ||
# In-memory merge simply raises an exception on all external merge tools, | ||||
# for now. | ||||
# | ||||
# It would be possible to run most tools with temporary files, but this | ||||
# raises the question of what to do if the user only partially resolves the | ||||
# file -- we can't leave a merge state. (Copy to somewhere in the .hg/ | ||||
# directory and tell the user how to get it is my best idea, but it's | ||||
# clunky.) | ||||
|
r43346 | raise error.InMemoryMergeConflictsError( | ||
|
r43387 | b'in-memory merge does not support external merge tools' | ||
|
r43346 | ) | ||
|
r35479 | |||
|
r40512 | def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args): | ||
|
r46353 | tmpl = ui.config(b'command-templates', b'pre-merge-tool-output') | ||
|
r40512 | if not tmpl: | ||
return | ||||
mappingdict = templateutil.mappingdict | ||||
|
r43346 | props = { | ||
|
r43347 | b'ctx': fcl.changectx(), | ||
b'node': hex(mynode), | ||||
b'path': fcl.path(), | ||||
b'local': mappingdict( | ||||
|
r43346 | { | ||
|
r43347 | b'ctx': fcl.changectx(), | ||
b'fctx': fcl, | ||||
b'node': hex(mynode), | ||||
b'name': _(b'local'), | ||||
b'islink': b'l' in fcl.flags(), | ||||
b'label': env[b'HG_MY_LABEL'], | ||||
|
r43346 | } | ||
), | ||||
|
r43347 | b'base': mappingdict( | ||
|
r43346 | { | ||
|
r43347 | b'ctx': fcb.changectx(), | ||
b'fctx': fcb, | ||||
b'name': _(b'base'), | ||||
b'islink': b'l' in fcb.flags(), | ||||
b'label': env[b'HG_BASE_LABEL'], | ||||
|
r43346 | } | ||
), | ||||
|
r43347 | b'other': mappingdict( | ||
|
r43346 | { | ||
|
r43347 | b'ctx': fco.changectx(), | ||
b'fctx': fco, | ||||
b'name': _(b'other'), | ||||
b'islink': b'l' in fco.flags(), | ||||
b'label': env[b'HG_OTHER_LABEL'], | ||||
|
r43346 | } | ||
), | ||||
|
r43347 | b'toolpath': toolpath, | ||
b'toolargs': args, | ||||
|
r43346 | } | ||
|
r40512 | |||
# TODO: make all of this something that can be specified on a per-tool basis | ||||
tmpl = templater.unquotestring(tmpl) | ||||
# Not using cmdutil.rendertemplate here since it causes errors importing | ||||
# things for us to import cmdutil. | ||||
tres = formatter.templateresources(ui, repo) | ||||
|
r43346 | t = formatter.maketemplater( | ||
ui, tmpl, defaults=templatekw.keywords, resources=tres | ||||
) | ||||
|
r40512 | ui.status(t.renderdefault(props)) | ||
|
r43346 | |||
|
r44304 | def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels): | ||
|
r38052 | tool, toolpath, binary, symlink, scriptfn = toolconf | ||
|
r41651 | uipathfn = scmutil.getuipathfn(repo) | ||
|
r27042 | if fcd.isabsent() or fco.isabsent(): | ||
|
r43346 | repo.ui.warn( | ||
|
r43387 | _(b'warning: %s cannot merge change/delete conflict for %s\n') | ||
|
r43346 | % (tool, uipathfn(fcd.path())) | ||
) | ||||
|
r27042 | return False, 1, None | ||
|
r34037 | unused, unused, unused, back = files | ||
|
r36994 | localpath = _workingpath(repo, fcd) | ||
|
r43347 | args = _toolstr(repo.ui, tool, b"args") | ||
|
r37095 | |||
|
r43346 | with _maketempfiles( | ||
|
r43347 | repo, fco, fca, repo.wvfs.join(back.path()), b"$output" in args | ||
|
r43346 | ) as temppaths: | ||
|
r37095 | basepath, otherpath, localoutputpath = temppaths | ||
|
r43347 | outpath = b"" | ||
|
r35925 | mylabel, otherlabel = labels[:2] | ||
if len(labels) >= 3: | ||||
baselabel = labels[2] | ||||
else: | ||||
|
r43347 | baselabel = b'base' | ||
|
r43346 | env = { | ||
|
r43347 | b'HG_FILE': fcd.path(), | ||
b'HG_MY_NODE': short(mynode), | ||||
b'HG_OTHER_NODE': short(fco.changectx().node()), | ||||
b'HG_BASE_NODE': short(fca.changectx().node()), | ||||
b'HG_MY_ISLINK': b'l' in fcd.flags(), | ||||
b'HG_OTHER_ISLINK': b'l' in fco.flags(), | ||||
b'HG_BASE_ISLINK': b'l' in fca.flags(), | ||||
b'HG_MY_LABEL': mylabel, | ||||
b'HG_OTHER_LABEL': otherlabel, | ||||
b'HG_BASE_LABEL': baselabel, | ||||
|
r43346 | } | ||
|
r34037 | ui = repo.ui | ||
|
r16125 | |||
|
r43347 | if b"$output" in args: | ||
|
r34783 | # read input from backup, write to original | ||
|
r36994 | outpath = localpath | ||
|
r37095 | localpath = localoutputpath | ||
|
r43346 | replace = { | ||
|
r43347 | b'local': localpath, | ||
b'base': basepath, | ||||
b'other': otherpath, | ||||
b'output': outpath, | ||||
b'labellocal': mylabel, | ||||
b'labelother': otherlabel, | ||||
b'labelbase': baselabel, | ||||
|
r43346 | } | ||
|
r37138 | args = util.interpolate( | ||
|
r43346 | br'\$', | ||
replace, | ||||
args, | ||||
lambda s: procutil.shellquote(util.localpath(s)), | ||||
) | ||||
|
r43347 | if _toolbool(ui, tool, b"gui"): | ||
|
r43346 | repo.ui.status( | ||
|
r43347 | _(b'running merge tool %s for file %s\n') | ||
|
r43346 | % (tool, uipathfn(fcd.path())) | ||
) | ||||
|
r38052 | if scriptfn is None: | ||
|
r43347 | cmd = toolpath + b' ' + args | ||
repo.ui.debug(b'launching merge tool: %s\n' % cmd) | ||||
|
r40512 | _describemerge(ui, repo, mynode, fcd, fca, fco, env, toolpath, args) | ||
|
r43346 | r = ui.system( | ||
|
r43347 | cmd, cwd=repo.root, environ=env, blockedtag=b'mergetool' | ||
|
r43346 | ) | ||
|
r38052 | else: | ||
|
r43346 | repo.ui.debug( | ||
|
r43347 | b'launching python merge script: %s:%s\n' % (toolpath, scriptfn) | ||
|
r43346 | ) | ||
|
r38052 | r = 0 | ||
try: | ||||
# avoid cycle cmdutil->merge->filemerge->extensions->cmdutil | ||||
from . import extensions | ||||
|
r43346 | |||
|
r43347 | mod = extensions.loadpath(toolpath, b'hgmerge.%s' % tool) | ||
|
r38052 | except Exception: | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"loading python merge script failed: %s") % toolpath | ||
|
r43346 | ) | ||
|
r38052 | mergefn = getattr(mod, scriptfn, None) | ||
if mergefn is None: | ||||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"%s does not have function: %s") % (toolpath, scriptfn) | ||
|
r43346 | ) | ||
|
r38052 | argslist = procutil.shellsplit(args) | ||
# avoid cycle cmdutil->merge->filemerge->hook->extensions->cmdutil | ||||
from . import hook | ||||
|
r43346 | |||
ret, raised = hook.pythonhook( | ||||
|
r43347 | ui, repo, b"merge", toolpath, mergefn, {b'args': argslist}, True | ||
|
r43346 | ) | ||
|
r38052 | if raised: | ||
r = 1 | ||||
|
r43347 | repo.ui.debug(b'merge tool returned: %d\n' % r) | ||
|
r34037 | return True, r, False | ||
|
r16125 | |||
|
r43346 | |||
|
r35498 | def _formatconflictmarker(ctx, template, label, pad): | ||
|
r21519 | """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() | ||||
|
r43347 | props = {b'ctx': ctx} | ||
|
r37003 | templateresult = template.renderdefault(props) | ||
|
r21519 | |||
|
r43347 | label = (b'%s:' % label).ljust(pad + 1) | ||
mark = b'%s %s' % (label, templateresult) | ||||
|
r21519 | |||
|
r21864 | if mark: | ||
|
r43346 | mark = mark.splitlines()[0] # split for safety | ||
|
r21864 | |||
|
r21865 | # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ') | ||
|
r37102 | return stringutil.ellipsis(mark, 80 - 8) | ||
|
r21519 | |||
|
r43346 | |||
|
r43347 | _defaultconflictlabels = [b'local', b'other'] | ||
|
r21524 | |||
|
r43346 | |||
|
r35925 | def _formatlabels(repo, fcd, fco, fca, labels, tool=None): | ||
|
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 | ||||
|
r46352 | template = ui.config(b'command-templates', b'mergemarker') | ||
|
r35925 | if tool is not None: | ||
|
r43347 | template = _toolstr(ui, tool, b'mergemarkertemplate', template) | ||
|
r32047 | template = templater.unquotestring(template) | ||
|
r35485 | tres = formatter.templateresources(ui, repo) | ||
|
r43346 | tmpl = formatter.maketemplater( | ||
ui, template, defaults=templatekw.keywords, resources=tres | ||||
) | ||||
|
r21519 | |||
|
r22026 | pad = max(len(l) for l in labels) | ||
|
r21519 | |||
|
r43346 | newlabels = [ | ||
_formatconflictmarker(cd, tmpl, labels[0], pad), | ||||
_formatconflictmarker(co, tmpl, labels[1], pad), | ||||
] | ||||
|
r22026 | if len(labels) > 2: | ||
|
r35498 | newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad)) | ||
|
r22026 | return newlabels | ||
|
r21519 | |||
|
r43346 | |||
|
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 { | ||||
|
r43347 | b"l": b"", | ||
b"o": b"", | ||||
|
r29774 | } | ||
return { | ||||
|
r43347 | b"l": b" [%s]" % labels[0], | ||
b"o": b" [%s]" % labels[1], | ||||
|
r29774 | } | ||
|
r43346 | |||
|
r34038 | def _restorebackup(fcd, back): | ||
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use | ||||
# util.copy here instead. | ||||
|
r34783 | fcd.write(back.data(), fcd.flags()) | ||
|
r34038 | |||
|
r43346 | |||
|
r34783 | def _makebackup(repo, ui, wctx, fcd, premerge): | ||
"""Makes and returns a filectx-like object for ``fcd``'s backup file. | ||||
|
r34033 | |||
In addition to preserving the user's pre-existing modifications to `fcd` | ||||
(if any), the backup is used to undo certain premerges, confirm whether a | ||||
merge changed anything, and determine what line endings the new file should | ||||
have. | ||||
|
r35720 | |||
Backups only need to be written once (right before the premerge) since their | ||||
content doesn't change afterwards. | ||||
|
r34033 | """ | ||
if fcd.isabsent(): | ||||
return None | ||||
|
r34783 | # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset -> | ||
# merge -> filemerge). (I suspect the fileset import is the weakest link) | ||||
from . import context | ||||
|
r43346 | |||
|
r41749 | back = scmutil.backuppath(ui, repo, fcd.path()) | ||
|
r43346 | inworkingdir = back.startswith(repo.wvfs.base) and not back.startswith( | ||
repo.vfs.base | ||||
) | ||||
|
r34785 | if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir: | ||
# If the backup file is to be in the working directory, and we're | ||||
# merging in-memory, we must redirect the backup to the memory context | ||||
# so we don't disturb the working directory. | ||||
|
r43346 | relpath = back[len(repo.wvfs.base) + 1 :] | ||
|
r35721 | if premerge: | ||
wctx[relpath].write(fcd.data(), fcd.flags()) | ||||
|
r34785 | return wctx[relpath] | ||
else: | ||||
|
r35720 | if premerge: | ||
# Otherwise, write to wherever path the user specified the backups | ||||
# should go. We still need to switch based on whether the source is | ||||
# in-memory so we can use the fast path of ``util.copy`` if both are | ||||
# on disk. | ||||
if isinstance(fcd, context.overlayworkingfilectx): | ||||
util.writefile(back, fcd.data()) | ||||
else: | ||||
|
r41749 | a = _workingpath(repo, fcd) | ||
|
r35720 | util.copyfile(a, back) | ||
|
r34785 | # A arbitraryfilectx is returned, so we can run the same functions on | ||
# the backup context regardless of where it lives. | ||||
return context.arbitraryfilectx(back, repo=repo) | ||||
|
r34033 | |||
|
r43346 | |||
|
r37016 | @contextlib.contextmanager | ||
|
r37095 | def _maketempfiles(repo, fco, fca, localpath, uselocalpath): | ||
"""Writes out `fco` and `fca` as temporary files, and (if uselocalpath) | ||||
copies `localpath` to another temporary file, so an external merge tool may | ||||
use them. | ||||
|
r34033 | """ | ||
|
r37017 | tmproot = None | ||
|
r43347 | tmprootprefix = repo.ui.config(b'experimental', b'mergetempdirprefix') | ||
|
r37017 | if tmprootprefix: | ||
|
r38183 | tmproot = pycompat.mkdtemp(prefix=tmprootprefix) | ||
|
r37017 | |||
|
r37095 | def maketempfrompath(prefix, path): | ||
fullbase, ext = os.path.splitext(path) | ||||
|
r43347 | pre = b"%s~%s" % (os.path.basename(fullbase), prefix) | ||
|
r37017 | if tmproot: | ||
name = os.path.join(tmproot, pre) | ||||
if ext: | ||||
name += ext | ||||
|
r43809 | f = open(name, "wb") | ||
|
r37017 | else: | ||
|
r43347 | fd, name = pycompat.mkstemp(prefix=pre + b'.', suffix=ext) | ||
|
r43809 | f = os.fdopen(fd, "wb") | ||
|
r37095 | return f, name | ||
def tempfromcontext(prefix, ctx): | ||||
f, name = maketempfrompath(prefix, ctx.path()) | ||||
|
r34033 | data = repo.wwritedata(ctx.path(), ctx.data()) | ||
f.write(data) | ||||
f.close() | ||||
return name | ||||
|
r43347 | b = tempfromcontext(b"base", fca) | ||
c = tempfromcontext(b"other", fco) | ||||
|
r37095 | d = localpath | ||
if uselocalpath: | ||||
# We start off with this being the backup filename, so remove the .orig | ||||
# to make syntax-highlighting more likely. | ||||
|
r43347 | if d.endswith(b'.orig'): | ||
|
r37095 | d, _ = os.path.splitext(d) | ||
|
r43347 | f, d = maketempfrompath(b"local", d) | ||
with open(localpath, b'rb') as src: | ||||
|
r37095 | f.write(src.read()) | ||
f.close() | ||||
|
r37016 | try: | ||
|
r37095 | yield b, c, d | ||
|
r37016 | finally: | ||
|
r37017 | if tmproot: | ||
shutil.rmtree(tmproot) | ||||
else: | ||||
util.unlink(b) | ||||
util.unlink(c) | ||||
|
r37095 | # if not uselocalpath, d is the 'orig'/backup file which we | ||
# shouldn't delete. | ||||
if d and uselocalpath: | ||||
util.unlink(d) | ||||
|
r34033 | |||
|
r43346 | |||
|
r34124 | def _filemerge(premerge, repo, wctx, 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 | |||
|
r43346 | if not fco.cmp(fcd): # files identical? | ||
|
r27034 | return True, None, False | ||
|
r26512 | |||
|
r26608 | ui = repo.ui | ||
fd = fcd.path() | ||||
|
r41651 | uipathfn = scmutil.getuipathfn(repo) | ||
fduipath = uipathfn(fd) | ||||
|
r26608 | binary = fcd.isbinary() or fco.isbinary() or fca.isbinary() | ||
|
r43347 | symlink = b'l' in fcd.flags() + fco.flags() | ||
|
r27039 | changedelete = fcd.isabsent() or fco.isabsent() | ||
tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete) | ||||
|
r38052 | scriptfn = None | ||
|
r43347 | if tool in internals and tool.startswith(b'internal:'): | ||
|
r26608 | # normalize to new-style names (':merge' etc) | ||
|
r43347 | tool = tool[len(b'internal') :] | ||
if toolpath and toolpath.startswith(b'python:'): | ||||
|
r38052 | invalidsyntax = False | ||
|
r43347 | if toolpath.count(b':') >= 2: | ||
script, scriptfn = toolpath[7:].rsplit(b':', 1) | ||||
|
r38052 | if not scriptfn: | ||
invalidsyntax = True | ||||
# missing :callable can lead to spliting on windows drive letter | ||||
|
r43347 | if b'\\' in scriptfn or b'/' in scriptfn: | ||
|
r38052 | invalidsyntax = True | ||
else: | ||||
invalidsyntax = True | ||||
if invalidsyntax: | ||||
|
r43347 | raise error.Abort(_(b"invalid 'python:' syntax: %s") % toolpath) | ||
|
r38052 | toolpath = script | ||
|
r43346 | ui.debug( | ||
|
r43347 | b"picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n" | ||
|
r43346 | % ( | ||
tool, | ||||
fduipath, | ||||
pycompat.bytestr(binary), | ||||
pycompat.bytestr(symlink), | ||||
pycompat.bytestr(changedelete), | ||||
) | ||||
) | ||||
|
r6003 | |||
|
r26608 | if tool in internals: | ||
func = internals[tool] | ||||
mergetype = func.mergetype | ||||
onfailure = func.onfailure | ||||
precheck = func.precheck | ||||
|
r35925 | isexternal = False | ||
|
r26608 | else: | ||
|
r35479 | if wctx.isinmemory(): | ||
func = _xmergeimm | ||||
else: | ||||
func = _xmerge | ||||
|
r26608 | mergetype = fullmerge | ||
|
r43347 | onfailure = _(b"merging %s failed!\n") | ||
|
r26608 | precheck = None | ||
|
r35925 | isexternal = True | ||
|
r26512 | |||
|
r38052 | toolconf = tool, toolpath, binary, symlink, scriptfn | ||
|
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(): | ||||
|
r43346 | ui.status( | ||
|
r43347 | _(b"merging %s and %s to %s\n") | ||
|
r43346 | % (uipathfn(orig), uipathfn(fco.path()), fduipath) | ||
) | ||||
|
r26609 | else: | ||
|
r43347 | ui.status(_(b"merging %s\n") % fduipath) | ||
|
r26528 | |||
|
r43347 | ui.debug(b"my %s other %s ancestor %s\n" % (fcd, fco, fca)) | ||
|
r26528 | |||
|
r43346 | if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, toolconf): | ||
|
r26608 | if onfailure: | ||
|
r35283 | if wctx.isinmemory(): | ||
|
r43346 | raise error.InMemoryMergeConflictsError( | ||
|
r43387 | b'in-memory merge does not support merge conflicts' | ||
|
r43346 | ) | ||
|
r41651 | ui.warn(onfailure % fduipath) | ||
|
r27034 | return True, 1, False | ||
|
r26529 | |||
|
r34783 | back = _makebackup(repo, ui, wctx, fcd, premerge) | ||
|
r34037 | files = (None, None, None, back) | ||
|
r26589 | r = 1 | ||
try: | ||||
|
r43347 | internalmarkerstyle = ui.config(b'ui', b'mergemarkers') | ||
|
r35925 | if isexternal: | ||
|
r43347 | markerstyle = _toolstr(ui, tool, b'mergemarkers') | ||
|
r35925 | else: | ||
markerstyle = internalmarkerstyle | ||||
|
r26529 | if not labels: | ||
labels = _defaultconflictlabels | ||||
|
r35925 | formattedlabels = labels | ||
|
r43347 | if markerstyle != b'basic': | ||
|
r43346 | formattedlabels = _formatlabels( | ||
repo, fcd, fco, fca, labels, tool=tool | ||||
) | ||||
|
r6004 | |||
|
r26607 | if premerge and mergetype == fullmerge: | ||
|
r35925 | # conflict markers generated by premerge will use 'detailed' | ||
# settings if either ui.mergemarkers or the tool's mergemarkers | ||||
# setting is 'detailed'. This way tools can have basic labels in | ||||
# space-constrained areas of the UI, but still get full information | ||||
# in conflict markers if premerge is 'keep' or 'keep-merge3'. | ||||
premergelabels = labels | ||||
labeltool = None | ||||
|
r43347 | if markerstyle != b'basic': | ||
|
r35925 | # respect 'tool's mergemarkertemplate (which defaults to | ||
|
r46352 | # command-templates.mergemarker) | ||
|
r35925 | labeltool = tool | ||
|
r43347 | if internalmarkerstyle != b'basic' or markerstyle != b'basic': | ||
|
r43346 | premergelabels = _formatlabels( | ||
repo, fcd, fco, fca, premergelabels, tool=labeltool | ||||
) | ||||
|
r35925 | |||
|
r43346 | r = _premerge( | ||
repo, fcd, fco, fca, toolconf, files, labels=premergelabels | ||||
) | ||||
|
r26611 | # complete if premerge successful (r is 0) | ||
|
r27034 | return not r, r, False | ||
|
r26567 | |||
|
r43346 | needcheck, r, deleted = func( | ||
repo, | ||||
mynode, | ||||
orig, | ||||
fcd, | ||||
fco, | ||||
fca, | ||||
toolconf, | ||||
files, | ||||
labels=formattedlabels, | ||||
) | ||||
|
r27033 | |||
|
r26575 | if needcheck: | ||
|
r34036 | r = _check(repo, r, ui, tool, fcd, files) | ||
|
r21519 | |||
|
r16125 | if r: | ||
if onfailure: | ||||
|
r35283 | if wctx.isinmemory(): | ||
|
r43346 | raise error.InMemoryMergeConflictsError( | ||
|
r43347 | b'in-memory merge ' | ||
b'does not support ' | ||||
b'merge conflicts' | ||||
|
r43346 | ) | ||
|
r41651 | ui.warn(onfailure % fduipath) | ||
|
r34798 | _onfilemergefailure(ui) | ||
|
r26589 | |||
|
r27034 | return True, r, deleted | ||
|
r26589 | finally: | ||
|
r27047 | if not r and back is not None: | ||
|
r34783 | back.remove() | ||
|
r6004 | |||
|
r43346 | |||
|
r34797 | def _haltmerge(): | ||
|
r43347 | msg = _(b'merge halted after failed merge (see hg resolve)') | ||
|
r34797 | raise error.InterventionRequired(msg) | ||
|
r43346 | |||
|
r34797 | def _onfilemergefailure(ui): | ||
|
r43347 | action = ui.config(b'merge', b'on-failure') | ||
if action == b'prompt': | ||||
|
r43387 | msg = _(b'continue merge operation (yn)?$$ &Yes $$ &No') | ||
|
r34797 | if ui.promptchoice(msg, 0) == 1: | ||
_haltmerge() | ||||
|
r43347 | if action == b'halt': | ||
|
r34797 | _haltmerge() | ||
# default action is 'continue', in which case we neither prompt nor halt | ||||
|
r43346 | |||
|
r38829 | def hasconflictmarkers(data): | ||
|
r48753 | # Detect lines starting with a string of 7 identical characters from the | ||
# subset Mercurial uses for conflict markers, followed by either the end of | ||||
# line or a space and some text. Note that using [<>=+|-]{7} would detect | ||||
# `<><><><><` as a conflict marker, which we don't want. | ||||
|
r43346 | return bool( | ||
|
r47065 | re.search( | ||
|
r48753 | br"^([<>=+|-])\1{6}( .*)$", | ||
|
r47065 | data, | ||
re.MULTILINE, | ||||
) | ||||
|
r43346 | ) | ||
|
r38829 | |||
|
r34036 | def _check(repo, r, ui, tool, fcd, files): | ||
|
r26575 | fd = fcd.path() | ||
|
r41651 | uipathfn = scmutil.getuipathfn(repo) | ||
|
r34036 | unused, unused, unused, back = files | ||
|
r26575 | |||
|
r43346 | if not r and ( | ||
|
r43347 | _toolbool(ui, tool, b"checkconflicts") | ||
or b'conflicts' in _toollist(ui, tool, b"check") | ||||
|
r43346 | ): | ||
|
r38829 | if hasconflictmarkers(fcd.data()): | ||
|
r26575 | r = 1 | ||
checked = False | ||||
|
r43347 | if b'prompt' in _toollist(ui, tool, b"check"): | ||
|
r26575 | checked = True | ||
|
r43346 | if ui.promptchoice( | ||
|
r43387 | _(b"was merge of '%s' successful (yn)?$$ &Yes $$ &No") | ||
|
r43346 | % uipathfn(fd), | ||
1, | ||||
): | ||||
|
r26575 | r = 1 | ||
|
r43346 | if ( | ||
not r | ||||
and not checked | ||||
and ( | ||||
|
r43347 | _toolbool(ui, tool, b"checkchanged") | ||
or b'changed' in _toollist(ui, tool, b"check") | ||||
|
r43346 | ) | ||
): | ||||
|
r34783 | if back is not None and not fcd.cmp(back): | ||
|
r43346 | if ui.promptchoice( | ||
_( | ||||
|
r43347 | b" output file %s appears unchanged\n" | ||
b"was merge successful (yn)?" | ||||
b"$$ &Yes $$ &No" | ||||
|
r43346 | ) | ||
% uipathfn(fd), | ||||
1, | ||||
): | ||||
|
r26575 | r = 1 | ||
|
r43347 | if back is not None and _toolbool(ui, tool, b"fixeol"): | ||
|
r34036 | _matcheol(_workingpath(repo, fcd), back) | ||
|
r26575 | |||
return r | ||||
|
r43346 | |||
|
r34036 | def _workingpath(repo, ctx): | ||
return repo.wjoin(ctx.path()) | ||||
|
r43346 | |||
|
r34124 | def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): | ||
|
r43346 | return _filemerge( | ||
True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels | ||||
) | ||||
|
r26607 | |||
|
r34124 | def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): | ||
|
r43346 | return _filemerge( | ||
False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels | ||||
) | ||||
|
r26605 | |||
|
r33663 | def loadinternalmerge(ui, extname, registrarobj): | ||
|
r46554 | """Load internal merge tool from specified registrarobj""" | ||
|
r43376 | for name, func in pycompat.iteritems(registrarobj._table): | ||
|
r43347 | fullname = b':' + name | ||
|
r33663 | internals[fullname] = func | ||
|
r43347 | internals[b'internal:' + name] = func | ||
|
r33663 | internalsdoc[fullname] = func | ||
|
r39162 | capabilities = sorted([k for k, v in func.capabilities.items() if v]) | ||
if capabilities: | ||||
|
r43347 | capdesc = b" (actual capabilities: %s)" % b', '.join( | ||
capabilities | ||||
) | ||||
func.__doc__ = func.__doc__ + pycompat.sysstr(b"\n\n%s" % capdesc) | ||||
|
r39303 | |||
# to put i18n comments into hg.pot for automatically generated texts | ||||
|
r39395 | # i18n: "binary" and "symlink" are keywords | ||
|
r39303 | # i18n: this text is added automatically | ||
|
r43347 | _(b" (actual capabilities: binary, symlink)") | ||
|
r39303 | # i18n: "binary" is keyword | ||
# i18n: this text is added automatically | ||||
|
r43347 | _(b" (actual capabilities: binary)") | ||
|
r39303 | # i18n: "symlink" is keyword | ||
# i18n: this text is added automatically | ||||
|
r43347 | _(b" (actual capabilities: symlink)") | ||
|
r39162 | |||
|
r43346 | |||
|
r33663 | # load built-in merge tools explicitly to setup internalsdoc | ||
loadinternalmerge(None, None, internaltool) | ||||
|
r16126 | # tell hggettext to extract docstrings from these functions: | ||
i18nfunctions = internals.values() | ||||