mercurial-scm/hg-stable: mercurial/filemerge.py annotate

annotate mercurial/filemerge.py @ 27039:d7517deedf86

filemerge._picktool: only pick from nomerge tools for change/delete conflicts For --tool or HGMERGE, we could have either: (a) proceeded with the particular tool, then failed the merge. (b) chosen to prompt regardless. We're explicitly choosing (b) here, because it's effectively what we've been doing so far and helps maintain an easier-to-use interface. However, in future patches we're going to change the default selection from 'pick changed version' to 'leave unresolved'. That fixes most of the brokenness involved with choice (b).

author	Siddharth Agarwal <sid0@fb.com>
date	Sun, 15 Nov 2015 21:40:15 -0800
parents	58a4eb16e722
children	1bde66b89bb2

rev	line source
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1 # filemerge.py - file-level merge handling for Mercurial
7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	2 #
7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	3 # Copyright 2006, 2007, 2008 Matt Mackall <mpm@selenic.com>
7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8209 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9709 diff changeset	6 # GNU General Public License version 2 or any later version.
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	7
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	8 from __future__ import absolute_import
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	9
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	10 import filecmp
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	11 import os
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	12 import re
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	13 import tempfile
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	14
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	15 from .i18n import _
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	16 from .node import nullid, short
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	17
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	18 from . import (
26941 454deda24315 filemerge: choose where .orig files are kept Christian Delahousse <cdelahousse@fb.com> parents: 26898 diff changeset	19 cmdutil,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	20 error,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	21 match,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	22 simplemerge,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	23 tagmerge,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	24 templatekw,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	25 templater,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	26 util,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	27 )
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	28
6013 bb441d77df99 filemerge: handle missing regappend Matt Mackall <mpm@selenic.com> parents: 6007 diff changeset	29 def _toolstr(ui, tool, part, default=""):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	30 return ui.config("merge-tools", tool + "." + part, default)
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	31
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	32 def _toolbool(ui, tool, part, default=False):
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	33 return ui.configbool("merge-tools", tool + "." + part, default)
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	34
11148 a912f26777d3 merge: introduce tool.check parameter David Champion <dgc@uchicago.edu> parents: 11146 diff changeset	35 def _toollist(ui, tool, part, default=[]):
a912f26777d3 merge: introduce tool.check parameter David Champion <dgc@uchicago.edu> parents: 11146 diff changeset	36 return ui.configlist("merge-tools", tool + "." + part, default)
a912f26777d3 merge: introduce tool.check parameter David Champion <dgc@uchicago.edu> parents: 11146 diff changeset	37
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	38 internals = {}
24099 be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	39 # Merge tools to document.
be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	40 internalsdoc = {}
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	41
26525 abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	42 # internal tool merge types
abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	43 nomerge = None
abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	44 mergeonly = 'mergeonly' # just the full merge, no premerge
abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	45 fullmerge = 'fullmerge' # both premerge and merge
abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	46
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	47 class absentfilectx(object):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	48 """Represents a file that's ostensibly in a context but is actually not
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	49 present in it.
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	50
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	51 This is here because it's very specific to the filemerge code for now --
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	52 other code is likely going to break with the values this returns."""
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	53 def __init__(self, ctx, f):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	54 self._ctx = ctx
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	55 self._f = f
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	56
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	57 def path(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	58 return self._f
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	59
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	60 def size(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	61 return None
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	62
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	63 def data(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	64 return None
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	65
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	66 def filenode(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	67 return nullid
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	68
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	69 _customcmp = True
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	70 def cmp(self, fctx):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	71 """compare with other file context
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	72
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	73 returns True if different from fctx.
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	74 """
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	75 return not (fctx.isabsent() and
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	76 fctx.ctx() == self.ctx() and
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	77 fctx.path() == self.path())
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	78
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	79 def flags(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	80 return ''
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	81
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	82 def changectx(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	83 return self._ctx
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	84
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	85 def isbinary(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	86 return False
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	87
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	88 def isabsent(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	89 return True
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	90
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	91 def internaltool(name, mergetype, onfailure=None, precheck=None):
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	92 '''return a decorator for populating internal merge tool table'''
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	93 def decorator(func):
22707 38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x Mads Kiilerich <madski@unity3d.com> parents: 22706 diff changeset	94 fullname = ':' + name
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	95 func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	96 internals[fullname] = func
22707 38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x Mads Kiilerich <madski@unity3d.com> parents: 22706 diff changeset	97 internals['internal:' + name] = func
24099 be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	98 internalsdoc[fullname] = func
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	99 func.mergetype = mergetype
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	100 func.onfailure = onfailure
26513 01224c28e0ed filemerge: add a before-merge callback to internal merge tools Siddharth Agarwal <sid0@fb.com> parents: 26512 diff changeset	101 func.precheck = precheck
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	102 return func
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	103 return decorator
8830 a9850eda2973 filemerge: add internal:prompt target Matt Mackall <mpm@selenic.com> parents: 8615 diff changeset	104
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	105 def _findtool(ui, tool):
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	106 if tool in internals:
6522 2b181fb3a70a use internal merge tool when specified for a merge-pattern in hgrc Dov Feldstern <dfeldstern@fastimap.com> parents: 6212 diff changeset	107 return tool
23148 b405dd6c90bf filemerge: split the logic for finding an external tool to its own function Matt Harbison <matt_harbison@yahoo.com> parents: 22707 diff changeset	108 return findexternaltool(ui, tool)
b405dd6c90bf filemerge: split the logic for finding an external tool to its own function Matt Harbison <matt_harbison@yahoo.com> parents: 22707 diff changeset	109
b405dd6c90bf filemerge: split the logic for finding an external tool to its own function Matt Harbison <matt_harbison@yahoo.com> parents: 22707 diff changeset	110 def findexternaltool(ui, tool):
13565 984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	111 for kn in ("regkey", "regkeyalt"):
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	112 k = _toolstr(ui, tool, kn)
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	113 if not k:
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	114 continue
14230 d51630301241 rename util.lookup_reg to lookupreg Adrian Buehlmann <adrian@cadifra.com> parents: 14168 diff changeset	115 p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
6006 3c9dbb743d20 merge: add registry look up bits to tool search Matt Mackall <mpm@selenic.com> parents: 6005 diff changeset	116 if p:
14271 4030630fb59c rename util.find_exe to findexe Adrian Buehlmann <adrian@cadifra.com> parents: 14230 diff changeset	117 p = util.findexe(p + _toolstr(ui, tool, "regappend"))
6006 3c9dbb743d20 merge: add registry look up bits to tool search Matt Mackall <mpm@selenic.com> parents: 6005 diff changeset	118 if p:
3c9dbb743d20 merge: add registry look up bits to tool search Matt Mackall <mpm@selenic.com> parents: 6005 diff changeset	119 return p
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 14749 diff changeset	120 exe = _toolstr(ui, tool, "executable", tool)
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 14749 diff changeset	121 return util.findexe(util.expandpath(exe))
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	122
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	123 def _picktool(repo, ui, path, binary, symlink, changedelete):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	124 def supportscd(tool):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	125 return tool in internals and internals[tool].mergetype == nomerge
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	126
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	127 def check(tool, pat, symlink, binary, changedelete):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	128 tmsg = tool
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	129 if pat:
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	130 tmsg += " specified for " + pat
7397 4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	131 if not _findtool(ui, tool):
4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	132 if pat: # explicitly requested tool deserves a warning
4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	133 ui.warn(_("couldn't find merge tool %s\n") % tmsg)
4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	134 else: # configured but non-existing tools are more silent
4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	135 ui.note(_("couldn't find merge tool %s\n") % tmsg)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	136 elif symlink and not _toolbool(ui, tool, "symlink"):
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	137 ui.warn(_("tool %s can't handle symlinks\n") % tmsg)
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	138 elif binary and not _toolbool(ui, tool, "binary"):
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	139 ui.warn(_("tool %s can't handle binary\n") % tmsg)
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	140 elif changedelete and not supportscd(tool):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	141 # the nomerge tools are the only tools that support change/delete
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	142 # conflicts
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	143 pass
6007 090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	144 elif not util.gui() and _toolbool(ui, tool, "gui"):
090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	145 ui.warn(_("tool %s requires a GUI\n") % tmsg)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	146 else:
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	147 return True
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	148 return False
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	149
25835 34ffe4c29782 filemerge: mark internal-only config option Matt Mackall <mpm@selenic.com> parents: 24987 diff changeset	150 # internal config: ui.forcemerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	151 # forcemerge comes from command line arguments, highest priority
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	152 force = ui.config('ui', 'forcemerge')
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	153 if force:
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	154 toolpath = _findtool(ui, force)
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	155 if changedelete and not supportscd(toolpath):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	156 return ":prompt", None
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	157 else:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	158 if toolpath:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	159 return (force, util.shellquote(toolpath))
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	160 else:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	161 # mimic HGMERGE if given tool not found
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	162 return (force, force)
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	163
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	164 # HGMERGE takes next precedence
6025 f2335246e5c7 filemerge: wrap quotes around tool path Steve Borho <steve@borho.org> parents: 6016 diff changeset	165 hgmerge = os.environ.get("HGMERGE")
f2335246e5c7 filemerge: wrap quotes around tool path Steve Borho <steve@borho.org> parents: 6016 diff changeset	166 if hgmerge:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	167 if changedelete and not supportscd(hgmerge):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	168 return ":prompt", None
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	169 else:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	170 return (hgmerge, hgmerge)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	171
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	172 # then patterns
6016 288ec2f6faa2 filemerge: fix pattern matching dhruva <dhruvakm@gmail.com> parents: 6015 diff changeset	173 for pat, tool in ui.configitems("merge-patterns"):
8567 fea40a677d43 match: add some default args Matt Mackall <mpm@selenic.com> parents: 8566 diff changeset	174 mf = match.match(repo.root, '', [pat])
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	175 if mf(path) and check(tool, pat, symlink, False, changedelete):
10339 23e608f42f2c fix spaces/identation issues Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	176 toolpath = _findtool(ui, tool)
17885 9a2cf955db84 filemerge: use util.shellquote when calling merge (issue3581) Keegan Carruthers-Smith <keegancsmith@fb.com> parents: 16256 diff changeset	177 return (tool, util.shellquote(toolpath))
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	178
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	179 # then merge tools
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	180 tools = {}
26730 a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	181 disabled = set()
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	182 for k, v in ui.configitems("merge-tools"):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	183 t = k.split('.')[0]
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	184 if t not in tools:
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	185 tools[t] = int(_toolstr(ui, t, "priority", "0"))
26730 a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	186 if _toolbool(ui, t, "disabled", False):
a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	187 disabled.add(t)
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	188 names = tools.keys()
26730 a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	189 tools = sorted([(-p, t) for t, p in tools.items() if t not in disabled])
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	190 uimerge = ui.config("ui", "merge")
0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	191 if uimerge:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	192 # external tools defined in uimerge won't be able to handle
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	193 # change/delete conflicts
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	194 if uimerge not in names and not changedelete:
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	195 return (uimerge, uimerge)
0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	196 tools.insert(0, (None, uimerge)) # highest priority
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	197 tools.append((None, "hgmerge")) # the old default, if found
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	198 for p, t in tools:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	199 if check(t, None, symlink, binary, changedelete):
7397 4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	200 toolpath = _findtool(ui, t)
17885 9a2cf955db84 filemerge: use util.shellquote when calling merge (issue3581) Keegan Carruthers-Smith <keegancsmith@fb.com> parents: 16256 diff changeset	201 return (t, util.shellquote(toolpath))
16254 c7eef052c9e3 filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 Matt Mackall <mpm@selenic.com> parents: 16205 diff changeset	202
c7eef052c9e3 filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 Matt Mackall <mpm@selenic.com> parents: 16205 diff changeset	203 # internal merge or prompt as last resort
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	204 if symlink or binary or changedelete:
22707 38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x Mads Kiilerich <madski@unity3d.com> parents: 22706 diff changeset	205 return ":prompt", None
38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x Mads Kiilerich <madski@unity3d.com> parents: 22706 diff changeset	206 return ":merge", None
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	207
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	208 def _eoltype(data):
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	209 "Guess the EOL type of a file"
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	210 if '\0' in data: # binary
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	211 return None
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	212 if '\r\n' in data: # Windows
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	213 return '\r\n'
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	214 if '\r' in data: # Old Mac
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	215 return '\r'
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	216 if '\n' in data: # UNIX
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	217 return '\n'
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	218 return None # unknown
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	219
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	220 def _matcheol(file, origfile):
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	221 "Convert EOL markers in a file to match origfile"
14168 135e244776f0 prevent transient leaks of file handle by using new helper functions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13565 diff changeset	222 tostyle = _eoltype(util.readfile(origfile))
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	223 if tostyle:
14168 135e244776f0 prevent transient leaks of file handle by using new helper functions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13565 diff changeset	224 data = util.readfile(file)
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	225 style = _eoltype(data)
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	226 if style:
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	227 newdata = data.replace(style, tostyle)
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	228 if newdata != data:
14168 135e244776f0 prevent transient leaks of file handle by using new helper functions Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 13565 diff changeset	229 util.writefile(file, newdata)
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	230
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	231 @internaltool('prompt', nomerge)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	232 def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	233 """Asks the user which of the local or the other version to keep as
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	234 the merged version."""
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	235 ui = repo.ui
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	236 fd = fcd.path()
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	237
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	238 try:
27038 58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	239 if fco.isabsent():
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	240 index = ui.promptchoice(
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	241 _("local changed %s which remote deleted\n"
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	242 "use (c)hanged version or (d)elete?"
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	243 "$$ &Changed $$ &Delete") % fd, 0)
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	244 choice = ['local', 'other'][index]
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	245 elif fcd.isabsent():
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	246 index = ui.promptchoice(
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	247 _("remote changed %s which local deleted\n"
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	248 "use (c)hanged version or leave (d)eleted?"
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	249 "$$ &Changed $$ &Deleted") % fd, 0)
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	250 choice = ['other', 'local'][index]
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	251 else:
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	252 index = ui.promptchoice(_("no tool found to merge %s\n"
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	253 "keep (l)ocal or take (o)ther?"
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	254 "$$ &Local $$ &Other") % fd, 0)
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	255 choice = ['local', 'other'][index]
26851 859f453e8b4e filemerge.prompt: separate out choice selection and action Siddharth Agarwal <sid0@fb.com> parents: 26730 diff changeset	256
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	257 if choice == 'other':
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	258 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf)
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	259 else:
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	260 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf)
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	261 except error.ResponseExpected:
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	262 ui.write("\n")
27032 28ee7af4b685 filemerge: return whether the file is deleted for nomerge internal tools Siddharth Agarwal <sid0@fb.com> parents: 26979 diff changeset	263 return 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	264
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	265 @internaltool('local', nomerge)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	266 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	267 """Uses the local version of files as the merged version."""
27036 63d6bc874dea filemerge: add support for change/delete conflicts to the ':local' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27034 diff changeset	268 return 0, fcd.isabsent()
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	269
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	270 @internaltool('other', nomerge)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	271 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	272 """Uses the other version of files as the merged version."""
27037 a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	273 if fco.isabsent():
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	274 # local changed, remote deleted -- 'deleted' picked
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	275 repo.wvfs.unlinkpath(fcd.path())
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	276 deleted = True
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	277 else:
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	278 repo.wwrite(fcd.path(), fco.data(), fco.flags())
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	279 deleted = False
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	280 return 0, deleted
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	281
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	282 @internaltool('fail', nomerge)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	283 def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	284 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	285 Rather than attempting to merge files that were modified on both
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	286 branches, it marks them as unresolved. The resolve command must be
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	287 used to resolve these conflicts."""
27032 28ee7af4b685 filemerge: return whether the file is deleted for nomerge internal tools Siddharth Agarwal <sid0@fb.com> parents: 26979 diff changeset	288 return 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	289
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	290 def _premerge(repo, toolconf, files, labels=None):
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	291 tool, toolpath, binary, symlink = toolconf
18257 a35d0128545e merge: never do premerge on symlinks Mads Kiilerich <mads@kiilerich.com> parents: 18256 diff changeset	292 if symlink:
a35d0128545e merge: never do premerge on symlinks Mads Kiilerich <mads@kiilerich.com> parents: 18256 diff changeset	293 return 1
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	294 a, b, c, back = files
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	295
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	296 ui = repo.ui
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	297
22032 d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	298 validkeep = ['keep', 'keep-merge3']
22031 b36c60cfe46f merge-tools: make premerge valid values extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22028 diff changeset	299
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	300 # do we attempt to simplemerge first?
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	301 try:
18257 a35d0128545e merge: never do premerge on symlinks Mads Kiilerich <mads@kiilerich.com> parents: 18256 diff changeset	302 premerge = _toolbool(ui, tool, "premerge", not binary)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	303 except error.ConfigError:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	304 premerge = _toolstr(ui, tool, "premerge").lower()
22031 b36c60cfe46f merge-tools: make premerge valid values extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22028 diff changeset	305 if premerge not in validkeep:
b36c60cfe46f merge-tools: make premerge valid values extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22028 diff changeset	306 _valid = ', '.join(["'" + v + "'" for v in validkeep])
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	307 raise error.ConfigError(_("%s.premerge not valid "
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	308 "('%s' is neither boolean nor %s)") %
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	309 (tool, premerge, _valid))
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	310
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	311 if premerge:
22032 d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	312 if premerge == 'keep-merge3':
d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	313 if not labels:
d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	314 labels = _defaultconflictlabels
d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	315 if len(labels) < 3:
d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	316 labels.append('base')
22023 f18830651811 simplemerge: burn "minimal" feature to the ground Pierre-Yves David <pierre-yves.david@fb.com> parents: 22022 diff changeset	317 r = simplemerge.simplemerge(ui, a, b, c, quiet=True, label=labels)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	318 if not r:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	319 ui.debug(" premerge successful\n")
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	320 return 0
22031 b36c60cfe46f merge-tools: make premerge valid values extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22028 diff changeset	321 if premerge not in validkeep:
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	322 util.copyfile(back, a) # restore from backup and try again
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	323 return 1 # continue merging
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	324
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	325 def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	326 tool, toolpath, binary, symlink = toolconf
0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	327 if symlink:
26518 a77679d0b887 filemerge: print correct name of tool for symlink checks Siddharth Agarwal <sid0@fb.com> parents: 26517 diff changeset	328 repo.ui.warn(_('warning: internal %s cannot merge symlinks '
a77679d0b887 filemerge: print correct name of tool for symlink checks Siddharth Agarwal <sid0@fb.com> parents: 26517 diff changeset	329 'for %s\n') % (tool, fcd.path()))
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	330 return False
0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	331 return True
0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	332
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	333 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	334 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	335 Uses the internal non-interactive simple merge algorithm for merging
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	336 files. It will fail if there are any conflicts and leave markers in
22027 b98e5c7afc70 internal:merge: update documentation Pierre-Yves David <pierre-yves.david@fb.com> parents: 22026 diff changeset	337 the partially merged file. Markers will have two sections, one for each side
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	338 of merge, unless mode equals 'union' which suppresses the markers."""
26572 c7850af6bb75 filemerge._merge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26567 diff changeset	339 a, b, c, back = files
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	340
26572 c7850af6bb75 filemerge._merge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26567 diff changeset	341 ui = repo.ui
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	342
26572 c7850af6bb75 filemerge._merge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26567 diff changeset	343 r = simplemerge.simplemerge(ui, a, b, c, label=labels, mode=mode)
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	344 return True, r, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	345
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	346 @internaltool('union', fullmerge,
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	347 _("warning: conflicts while merging %s! "
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	348 "(edit, then use 'hg resolve --mark')\n"),
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	349 precheck=_mergecheck)
26071 ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	350 def _iunion(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	351 """
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	352 Uses the internal non-interactive simple merge algorithm for merging
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	353 files. It will use both left and right sides for conflict regions.
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	354 No markers are inserted."""
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	355 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf,
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	356 files, labels, 'union')
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	357
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	358 @internaltool('merge', fullmerge,
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	359 _("warning: conflicts while merging %s! "
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	360 "(edit, then use 'hg resolve --mark')\n"),
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	361 precheck=_mergecheck)
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	362 def _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	363 """
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	364 Uses the internal non-interactive simple merge algorithm for merging
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	365 files. It will fail if there are any conflicts and leave markers in
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	366 the partially merged file. Markers will have two sections, one for each side
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	367 of merge."""
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	368 return _merge(repo, mynode, orig, fcd, fco, fca, toolconf,
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	369 files, labels, 'merge')
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	370
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	371 @internaltool('merge3', fullmerge,
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	372 _("warning: conflicts while merging %s! "
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	373 "(edit, then use 'hg resolve --mark')\n"),
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	374 precheck=_mergecheck)
22028 3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	375 def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	376 """
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	377 Uses the internal non-interactive simple merge algorithm for merging
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	378 files. It will fail if there are any conflicts and leave markers in
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	379 the partially merged file. Marker will have three sections, one from each
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	380 side of the merge and one for the base content."""
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	381 if not labels:
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	382 labels = _defaultconflictlabels
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	383 if len(labels) < 3:
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	384 labels.append('base')
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	385 return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	386
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	387 def _imergeauto(repo, mynode, orig, fcd, fco, fca, toolconf, files,
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	388 labels=None, localorother=None):
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	389 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	390 Generic driver for _imergelocal and _imergeother
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	391 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	392 assert localorother is not None
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	393 tool, toolpath, binary, symlink = toolconf
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	394 a, b, c, back = files
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	395 r = simplemerge.simplemerge(repo.ui, a, b, c, label=labels,
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	396 localorother=localorother)
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	397 return True, r
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	398
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	399 @internaltool('merge-local', mergeonly, precheck=_mergecheck)
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	400 def _imergelocal(args, *kwargs):
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	401 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	402 Like :merge, but resolve all conflicts non-interactively in favor
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	403 of the local changes."""
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	404 success, status = _imergeauto(localorother='local', args, *kwargs)
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	405 return success, status, False
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	406
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	407 @internaltool('merge-other', mergeonly, precheck=_mergecheck)
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	408 def _imergeother(args, *kwargs):
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	409 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	410 Like :merge, but resolve all conflicts non-interactively in favor
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	411 of the other changes."""
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	412 success, status = _imergeauto(localorother='other', args, *kwargs)
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	413 return success, status, False
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	414
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	415 @internaltool('tagmerge', mergeonly,
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	416 _("automatic tag merging of %s failed! "
22707 38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x Mads Kiilerich <madski@unity3d.com> parents: 22706 diff changeset	417 "(use 'hg resolve --tool :merge' or another merge "
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	418 "tool of your choice)\n"))
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	419 def _itagmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	420 """
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	421 Uses the internal tag merge algorithm (experimental).
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	422 """
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	423 success, status = tagmerge.merge(repo, fcd, fco, fca)
089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	424 return success, status, False
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	425
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	426 @internaltool('dump', fullmerge)
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	427 def _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	428 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	429 Creates three versions of the files to merge, containing the
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	430 contents of local, other and base. These files can then be used to
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	431 perform a merge manually. If the file to be merged is named
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	432 ``a.txt``, these files will accordingly be named ``a.txt.local``,
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	433 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	434 same directory as ``a.txt``."""
26573 a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	435 a, b, c, back = files
a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	436
a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	437 fd = fcd.path()
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	438
26573 a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	439 util.copyfile(a, a + ".local")
a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	440 repo.wwrite(fd + ".other", fco.data(), fco.flags())
a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	441 repo.wwrite(fd + ".base", fca.data(), fca.flags())
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	442 return False, 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	443
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	444 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
26574 f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	445 tool, toolpath, binary, symlink = toolconf
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	446 a, b, c, back = files
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	447 out = ""
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	448 env = {'HG_FILE': fcd.path(),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	449 'HG_MY_NODE': short(mynode),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	450 'HG_OTHER_NODE': str(fco.changectx()),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	451 'HG_BASE_NODE': str(fca.changectx()),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	452 'HG_MY_ISLINK': 'l' in fcd.flags(),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	453 'HG_OTHER_ISLINK': 'l' in fco.flags(),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	454 'HG_BASE_ISLINK': 'l' in fca.flags(),
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	455 }
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	456
26574 f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	457 ui = repo.ui
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	458
26574 f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	459 args = _toolstr(ui, tool, "args", '$local $base $other')
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	460 if "$output" in args:
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	461 out, a = a, back # read input from backup, write to original
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	462 replace = {'local': a, 'base': b, 'other': c, 'output': out}
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	463 args = util.interpolate(r'\$', replace, args,
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	464 lambda s: util.shellquote(util.localpath(s)))
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	465 cmd = toolpath + ' ' + args
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	466 repo.ui.debug('launching merge tool: %s\n' % cmd)
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	467 r = ui.system(cmd, cwd=repo.root, environ=env)
f82cb7dffb49 filemerge._xmerge: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26573 diff changeset	468 repo.ui.debug('merge tool returned: %s\n' % r)
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	469 return True, r, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	470
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	471 def _formatconflictmarker(repo, ctx, template, label, pad):
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	472 """Applies the given template to the ctx, prefixed by the label.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	473
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	474 Pad is the minimum width of the label prefix, so that multiple markers
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	475 can have aligned templated parts.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	476 """
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	477 if ctx.node() is None:
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	478 ctx = ctx.p1()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	479
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	480 props = templatekw.keywords.copy()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	481 props['templ'] = template
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	482 props['ctx'] = ctx
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	483 props['repo'] = repo
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	484 templateresult = template('conflictmarker', **props)
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	485
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	486 label = ('%s:' % label).ljust(pad + 1)
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	487 mark = '%s %s' % (label, templater.stringify(templateresult))
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	488
21864 755bf1bbe0a9 filemerge: use only the first line of the generated conflict marker for safety FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21693 diff changeset	489 if mark:
755bf1bbe0a9 filemerge: use only the first line of the generated conflict marker for safety FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21693 diff changeset	490 mark = mark.splitlines()[0] # split for safety
755bf1bbe0a9 filemerge: use only the first line of the generated conflict marker for safety FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21693 diff changeset	491
21865 78e56e70c70a filemerge: use 'util.ellipsis' to trim custom conflict markers correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21864 diff changeset	492 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
78e56e70c70a filemerge: use 'util.ellipsis' to trim custom conflict markers correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21864 diff changeset	493 return util.ellipsis(mark, 80 - 8)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	494
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	495 _defaultconflictmarker = ('{node\|short} ' +
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	496 '{ifeq(tags, "tip", "", "{tags} ")}' +
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	497 '{if(bookmarks, "{bookmarks} ")}' +
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	498 '{ifeq(branch, "default", "", "{branch} ")}' +
21693 9c35f3a8cac4 merge: drop the quotes around commit description Pierre-Yves David <pierre-yves.david@fb.com> parents: 21524 diff changeset	499 '- {author\|user}: {desc\|firstline}')
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	500
21524 47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21519 diff changeset	501 _defaultconflictlabels = ['local', 'other']
47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21519 diff changeset	502
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	503 def _formatlabels(repo, fcd, fco, fca, labels):
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	504 """Formats the given labels using the conflict marker template.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	505
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	506 Returns a list of formatted labels.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	507 """
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	508 cd = fcd.changectx()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	509 co = fco.changectx()
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	510 ca = fca.changectx()
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	511
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	512 ui = repo.ui
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	513 template = ui.config('ui', 'mergemarkertemplate', _defaultconflictmarker)
22025 5f22975d320d filemerge: drop extra white space Pierre-Yves David <pierre-yves.david@fb.com> parents: 22023 diff changeset	514 tmpl = templater.templater(None, cache={'conflictmarker': template})
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	515
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	516 pad = max(len(l) for l in labels)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	517
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	518 newlabels = [_formatconflictmarker(repo, cd, tmpl, labels[0], pad),
6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	519 _formatconflictmarker(repo, co, tmpl, labels[1], pad)]
6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	520 if len(labels) > 2:
6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	521 newlabels.append(_formatconflictmarker(repo, ca, tmpl, labels[2], pad))
6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	522 return newlabels
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	523
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	524 def _filemerge(premerge, repo, mynode, orig, fcd, fco, fca, labels=None):
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	525 """perform a 3-way merge in the working directory
7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	526
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	527 premerge = whether this is a premerge
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	528 mynode = parent node before merge
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	529 orig = original local filename before merge
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	530 fco = other file context
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	531 fca = ancestor file context
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	532 fcd = local file context for current/destination file
26606 2a405d307f8c filemerge: also return whether the merge is complete Siddharth Agarwal <sid0@fb.com> parents: 26605 diff changeset	533
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	534 Returns whether the merge is complete, the return value of the merge, and
86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	535 a boolean indicating whether the file was deleted from disk."""
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	536
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	537 def temp(prefix, ctx):
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	538 pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	539 (fd, name) = tempfile.mkstemp(prefix=pre)
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	540 data = repo.wwritedata(ctx.path(), ctx.data())
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	541 f = os.fdopen(fd, "wb")
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	542 f.write(data)
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	543 f.close()
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	544 return name
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	545
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	546 if not fco.cmp(fcd): # files identical?
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	547 return True, None, False
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	548
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	549 ui = repo.ui
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	550 fd = fcd.path()
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	551 binary = fcd.isbinary() or fco.isbinary() or fca.isbinary()
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	552 symlink = 'l' in fcd.flags() + fco.flags()
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	553 changedelete = fcd.isabsent() or fco.isabsent()
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	554 tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete)
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	555 if tool in internals and tool.startswith('internal:'):
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	556 # normalize to new-style names (':merge' etc)
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	557 tool = tool[len('internal'):]
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	558 ui.debug("picked tool '%s' for %s (binary %s symlink %s)\n" %
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	559 (tool, fd, binary, symlink))
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	560
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	561 if tool in internals:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	562 func = internals[tool]
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	563 mergetype = func.mergetype
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	564 onfailure = func.onfailure
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	565 precheck = func.precheck
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	566 else:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	567 func = _xmerge
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	568 mergetype = fullmerge
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	569 onfailure = _("merging %s failed!\n")
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	570 precheck = None
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	571
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	572 toolconf = tool, toolpath, binary, symlink
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	573
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	574 if mergetype == nomerge:
27032 28ee7af4b685 filemerge: return whether the file is deleted for nomerge internal tools Siddharth Agarwal <sid0@fb.com> parents: 26979 diff changeset	575 r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf)
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	576 return True, r, deleted
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	577
26609 47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	578 if premerge:
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	579 if orig != fco.path():
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	580 ui.status(_("merging %s and %s to %s\n") % (orig, fco.path(), fd))
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	581 else:
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	582 ui.status(_("merging %s\n") % fd)
26528 8bfef5737321 filemerge: move 'merging' output to before file creation Siddharth Agarwal <sid0@fb.com> parents: 26527 diff changeset	583
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	584 ui.debug("my %s other %s ancestor %s\n" % (fcd, fco, fca))
26528 8bfef5737321 filemerge: move 'merging' output to before file creation Siddharth Agarwal <sid0@fb.com> parents: 26527 diff changeset	585
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	586 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca,
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	587 toolconf):
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	588 if onfailure:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	589 ui.warn(onfailure % fd)
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	590 return True, 1, False
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	591
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	592 a = repo.wjoin(fd)
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	593 b = temp("base", fca)
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	594 c = temp("other", fco)
26941 454deda24315 filemerge: choose where .orig files are kept Christian Delahousse <cdelahousse@fb.com> parents: 26898 diff changeset	595 back = cmdutil.origpath(ui, repo, a)
26610 f9f82c444ff7 filemerge: only copy to backup during premerge step Siddharth Agarwal <sid0@fb.com> parents: 26609 diff changeset	596 if premerge:
f9f82c444ff7 filemerge: only copy to backup during premerge step Siddharth Agarwal <sid0@fb.com> parents: 26609 diff changeset	597 util.copyfile(a, back)
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	598 files = (a, b, c, back)
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	599
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	600 r = 1
fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	601 try:
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	602 markerstyle = ui.config('ui', 'mergemarkers', 'basic')
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	603 if not labels:
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	604 labels = _defaultconflictlabels
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	605 if markerstyle != 'basic':
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	606 labels = _formatlabels(repo, fcd, fco, fca, labels)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	607
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	608 if premerge and mergetype == fullmerge:
26567 f18646cf0e93 filemerge: call premerge directly from main merge function Siddharth Agarwal <sid0@fb.com> parents: 26529 diff changeset	609 r = _premerge(repo, toolconf, files, labels=labels)
26611 a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps Siddharth Agarwal <sid0@fb.com> parents: 26610 diff changeset	610 # complete if premerge successful (r is 0)
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	611 return not r, r, False
26567 f18646cf0e93 filemerge: call premerge directly from main merge function Siddharth Agarwal <sid0@fb.com> parents: 26529 diff changeset	612
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	613 needcheck, r, deleted = func(repo, mynode, orig, fcd, fco, fca,
089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	614 toolconf, files, labels=labels)
089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	615
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	616 if needcheck:
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	617 r = _check(r, ui, tool, fcd, files)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	618
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	619 if r:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	620 if onfailure:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	621 ui.warn(onfailure % fd)
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	622
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	623 return True, r, deleted
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	624 finally:
fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	625 if not r:
21100 098a274764b3 filemerge: better handling of failing remove of temporary files Mads Kiilerich <madski@unity3d.com> parents: 20676 diff changeset	626 util.unlink(back)
098a274764b3 filemerge: better handling of failing remove of temporary files Mads Kiilerich <madski@unity3d.com> parents: 20676 diff changeset	627 util.unlink(b)
098a274764b3 filemerge: better handling of failing remove of temporary files Mads Kiilerich <madski@unity3d.com> parents: 20676 diff changeset	628 util.unlink(c)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	629
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	630 def _check(r, ui, tool, fcd, files):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	631 fd = fcd.path()
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	632 a, b, c, back = files
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	633
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	634 if not r and (_toolbool(ui, tool, "checkconflicts") or
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	635 'conflicts' in _toollist(ui, tool, "check")):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	636 if re.search("^(<<<<<<< .\|=======\|>>>>>>> .)$", fcd.data(),
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	637 re.MULTILINE):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	638 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	639
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	640 checked = False
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	641 if 'prompt' in _toollist(ui, tool, "check"):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	642 checked = True
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	643 if ui.promptchoice(_("was merge of '%s' successful (yn)?"
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	644 "$$ &Yes $$ &No") % fd, 1):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	645 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	646
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	647 if not r and not checked and (_toolbool(ui, tool, "checkchanged") or
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	648 'changed' in
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	649 _toollist(ui, tool, "check")):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	650 if filecmp.cmp(a, back):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	651 if ui.promptchoice(_(" output file %s appears unchanged\n"
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	652 "was merge successful (yn)?"
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	653 "$$ &Yes $$ &No") % fd, 1):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	654 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	655
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	656 if _toolbool(ui, tool, "fixeol"):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	657 _matcheol(a, back)
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	658
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	659 return r
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	660
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	661 def premerge(repo, mynode, orig, fcd, fco, fca, labels=None):
45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	662 return _filemerge(True, repo, mynode, orig, fcd, fco, fca, labels=labels)
45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	663
26605 ef21a2c41629 filemerge: add a wrapper around the filemerge function Siddharth Agarwal <sid0@fb.com> parents: 26589 diff changeset	664 def filemerge(repo, mynode, orig, fcd, fco, fca, labels=None):
26611 a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps Siddharth Agarwal <sid0@fb.com> parents: 26610 diff changeset	665 return _filemerge(False, repo, mynode, orig, fcd, fco, fca, labels=labels)
26605 ef21a2c41629 filemerge: add a wrapper around the filemerge function Siddharth Agarwal <sid0@fb.com> parents: 26589 diff changeset	666
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	667 # tell hggettext to extract docstrings from these functions:
0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	668 i18nfunctions = internals.values()

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/filemerge.py @ 27039:d7517deedf86