##// END OF EJS Templates
templater: drop unneeded resources from conflict-marker data...
templater: drop unneeded resources from conflict-marker data Follow-up for 32c278eb876f and f1c54d003327.

File last commit:

r35498:c240657f default
r35498:c240657f default
Show More
filemerge.py
838 lines | 30.0 KiB | text/x-python | PythonLexer
Matt Mackall
filemerge: pull file-merging code into its own module
r6003 # filemerge.py - file-level merge handling for Mercurial
#
# Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
filemerge: pull file-merging code into its own module
r6003
Gregory Szorc
filemerge: use absolute_import
r25949 from __future__ import absolute_import
import os
import re
import tempfile
from .i18n import _
Siddharth Agarwal
filemerge: introduce class whose objects represent files not in a context...
r26979 from .node import nullid, short
Gregory Szorc
filemerge: use absolute_import
r25949
from . import (
Pulkit Goyal
py3: replace os.environ with encoding.environ (part 3 of 5)
r30636 encoding,
Gregory Szorc
filemerge: use absolute_import
r25949 error,
Yuya Nishihara
templater: factor out function that creates templater from string template...
r28955 formatter,
Gregory Szorc
filemerge: use absolute_import
r25949 match,
Pulkit Goyal
py3: make format strings unicodes and not bytes...
r30073 pycompat,
FUJIWARA Katsunori
filemerge: move decorator definition for internal merge tools to registrar...
r33663 registrar,
Siddharth Agarwal
origpath: move from cmdutil to scmutil...
r27651 scmutil,
Gregory Szorc
filemerge: use absolute_import
r25949 simplemerge,
tagmerge,
templatekw,
templater,
util,
)
Matt Mackall
merge: allow smarter tool configuration...
r6004
Boris Feld
configitems: register the full 'merge-tools' config and sub-options...
r34827 def _toolstr(ui, tool, part, *args):
return ui.config("merge-tools", tool + "." + part, *args)
Matt Mackall
merge: allow smarter tool configuration...
r6004
Boris Feld
configitems: register the full 'merge-tools' config and sub-options...
r34827 def _toolbool(ui, tool, part,*args):
return ui.configbool("merge-tools", tool + "." + part, *args)
Matt Mackall
merge: allow smarter tool configuration...
r6004
Boris Feld
configitems: register the full 'merge-tools' config and sub-options...
r34827 def _toollist(ui, tool, part):
return ui.configlist("merge-tools", tool + "." + part)
David Champion
merge: introduce tool.check parameter...
r11148
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 internals = {}
Gregory Szorc
help.merge-tools: do not double document merge tools...
r24099 # Merge tools to document.
internalsdoc = {}
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
FUJIWARA Katsunori
filemerge: move decorator definition for internal merge tools to registrar...
r33663 internaltool = registrar.internalmerge()
Siddharth Agarwal
filemerge: add some merge types...
r26525 # internal tool merge types
FUJIWARA Katsunori
filemerge: move decorator definition for internal merge tools to registrar...
r33663 nomerge = internaltool.nomerge
mergeonly = internaltool.mergeonly # just the full merge, no premerge
fullmerge = internaltool.fullmerge # both premerge and merge
Siddharth Agarwal
filemerge: add some merge types...
r26525
Stanislau Hlebik
filemerge: store error messages in module variables...
r32318 _localchangedotherdeletedmsg = _(
"local%(l)s changed %(fd)s which other%(o)s deleted\n"
"use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _(
"other%(o)s changed %(fd)s which local%(l)s deleted\n"
"use (c)hanged version, leave (d)eleted, or "
"leave (u)nresolved?"
"$$ &Changed $$ &Deleted $$ &Unresolved")
Siddharth Agarwal
filemerge: introduce class whose objects represent files not in a context...
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
Matt Mackall
merge: allow smarter tool configuration...
r6004 def _findtool(ui, tool):
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 if tool in internals:
Dov Feldstern
use internal merge tool when specified for a merge-pattern in hgrc...
r6522 return tool
Matt Harbison
filemerge: split the logic for finding an external tool to its own function...
r23148 return findexternaltool(ui, tool)
def findexternaltool(ui, tool):
Steve Borho
filemerge: introduce a 'regkeyalt' merge tool variable...
r13565 for kn in ("regkey", "regkeyalt"):
k = _toolstr(ui, tool, kn)
if not k:
continue
Adrian Buehlmann
rename util.lookup_reg to lookupreg
r14230 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
Matt Mackall
merge: add registry look up bits to tool search
r6006 if p:
Kostia Balytskyi
filemerge: pass a default value to _toolstr (issue5718)...
r34947 p = util.findexe(p + _toolstr(ui, tool, "regappend", ""))
Matt Mackall
merge: add registry look up bits to tool search
r6006 if p:
return p
Greg Ward
merge: expand environment variables and ~/ in tool.executable...
r15264 exe = _toolstr(ui, tool, "executable", tool)
return util.findexe(util.expandpath(exe))
Matt Mackall
merge: allow smarter tool configuration...
r6004
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
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):
Matt Mackall
merge: allow smarter tool configuration...
r6004 tmsg = tool
if pat:
FUJIWARA Katsunori
filemerge: make warning message more i18n friendly...
r32254 tmsg = _("%s (for pattern %s)") % (tool, pat)
Mads Kiilerich
More verbose logging when filemerge searches for merge-tool...
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)
Matt Mackall
merge: allow smarter tool configuration...
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)
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 elif changedelete and not supportscd(tool):
# the nomerge tools are the only tools that support change/delete
# conflicts
pass
Matt Mackall
filemerge: add config item for GUI tools...
r6007 elif not util.gui() and _toolbool(ui, tool, "gui"):
ui.warn(_("tool %s requires a GUI\n") % tmsg)
Matt Mackall
merge: allow smarter tool configuration...
r6004 else:
return True
return False
Matt Mackall
filemerge: mark internal-only config option
r25835 # internal config: ui.forcemerge
Steve Borho
merge: implement --tool arguments using new ui.forcemerge configurable...
r12788 # forcemerge comes from command line arguments, highest priority
force = ui.config('ui', 'forcemerge')
if force:
toolpath = _findtool(ui, force)
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 if changedelete and not supportscd(toolpath):
return ":prompt", None
Steve Borho
merge: implement --tool arguments using new ui.forcemerge configurable...
r12788 else:
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 if toolpath:
return (force, util.shellquote(toolpath))
else:
# mimic HGMERGE if given tool not found
return (force, force)
Steve Borho
merge: implement --tool arguments using new ui.forcemerge configurable...
r12788
# HGMERGE takes next precedence
Pulkit Goyal
py3: replace os.environ with encoding.environ (part 3 of 5)
r30636 hgmerge = encoding.environ.get("HGMERGE")
Steve Borho
filemerge: wrap quotes around tool path
r6025 if hgmerge:
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 if changedelete and not supportscd(hgmerge):
return ":prompt", None
else:
return (hgmerge, hgmerge)
Matt Mackall
merge: allow smarter tool configuration...
r6004
# then patterns
dhruva
filemerge: fix pattern matching
r6016 for pat, tool in ui.configitems("merge-patterns"):
Matt Mackall
match: add some default args
r8567 mf = match.match(repo.root, '', [pat])
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 if mf(path) and check(tool, pat, symlink, False, changedelete):
Benoit Boissinot
fix spaces/identation issues
r10339 toolpath = _findtool(ui, tool)
Keegan Carruthers-Smith
filemerge: use util.shellquote when calling merge (issue3581)
r17885 return (tool, util.shellquote(toolpath))
Matt Mackall
merge: allow smarter tool configuration...
r6004
# then merge tools
tools = {}
Augie Fackler
merge-tools: allow marking a mergetool as completely disabled...
r26730 disabled = set()
Matt Mackall
many, many trivial check-code fixups
r10282 for k, v in ui.configitems("merge-tools"):
Matt Mackall
merge: allow smarter tool configuration...
r6004 t = k.split('.')[0]
if t not in tools:
Boris Feld
configitems: register the full 'merge-tools' config and sub-options...
r34827 tools[t] = int(_toolstr(ui, t, "priority"))
if _toolbool(ui, t, "disabled"):
Augie Fackler
merge-tools: allow marking a mergetool as completely disabled...
r26730 disabled.add(t)
Steve Borho
filemerge: more backwards compatible behavior for ui.merge...
r6076 names = tools.keys()
Augie Fackler
filemerge: avoid shadowing a variable in a list comprehension
r30388 tools = sorted([(-p, tool) for tool, p in tools.items()
if tool not in disabled])
Steve Borho
filemerge: more backwards compatible behavior for ui.merge...
r6076 uimerge = ui.config("ui", "merge")
if uimerge:
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 # external tools defined in uimerge won't be able to handle
# change/delete conflicts
if uimerge not in names and not changedelete:
Steve Borho
filemerge: more backwards compatible behavior for ui.merge...
r6076 return (uimerge, uimerge)
tools.insert(0, (None, uimerge)) # highest priority
Matt Mackall
merge: allow smarter tool configuration...
r6004 tools.append((None, "hgmerge")) # the old default, if found
Matt Mackall
many, many trivial check-code fixups
r10282 for p, t in tools:
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 if check(t, None, symlink, binary, changedelete):
Mads Kiilerich
More verbose logging when filemerge searches for merge-tool...
r7397 toolpath = _findtool(ui, t)
Keegan Carruthers-Smith
filemerge: use util.shellquote when calling merge (issue3581)
r17885 return (t, util.shellquote(toolpath))
Matt Mackall
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559...
r16254
# internal merge or prompt as last resort
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 if symlink or binary or changedelete:
FUJIWARA Katsunori
filemerge: show warning about choice of :prompt only at an actual fallback...
r32253 if not changedelete and len(tools):
# any tool is rejected by capability for symlink or binary
ui.warn(_("no tool found to merge %s\n") % path)
Mads Kiilerich
filemerge: switch the default name for internal tools from internal:x to :x
r22707 return ":prompt", None
return ":merge", None
Matt Mackall
filemerge: pull file-merging code into its own module
r6003
Matt Mackall
merge: add support for tool EOL fixups...
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
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 def _matcheol(file, back):
Matt Mackall
merge: add support for tool EOL fixups...
r6005 "Convert EOL markers in a file to match origfile"
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 tostyle = _eoltype(back.data()) # No repo.wread filters?
Matt Mackall
merge: add support for tool EOL fixups...
r6005 if tostyle:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 data = util.readfile(file)
Matt Mackall
merge: add support for tool EOL fixups...
r6005 style = _eoltype(data)
if style:
newdata = data.replace(style, tostyle)
if newdata != data:
Dan Villiom Podlaski Christiansen
prevent transient leaks of file handle by using new helper functions...
r14168 util.writefile(file, newdata)
Matt Mackall
merge: add support for tool EOL fixups...
r6005
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('prompt', nomerge)
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
timeless
filemerge: use revset notation for p1/p2 of local/other descriptions
r28640 """Asks the user which of the local `p1()` or the other `p2()` version to
keep as the merged version."""
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 ui = repo.ui
fd = fcd.path()
Phil Cohen
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM...
r35283 # Avoid prompting during an in-memory merge since it doesn't support merge
# conflicts.
if fcd.changectx().isinmemory():
raise error.InMemoryMergeConflictsError('in-memory merge does not '
'support file conflicts')
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 prompts = partextras(labels)
prompts['fd'] = fd
Siddharth Agarwal
filemerge: treat EOF at prompt as fail, not abort...
r26898 try:
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':prompt' tool...
r27038 if fco.isabsent():
index = ui.promptchoice(
Stanislau Hlebik
filemerge: store error messages in module variables...
r32318 _localchangedotherdeletedmsg % prompts, 2)
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to change/delete prompts...
r27163 choice = ['local', 'other', 'unresolved'][index]
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':prompt' tool...
r27038 elif fcd.isabsent():
index = ui.promptchoice(
Stanislau Hlebik
filemerge: store error messages in module variables...
r32318 _otherchangedlocaldeletedmsg % prompts, 2)
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to change/delete prompts...
r27163 choice = ['other', 'local', 'unresolved'][index]
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':prompt' tool...
r27038 else:
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to regular prompts...
r27162 index = ui.promptchoice(
FUJIWARA Katsunori
filemerge: show warning about choice of :prompt only at an actual fallback...
r32253 _("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved"
" for %(fd)s?"
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2)
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to regular prompts...
r27162 choice = ['local', 'other', 'unresolved'][index]
Siddharth Agarwal
filemerge.prompt: separate out choice selection and action...
r26851
Siddharth Agarwal
filemerge: treat EOF at prompt as fail, not abort...
r26898 if choice == 'other':
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf,
labels)
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to regular prompts...
r27162 elif choice == 'local':
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf,
labels)
Siddharth Agarwal
filemerge: add a 'leave unresolved' option to regular prompts...
r27162 elif choice == 'unresolved':
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf,
labels)
Siddharth Agarwal
filemerge: treat EOF at prompt as fail, not abort...
r26898 except error.ResponseExpected:
ui.write("\n")
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf,
labels)
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('local', nomerge)
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
timeless
filemerge: use revset notation for p1/p2 of local/other descriptions
r28640 """Uses the local `p1()` version of files as the merged version."""
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':local' merge tool...
r27036 return 0, fcd.isabsent()
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('other', nomerge)
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
timeless
filemerge: use revset notation for p1/p2 of local/other descriptions
r28640 """Uses the other `p2()` version of files as the merged version."""
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':other' merge tool...
r27037 if fco.isabsent():
# local changed, remote deleted -- 'deleted' picked
Phil Cohen
filemerge: convert a couple of wvfs calls in internal mergetools to contexts...
r33152 _underlyingfctxifabsent(fcd).remove()
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':other' merge tool...
r27037 deleted = True
else:
Phil Cohen
filemerge: convert a couple of wvfs calls in internal mergetools to contexts...
r33152 _underlyingfctxifabsent(fcd).write(fco.data(), fco.flags())
Siddharth Agarwal
filemerge: add support for change/delete conflicts to the ':other' merge tool...
r27037 deleted = False
return 0, deleted
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('fail', nomerge)
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
Matt Mackall
filemerge: remove some redundancy in decorators/docstrings
r16127 """
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
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."""
Siddharth Agarwal
filemerge: in ':fail' tool, write out other side if local side is deleted...
r27123 # for change/delete conflicts write out the changed version, then fail
if fcd.isabsent():
Phil Cohen
filemerge: convert a couple of wvfs calls in internal mergetools to contexts...
r33152 _underlyingfctxifabsent(fcd).write(fco.data(), fco.flags())
Siddharth Agarwal
filemerge: return whether the file is deleted for nomerge internal tools...
r27032 return 1, False
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Phil Cohen
filemerge: convert a couple of wvfs calls in internal mergetools to contexts...
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
Siddharth Agarwal
filemerge: don't attempt to premerge change/delete conflicts...
r27041 def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 tool, toolpath, binary, symlink = toolconf
Siddharth Agarwal
filemerge: don't attempt to premerge change/delete conflicts...
r27041 if symlink or fcd.isabsent() or fco.isabsent():
Mads Kiilerich
merge: never do premerge on symlinks...
r18257 return 1
Phil Cohen
filemerge: eliminate most uses of tempfiles...
r34034 unused, unused, unused, back = files
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
ui = repo.ui
Pierre-Yves David
merge-tools: add a `premerge=keep-merge3` config option...
r22032 validkeep = ['keep', 'keep-merge3']
Pierre-Yves David
merge-tools: make premerge valid values extensible...
r22031
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 # do we attempt to simplemerge first?
try:
Mads Kiilerich
merge: never do premerge on symlinks...
r18257 premerge = _toolbool(ui, tool, "premerge", not binary)
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 except error.ConfigError:
Boris Feld
configitems: register the full 'merge-tools' config and sub-options...
r34827 premerge = _toolstr(ui, tool, "premerge", "").lower()
Pierre-Yves David
merge-tools: make premerge valid values extensible...
r22031 if premerge not in validkeep:
_valid = ', '.join(["'" + v + "'" for v in validkeep])
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 raise error.ConfigError(_("%s.premerge not valid "
"('%s' is neither boolean nor %s)") %
(tool, premerge, _valid))
if premerge:
Pierre-Yves David
merge-tools: add a `premerge=keep-merge3` config option...
r22032 if premerge == 'keep-merge3':
if not labels:
labels = _defaultconflictlabels
if len(labels) < 3:
labels.append('base')
Phil Cohen
simplemerge: remove unused `repo` parameter...
r34051 r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels)
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 if not r:
ui.debug(" premerge successful\n")
return 0
Pierre-Yves David
merge-tools: make premerge valid values extensible...
r22031 if premerge not in validkeep:
Phil Cohen
filemerge: eliminate most uses of tempfiles...
r34034 # restore from backup and try again
Phil Cohen
filemerge: add _restorebackup...
r34038 _restorebackup(fcd, back)
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 return 1 # continue merging
Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck...
r26948 def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
Siddharth Agarwal
filemerge: add a precheck for symlinks...
r26515 tool, toolpath, binary, symlink = toolconf
if symlink:
Siddharth Agarwal
filemerge: print correct name of tool for symlink checks...
r26518 repo.ui.warn(_('warning: internal %s cannot merge symlinks '
'for %s\n') % (tool, fcd.path()))
Siddharth Agarwal
filemerge: add a precheck for symlinks...
r26515 return False
Siddharth Agarwal
filemerge._mergecheck: add check for change/delete conflicts...
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
Siddharth Agarwal
filemerge: add a precheck for symlinks...
r26515 return True
Erik Huelsmann
filemerge: split internal merge into api entry point and internal helper...
r26070 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
Matt Mackall
filemerge: remove some redundancy in decorators/docstrings
r16127 """
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in
Pierre-Yves David
internal:merge: update documentation...
r22027 the partially merged file. Markers will have two sections, one for each side
Erik Huelsmann
filemerge: split internal merge into api entry point and internal helper...
r26070 of merge, unless mode equals 'union' which suppresses the markers."""
Siddharth Agarwal
filemerge._merge: drop no longer necessary 'if r:' check...
r26572 ui = repo.ui
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Phil Cohen
simplemerge: remove unused `repo` parameter...
r34051 r = simplemerge.simplemerge(ui, fcd, fca, fco, label=labels, mode=mode)
Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools...
r27033 return True, r, False
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('union', fullmerge,
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 _("warning: conflicts while merging %s! "
"(edit, then use 'hg resolve --mark')\n"),
Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck...
r26948 precheck=_mergecheck)
Erik Huelsmann
filemerge: add 'union' merge to internal merge tool...
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')
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('merge', fullmerge,
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 _("warning: conflicts while merging %s! "
"(edit, then use 'hg resolve --mark')\n"),
Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck...
r26948 precheck=_mergecheck)
Erik Huelsmann
filemerge: split internal merge into api entry point and internal helper...
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')
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('merge3', fullmerge,
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 _("warning: conflicts while merging %s! "
"(edit, then use 'hg resolve --mark')\n"),
Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck...
r26948 precheck=_mergecheck)
Pierre-Yves David
merge: add an internal:merge3 tool...
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)
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
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
Phil Cohen
simplemerge: remove unused `repo` parameter...
r34051 r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels,
localorother=localorother)
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224 return True, r
Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck...
r26948 @internaltool('merge-local', mergeonly, precheck=_mergecheck)
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224 def _imergelocal(*args, **kwargs):
"""
Like :merge, but resolve all conflicts non-interactively in favor
timeless
filemerge: use revset notation for p1/p2 of local/other descriptions
r28640 of the local `p1()` changes."""
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224 success, status = _imergeauto(localorother='local', *args, **kwargs)
Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools...
r27033 return success, status, False
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224
Siddharth Agarwal
filemerge: rename _symlinkcheck to _mergecheck...
r26948 @internaltool('merge-other', mergeonly, precheck=_mergecheck)
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224 def _imergeother(*args, **kwargs):
"""
Like :merge, but resolve all conflicts non-interactively in favor
timeless
filemerge: use revset notation for p1/p2 of local/other descriptions
r28640 of the other `p2()` changes."""
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224 success, status = _imergeauto(localorother='other', *args, **kwargs)
Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools...
r27033 return success, status, False
Jordi Gutiérrez Hermoso
filemerge: add non-interactive :merge-local and :merge-other...
r26224
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('tagmerge', mergeonly,
Angel Ezquerra
filemerge: add internal:tagmerge merge tool...
r21922 _("automatic tag merging of %s failed! "
Mads Kiilerich
filemerge: switch the default name for internal tools from internal:x to :x
r22707 "(use 'hg resolve --tool :merge' or another merge "
Angel Ezquerra
filemerge: add internal:tagmerge merge tool...
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).
"""
Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools...
r27033 success, status = tagmerge.merge(repo, fcd, fco, fca)
return success, status, False
Angel Ezquerra
filemerge: add internal:tagmerge merge tool...
r21922
Siddharth Agarwal
filemerge: switch trymerge boolean to mergetype enum...
r26526 @internaltool('dump', fullmerge)
Durham Goode
merge: define conflict marker labels in filemerge()...
r21273 def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
Matt Mackall
filemerge: remove some redundancy in decorators/docstrings
r16127 """
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
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
FUJIWARA Katsunori
filemerge: add internal merge tool to dump files forcibly...
r32255 same directory as ``a.txt``.
Joe Blaylock
help: fix typo in hg merge documentation
r34916 This implies premerge. Therefore, files aren't dumped, if premerge
FUJIWARA Katsunori
filemerge: add internal merge tool to dump files forcibly...
r32255 runs successfully. Use :forcedump to forcibly write files out.
"""
Phil Cohen
filemerge: add `_workingpath`...
r34036 a = _workingpath(repo, fcd)
Siddharth Agarwal
filemerge._idump: drop no longer necessary 'if r:' check...
r26573 fd = fcd.path()
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Phil Cohen
filemerge: add a missing flushall()...
r34786 from . import context
if isinstance(fcd, context.overlayworkingfilectx):
Phil Cohen
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM...
r35283 raise error.InMemoryMergeConflictsError('in-memory merge does not '
'support the :dump tool.')
Phil Cohen
filemerge: add a missing flushall()...
r34786
Phil Cohen
filemerge: use fctx.write() in the internal:dump tool, instead of copy...
r34078 util.writefile(a + ".local", fcd.decodeddata())
Siddharth Agarwal
filemerge._idump: drop no longer necessary 'if r:' check...
r26573 repo.wwrite(fd + ".other", fco.data(), fco.flags())
repo.wwrite(fd + ".base", fca.data(), fca.flags())
Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools...
r27033 return False, 1, False
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
FUJIWARA Katsunori
filemerge: add internal merge tool to dump files forcibly...
r32255 @internaltool('forcedump', mergeonly)
def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=None):
"""
Creates three versions of the files as same as :dump, but omits premerge.
"""
return _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=labels)
Phil Cohen
filemerge: only raise InMemoryMergeConflictsError when running _xmerge...
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.)
raise error.InMemoryMergeConflictsError('in-memory merge does not support '
'external merge tools')
Durham Goode
merge: define conflict marker labels in filemerge()...
r21273 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
Siddharth Agarwal
filemerge._xmerge: drop no longer necessary 'if r:' check...
r26574 tool, toolpath, binary, symlink = toolconf
Siddharth Agarwal
filemerge: don't try using external tools on change/delete conflicts...
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
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 unused, unused, unused, back = files
Phil Cohen
filemerge: add `_workingpath`...
r34036 a = _workingpath(repo, fcd)
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 b, c = _maketempfiles(repo, fco, fca)
try:
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(),
}
ui = repo.ui
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Boris Feld
configitems: register the full 'merge-tools' config and sub-options...
r34827 args = _toolstr(ui, tool, "args")
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 if "$output" in args:
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 # read input from backup, write to original
out = a
a = repo.wvfs.join(back.path())
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 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
if _toolbool(ui, tool, "gui"):
repo.ui.status(_('running merge tool %s for file %s\n') %
(tool, fcd.path()))
repo.ui.debug('launching merge tool: %s\n' % cmd)
r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
Pulkit Goyal
py3: use '%d' for integers instead of '%s'...
r34507 repo.ui.debug('merge tool returned: %d\n' % r)
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 return True, r, False
finally:
util.unlink(b)
util.unlink(c)
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125
Yuya Nishihara
templater: drop unneeded resources from conflict-marker data...
r35498 def _formatconflictmarker(ctx, template, label, pad):
Durham Goode
merge: add conflict marker formatter (BC)...
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()
props = templatekw.keywords.copy()
props['ctx'] = ctx
Yuya Nishihara
templater: add simple interface for unnamed template (API)...
r32873 templateresult = template.render(props)
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
label = ('%s:' % label).ljust(pad + 1)
Yuya Nishihara
templater: add simple interface for unnamed template (API)...
r32873 mark = '%s %s' % (label, templateresult)
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
FUJIWARA Katsunori
filemerge: use only the first line of the generated conflict marker for safety...
r21864 if mark:
mark = mark.splitlines()[0] # split for safety
FUJIWARA Katsunori
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly...
r21865 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
return util.ellipsis(mark, 80 - 8)
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
Durham Goode
merge: add labels parameter from merge.update to filemerge...
r21524 _defaultconflictlabels = ['local', 'other']
Pierre-Yves David
filemerge: allow the formatting of three labels instead of two...
r22026 def _formatlabels(repo, fcd, fco, fca, labels):
Durham Goode
merge: add conflict marker formatter (BC)...
r21519 """Formats the given labels using the conflict marker template.
Returns a list of formatted labels.
"""
cd = fcd.changectx()
co = fco.changectx()
Pierre-Yves David
filemerge: allow the formatting of three labels instead of two...
r22026 ca = fca.changectx()
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
ui = repo.ui
Boris Feld
configitems: register the 'ui.mergemarkertemplate' config
r33523 template = ui.config('ui', 'mergemarkertemplate')
Yuya Nishihara
filemerge: optionally strip quotes from merge marker template (BC)...
r32047 template = templater.unquotestring(template)
Yuya Nishihara
templater: move repo, ui and cache to per-engine resources
r35485 tres = formatter.templateresources(ui, repo)
tmpl = formatter.maketemplater(ui, template, resources=tres)
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
Pierre-Yves David
filemerge: allow the formatting of three labels instead of two...
r22026 pad = max(len(l) for l in labels)
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
Yuya Nishihara
templater: drop unneeded resources from conflict-marker data...
r35498 newlabels = [_formatconflictmarker(cd, tmpl, labels[0], pad),
_formatconflictmarker(co, tmpl, labels[1], pad)]
Pierre-Yves David
filemerge: allow the formatting of three labels instead of two...
r22026 if len(labels) > 2:
Yuya Nishihara
templater: drop unneeded resources from conflict-marker data...
r35498 newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad))
Pierre-Yves David
filemerge: allow the formatting of three labels instead of two...
r22026 return newlabels
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
Simon Farnsworth
merge: use labels in prompts to the user...
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],
}
Phil Cohen
filemerge: add _restorebackup...
r34038 def _restorebackup(fcd, back):
# TODO: Add a workingfilectx.write(otherfilectx) path so we can use
# util.copy here instead.
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 fcd.write(back.data(), fcd.flags())
Phil Cohen
filemerge: add _restorebackup...
r34038
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 def _makebackup(repo, ui, wctx, fcd, premerge):
"""Makes and returns a filectx-like object for ``fcd``'s backup file.
Phil Cohen
filemerge: extract _maketemp and _makebackup...
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.
"""
if fcd.isabsent():
return None
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset ->
# merge -> filemerge). (I suspect the fileset import is the weakest link)
from . import context
Phil Cohen
filemerge: add `_workingpath`...
r34036 a = _workingpath(repo, fcd)
Phil Cohen
filemerge: extract _maketemp and _makebackup...
r34033 back = scmutil.origpath(ui, repo, a)
Phil Cohen
filemerge: store backups in the overlayworkingctx if using imm...
r34785 inworkingdir = (back.startswith(repo.wvfs.base) and not
back.startswith(repo.vfs.base))
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.
relpath = back[len(repo.wvfs.base) + 1:]
wctx[relpath].write(fcd.data(), fcd.flags())
return wctx[relpath]
else:
# Otherwise, write to wherever the user specified the backups should go.
#
# A arbitraryfilectx is returned, so we can run the same functions on
# the backup context regardless of where it lives.
if premerge:
util.copyfile(a, back)
return context.arbitraryfilectx(back, repo=repo)
Phil Cohen
filemerge: extract _maketemp and _makebackup...
r34033
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 def _maketempfiles(repo, fco, fca):
Phil Cohen
filemerge: extract _maketemp and _makebackup...
r34033 """Writes out `fco` and `fca` as temporary files, so an external merge
tool may use them.
"""
def temp(prefix, ctx):
fullbase, ext = os.path.splitext(ctx.path())
pre = "%s~%s." % (os.path.basename(fullbase), prefix)
(fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
data = repo.wwritedata(ctx.path(), ctx.data())
f = os.fdopen(fd, pycompat.sysstr("wb"))
f.write(data)
f.close()
return name
b = temp("base", fca)
c = temp("other", fco)
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 return b, c
Phil Cohen
filemerge: extract _maketemp and _makebackup...
r34033
Phil Cohen
merge: pass wctx to premerge, filemerge...
r34124 def _filemerge(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
Matt Mackall
filemerge: pull file-merging code into its own module
r6003 """perform a 3-way merge in the working directory
Siddharth Agarwal
filemerge: introduce a premerge flag and function...
r26607 premerge = whether this is a premerge
Matt Mackall
merge: introduce mergestate
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
Siddharth Agarwal
filemerge: also return whether the merge is complete...
r26606
Siddharth Agarwal
filemerge: return whether the file was deleted...
r27034 Returns whether the merge is complete, the return value of the merge, and
a boolean indicating whether the file was deleted from disk."""
Matt Mackall
filemerge: pull file-merging code into its own module
r6003
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 if not fco.cmp(fcd): # files identical?
Siddharth Agarwal
filemerge: return whether the file was deleted...
r27034 return True, None, False
Siddharth Agarwal
filemerge: indent filemerge.filemerge...
r26512
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 ui = repo.ui
fd = fcd.path()
binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
symlink = 'l' in fcd.flags() + fco.flags()
Siddharth Agarwal
filemerge._picktool: only pick from nomerge tools for change/delete conflicts...
r27039 changedelete = fcd.isabsent() or fco.isabsent()
tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete)
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 if tool in internals and tool.startswith('internal:'):
# normalize to new-style names (':merge' etc)
tool = tool[len('internal'):]
Siddharth Agarwal
filemerge: add debug output for whether this is a change/delete conflict...
r27161 ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
Pulkit Goyal
py3: convert bool variables to bytes
r32753 % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink),
pycompat.bytestr(changedelete)))
Matt Mackall
filemerge: pull file-merging code into its own module
r6003
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 if tool in internals:
func = internals[tool]
mergetype = func.mergetype
onfailure = func.onfailure
precheck = func.precheck
else:
Phil Cohen
filemerge: only raise InMemoryMergeConflictsError when running _xmerge...
r35479 if wctx.isinmemory():
func = _xmergeimm
else:
func = _xmerge
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 mergetype = fullmerge
onfailure = _("merging %s failed!\n")
precheck = None
Siddharth Agarwal
filemerge: indent filemerge.filemerge...
r26512
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 toolconf = tool, toolpath, binary, symlink
Matt Mackall
filemerge: pull file-merging code into its own module
r6003
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 if mergetype == nomerge:
Simon Farnsworth
merge: use labels in prompts to the user...
r29774 r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
Siddharth Agarwal
filemerge: return whether the file was deleted...
r27034 return True, r, deleted
Siddharth Agarwal
filemerge: indent filemerge.filemerge...
r26512
Siddharth Agarwal
filemerge: only print out "merging f" output at premerge step...
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)
Siddharth Agarwal
filemerge: move 'merging' output to before file creation...
r26528
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
Siddharth Agarwal
filemerge: move 'merging' output to before file creation...
r26528
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
toolconf):
if onfailure:
Phil Cohen
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM...
r35283 if wctx.isinmemory():
raise error.InMemoryMergeConflictsError('in-memory merge does '
'not support merge '
'conflicts')
Siddharth Agarwal
filemerge: deindent the parts of filemerge outside the try block...
r26608 ui.warn(onfailure % fd)
Siddharth Agarwal
filemerge: return whether the file was deleted...
r27034 return True, 1, False
Siddharth Agarwal
filemerge: move precheck to before files are written out...
r26529
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 back = _makebackup(repo, ui, wctx, fcd, premerge)
Phil Cohen
filemerge: reduce creation of tempfiles until needed...
r34037 files = (None, None, None, back)
Siddharth Agarwal
filemerge: clean up temp files in a finally block...
r26589 r = 1
try:
Jun Wu
codemod: register core configitems using a script...
r33499 markerstyle = ui.config('ui', 'mergemarkers')
Siddharth Agarwal
filemerge: move precheck to before files are written out...
r26529 if not labels:
labels = _defaultconflictlabels
if markerstyle != 'basic':
labels = _formatlabels(repo, fcd, fco, fca, labels)
Matt Mackall
merge: allow smarter tool configuration...
r6004
Siddharth Agarwal
filemerge: introduce a premerge flag and function...
r26607 if premerge and mergetype == fullmerge:
Siddharth Agarwal
filemerge: don't attempt to premerge change/delete conflicts...
r27041 r = _premerge(repo, fcd, fco, fca, toolconf, files, labels=labels)
Siddharth Agarwal
filemerge: break overall filemerge into separate premerge and merge steps...
r26611 # complete if premerge successful (r is 0)
Siddharth Agarwal
filemerge: return whether the file was deleted...
r27034 return not r, r, False
Siddharth Agarwal
filemerge: call premerge directly from main merge function...
r26567
Siddharth Agarwal
filemerge: return whether the file is deleted from all other merge tools...
r27033 needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca,
toolconf, files, labels=labels)
Siddharth Agarwal
filemerge: move post-merge checks into a separate function...
r26575 if needcheck:
Phil Cohen
filemerge: add `_workingpath`...
r34036 r = _check(repo, r, ui, tool, fcd, files)
Durham Goode
merge: add conflict marker formatter (BC)...
r21519
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 if r:
if onfailure:
Phil Cohen
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM...
r35283 if wctx.isinmemory():
raise error.InMemoryMergeConflictsError('in-memory merge '
'does not support '
'merge conflicts')
FUJIWARA Katsunori
filemerge: refactoring of 'filemerge()'...
r16125 ui.warn(onfailure % fd)
Ryan McElroy
merge: allow user to halt merge on merge-tool failures...
r34798 _onfilemergefailure(ui)
Siddharth Agarwal
filemerge: clean up temp files in a finally block...
r26589
Siddharth Agarwal
filemerge: return whether the file was deleted...
r27034 return True, r, deleted
Siddharth Agarwal
filemerge: clean up temp files in a finally block...
r26589 finally:
Siddharth Agarwal
filemerge: don't try to copy files known to be absent...
r27047 if not r and back is not None:
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 back.remove()
Matt Mackall
merge: allow smarter tool configuration...
r6004
Ryan McElroy
filemerge: introduce functions to halt merge flow...
r34797 def _haltmerge():
msg = _('merge halted after failed merge (see hg resolve)')
raise error.InterventionRequired(msg)
def _onfilemergefailure(ui):
action = ui.config('merge', 'on-failure')
if action == 'prompt':
msg = _('continue merge operation (yn)?' '$$ &Yes $$ &No')
if ui.promptchoice(msg, 0) == 1:
_haltmerge()
if action == 'halt':
_haltmerge()
# default action is 'continue', in which case we neither prompt nor halt
Phil Cohen
filemerge: add `_workingpath`...
r34036 def _check(repo, r, ui, tool, fcd, files):
Siddharth Agarwal
filemerge: move post-merge checks into a separate function...
r26575 fd = fcd.path()
Phil Cohen
filemerge: add `_workingpath`...
r34036 unused, unused, unused, back = files
Siddharth Agarwal
filemerge: move post-merge checks into a separate function...
r26575
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")):
Phil Cohen
filemerge: use arbitraryfilectx for backups...
r34783 if back is not None and not fcd.cmp(back):
Siddharth Agarwal
filemerge: move post-merge checks into a separate function...
r26575 if ui.promptchoice(_(" output file %s appears unchanged\n"
"was merge successful (yn)?"
"$$ &Yes $$ &No") % fd, 1):
r = 1
Siddharth Agarwal
filemerge: don't try to copy files known to be absent...
r27047 if back is not None and _toolbool(ui, tool, "fixeol"):
Phil Cohen
filemerge: add `_workingpath`...
r34036 _matcheol(_workingpath(repo, fcd), back)
Siddharth Agarwal
filemerge: move post-merge checks into a separate function...
r26575
return r
Phil Cohen
filemerge: add `_workingpath`...
r34036 def _workingpath(repo, ctx):
return repo.wjoin(ctx.path())
Phil Cohen
merge: pass wctx to premerge, filemerge...
r34124 def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(True, repo, wctx, mynode, orig, fcd, fco, fca,
labels=labels)
Siddharth Agarwal
filemerge: introduce a premerge flag and function...
r26607
Phil Cohen
merge: pass wctx to premerge, filemerge...
r34124 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
return _filemerge(False, repo, wctx, mynode, orig, fcd, fco, fca,
labels=labels)
Siddharth Agarwal
filemerge: add a wrapper around the filemerge function...
r26605
FUJIWARA Katsunori
filemerge: move decorator definition for internal merge tools to registrar...
r33663 def loadinternalmerge(ui, extname, registrarobj):
"""Load internal merge tool from specified registrarobj
"""
for name, func in registrarobj._table.iteritems():
fullname = ':' + name
internals[fullname] = func
internals['internal:' + name] = func
internalsdoc[fullname] = func
# load built-in merge tools explicitly to setup internalsdoc
loadinternalmerge(None, None, internaltool)
FUJIWARA Katsunori
filemerge: create detail of internal merge tools from documentation string...
r16126 # tell hggettext to extract docstrings from these functions:
i18nfunctions = internals.values()