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

annotate mercurial/filemerge.py @ 34796:ed91846c29cf

filemerge: introduce functions to halt merge flow Depends on D931. This patch introduces functions and a config option that will allow a user to halt the merge if there are failures during a file merge. These functions will be used in the next patch. Differential Revision: https://phab.mercurial-scm.org/D932

author	Ryan McElroy <rmcelroy@fb.com>
date	Fri, 06 Oct 2017 06:48:43 -0700
parents	1af4561b6bfe
children	284fa44f7f39

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 os
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	11 import re
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	12 import tempfile
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	13
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	14 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	15 from .node import nullid, short
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	16
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	17 from . import (
30641 f1c9fafcbf46 py3: replace os.environ with encoding.environ (part 3 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30547 diff changeset	18 encoding,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	19 error,
28955 78759f78a44e templater: factor out function that creates templater from string template Yuya Nishihara <yuya@tcha.org> parents: 28954 diff changeset	20 formatter,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	21 match,
30073 aa23c93e636d py3: make format strings unicodes and not bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 29786 diff changeset	22 pycompat,
33725 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	23 registrar,
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27599 diff changeset	24 scmutil,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	25 simplemerge,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	26 tagmerge,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	27 templatekw,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	28 templater,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	29 util,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	30 )
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	31
6013 bb441d77df99 filemerge: handle missing regappend Matt Mackall <mpm@selenic.com> parents: 6007 diff changeset	32 def _toolstr(ui, tool, part, default=""):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	33 return ui.config("merge-tools", tool + "." + part, default)
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	34
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	35 def _toolbool(ui, tool, part, default=False):
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	36 return ui.configbool("merge-tools", tool + "." + part, default)
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	37
31398 758526333dec filemerge: don't use mutable default argument value Gregory Szorc <gregory.szorc@gmail.com> parents: 31214 diff changeset	38 def _toollist(ui, tool, part, default=None):
31445 ac7aa96e4cd8 filemerge: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31398 diff changeset	39 if default is None:
ac7aa96e4cd8 filemerge: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31398 diff changeset	40 default = []
ac7aa96e4cd8 filemerge: explicitly tests for None Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31398 diff changeset	41 return ui.configlist("merge-tools", tool + "." + part, default)
11148 a912f26777d3 merge: introduce tool.check parameter David Champion <dgc@uchicago.edu> parents: 11146 diff changeset	42
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	43 internals = {}
24099 be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	44 # Merge tools to document.
be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	45 internalsdoc = {}
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	46
33725 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	47 internaltool = registrar.internalmerge()
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	48
26525 abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	49 # internal tool merge types
33725 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	50 nomerge = internaltool.nomerge
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	51 mergeonly = internaltool.mergeonly # just the full merge, no premerge
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	52 fullmerge = internaltool.fullmerge # both premerge and merge
26525 abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	53
32357 6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	54 _localchangedotherdeletedmsg = _(
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	55 "local%(l)s changed %(fd)s which other%(o)s deleted\n"
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	56 "use (c)hanged version, (d)elete, or leave (u)nresolved?"
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	57 "$$ &Changed $$ &Delete $$ &Unresolved")
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	58
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	59 _otherchangedlocaldeletedmsg = _(
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	60 "other%(o)s changed %(fd)s which local%(l)s deleted\n"
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	61 "use (c)hanged version, leave (d)eleted, or "
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	62 "leave (u)nresolved?"
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	63 "$$ &Changed $$ &Deleted $$ &Unresolved")
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	64
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	65 class absentfilectx(object):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	66 """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	67 present in it.
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 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	70 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	71 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	72 self._ctx = ctx
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	73 self._f = f
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 def path(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	76 return self._f
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	77
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	78 def size(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	79 return None
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	80
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	81 def data(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	82 return None
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	83
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	84 def filenode(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	85 return nullid
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	86
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	87 _customcmp = True
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	88 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	89 """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	90
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	91 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	92 """
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	93 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	94 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	95 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	96
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	97 def flags(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	98 return ''
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	99
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	100 def changectx(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	101 return self._ctx
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	102
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	103 def isbinary(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	104 return False
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	105
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	106 def isabsent(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	107 return True
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	108
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	109 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	110 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	111 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	112 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	113
b405dd6c90bf filemerge: split the logic for finding an external tool to its own function Matt Harbison <matt_harbison@yahoo.com> parents: 22707 diff changeset	114 def findexternaltool(ui, tool):
13565 984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	115 for kn in ("regkey", "regkeyalt"):
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	116 k = _toolstr(ui, tool, kn)
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	117 if not k:
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	118 continue
14230 d51630301241 rename util.lookup_reg to lookupreg Adrian Buehlmann <adrian@cadifra.com> parents: 14168 diff changeset	119 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	120 if p:
14271 4030630fb59c rename util.find_exe to findexe Adrian Buehlmann <adrian@cadifra.com> parents: 14230 diff changeset	121 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	122 if p:
3c9dbb743d20 merge: add registry look up bits to tool search Matt Mackall <mpm@selenic.com> parents: 6005 diff changeset	123 return p
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 14749 diff changeset	124 exe = _toolstr(ui, tool, "executable", tool)
157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 14749 diff changeset	125 return util.findexe(util.expandpath(exe))
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	126
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	127 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	128 def supportscd(tool):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	129 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	130
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	131 def check(tool, pat, symlink, binary, changedelete):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	132 tmsg = tool
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	133 if pat:
32294 177742666abd filemerge: make warning message more i18n friendly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32293 diff changeset	134 tmsg = _("%s (for pattern %s)") % (tool, pat)
7397 4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	135 if not _findtool(ui, tool):
4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	136 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	137 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	138 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	139 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	140 elif symlink and not _toolbool(ui, tool, "symlink"):
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	141 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	142 elif binary and not _toolbool(ui, tool, "binary"):
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	143 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	144 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	145 # 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	146 # conflicts
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	147 pass
6007 090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	148 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	149 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	150 else:
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	151 return True
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	152 return False
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	153
25835 34ffe4c29782 filemerge: mark internal-only config option Matt Mackall <mpm@selenic.com> parents: 24987 diff changeset	154 # internal config: ui.forcemerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	155 # 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	156 force = ui.config('ui', 'forcemerge')
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	157 if force:
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	158 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	159 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	160 return ":prompt", None
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	161 else:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	162 if toolpath:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	163 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	164 else:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	165 # 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	166 return (force, force)
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	167
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	168 # HGMERGE takes next precedence
30641 f1c9fafcbf46 py3: replace os.environ with encoding.environ (part 3 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30547 diff changeset	169 hgmerge = encoding.environ.get("HGMERGE")
6025 f2335246e5c7 filemerge: wrap quotes around tool path Steve Borho <steve@borho.org> parents: 6016 diff changeset	170 if hgmerge:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	171 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	172 return ":prompt", None
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	173 else:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	174 return (hgmerge, hgmerge)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	175
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	176 # then patterns
6016 288ec2f6faa2 filemerge: fix pattern matching dhruva <dhruvakm@gmail.com> parents: 6015 diff changeset	177 for pat, tool in ui.configitems("merge-patterns"):
8567 fea40a677d43 match: add some default args Matt Mackall <mpm@selenic.com> parents: 8566 diff changeset	178 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	179 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	180 toolpath = _findtool(ui, tool)
17885 9a2cf955db84 filemerge: use util.shellquote when calling merge (issue3581) Keegan Carruthers-Smith <keegancsmith@fb.com> parents: 16256 diff changeset	181 return (tool, util.shellquote(toolpath))
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	182
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	183 # then merge tools
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	184 tools = {}
26730 a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	185 disabled = set()
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	186 for k, v in ui.configitems("merge-tools"):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	187 t = k.split('.')[0]
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	188 if t not in tools:
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	189 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	190 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	191 disabled.add(t)
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	192 names = tools.keys()
30398 8819b63732b9 filemerge: avoid shadowing a variable in a list comprehension Augie Fackler <augie@google.com> parents: 30073 diff changeset	193 tools = sorted([(-p, tool) for tool, p in tools.items()
8819b63732b9 filemerge: avoid shadowing a variable in a list comprehension Augie Fackler <augie@google.com> parents: 30073 diff changeset	194 if tool not in disabled])
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	195 uimerge = ui.config("ui", "merge")
0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	196 if uimerge:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	197 # 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	198 # change/delete conflicts
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	199 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	200 return (uimerge, uimerge)
0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	201 tools.insert(0, (None, uimerge)) # highest priority
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	202 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	203 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	204 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	205 toolpath = _findtool(ui, t)
17885 9a2cf955db84 filemerge: use util.shellquote when calling merge (issue3581) Keegan Carruthers-Smith <keegancsmith@fb.com> parents: 16256 diff changeset	206 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	207
c7eef052c9e3 filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 Matt Mackall <mpm@selenic.com> parents: 16205 diff changeset	208 # 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	209 if symlink or binary or changedelete:
32293 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32047 diff changeset	210 if not changedelete and len(tools):
7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32047 diff changeset	211 # any tool is rejected by capability for symlink or binary
7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32047 diff changeset	212 ui.warn(_("no tool found to merge %s\n") % path)
22707 38e0363dcbe0 filemerge: switch the default name for internal tools from internal:x to :x Mads Kiilerich <madski@unity3d.com> parents: 22706 diff changeset	213 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	214 return ":merge", None
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	215
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	216 def _eoltype(data):
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	217 "Guess the EOL type of a file"
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	218 if '\0' in data: # binary
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	219 return None
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	220 if '\r\n' in data: # Windows
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	221 return '\r\n'
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	222 if '\r' in data: # Old Mac
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	223 return '\r'
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	224 if '\n' in data: # UNIX
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	225 return '\n'
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	226 return None # unknown
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	227
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	228 def _matcheol(file, back):
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	229 "Convert EOL markers in a file to match origfile"
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	230 tostyle = _eoltype(back.data()) # No repo.wread filters?
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	231 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	232 data = util.readfile(file)
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	233 style = _eoltype(data)
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	234 if style:
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	235 newdata = data.replace(style, tostyle)
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	236 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	237 util.writefile(file, newdata)
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	238
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	239 @internaltool('prompt', nomerge)
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	240 def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
28640 4fc640fd0026 filemerge: use revset notation for p1/p2 of local/other descriptions timeless <timeless@mozdev.org> parents: 28578 diff changeset	241 """Asks the user which of the local `p1()` or the other `p2()` version to
4fc640fd0026 filemerge: use revset notation for p1/p2 of local/other descriptions timeless <timeless@mozdev.org> parents: 28578 diff changeset	242 keep as the merged version."""
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	243 ui = repo.ui
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	244 fd = fcd.path()
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	245
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	246 prompts = partextras(labels)
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	247 prompts['fd'] = fd
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	248 try:
27038 58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	249 if fco.isabsent():
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	250 index = ui.promptchoice(
32357 6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	251 _localchangedotherdeletedmsg % prompts, 2)
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	252 choice = ['local', 'other', 'unresolved'][index]
27038 58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	253 elif fcd.isabsent():
58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	254 index = ui.promptchoice(
32357 6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32295 diff changeset	255 _otherchangedlocaldeletedmsg % prompts, 2)
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	256 choice = ['other', 'local', 'unresolved'][index]
27038 58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	257 else:
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	258 index = ui.promptchoice(
32293 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32047 diff changeset	259 _("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved"
7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32047 diff changeset	260 " for %(fd)s?"
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	261 "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2)
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	262 choice = ['local', 'other', 'unresolved'][index]
26851 859f453e8b4e filemerge.prompt: separate out choice selection and action Siddharth Agarwal <sid0@fb.com> parents: 26730 diff changeset	263
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	264 if choice == 'other':
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	265 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf,
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	266 labels)
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	267 elif choice == 'local':
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	268 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf,
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	269 labels)
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	270 elif choice == 'unresolved':
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	271 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf,
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	272 labels)
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	273 except error.ResponseExpected:
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	274 ui.write("\n")
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	275 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf,
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	276 labels)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	277
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	278 @internaltool('local', nomerge)
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	279 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
28640 4fc640fd0026 filemerge: use revset notation for p1/p2 of local/other descriptions timeless <timeless@mozdev.org> parents: 28578 diff changeset	280 """Uses the local `p1()` 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	281 return 0, fcd.isabsent()
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	282
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	283 @internaltool('other', nomerge)
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	284 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
28640 4fc640fd0026 filemerge: use revset notation for p1/p2 of local/other descriptions timeless <timeless@mozdev.org> parents: 28578 diff changeset	285 """Uses the other `p2()` 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	286 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	287 # local changed, remote deleted -- 'deleted' picked
33157 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	288 _underlyingfctxifabsent(fcd).remove()
27037 a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	289 deleted = True
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	290 else:
33157 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	291 _underlyingfctxifabsent(fcd).write(fco.data(), fco.flags())
27037 a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	292 deleted = False
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	293 return 0, deleted
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	294
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	295 @internaltool('fail', nomerge)
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	296 def _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels=None):
16127 14dc2bbba6d2 filemerge: remove some redundancy in decorators/docstrings Matt Mackall <mpm@selenic.com> parents: 16126 diff changeset	297 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	298 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	299 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	300 used to resolve these conflicts."""
27123 4dc5951df1e4 filemerge: in ':fail' tool, write out other side if local side is deleted Siddharth Agarwal <sid0@fb.com> parents: 27047 diff changeset	301 # for change/delete conflicts write out the changed version, then fail
4dc5951df1e4 filemerge: in ':fail' tool, write out other side if local side is deleted Siddharth Agarwal <sid0@fb.com> parents: 27047 diff changeset	302 if fcd.isabsent():
33157 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	303 _underlyingfctxifabsent(fcd).write(fco.data(), fco.flags())
27032 28ee7af4b685 filemerge: return whether the file is deleted for nomerge internal tools Siddharth Agarwal <sid0@fb.com> parents: 26979 diff changeset	304 return 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	305
33157 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	306 def _underlyingfctxifabsent(filectx):
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	307 """Sometimes when resolving, our fcd is actually an absentfilectx, but
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	308 we want to write to it (to do the resolve). This helper returns the
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	309 underyling workingfilectx in that case.
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	310 """
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	311 if filectx.isabsent():
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	312 return filectx.changectx()[filectx.path()]
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	313 else:
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	314 return filectx
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32891 diff changeset	315
27041 0e330f59ef68 filemerge: don't attempt to premerge change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27040 diff changeset	316 def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	317 tool, toolpath, binary, symlink = toolconf
27041 0e330f59ef68 filemerge: don't attempt to premerge change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27040 diff changeset	318 if symlink or fcd.isabsent() or fco.isabsent():
18257 a35d0128545e merge: never do premerge on symlinks Mads Kiilerich <mads@kiilerich.com> parents: 18256 diff changeset	319 return 1
34049 67cfffbfb6a0 filemerge: eliminate most uses of tempfiles Phil Cohen <phillco@fb.com> parents: 34048 diff changeset	320 unused, unused, unused, back = files
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	321
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	322 ui = repo.ui
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	323
22032 d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	324 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	325
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	326 # do we attempt to simplemerge first?
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	327 try:
18257 a35d0128545e merge: never do premerge on symlinks Mads Kiilerich <mads@kiilerich.com> parents: 18256 diff changeset	328 premerge = _toolbool(ui, tool, "premerge", not binary)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	329 except error.ConfigError:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	330 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	331 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	332 _valid = ', '.join(["'" + v + "'" for v in validkeep])
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	333 raise error.ConfigError(_("%s.premerge not valid "
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	334 "('%s' is neither boolean nor %s)") %
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	335 (tool, premerge, _valid))
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	336
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	337 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	338 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	339 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	340 labels = _defaultconflictlabels
d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	341 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	342 labels.append('base')
34066 6330df9d6393 simplemerge: remove unused `repo` parameter Phil Cohen <phillco@fb.com> parents: 34053 diff changeset	343 r = simplemerge.simplemerge(ui, fcd, fca, fco, quiet=True, label=labels)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	344 if not r:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	345 ui.debug(" premerge successful\n")
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	346 return 0
22031 b36c60cfe46f merge-tools: make premerge valid values extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22028 diff changeset	347 if premerge not in validkeep:
34049 67cfffbfb6a0 filemerge: eliminate most uses of tempfiles Phil Cohen <phillco@fb.com> parents: 34048 diff changeset	348 # restore from backup and try again
34053 fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34052 diff changeset	349 _restorebackup(fcd, back)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	350 return 1 # continue merging
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	351
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	352 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	353 tool, toolpath, binary, symlink = toolconf
0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	354 if symlink:
26518 a77679d0b887 filemerge: print correct name of tool for symlink checks Siddharth Agarwal <sid0@fb.com> parents: 26517 diff changeset	355 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	356 'for %s\n') % (tool, fcd.path()))
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	357 return False
27040 1bde66b89bb2 filemerge._mergecheck: add check for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27039 diff changeset	358 if fcd.isabsent() or fco.isabsent():
1bde66b89bb2 filemerge._mergecheck: add check for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27039 diff changeset	359 repo.ui.warn(_('warning: internal %s cannot merge change/delete '
1bde66b89bb2 filemerge._mergecheck: add check for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27039 diff changeset	360 'conflict for %s\n') % (tool, fcd.path()))
1bde66b89bb2 filemerge._mergecheck: add check for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27039 diff changeset	361 return False
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	362 return True
0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	363
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	364 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	365 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	366 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	367 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	368 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	369 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	370 ui = repo.ui
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	371
34066 6330df9d6393 simplemerge: remove unused `repo` parameter Phil Cohen <phillco@fb.com> parents: 34053 diff changeset	372 r = simplemerge.simplemerge(ui, fcd, fca, fco, 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	373 return True, r, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	374
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	375 @internaltool('union', fullmerge,
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	376 _("warning: conflicts while merging %s! "
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	377 "(edit, then use 'hg resolve --mark')\n"),
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	378 precheck=_mergecheck)
26071 ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	379 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	380 """
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	381 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	382 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	383 No markers are inserted."""
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	384 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	385 files, labels, 'union')
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	386
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	387 @internaltool('merge', fullmerge,
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	388 _("warning: conflicts while merging %s! "
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	389 "(edit, then use 'hg resolve --mark')\n"),
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	390 precheck=_mergecheck)
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	391 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	392 """
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	393 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	394 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	395 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	396 of merge."""
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	397 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	398 files, labels, 'merge')
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	399
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	400 @internaltool('merge3', fullmerge,
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	401 _("warning: conflicts while merging %s! "
ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 26613 diff changeset	402 "(edit, then use 'hg resolve --mark')\n"),
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	403 precheck=_mergecheck)
22028 3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	404 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	405 """
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	406 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	407 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	408 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	409 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	410 if not labels:
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	411 labels = _defaultconflictlabels
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	412 if len(labels) < 3:
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	413 labels.append('base')
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	414 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	415
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	416 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	417 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	418 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	419 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	420 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	421 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	422 tool, toolpath, binary, symlink = toolconf
34066 6330df9d6393 simplemerge: remove unused `repo` parameter Phil Cohen <phillco@fb.com> parents: 34053 diff changeset	423 r = simplemerge.simplemerge(repo.ui, fcd, fca, fco, label=labels,
6330df9d6393 simplemerge: remove unused `repo` parameter Phil Cohen <phillco@fb.com> parents: 34053 diff changeset	424 localorother=localorother)
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	425 return True, r
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	426
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	427 @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	428 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	429 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	430 Like :merge, but resolve all conflicts non-interactively in favor
28640 4fc640fd0026 filemerge: use revset notation for p1/p2 of local/other descriptions timeless <timeless@mozdev.org> parents: 28578 diff changeset	431 of the local `p1()` changes."""
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	432 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	433 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	434
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	435 @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	436 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	437 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	438 Like :merge, but resolve all conflicts non-interactively in favor
28640 4fc640fd0026 filemerge: use revset notation for p1/p2 of local/other descriptions timeless <timeless@mozdev.org> parents: 28578 diff changeset	439 of the other `p2()` changes."""
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	440 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	441 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	442
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	443 @internaltool('tagmerge', mergeonly,
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	444 _("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	445 "(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	446 "tool of your choice)\n"))
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	447 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	448 """
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	449 Uses the internal tag merge algorithm (experimental).
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	450 """
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	451 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	452 return success, status, False
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	453
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	454 @internaltool('dump', fullmerge)
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	455 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	456 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	457 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	458 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	459 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	460 ``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	461 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
32295 7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	462 same directory as ``a.txt``.
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	463
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	464 This implies permerge. Therefore, files aren't dumped, if premerge
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	465 runs successfully. Use :forcedump to forcibly write files out.
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	466 """
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	467 a = _workingpath(repo, fcd)
26573 a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	468 fd = fcd.path()
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	469
34785 1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	470 # Run ``flushall()`` to make any missing folders the following wwrite
1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	471 # calls might be depending on.
1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	472 from . import context
1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	473 if isinstance(fcd, context.overlayworkingfilectx):
1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	474 fcd.ctx().flushall()
1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	475
34093 cd38b83bfb23 filemerge: use fctx.write() in the internal:dump tool, instead of copy Phil Cohen <phillco@fb.com> parents: 34066 diff changeset	476 util.writefile(a + ".local", fcd.decodeddata())
26573 a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	477 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	478 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	479 return False, 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	480
32295 7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	481 @internaltool('forcedump', mergeonly)
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	482 def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	483 labels=None):
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	484 """
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	485 Creates three versions of the files as same as :dump, but omits premerge.
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	486 """
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	487 return _idump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	488 labels=labels)
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32294 diff changeset	489
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	490 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	491 tool, toolpath, binary, symlink = toolconf
27042 30b919bc49bf filemerge: don't try using external tools on change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27041 diff changeset	492 if fcd.isabsent() or fco.isabsent():
30b919bc49bf filemerge: don't try using external tools on change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27041 diff changeset	493 repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
30b919bc49bf filemerge: don't try using external tools on change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27041 diff changeset	494 'for %s\n') % (tool, fcd.path()))
30b919bc49bf filemerge: don't try using external tools on change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27041 diff changeset	495 return False, 1, None
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	496 unused, unused, unused, back = files
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	497 a = _workingpath(repo, fcd)
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	498 b, c = _maketempfiles(repo, fco, fca)
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	499 try:
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	500 out = ""
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	501 env = {'HG_FILE': fcd.path(),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	502 'HG_MY_NODE': short(mynode),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	503 'HG_OTHER_NODE': str(fco.changectx()),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	504 'HG_BASE_NODE': str(fca.changectx()),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	505 'HG_MY_ISLINK': 'l' in fcd.flags(),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	506 'HG_OTHER_ISLINK': 'l' in fco.flags(),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	507 'HG_BASE_ISLINK': 'l' in fca.flags(),
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	508 }
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	509 ui = repo.ui
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	510
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	511 args = _toolstr(ui, tool, "args", '$local $base $other')
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	512 if "$output" in args:
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	513 # read input from backup, write to original
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	514 out = a
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	515 a = repo.wvfs.join(back.path())
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	516 replace = {'local': a, 'base': b, 'other': c, 'output': out}
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	517 args = util.interpolate(r'\$', replace, args,
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	518 lambda s: util.shellquote(util.localpath(s)))
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	519 cmd = toolpath + ' ' + args
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	520 if _toolbool(ui, tool, "gui"):
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	521 repo.ui.status(_('running merge tool %s for file %s\n') %
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	522 (tool, fcd.path()))
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	523 repo.ui.debug('launching merge tool: %s\n' % cmd)
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	524 r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
34506 1d804c22c671 py3: use '%d' for integers instead of '%s' Pulkit Goyal <7895pulkit@gmail.com> parents: 34138 diff changeset	525 repo.ui.debug('merge tool returned: %d\n' % r)
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	526 return True, r, False
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	527 finally:
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	528 util.unlink(b)
96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	529 util.unlink(c)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	530
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	531 def _formatconflictmarker(repo, ctx, template, label, pad):
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	532 """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	533
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	534 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	535 can have aligned templated parts.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	536 """
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	537 if ctx.node() is None:
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	538 ctx = ctx.p1()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	539
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	540 props = templatekw.keywords.copy()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	541 props['templ'] = template
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	542 props['ctx'] = ctx
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	543 props['repo'] = repo
32891 2ecce24dfcd3 templater: add simple interface for unnamed template (API) Yuya Nishihara <yuya@tcha.org> parents: 32773 diff changeset	544 templateresult = template.render(props)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	545
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	546 label = ('%s:' % label).ljust(pad + 1)
32891 2ecce24dfcd3 templater: add simple interface for unnamed template (API) Yuya Nishihara <yuya@tcha.org> parents: 32773 diff changeset	547 mark = '%s %s' % (label, templateresult)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	548
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	549 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	550 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	551
21865 78e56e70c70a filemerge: use 'util.ellipsis' to trim custom conflict markers correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21864 diff changeset	552 # 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	553 return util.ellipsis(mark, 80 - 8)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	554
21524 47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21519 diff changeset	555 _defaultconflictlabels = ['local', 'other']
47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21519 diff changeset	556
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	557 def _formatlabels(repo, fcd, fco, fca, labels):
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	558 """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	559
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	560 Returns a list of formatted labels.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	561 """
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	562 cd = fcd.changectx()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	563 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	564 ca = fca.changectx()
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	565
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	566 ui = repo.ui
33523 11025c4f1016 configitems: register the 'ui.mergemarkertemplate' config Boris Feld <boris.feld@octobus.net> parents: 33499 diff changeset	567 template = ui.config('ui', 'mergemarkertemplate')
32047 458f7294dfee filemerge: optionally strip quotes from merge marker template (BC) Yuya Nishihara <yuya@tcha.org> parents: 31445 diff changeset	568 template = templater.unquotestring(template)
32891 2ecce24dfcd3 templater: add simple interface for unnamed template (API) Yuya Nishihara <yuya@tcha.org> parents: 32773 diff changeset	569 tmpl = formatter.maketemplater(ui, template)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	570
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	571 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	572
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	573 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	574 _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	575 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	576 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	577 return newlabels
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	578
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	579 def partextras(labels):
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	580 """Return a dictionary of extra labels for use in prompts to the user
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	581
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	582 Intended use is in strings of the form "(l)ocal%(l)s".
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	583 """
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	584 if labels is None:
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	585 return {
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	586 "l": "",
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	587 "o": "",
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	588 }
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	589
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	590 return {
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	591 "l": " [%s]" % labels[0],
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	592 "o": " [%s]" % labels[1],
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	593 }
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	594
34053 fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34052 diff changeset	595 def _restorebackup(fcd, back):
fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34052 diff changeset	596 # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34052 diff changeset	597 # util.copy here instead.
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	598 fcd.write(back.data(), fcd.flags())
34053 fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34052 diff changeset	599
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	600 def _makebackup(repo, ui, wctx, fcd, premerge):
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	601 """Makes and returns a filectx-like object for ``fcd``'s backup file.
34048 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	602
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	603 In addition to preserving the user's pre-existing modifications to `fcd`
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	604 (if any), the backup is used to undo certain premerges, confirm whether a
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	605 merge changed anything, and determine what line endings the new file should
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	606 have.
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	607 """
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	608 if fcd.isabsent():
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	609 return None
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	610 # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset ->
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	611 # merge -> filemerge). (I suspect the fileset import is the weakest link)
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	612 from . import context
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	613 a = _workingpath(repo, fcd)
34048 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	614 back = scmutil.origpath(ui, repo, a)
34784 123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	615 inworkingdir = (back.startswith(repo.wvfs.base) and not
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	616 back.startswith(repo.vfs.base))
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	617
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	618 if isinstance(fcd, context.overlayworkingfilectx) and inworkingdir:
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	619 # If the backup file is to be in the working directory, and we're
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	620 # merging in-memory, we must redirect the backup to the memory context
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	621 # so we don't disturb the working directory.
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	622 relpath = back[len(repo.wvfs.base) + 1:]
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	623 wctx[relpath].write(fcd.data(), fcd.flags())
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	624 return wctx[relpath]
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	625 else:
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	626 # Otherwise, write to wherever the user specified the backups should go.
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	627 #
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	628 # A arbitraryfilectx is returned, so we can run the same functions on
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	629 # the backup context regardless of where it lives.
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	630 if premerge:
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	631 util.copyfile(a, back)
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	632 return context.arbitraryfilectx(back, repo=repo)
34048 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	633
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	634 def _maketempfiles(repo, fco, fca):
34048 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	635 """Writes out `fco` and `fca` as temporary files, so an external merge
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	636 tool may use them.
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	637 """
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	638 def temp(prefix, ctx):
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	639 fullbase, ext = os.path.splitext(ctx.path())
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	640 pre = "%s~%s." % (os.path.basename(fullbase), prefix)
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	641 (fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	642 data = repo.wwritedata(ctx.path(), ctx.data())
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	643 f = os.fdopen(fd, pycompat.sysstr("wb"))
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	644 f.write(data)
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	645 f.close()
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	646 return name
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	647
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	648 b = temp("base", fca)
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	649 c = temp("other", fco)
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	650
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	651 return b, c
34048 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33924 diff changeset	652
34137 c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	653 def _filemerge(premerge, repo, wctx, 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	654 """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	655
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	656 premerge = whether this is a premerge
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	657 mynode = parent node before merge
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	658 orig = original local filename before merge
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	659 fco = other file context
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	660 fca = ancestor file context
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	661 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	662
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	663 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	664 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	665
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	666 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	667 return True, None, False
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	668
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	669 ui = repo.ui
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	670 fd = fcd.path()
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	671 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	672 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	673 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	674 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	675 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	676 # 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	677 tool = tool[len('internal'):]
27161 296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict Siddharth Agarwal <sid0@fb.com> parents: 27124 diff changeset	678 ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
32773 264b86cf2092 py3: convert bool variables to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32357 diff changeset	679 % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink),
264b86cf2092 py3: convert bool variables to bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 32357 diff changeset	680 pycompat.bytestr(changedelete)))
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	681
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	682 if tool in internals:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	683 func = internals[tool]
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	684 mergetype = func.mergetype
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	685 onfailure = func.onfailure
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	686 precheck = func.precheck
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	687 else:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	688 func = _xmerge
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	689 mergetype = fullmerge
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	690 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	691 precheck = None
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	692
34138 9c07cff039bc filemerge: flush if using deferred writes when running a merge tool Phil Cohen <phillco@fb.com> parents: 34137 diff changeset	693 # If using deferred writes, must flush any deferred contents if running
9c07cff039bc filemerge: flush if using deferred writes when running a merge tool Phil Cohen <phillco@fb.com> parents: 34137 diff changeset	694 # an external merge tool since it has arbitrary access to the working
9c07cff039bc filemerge: flush if using deferred writes when running a merge tool Phil Cohen <phillco@fb.com> parents: 34137 diff changeset	695 # copy.
9c07cff039bc filemerge: flush if using deferred writes when running a merge tool Phil Cohen <phillco@fb.com> parents: 34137 diff changeset	696 wctx.flushall()
9c07cff039bc filemerge: flush if using deferred writes when running a merge tool Phil Cohen <phillco@fb.com> parents: 34137 diff changeset	697
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	698 toolconf = tool, toolpath, binary, symlink
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	699
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	700 if mergetype == nomerge:
29785 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29680 diff changeset	701 r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	702 return True, r, deleted
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	703
26609 47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	704 if premerge:
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	705 if orig != fco.path():
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	706 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	707 else:
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	708 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	709
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	710 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	711
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	712 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	713 toolconf):
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	714 if onfailure:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	715 ui.warn(onfailure % fd)
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	716 return True, 1, False
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	717
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	718 back = _makebackup(repo, ui, wctx, fcd, premerge)
34052 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34051 diff changeset	719 files = (None, None, None, back)
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	720 r = 1
fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	721 try:
33499 0407a51b9d8c codemod: register core configitems using a script Jun Wu <quark@fb.com> parents: 33157 diff changeset	722 markerstyle = ui.config('ui', 'mergemarkers')
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	723 if not labels:
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	724 labels = _defaultconflictlabels
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	725 if markerstyle != 'basic':
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	726 labels = _formatlabels(repo, fcd, fco, fca, labels)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	727
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	728 if premerge and mergetype == fullmerge:
27041 0e330f59ef68 filemerge: don't attempt to premerge change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27040 diff changeset	729 r = _premerge(repo, fcd, fco, fca, 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	730 # 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	731 return not r, r, False
26567 f18646cf0e93 filemerge: call premerge directly from main merge function Siddharth Agarwal <sid0@fb.com> parents: 26529 diff changeset	732
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	733 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	734 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	735
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	736 if needcheck:
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	737 r = _check(repo, r, ui, tool, fcd, files)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	738
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	739 if r:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	740 if onfailure:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	741 ui.warn(onfailure % fd)
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	742
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	743 return True, r, deleted
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	744 finally:
27047 e1458049dca5 filemerge: don't try to copy files known to be absent Siddharth Agarwal <sid0@fb.com> parents: 27042 diff changeset	745 if not r and back is not None:
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	746 back.remove()
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	747
34796 ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	748 def _haltmerge():
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	749 msg = _('merge halted after failed merge (see hg resolve)')
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	750 raise error.InterventionRequired(msg)
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	751
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	752 def _onfilemergefailure(ui):
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	753 action = ui.config('merge', 'on-failure')
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	754 if action == 'prompt':
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	755 msg = _('continue merge operation (yn)?' '$$ &Yes $$ &No')
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	756 if ui.promptchoice(msg, 0) == 1:
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	757 _haltmerge()
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	758 if action == 'halt':
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	759 _haltmerge()
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	760 # default action is 'continue', in which case we neither prompt nor halt
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	761
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	762 def _check(repo, r, ui, tool, fcd, files):
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	763 fd = fcd.path()
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	764 unused, unused, unused, back = files
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	765
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	766 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	767 '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	768 if re.search("^(<<<<<<< .\|=======\|>>>>>>> .)$", fcd.data(),
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	769 re.MULTILINE):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	770 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	771
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	772 checked = False
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	773 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	774 checked = True
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	775 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	776 "$$ &Yes $$ &No") % fd, 1):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	777 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	778
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	779 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	780 'changed' in
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	781 _toollist(ui, tool, "check")):
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	782 if back is not None and not fcd.cmp(back):
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	783 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	784 "was merge successful (yn)?"
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	785 "$$ &Yes $$ &No") % fd, 1):
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	786 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	787
27047 e1458049dca5 filemerge: don't try to copy files known to be absent Siddharth Agarwal <sid0@fb.com> parents: 27042 diff changeset	788 if back is not None and _toolbool(ui, tool, "fixeol"):
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	789 _matcheol(_workingpath(repo, fcd), back)
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	790
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	791 return r
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	792
34051 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	793 def _workingpath(repo, ctx):
7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	794 return repo.wjoin(ctx.path())
7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34050 diff changeset	795
34137 c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	796 def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	797 return _filemerge(True, repo, wctx, mynode, orig, fcd, fco, fca,
c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	798 labels=labels)
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	799
34137 c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	800 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	801 return _filemerge(False, repo, wctx, mynode, orig, fcd, fco, fca,
c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34093 diff changeset	802 labels=labels)
26605 ef21a2c41629 filemerge: add a wrapper around the filemerge function Siddharth Agarwal <sid0@fb.com> parents: 26589 diff changeset	803
33725 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	804 def loadinternalmerge(ui, extname, registrarobj):
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	805 """Load internal merge tool from specified registrarobj
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	806 """
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	807 for name, func in registrarobj._table.iteritems():
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	808 fullname = ':' + name
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	809 internals[fullname] = func
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	810 internals['internal:' + name] = func
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	811 internalsdoc[fullname] = func
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	812
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	813 # load built-in merge tools explicitly to setup internalsdoc
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	814 loadinternalmerge(None, None, internaltool)
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	815
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	816 # 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	817 i18nfunctions = internals.values()

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/filemerge.py @ 34796:ed91846c29cf