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

annotate mercurial/filemerge.py @ 43076:2372284d9457

formatting: blacken the codebase This is using my patch to black (https://github.com/psf/black/pull/826) so we don't un-wrap collection literals. Done with: hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S # skip-blame mass-reformatting only # no-check-commit reformats foo_bar functions Differential Revision: https://phab.mercurial-scm.org/D6971

author	Augie Fackler <augie@google.com>
date	Sun, 06 Oct 2019 09:45:02 -0400
parents	4764e8436b2a
children	687b865b95ad

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
36998 3723b42ff953 filemerge: move temp file unlinks to _maketempfiles Kyle Lippincott <spectral@google.com> parents: 36988 diff changeset	10 import contextlib
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	11 import os
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	12 import re
36999 e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	13 import shutil
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	14
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	15 from .i18n import _
40478 86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	16 from .node import (
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	17 hex,
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	18 nullid,
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	19 short,
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	20 )
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	21
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	22 from . import (
30636 f1c9fafcbf46 py3: replace os.environ with encoding.environ (part 3 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30538 diff changeset	23 encoding,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	24 error,
28955 78759f78a44e templater: factor out function that creates templater from string template Yuya Nishihara <yuya@tcha.org> parents: 28954 diff changeset	25 formatter,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	26 match,
30073 aa23c93e636d py3: make format strings unicodes and not bytes Pulkit Goyal <7895pulkit@gmail.com> parents: 29775 diff changeset	27 pycompat,
33699 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	28 registrar,
27651 07fc2f2134ba origpath: move from cmdutil to scmutil Siddharth Agarwal <sid0@fb.com> parents: 27599 diff changeset	29 scmutil,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	30 simplemerge,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	31 tagmerge,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	32 templatekw,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	33 templater,
40478 86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	34 templateutil,
25949 80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	35 util,
80aba76e29c1 filemerge: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25835 diff changeset	36 )
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	37
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37077 diff changeset	38 from .utils import (
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	39 procutil,
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37077 diff changeset	40 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37077 diff changeset	41 )
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37077 diff changeset	42
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	43
34826 18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	44 def _toolstr(ui, tool, part, *args):
18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	45 return ui.config("merge-tools", tool + "." + part, *args)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	46
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	47
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	48 def _toolbool(ui, tool, part, *args):
34826 18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	49 return ui.configbool("merge-tools", tool + "." + part, *args)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	50
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	51
34826 18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	52 def _toollist(ui, tool, part):
18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	53 return ui.configlist("merge-tools", tool + "." + part)
11148 a912f26777d3 merge: introduce tool.check parameter David Champion <dgc@uchicago.edu> parents: 11146 diff changeset	54
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	55
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	56 internals = {}
24099 be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	57 # Merge tools to document.
be83fd9d46d5 help.merge-tools: do not double document merge tools Gregory Szorc <gregory.szorc@gmail.com> parents: 23270 diff changeset	58 internalsdoc = {}
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	59
33699 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	60 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	61
26525 abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	62 # internal tool merge types
33699 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	63 nomerge = internaltool.nomerge
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	64 mergeonly = internaltool.mergeonly # just the full merge, no premerge
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	65 fullmerge = internaltool.fullmerge # both premerge and merge
26525 abc2327e382a filemerge: add some merge types Siddharth Agarwal <sid0@fb.com> parents: 26519 diff changeset	66
42565 4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	67 # IMPORTANT: keep the last line of this prompt very short ("What do you want to
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	68 # do?") because of issue6158, ideally to <40 English characters (to allow other
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	69 # languages that may take more columns to still have a chance to fit in an
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	70 # 80-column screen).
32317 6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32255 diff changeset	71 _localchangedotherdeletedmsg = _(
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	72 "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
42565 4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	73 "You can use (c)hanged version, (d)elete, or leave (u)nresolved.\n"
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	74 "What do you want to do?"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	75 "$$ &Changed $$ &Delete $$ &Unresolved"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	76 )
32317 6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32255 diff changeset	77
6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32255 diff changeset	78 _otherchangedlocaldeletedmsg = _(
39285 a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt Pulkit Goyal <pulkit@yandex-team.ru> parents: 39284 diff changeset	79 "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
42565 4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	80 "You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.\n"
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	81 "What do you want to do?"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	82 "$$ &Changed $$ &Deleted $$ &Unresolved"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	83 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	84
32317 6587427b2018 filemerge: store error messages in module variables Stanislau Hlebik <stash@fb.com> parents: 32255 diff changeset	85
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	86 class absentfilectx(object):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	87 """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	88 present in it.
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	89
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	90 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	91 other code is likely going to break with the values this returns."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	92
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	93 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	94 self._ctx = ctx
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	95 self._f = f
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 path(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	98 return self._f
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 size(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	101 return None
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 data(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	104 return None
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 filenode(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	107 return nullid
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	108
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	109 _customcmp = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	110
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	111 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	112 """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	113
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	114 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	115 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	116 return not (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	117 fctx.isabsent()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	118 and fctx.ctx() == self.ctx()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	119 and fctx.path() == self.path()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	120 )
26979 7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	121
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	122 def flags(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	123 return ''
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	124
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	125 def changectx(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	126 return self._ctx
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	127
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	128 def isbinary(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	129 return False
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	130
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	131 def isabsent(self):
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	132 return True
7b038ec6c5fd filemerge: introduce class whose objects represent files not in a context Siddharth Agarwal <sid0@fb.com> parents: 26967 diff changeset	133
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	134
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	135 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	136 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	137 return tool
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	138 cmd = _toolstr(ui, tool, "executable", tool)
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	139 if cmd.startswith('python:'):
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	140 return cmd
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	141 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	142
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	143
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	144 def _quotetoolpath(cmd):
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	145 if cmd.startswith('python:'):
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	146 return cmd
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	147 return procutil.shellquote(cmd)
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	148
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	149
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	150 def findexternaltool(ui, tool):
13565 984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	151 for kn in ("regkey", "regkeyalt"):
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	152 k = _toolstr(ui, tool, kn)
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	153 if not k:
984175605311 filemerge: introduce a 'regkeyalt' merge tool variable Steve Borho <steve@borho.org> parents: 12788 diff changeset	154 continue
14230 d51630301241 rename util.lookup_reg to lookupreg Adrian Buehlmann <adrian@cadifra.com> parents: 14168 diff changeset	155 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	156 if p:
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	157 p = procutil.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	158 if p:
3c9dbb743d20 merge: add registry look up bits to tool search Matt Mackall <mpm@selenic.com> parents: 6005 diff changeset	159 return p
15264 157d93c41c10 merge: expand environment variables and ~/ in tool.executable Greg Ward <greg@gerg.ca> parents: 14749 diff changeset	160 exe = _toolstr(ui, tool, "executable", tool)
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	161 return procutil.findexe(util.expandpath(exe))
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	162
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	163
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	164 def _picktool(repo, ui, path, binary, symlink, changedelete):
39125 cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	165 strictcheck = ui.configbool('merge', 'strict-capability-check')
cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	166
39123 4d7b11877dd0 filemerge: add the function to examine a capability of a internal tool FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39122 diff changeset	167 def hascapability(tool, capability, strict=False):
39266 82555d7186d0 filemerge: make capability check for internal tools ignore merge-tools section FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39126 diff changeset	168 if tool in internals:
82555d7186d0 filemerge: make capability check for internal tools ignore merge-tools section FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39126 diff changeset	169 return strict and internals[tool].capabilities.get(capability)
39123 4d7b11877dd0 filemerge: add the function to examine a capability of a internal tool FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39122 diff changeset	170 return _toolbool(ui, tool, capability)
4d7b11877dd0 filemerge: add the function to examine a capability of a internal tool FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39122 diff changeset	171
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	172 def supportscd(tool):
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	173 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	174
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	175 def check(tool, pat, symlink, binary, changedelete):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	176 tmsg = tool
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	177 if pat:
32254 177742666abd filemerge: make warning message more i18n friendly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32253 diff changeset	178 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	179 if not _findtool(ui, tool):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	180 if pat: # explicitly requested tool deserves a warning
7397 4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	181 ui.warn(_("couldn't find merge tool %s\n") % tmsg)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	182 else: # configured but non-existing tools are more silent
7397 4c92d8971809 More verbose logging when filemerge searches for merge-tool Mads Kiilerich <mads@kiilerich.com> parents: 6762 diff changeset	183 ui.note(_("couldn't find merge tool %s\n") % tmsg)
39125 cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	184 elif symlink and not hascapability(tool, "symlink", strictcheck):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	185 ui.warn(_("tool %s can't handle symlinks\n") % tmsg)
39125 cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	186 elif binary and not hascapability(tool, "binary", strictcheck):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	187 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	188 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	189 # 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	190 # conflicts
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	191 pass
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	192 elif not procutil.gui() and _toolbool(ui, tool, "gui"):
6007 090b1a665901 filemerge: add config item for GUI tools Matt Mackall <mpm@selenic.com> parents: 6006 diff changeset	193 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	194 else:
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	195 return True
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	196 return False
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	197
25835 34ffe4c29782 filemerge: mark internal-only config option Matt Mackall <mpm@selenic.com> parents: 24987 diff changeset	198 # internal config: ui.forcemerge
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	199 # 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	200 force = ui.config('ui', 'forcemerge')
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	201 if force:
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	202 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	203 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	204 return ":prompt", None
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	205 else:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	206 if toolpath:
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	207 return (force, _quotetoolpath(toolpath))
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	208 else:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	209 # 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	210 return (force, force)
12788 de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	211
de793925862e merge: implement --tool arguments using new ui.forcemerge configurable Steve Borho <steve@borho.org> parents: 12047 diff changeset	212 # HGMERGE takes next precedence
30636 f1c9fafcbf46 py3: replace os.environ with encoding.environ (part 3 of 5) Pulkit Goyal <7895pulkit@gmail.com> parents: 30538 diff changeset	213 hgmerge = encoding.environ.get("HGMERGE")
6025 f2335246e5c7 filemerge: wrap quotes around tool path Steve Borho <steve@borho.org> parents: 6016 diff changeset	214 if hgmerge:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	215 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	216 return ":prompt", None
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	217 else:
d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	218 return (hgmerge, hgmerge)
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	219
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	220 # then patterns
39125 cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	221
cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	222 # whether binary capability should be checked strictly
cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	223 binarycap = binary and strictcheck
cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	224
6016 288ec2f6faa2 filemerge: fix pattern matching dhruva <dhruvakm@gmail.com> parents: 6015 diff changeset	225 for pat, tool in ui.configitems("merge-patterns"):
8567 fea40a677d43 match: add some default args Matt Mackall <mpm@selenic.com> parents: 8566 diff changeset	226 mf = match.match(repo.root, '', [pat])
39125 cded904f7acc filemerge: add config knob to check capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39124 diff changeset	227 if mf(path) and check(tool, pat, symlink, binarycap, changedelete):
39124 6618634e3325 filemerge: show warning if chosen tool has no binary files capability FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39123 diff changeset	228 if binary and not hascapability(tool, "binary", strict=True):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	229 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	230 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	231 "warning: check merge-patterns configurations,"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	232 " if %r for binary file %r is unintentional\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	233 "(see 'hg help merge-tools'"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	234 " for binary files capability)\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	235 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	236 % (pycompat.bytestr(tool), pycompat.bytestr(path))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	237 )
10339 23e608f42f2c fix spaces/identation issues Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	238 toolpath = _findtool(ui, tool)
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	239 return (tool, _quotetoolpath(toolpath))
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	240
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	241 # then merge tools
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	242 tools = {}
26730 a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	243 disabled = set()
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	244 for k, v in ui.configitems("merge-tools"):
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	245 t = k.split('.')[0]
5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	246 if t not in tools:
34826 18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	247 tools[t] = int(_toolstr(ui, t, "priority"))
18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	248 if _toolbool(ui, t, "disabled"):
26730 a1e43e85d294 merge-tools: allow marking a mergetool as completely disabled Augie Fackler <augie@google.com> parents: 26614 diff changeset	249 disabled.add(t)
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	250 names = tools.keys()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	251 tools = sorted(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	252 [(-p, tool) for tool, p in tools.items() if tool not in disabled]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	253 )
6076 0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	254 uimerge = ui.config("ui", "merge")
0ee885fea464 filemerge: more backwards compatible behavior for ui.merge Steve Borho <steve@borho.org> parents: 6075 diff changeset	255 if uimerge:
27039 d7517deedf86 filemerge._picktool: only pick from nomerge tools for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27038 diff changeset	256 # 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	257 # change/delete conflicts
38952 0e58c5b20745 mergetool: warn if ui.merge points to nonexistent tool Martin von Zweigbergk <martinvonz@google.com> parents: 38793 diff changeset	258 if check(uimerge, path, symlink, binary, changedelete):
0e58c5b20745 mergetool: warn if ui.merge points to nonexistent tool Martin von Zweigbergk <martinvonz@google.com> parents: 38793 diff changeset	259 if uimerge not in names and not changedelete:
0e58c5b20745 mergetool: warn if ui.merge points to nonexistent tool Martin von Zweigbergk <martinvonz@google.com> parents: 38793 diff changeset	260 return (uimerge, uimerge)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	261 tools.insert(0, (None, uimerge)) # highest priority
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	262 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	263 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	264 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	265 toolpath = _findtool(ui, t)
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	266 return (t, _quotetoolpath(toolpath))
16254 c7eef052c9e3 filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 Matt Mackall <mpm@selenic.com> parents: 16205 diff changeset	267
c7eef052c9e3 filemerge: restore default prompt for binary/symlink lost in 83925d3a4559 Matt Mackall <mpm@selenic.com> parents: 16205 diff changeset	268 # 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	269 if symlink or binary or changedelete:
32253 7d4ce4b567c5 filemerge: show warning about choice of :prompt only at an actual fallback FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32047 diff changeset	270 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	271 # 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	272 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	273 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	274 return ":merge", None
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	275
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	276
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	277 def _eoltype(data):
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	278 "Guess the EOL type of a file"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	279 if '\0' in data: # binary
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	280 return None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	281 if '\r\n' in data: # Windows
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	282 return '\r\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	283 if '\r' in data: # Old Mac
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	284 return '\r'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	285 if '\n' in data: # UNIX
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	286 return '\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	287 return None # unknown
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	288
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	289
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	290 def _matcheol(file, back):
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	291 "Convert EOL markers in a file to match origfile"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	292 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	293 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	294 data = util.readfile(file)
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	295 style = _eoltype(data)
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	296 if style:
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	297 newdata = data.replace(style, tostyle)
3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	298 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	299 util.writefile(file, newdata)
6005 3c33032d8906 merge: add support for tool EOL fixups Matt Mackall <mpm@selenic.com> parents: 6004 diff changeset	300
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	301
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	302 @internaltool('prompt', nomerge)
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	303 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	304 """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	305 keep as the merged version."""
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	306 ui = repo.ui
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	307 fd = fcd.path()
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	308 uipathfn = scmutil.getuipathfn(repo)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	309
35282 46d7f0713a87 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Phil Cohen <phillco@fb.com> parents: 35281 diff changeset	310 # Avoid prompting during an in-memory merge since it doesn't support merge
46d7f0713a87 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Phil Cohen <phillco@fb.com> parents: 35281 diff changeset	311 # conflicts.
46d7f0713a87 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Phil Cohen <phillco@fb.com> parents: 35281 diff changeset	312 if fcd.changectx().isinmemory():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	313 raise error.InMemoryMergeConflictsError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	314 'in-memory merge does not ' 'support file conflicts'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	315 )
35282 46d7f0713a87 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Phil Cohen <phillco@fb.com> parents: 35281 diff changeset	316
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	317 prompts = partextras(labels)
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	318 prompts['fd'] = uipathfn(fd)
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	319 try:
27038 58a4eb16e722 filemerge: add support for change/delete conflicts to the ':prompt' tool Siddharth Agarwal <sid0@fb.com> parents: 27037 diff changeset	320 if fco.isabsent():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	321 index = ui.promptchoice(_localchangedotherdeletedmsg % prompts, 2)
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	322 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	323 elif fcd.isabsent():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	324 index = ui.promptchoice(_otherchangedlocaldeletedmsg % prompts, 2)
27163 27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts Siddharth Agarwal <sid0@fb.com> parents: 27162 diff changeset	325 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	326 else:
42565 4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	327 # IMPORTANT: keep the last line of this prompt ("What do you want to
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	328 # do?") very short, see comment next to _localchangedotherdeletedmsg
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158) Kyle Lippincott <spectral@google.com> parents: 41600 diff changeset	329 # at the top of the file for details.
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	330 index = ui.promptchoice(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	331 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	332 "file '%(fd)s' needs to be resolved.\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	333 "You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	334 "(u)nresolved.\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	335 "What do you want to do?"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	336 "$$ &Local $$ &Other $$ &Unresolved"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	337 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	338 % prompts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	339 2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	340 )
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	341 choice = ['local', 'other', 'unresolved'][index]
26851 859f453e8b4e filemerge.prompt: separate out choice selection and action Siddharth Agarwal <sid0@fb.com> parents: 26730 diff changeset	342
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	343 if choice == 'other':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	344 return _iother(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	345 elif choice == 'local':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	346 return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
27162 4ab69be0ea15 filemerge: add a 'leave unresolved' option to regular prompts Siddharth Agarwal <sid0@fb.com> parents: 27161 diff changeset	347 elif choice == 'unresolved':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	348 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
26898 33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	349 except error.ResponseExpected:
33eb8a56d0c9 filemerge: treat EOF at prompt as fail, not abort Siddharth Agarwal <sid0@fb.com> parents: 26893 diff changeset	350 ui.write("\n")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	351 return _ifail(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	352
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	353
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	354 @internaltool('local', nomerge)
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	355 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	356 """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	357 return 0, fcd.isabsent()
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	358
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	359
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	360 @internaltool('other', nomerge)
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	361 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	362 """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	363 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	364 # local changed, remote deleted -- 'deleted' picked
33151 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	365 _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	366 deleted = True
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	367 else:
33151 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	368 _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	369 deleted = False
a8908c139f2f filemerge: add support for change/delete conflicts to the ':other' merge tool Siddharth Agarwal <sid0@fb.com> parents: 27036 diff changeset	370 return 0, deleted
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	371
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	372
26526 7fa3560443fd filemerge: switch trymerge boolean to mergetype enum Siddharth Agarwal <sid0@fb.com> parents: 26525 diff changeset	373 @internaltool('fail', nomerge)
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	374 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	375 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	376 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	377 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	378 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	379 # 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	380 if fcd.isabsent():
33151 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	381 _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	382 return 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	383
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	384
33151 851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	385 def _underlyingfctxifabsent(filectx):
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	386 """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: 32873 diff changeset	387 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: 32873 diff changeset	388 underyling workingfilectx in that case.
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	389 """
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	390 if filectx.isabsent():
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	391 return filectx.changectx()[filectx.path()]
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	392 else:
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	393 return filectx
851825214aa3 filemerge: convert a couple of wvfs calls in internal mergetools to contexts Phil Cohen <phillco@fb.com> parents: 32873 diff changeset	394
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	395
27041 0e330f59ef68 filemerge: don't attempt to premerge change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27040 diff changeset	396 def _premerge(repo, fcd, fco, fca, toolconf, files, labels=None):
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	397 tool, toolpath, binary, symlink, scriptfn = toolconf
27041 0e330f59ef68 filemerge: don't attempt to premerge change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27040 diff changeset	398 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	399 return 1
34032 67cfffbfb6a0 filemerge: eliminate most uses of tempfiles Phil Cohen <phillco@fb.com> parents: 34031 diff changeset	400 unused, unused, unused, back = files
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	401
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	402 ui = repo.ui
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	403
22032 d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	404 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	405
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	406 # do we attempt to simplemerge first?
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	407 try:
18257 a35d0128545e merge: never do premerge on symlinks Mads Kiilerich <mads@kiilerich.com> parents: 18256 diff changeset	408 premerge = _toolbool(ui, tool, "premerge", not binary)
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	409 except error.ConfigError:
34826 18a3274ed675 configitems: register the full 'merge-tools' config and sub-options Boris Feld <boris.feld@octobus.net> parents: 34797 diff changeset	410 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	411 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	412 _valid = ', '.join(["'" + v + "'" for v in validkeep])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	413 raise error.ConfigError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	414 _("%s.premerge not valid " "('%s' is neither boolean nor %s)")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	415 % (tool, premerge, _valid)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	416 )
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	417
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	418 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	419 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	420 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	421 labels = _defaultconflictlabels
d7f25834ffbb merge-tools: add a `premerge=keep-merge3` config option Pierre-Yves David <pierre-yves.david@fb.com> parents: 22031 diff changeset	422 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	423 labels.append('base')
34049 6330df9d6393 simplemerge: remove unused `repo` parameter Phil Cohen <phillco@fb.com> parents: 34036 diff changeset	424 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	425 if not r:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	426 ui.debug(" premerge successful\n")
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	427 return 0
22031 b36c60cfe46f merge-tools: make premerge valid values extensible Pierre-Yves David <pierre-yves.david@fb.com> parents: 22028 diff changeset	428 if premerge not in validkeep:
34032 67cfffbfb6a0 filemerge: eliminate most uses of tempfiles Phil Cohen <phillco@fb.com> parents: 34031 diff changeset	429 # restore from backup and try again
34036 fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34035 diff changeset	430 _restorebackup(fcd, back)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	431 return 1 # continue merging
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	432
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	433
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	434 def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	435 tool, toolpath, binary, symlink, scriptfn = toolconf
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	436 uipathfn = scmutil.getuipathfn(repo)
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	437 if symlink:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	438 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	439 _('warning: internal %s cannot merge symlinks ' 'for %s\n')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	440 % (tool, uipathfn(fcd.path()))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	441 )
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	442 return False
27040 1bde66b89bb2 filemerge._mergecheck: add check for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27039 diff changeset	443 if fcd.isabsent() or fco.isabsent():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	444 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	445 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	446 'warning: internal %s cannot merge change/delete '
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	447 'conflict for %s\n'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	448 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	449 % (tool, uipathfn(fcd.path()))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	450 )
27040 1bde66b89bb2 filemerge._mergecheck: add check for change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27039 diff changeset	451 return False
26515 0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	452 return True
0ffa7fe1076b filemerge: add a precheck for symlinks Siddharth Agarwal <sid0@fb.com> parents: 26514 diff changeset	453
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	454
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	455 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	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 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	458 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	459 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	460 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	461 ui = repo.ui
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	462
34049 6330df9d6393 simplemerge: remove unused `repo` parameter Phil Cohen <phillco@fb.com> parents: 34036 diff changeset	463 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	464 return True, r, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	465
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	466
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	467 @internaltool(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	468 'union',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	469 fullmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	470 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	471 "warning: conflicts while merging %s! "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	472 "(edit, then use 'hg resolve --mark')\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	473 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	474 precheck=_mergecheck,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	475 )
26071 ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	476 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	477 """
ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	478 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	479 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	480 No markers are inserted."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	481 return _merge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	482 repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, 'union'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	483 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	484
26071 ff12a6c63c3d filemerge: add 'union' merge to internal merge tool Erik Huelsmann <ehuels@gmail.com> parents: 26070 diff changeset	485
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	486 @internaltool(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	487 'merge',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	488 fullmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	489 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	490 "warning: conflicts while merging %s! "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	491 "(edit, then use 'hg resolve --mark')\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	492 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	493 precheck=_mergecheck,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	494 )
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	495 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	496 """
e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	497 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	498 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	499 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	500 of merge."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	501 return _merge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	502 repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, 'merge'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	503 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	504
26070 e15966216aec filemerge: split internal merge into api entry point and internal helper Erik Huelsmann <ehuels@gmail.com> parents: 25949 diff changeset	505
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	506 @internaltool(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	507 'merge3',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	508 fullmerge,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	509 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	510 "warning: conflicts while merging %s! "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	511 "(edit, then use 'hg resolve --mark')\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	512 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	513 precheck=_mergecheck,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	514 )
22028 3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	515 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	516 """
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	517 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	518 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	519 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	520 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	521 if not labels:
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	522 labels = _defaultconflictlabels
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	523 if len(labels) < 3:
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	524 labels.append('base')
3d0572ab3b4a merge: add an internal:merge3 tool Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 22027 diff changeset	525 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	526
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	527
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	528 def _imergeauto(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	529 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	530 mynode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	531 orig,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	532 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	533 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	534 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	535 toolconf,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	536 files,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	537 labels=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	538 localorother=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	539 ):
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	540 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	541 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	542 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	543 assert localorother is not None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	544 r = simplemerge.simplemerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	545 repo.ui, fcd, fca, fco, label=labels, localorother=localorother
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	546 )
26224 a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	547 return True, r
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	548
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	549
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	550 @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	551 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	552 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	553 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	554 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	555 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	556 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	557
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	558
26948 067ab07435c9 filemerge: rename _symlinkcheck to _mergecheck Siddharth Agarwal <sid0@fb.com> parents: 26941 diff changeset	559 @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	560 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	561 """
a4da463df6cf filemerge: add non-interactive :merge-local and :merge-other Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 26071 diff changeset	562 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	563 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	564 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	565 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	566
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	567
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	568 @internaltool(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	569 'tagmerge',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	570 mergeonly,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	571 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	572 "automatic tag merging of %s failed! "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	573 "(use 'hg resolve --tool :merge' or another merge "
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	574 "tool of your choice)\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	575 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	576 )
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	577 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	578 """
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	579 Uses the internal tag merge algorithm (experimental).
50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	580 """
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	581 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	582 return success, status, False
21922 50e20154cb68 filemerge: add internal:tagmerge merge tool Angel Ezquerra <angel.ezquerra@gmail.com> parents: 21921 diff changeset	583
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	584
39122 5d3b58472660 filemerge: set actual capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 38952 diff changeset	585 @internaltool('dump', fullmerge, binary=True, symlink=True)
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	586 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	587 """
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	588 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	589 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	590 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	591 ``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	592 ``a.txt.other`` and ``a.txt.base`` and they will be placed in the
32255 7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32254 diff changeset	593 same directory as ``a.txt``.
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32254 diff changeset	594
34915 cab34bda259e help: fix typo in hg merge documentation Joe Blaylock <jrbl@google.com> parents: 34826 diff changeset	595 This implies premerge. Therefore, files aren't dumped, if premerge
32255 7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32254 diff changeset	596 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: 32254 diff changeset	597 """
34034 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	598 a = _workingpath(repo, fcd)
26573 a875773cf537 filemerge._idump: drop no longer necessary 'if r:' check Siddharth Agarwal <sid0@fb.com> parents: 26572 diff changeset	599 fd = fcd.path()
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	600
34785 1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	601 from . import context
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	602
34785 1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	603 if isinstance(fcd, context.overlayworkingfilectx):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	604 raise error.InMemoryMergeConflictsError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	605 'in-memory merge does not ' 'support the :dump tool.'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	606 )
34785 1af4561b6bfe filemerge: add a missing flushall() Phil Cohen <phillco@fb.com> parents: 34784 diff changeset	607
34076 cd38b83bfb23 filemerge: use fctx.write() in the internal:dump tool, instead of copy Phil Cohen <phillco@fb.com> parents: 34049 diff changeset	608 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	609 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	610 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	611 return False, 1, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	612
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	613
39122 5d3b58472660 filemerge: set actual capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 38952 diff changeset	614 @internaltool('forcedump', mergeonly, binary=True, symlink=True)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	615 def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
32255 7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32254 diff changeset	616 """
7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32254 diff changeset	617 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: 32254 diff changeset	618 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	619 return _idump(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	620 repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=labels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	621 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	622
32255 7e35d31b41fd filemerge: add internal merge tool to dump files forcibly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 32254 diff changeset	623
35463 ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	624 def _xmergeimm(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	625 # In-memory merge simply raises an exception on all external merge tools,
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	626 # for now.
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	627 #
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	628 # It would be possible to run most tools with temporary files, but this
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	629 # raises the question of what to do if the user only partially resolves the
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	630 # file -- we can't leave a merge state. (Copy to somewhere in the .hg/
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	631 # directory and tell the user how to get it is my best idea, but it's
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	632 # clunky.)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	633 raise error.InMemoryMergeConflictsError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	634 'in-memory merge does not support ' 'external merge tools'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	635 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	636
35463 ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	637
40478 86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	638 def _describemerge(ui, repo, mynode, fcl, fcb, fco, env, toolpath, args):
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	639 tmpl = ui.config('ui', 'pre-merge-tool-output-template')
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	640 if not tmpl:
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	641 return
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	642
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	643 mappingdict = templateutil.mappingdict
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	644 props = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	645 'ctx': fcl.changectx(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	646 'node': hex(mynode),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	647 'path': fcl.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	648 'local': mappingdict(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	649 {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	650 'ctx': fcl.changectx(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	651 'fctx': fcl,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	652 'node': hex(mynode),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	653 'name': _('local'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	654 'islink': 'l' in fcl.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	655 'label': env['HG_MY_LABEL'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	656 }
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	657 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	658 'base': mappingdict(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	659 {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	660 'ctx': fcb.changectx(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	661 'fctx': fcb,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	662 'name': _('base'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	663 'islink': 'l' in fcb.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	664 'label': env['HG_BASE_LABEL'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	665 }
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	666 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	667 'other': mappingdict(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	668 {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	669 'ctx': fco.changectx(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	670 'fctx': fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	671 'name': _('other'),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	672 'islink': 'l' in fco.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	673 'label': env['HG_OTHER_LABEL'],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	674 }
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	675 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	676 'toolpath': toolpath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	677 'toolargs': args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	678 }
40478 86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	679
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	680 # TODO: make all of this something that can be specified on a per-tool basis
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	681 tmpl = templater.unquotestring(tmpl)
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	682
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	683 # Not using cmdutil.rendertemplate here since it causes errors importing
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	684 # things for us to import cmdutil.
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	685 tres = formatter.templateresources(ui, repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	686 t = formatter.maketemplater(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	687 ui, tmpl, defaults=templatekw.keywords, resources=tres
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	688 )
40478 86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	689 ui.status(t.renderdefault(props))
86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	690
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	691
21273 20b8090d8125 merge: define conflict marker labels in filemerge() Durham Goode <durham@fb.com> parents: 21100 diff changeset	692 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	693 tool, toolpath, binary, symlink, scriptfn = toolconf
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	694 uipathfn = scmutil.getuipathfn(repo)
27042 30b919bc49bf filemerge: don't try using external tools on change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27041 diff changeset	695 if fcd.isabsent() or fco.isabsent():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	696 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	697 _('warning: %s cannot merge change/delete conflict ' 'for %s\n')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	698 % (tool, uipathfn(fcd.path()))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	699 )
27042 30b919bc49bf filemerge: don't try using external tools on change/delete conflicts Siddharth Agarwal <sid0@fb.com> parents: 27041 diff changeset	700 return False, 1, None
34035 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34034 diff changeset	701 unused, unused, unused, back = files
36976 a4a95bd7158d filemerge: give some variables in _xmerge more descriptive names Kyle Lippincott <spectral@google.com> parents: 36835 diff changeset	702 localpath = _workingpath(repo, fcd)
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	703 args = _toolstr(repo.ui, tool, "args")
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	704
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	705 with _maketempfiles(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	706 repo, fco, fca, repo.wvfs.join(back.path()), "$output" in args
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	707 ) as temppaths:
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	708 basepath, otherpath, localoutputpath = temppaths
36976 a4a95bd7158d filemerge: give some variables in _xmerge more descriptive names Kyle Lippincott <spectral@google.com> parents: 36835 diff changeset	709 outpath = ""
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	710 mylabel, otherlabel = labels[:2]
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	711 if len(labels) >= 3:
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	712 baselabel = labels[2]
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	713 else:
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	714 baselabel = 'base'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	715 env = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	716 'HG_FILE': fcd.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	717 'HG_MY_NODE': short(mynode),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	718 'HG_OTHER_NODE': short(fco.changectx().node()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	719 'HG_BASE_NODE': short(fca.changectx().node()),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	720 'HG_MY_ISLINK': 'l' in fcd.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	721 'HG_OTHER_ISLINK': 'l' in fco.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	722 'HG_BASE_ISLINK': 'l' in fca.flags(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	723 'HG_MY_LABEL': mylabel,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	724 'HG_OTHER_LABEL': otherlabel,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	725 'HG_BASE_LABEL': baselabel,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	726 }
34035 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34034 diff changeset	727 ui = repo.ui
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	728
34035 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34034 diff changeset	729 if "$output" in args:
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	730 # read input from backup, write to original
36976 a4a95bd7158d filemerge: give some variables in _xmerge more descriptive names Kyle Lippincott <spectral@google.com> parents: 36835 diff changeset	731 outpath = localpath
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	732 localpath = localoutputpath
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	733 replace = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	734 'local': localpath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	735 'base': basepath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	736 'other': otherpath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	737 'output': outpath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	738 'labellocal': mylabel,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	739 'labelother': otherlabel,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	740 'labelbase': baselabel,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	741 }
37120 a8a902d7176e procutil: bulk-replace function calls to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37084 diff changeset	742 args = util.interpolate(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	743 br'\$',
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	744 replace,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	745 args,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	746 lambda s: procutil.shellquote(util.localpath(s)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	747 )
34035 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34034 diff changeset	748 if _toolbool(ui, tool, "gui"):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	749 repo.ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	750 _('running merge tool %s for file %s\n')
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	751 % (tool, uipathfn(fcd.path()))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	752 )
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	753 if scriptfn is None:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	754 cmd = toolpath + ' ' + args
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	755 repo.ui.debug('launching merge tool: %s\n' % cmd)
40478 86dfae98a3a2 merge-tools: when calling external merge tool, describe the resolve inputs Kyle Lippincott <spectral@google.com> parents: 39359 diff changeset	756 _describemerge(ui, repo, mynode, fcd, fca, fco, env, toolpath, args)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	757 r = ui.system(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	758 cmd, cwd=repo.root, environ=env, blockedtag='mergetool'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	759 )
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	760 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	761 repo.ui.debug(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	762 'launching python merge script: %s:%s\n' % (toolpath, scriptfn)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	763 )
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	764 r = 0
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	765 try:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	766 # avoid cycle cmdutil->merge->filemerge->extensions->cmdutil
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	767 from . import extensions
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	768
38159 dea3903175ee filemerge: don't pass function name as loadpath's module_name param hindlemail <tom_hindle@sil.org> parents: 38041 diff changeset	769 mod = extensions.loadpath(toolpath, 'hgmerge.%s' % tool)
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	770 except Exception:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	771 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	772 _("loading python merge script failed: %s") % toolpath
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	773 )
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	774 mergefn = getattr(mod, scriptfn, None)
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	775 if mergefn is None:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	776 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	777 _("%s does not have function: %s") % (toolpath, scriptfn)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	778 )
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	779 argslist = procutil.shellsplit(args)
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	780 # avoid cycle cmdutil->merge->filemerge->hook->extensions->cmdutil
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	781 from . import hook
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	782
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	783 ret, raised = hook.pythonhook(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	784 ui, repo, "merge", toolpath, mergefn, {'args': argslist}, True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	785 )
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	786 if raised:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	787 r = 1
34506 1d804c22c671 py3: use '%d' for integers instead of '%s' Pulkit Goyal <7895pulkit@gmail.com> parents: 34123 diff changeset	788 repo.ui.debug('merge tool returned: %d\n' % r)
34035 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34034 diff changeset	789 return True, r, False
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	790
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	791
35482 c240657febb7 templater: drop unneeded resources from conflict-marker data Yuya Nishihara <yuya@tcha.org> parents: 35469 diff changeset	792 def _formatconflictmarker(ctx, template, label, pad):
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	793 """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	794
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	795 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	796 can have aligned templated parts.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	797 """
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	798 if ctx.node() is None:
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	799 ctx = ctx.p1()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	800
35483 817a3d20dd01 templater: register keywords to defaults table Yuya Nishihara <yuya@tcha.org> parents: 35482 diff changeset	801 props = {'ctx': ctx}
36988 317382151ac3 templater: rename .render(mapping) to .renderdefault(mapping) (API) Yuya Nishihara <yuya@tcha.org> parents: 36976 diff changeset	802 templateresult = template.renderdefault(props)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	803
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	804 label = ('%s:' % label).ljust(pad + 1)
32873 2ecce24dfcd3 templater: add simple interface for unnamed template (API) Yuya Nishihara <yuya@tcha.org> parents: 32753 diff changeset	805 mark = '%s %s' % (label, templateresult)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	806
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	807 if mark:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	808 mark = mark.splitlines()[0] # split for safety
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	809
21865 78e56e70c70a filemerge: use 'util.ellipsis' to trim custom conflict markers correctly FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21864 diff changeset	810 # 8 for the prefix of conflict marker lines (e.g. '<<<<<<< ')
37084 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37077 diff changeset	811 return stringutil.ellipsis(mark, 80 - 8)
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	812
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	813
21524 47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21519 diff changeset	814 _defaultconflictlabels = ['local', 'other']
47b97d9af27e merge: add labels parameter from merge.update to filemerge Durham Goode <durham@fb.com> parents: 21519 diff changeset	815
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	816
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	817 def _formatlabels(repo, fcd, fco, fca, labels, tool=None):
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	818 """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	819
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	820 Returns a list of formatted labels.
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	821 """
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	822 cd = fcd.changectx()
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	823 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	824 ca = fca.changectx()
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	825
25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	826 ui = repo.ui
33523 11025c4f1016 configitems: register the 'ui.mergemarkertemplate' config Boris Feld <boris.feld@octobus.net> parents: 33499 diff changeset	827 template = ui.config('ui', 'mergemarkertemplate')
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	828 if tool is not None:
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	829 template = _toolstr(ui, tool, 'mergemarkertemplate', template)
32047 458f7294dfee filemerge: optionally strip quotes from merge marker template (BC) Yuya Nishihara <yuya@tcha.org> parents: 31436 diff changeset	830 template = templater.unquotestring(template)
35469 f1c54d003327 templater: move repo, ui and cache to per-engine resources Yuya Nishihara <yuya@tcha.org> parents: 35463 diff changeset	831 tres = formatter.templateresources(ui, repo)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	832 tmpl = formatter.maketemplater(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	833 ui, template, defaults=templatekw.keywords, resources=tres
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	834 )
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	835
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	836 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	837
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	838 newlabels = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	839 _formatconflictmarker(cd, tmpl, labels[0], pad),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	840 _formatconflictmarker(co, tmpl, labels[1], pad),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	841 ]
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	842 if len(labels) > 2:
35482 c240657febb7 templater: drop unneeded resources from conflict-marker data Yuya Nishihara <yuya@tcha.org> parents: 35469 diff changeset	843 newlabels.append(_formatconflictmarker(ca, tmpl, labels[2], pad))
22026 6966542768ff filemerge: allow the formatting of three labels instead of two Pierre-Yves David <pierre-yves.david@fb.com> parents: 22025 diff changeset	844 return newlabels
21519 25d5a9ecbb85 merge: add conflict marker formatter (BC) Durham Goode <durham@fb.com> parents: 21273 diff changeset	845
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	846
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	847 def partextras(labels):
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	848 """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: 29660 diff changeset	849
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	850 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: 29660 diff changeset	851 """
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	852 if labels is None:
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	853 return {
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	854 "l": "",
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	855 "o": "",
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	856 }
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	857
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	858 return {
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	859 "l": " [%s]" % labels[0],
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	860 "o": " [%s]" % labels[1],
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	861 }
a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	862
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	863
34036 fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34035 diff changeset	864 def _restorebackup(fcd, back):
fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34035 diff changeset	865 # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34035 diff changeset	866 # util.copy here instead.
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	867 fcd.write(back.data(), fcd.flags())
34036 fe04c018eaac filemerge: add _restorebackup Phil Cohen <phillco@fb.com> parents: 34035 diff changeset	868
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	869
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	870 def _makebackup(repo, ui, wctx, fcd, premerge):
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	871 """Makes and returns a filectx-like object for ``fcd``'s backup file.
34031 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	872
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	873 In addition to preserving the user's pre-existing modifications to `fcd`
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	874 (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: 33906 diff changeset	875 merge changed anything, and determine what line endings the new file should
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	876 have.
35702 c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	877
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	878 Backups only need to be written once (right before the premerge) since their
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	879 content doesn't change afterwards.
34031 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	880 """
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	881 if fcd.isabsent():
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	882 return None
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	883 # TODO: Break this import cycle somehow. (filectx -> ctx -> fileset ->
f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	884 # 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	885 from . import context
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	886
41600 a8ccd821b7d2 filemerge: migrate to scmutil.backuppath() Martin von Zweigbergk <martinvonz@google.com> parents: 41510 diff changeset	887 back = scmutil.backuppath(ui, repo, fcd.path())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	888 inworkingdir = back.startswith(repo.wvfs.base) and not back.startswith(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	889 repo.vfs.base
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	890 )
34784 123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	891 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	892 # 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	893 # 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	894 # so we don't disturb the working directory.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	895 relpath = back[len(repo.wvfs.base) + 1 :]
35703 9a50ffd15b25 filemerge: only write in-memory backup during premerge Phil Cohen <phillco@fb.com> parents: 35702 diff changeset	896 if premerge:
9a50ffd15b25 filemerge: only write in-memory backup during premerge Phil Cohen <phillco@fb.com> parents: 35702 diff changeset	897 wctx[relpath].write(fcd.data(), fcd.flags())
34784 123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	898 return wctx[relpath]
123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	899 else:
35702 c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	900 if premerge:
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	901 # Otherwise, write to wherever path the user specified the backups
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	902 # should go. We still need to switch based on whether the source is
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	903 # in-memory so we can use the fast path of ``util.copy`` if both are
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	904 # on disk.
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	905 if isinstance(fcd, context.overlayworkingfilectx):
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	906 util.writefile(back, fcd.data())
c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	907 else:
41600 a8ccd821b7d2 filemerge: migrate to scmutil.backuppath() Martin von Zweigbergk <martinvonz@google.com> parents: 41510 diff changeset	908 a = _workingpath(repo, fcd)
35702 c0439e11af16 filemerge: fix backing up an in-memory file to a custom location Phil Cohen <phillco@fb.com> parents: 35483 diff changeset	909 util.copyfile(a, back)
34784 123a68e6b473 filemerge: store backups in the overlayworkingctx if using imm Phil Cohen <phillco@fb.com> parents: 34782 diff changeset	910 # 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	911 # 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	912 return context.arbitraryfilectx(back, repo=repo)
34031 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	913
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	914
36998 3723b42ff953 filemerge: move temp file unlinks to _maketempfiles Kyle Lippincott <spectral@google.com> parents: 36988 diff changeset	915 @contextlib.contextmanager
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	916 def _maketempfiles(repo, fco, fca, localpath, uselocalpath):
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	917 """Writes out `fco` and `fca` as temporary files, and (if uselocalpath)
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	918 copies `localpath` to another temporary file, so an external merge tool may
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	919 use them.
34031 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	920 """
36999 e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	921 tmproot = None
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	922 tmprootprefix = repo.ui.config('experimental', 'mergetempdirprefix')
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	923 if tmprootprefix:
38165 2ce60954b1b7 py3: wrap tempfile.mkdtemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38164 diff changeset	924 tmproot = pycompat.mkdtemp(prefix=tmprootprefix)
36999 e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	925
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	926 def maketempfrompath(prefix, path):
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	927 fullbase, ext = os.path.splitext(path)
36999 e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	928 pre = "%s~%s" % (os.path.basename(fullbase), prefix)
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	929 if tmproot:
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	930 name = os.path.join(tmproot, pre)
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	931 if ext:
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	932 name += ext
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	933 f = open(name, r"wb")
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	934 else:
38164 aac4be30e250 py3: wrap tempfile.mkstemp() to use bytes path Yuya Nishihara <yuya@tcha.org> parents: 38159 diff changeset	935 fd, name = pycompat.mkstemp(prefix=pre + '.', suffix=ext)
36999 e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	936 f = os.fdopen(fd, r"wb")
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	937 return f, name
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	938
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	939 def tempfromcontext(prefix, ctx):
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	940 f, name = maketempfrompath(prefix, ctx.path())
34031 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	941 data = repo.wwritedata(ctx.path(), ctx.data())
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	942 f.write(data)
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	943 f.close()
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	944 return name
52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	945
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	946 b = tempfromcontext("base", fca)
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	947 c = tempfromcontext("other", fco)
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	948 d = localpath
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	949 if uselocalpath:
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	950 # We start off with this being the backup filename, so remove the .orig
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	951 # to make syntax-highlighting more likely.
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	952 if d.endswith('.orig'):
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	953 d, _ = os.path.splitext(d)
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	954 f, d = maketempfrompath("local", d)
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	955 with open(localpath, 'rb') as src:
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	956 f.write(src.read())
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	957 f.close()
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	958
36998 3723b42ff953 filemerge: move temp file unlinks to _maketempfiles Kyle Lippincott <spectral@google.com> parents: 36988 diff changeset	959 try:
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	960 yield b, c, d
36998 3723b42ff953 filemerge: move temp file unlinks to _maketempfiles Kyle Lippincott <spectral@google.com> parents: 36988 diff changeset	961 finally:
36999 e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	962 if tmproot:
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	963 shutil.rmtree(tmproot)
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	964 else:
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	965 util.unlink(b)
e349ad5cbb71 filemerge: use a single temp dir instead of temp files Kyle Lippincott <spectral@google.com> parents: 36998 diff changeset	966 util.unlink(c)
37077 1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	967 # if not uselocalpath, d is the 'orig'/backup file which we
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	968 # shouldn't delete.
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	969 if d and uselocalpath:
1e30a26a65d0 filemerge: make the 'local' path match the format that 'base' and 'other' use Kyle Lippincott <spectral@google.com> parents: 36999 diff changeset	970 util.unlink(d)
34031 52bd006b4f49 filemerge: extract _maketemp and _makebackup Phil Cohen <phillco@fb.com> parents: 33906 diff changeset	971
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	972
34122 c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34076 diff changeset	973 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	974 """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	975
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	976 premerge = whether this is a premerge
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	977 mynode = parent node before merge
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	978 orig = original local filename before merge
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	979 fco = other file context
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	980 fca = ancestor file context
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	981 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	982
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	983 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	984 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	985
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	986 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	987 return True, None, False
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	988
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	989 ui = repo.ui
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	990 fd = fcd.path()
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	991 uipathfn = scmutil.getuipathfn(repo)
faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	992 fduipath = uipathfn(fd)
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	993 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	994 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	995 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	996 tool, toolpath = _picktool(repo, ui, fd, binary, symlink, changedelete)
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	997 scriptfn = None
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	998 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	999 # normalize to new-style names (':merge' etc)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1000 tool = tool[len('internal') :]
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1001 if toolpath and toolpath.startswith('python:'):
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1002 invalidsyntax = False
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1003 if toolpath.count(':') >= 2:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1004 script, scriptfn = toolpath[7:].rsplit(':', 1)
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1005 if not scriptfn:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1006 invalidsyntax = True
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1007 # missing :callable can lead to spliting on windows drive letter
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1008 if '\\' in scriptfn or '/' in scriptfn:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1009 invalidsyntax = True
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1010 else:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1011 invalidsyntax = True
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1012 if invalidsyntax:
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1013 raise error.Abort(_("invalid 'python:' syntax: %s") % toolpath)
242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1014 toolpath = script
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1015 ui.debug(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1016 "picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1017 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1018 tool,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1019 fduipath,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1020 pycompat.bytestr(binary),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1021 pycompat.bytestr(symlink),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1022 pycompat.bytestr(changedelete),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1023 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1024 )
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1025
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1026 if tool in internals:
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1027 func = internals[tool]
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1028 mergetype = func.mergetype
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1029 onfailure = func.onfailure
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1030 precheck = func.precheck
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1031 isexternal = False
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1032 else:
35463 ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	1033 if wctx.isinmemory():
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	1034 func = _xmergeimm
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	1035 else:
ef7e667a4f7b filemerge: only raise InMemoryMergeConflictsError when running _xmerge Phil Cohen <phillco@fb.com> parents: 35282 diff changeset	1036 func = _xmerge
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1037 mergetype = fullmerge
ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1038 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	1039 precheck = None
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1040 isexternal = True
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	1041
38041 242eb5132203 filemerge: support specifying a python function to custom merge-tools hindlemail <tom_hindle@sil.org> parents: 37120 diff changeset	1042 toolconf = tool, toolpath, binary, symlink, scriptfn
6003 7855b88ba838 filemerge: pull file-merging code into its own module Matt Mackall <mpm@selenic.com> parents: diff changeset	1043
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1044 if mergetype == nomerge:
29774 a7f8939641aa merge: use labels in prompts to the user Simon Farnsworth <simonfar@fb.com> parents: 29660 diff changeset	1045 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	1046 return True, r, deleted
26512 4c52dd406adc filemerge: indent filemerge.filemerge Siddharth Agarwal <sid0@fb.com> parents: 26224 diff changeset	1047
26609 47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	1048 if premerge:
47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	1049 if orig != fco.path():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1050 ui.status(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1051 _("merging %s and %s to %s\n")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1052 % (uipathfn(orig), uipathfn(fco.path()), fduipath)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1053 )
26609 47681e77e484 filemerge: only print out "merging f" output at premerge step Siddharth Agarwal <sid0@fb.com> parents: 26608 diff changeset	1054 else:
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	1055 ui.status(_("merging %s\n") % fduipath)
26528 8bfef5737321 filemerge: move 'merging' output to before file creation Siddharth Agarwal <sid0@fb.com> parents: 26527 diff changeset	1056
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1057 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	1058
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1059 if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, toolconf):
26608 ae5b60d3294f filemerge: deindent the parts of filemerge outside the try block Siddharth Agarwal <sid0@fb.com> parents: 26607 diff changeset	1060 if onfailure:
35282 46d7f0713a87 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Phil Cohen <phillco@fb.com> parents: 35281 diff changeset	1061 if wctx.isinmemory():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1062 raise error.InMemoryMergeConflictsError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1063 'in-memory merge does ' 'not support merge ' 'conflicts'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1064 )
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	1065 ui.warn(onfailure % fduipath)
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	1066 return True, 1, False
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	1067
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	1068 back = _makebackup(repo, ui, wctx, fcd, premerge)
34035 96123bdea43e filemerge: reduce creation of tempfiles until needed Phil Cohen <phillco@fb.com> parents: 34034 diff changeset	1069 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	1070 r = 1
fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	1071 try:
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1072 internalmarkerstyle = ui.config('ui', 'mergemarkers')
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1073 if isexternal:
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1074 markerstyle = _toolstr(ui, tool, 'mergemarkers')
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1075 else:
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1076 markerstyle = internalmarkerstyle
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1077
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	1078 if not labels:
7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	1079 labels = _defaultconflictlabels
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1080 formattedlabels = labels
26529 7833b13b001f filemerge: move precheck to before files are written out Siddharth Agarwal <sid0@fb.com> parents: 26528 diff changeset	1081 if markerstyle != 'basic':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1082 formattedlabels = _formatlabels(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1083 repo, fcd, fco, fca, labels, tool=tool
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1084 )
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	1085
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	1086 if premerge and mergetype == fullmerge:
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1087 # conflict markers generated by premerge will use 'detailed'
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1088 # settings if either ui.mergemarkers or the tool's mergemarkers
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1089 # setting is 'detailed'. This way tools can have basic labels in
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1090 # space-constrained areas of the UI, but still get full information
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1091 # in conflict markers if premerge is 'keep' or 'keep-merge3'.
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1092 premergelabels = labels
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1093 labeltool = None
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1094 if markerstyle != 'basic':
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1095 # respect 'tool's mergemarkertemplate (which defaults to
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1096 # ui.mergemarkertemplate)
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1097 labeltool = tool
9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1098 if internalmarkerstyle != 'basic' or markerstyle != 'basic':
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1099 premergelabels = _formatlabels(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1100 repo, fcd, fco, fca, premergelabels, tool=labeltool
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1101 )
35907 9037c29e9f53 filemerge: support passing labels to external merge tools Kyle Lippincott <spectral@google.com> parents: 35829 diff changeset	1102
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1103 r = _premerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1104 repo, fcd, fco, fca, toolconf, files, labels=premergelabels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1105 )
26611 a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps Siddharth Agarwal <sid0@fb.com> parents: 26610 diff changeset	1106 # 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	1107 return not r, r, False
26567 f18646cf0e93 filemerge: call premerge directly from main merge function Siddharth Agarwal <sid0@fb.com> parents: 26529 diff changeset	1108
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1109 needcheck, r, deleted = func(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1110 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1111 mynode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1112 orig,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1113 fcd,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1114 fco,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1115 fca,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1116 toolconf,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1117 files,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1118 labels=formattedlabels,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1119 )
27033 089dab8794dc filemerge: return whether the file is deleted from all other merge tools Siddharth Agarwal <sid0@fb.com> parents: 27032 diff changeset	1120
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1121 if needcheck:
34034 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1122 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	1123
16125 83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	1124 if r:
83925d3a4559 filemerge: refactoring of 'filemerge()' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15738 diff changeset	1125 if onfailure:
35282 46d7f0713a87 filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM Phil Cohen <phillco@fb.com> parents: 35281 diff changeset	1126 if wctx.isinmemory():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1127 raise error.InMemoryMergeConflictsError(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1128 'in-memory merge ' 'does not support ' 'merge conflicts'
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1129 )
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	1130 ui.warn(onfailure % fduipath)
34797 284fa44f7f39 merge: allow user to halt merge on merge-tool failures Ryan McElroy <rmcelroy@fb.com> parents: 34796 diff changeset	1131 _onfilemergefailure(ui)
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	1132
27034 86ede9eda252 filemerge: return whether the file was deleted Siddharth Agarwal <sid0@fb.com> parents: 27033 diff changeset	1133 return True, r, deleted
26589 fb388aa26453 filemerge: clean up temp files in a finally block Siddharth Agarwal <sid0@fb.com> parents: 26575 diff changeset	1134 finally:
27047 e1458049dca5 filemerge: don't try to copy files known to be absent Siddharth Agarwal <sid0@fb.com> parents: 27042 diff changeset	1135 if not r and back is not None:
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	1136 back.remove()
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 6003 diff changeset	1137
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1138
34796 ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1139 def _haltmerge():
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1140 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	1141 raise error.InterventionRequired(msg)
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1142
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1143
34796 ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1144 def _onfilemergefailure(ui):
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1145 action = ui.config('merge', 'on-failure')
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1146 if action == 'prompt':
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1147 msg = _('continue merge operation (yn)?' '$$ &Yes $$ &No')
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1148 if ui.promptchoice(msg, 0) == 1:
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1149 _haltmerge()
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1150 if action == 'halt':
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1151 _haltmerge()
ed91846c29cf filemerge: introduce functions to halt merge flow Ryan McElroy <rmcelroy@fb.com> parents: 34785 diff changeset	1152 # 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	1153
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1154
38793 6c8e3c847977 resolve: add option to warn/abort on -m with unresolved conflict markers Kyle Lippincott <spectral@google.com> parents: 38165 diff changeset	1155 def hasconflictmarkers(data):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1156 return bool(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1157 re.search("^(<<<<<<< .\|=======\|>>>>>>> .)$", data, re.MULTILINE)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1158 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1159
38793 6c8e3c847977 resolve: add option to warn/abort on -m with unresolved conflict markers Kyle Lippincott <spectral@google.com> parents: 38165 diff changeset	1160
34034 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1161 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	1162 fd = fcd.path()
41510 faa49a5914bb merge: respect ui.relative-paths Martin von Zweigbergk <martinvonz@google.com> parents: 41365 diff changeset	1163 uipathfn = scmutil.getuipathfn(repo)
34034 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1164 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	1165
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1166 if not r and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1167 _toolbool(ui, tool, "checkconflicts")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1168 or 'conflicts' in _toollist(ui, tool, "check")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1169 ):
38793 6c8e3c847977 resolve: add option to warn/abort on -m with unresolved conflict markers Kyle Lippincott <spectral@google.com> parents: 38165 diff changeset	1170 if hasconflictmarkers(fcd.data()):
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1171 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1172
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1173 checked = False
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1174 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	1175 checked = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1176 if ui.promptchoice(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1177 _("was merge of '%s' successful (yn)?" "$$ &Yes $$ &No")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1178 % uipathfn(fd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1179 1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1180 ):
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1181 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1182
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1183 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1184 not r
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1185 and not checked
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1186 and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1187 _toolbool(ui, tool, "checkchanged")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1188 or 'changed' in _toollist(ui, tool, "check")
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1189 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1190 ):
34782 f21eecc64ace filemerge: use arbitraryfilectx for backups Phil Cohen <phillco@fb.com> parents: 34506 diff changeset	1191 if back is not None and not fcd.cmp(back):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1192 if ui.promptchoice(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1193 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1194 " output file %s appears unchanged\n"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1195 "was merge successful (yn)?"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1196 "$$ &Yes $$ &No"
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1197 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1198 % uipathfn(fd),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1199 1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1200 ):
26575 d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1201 r = 1
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1202
27047 e1458049dca5 filemerge: don't try to copy files known to be absent Siddharth Agarwal <sid0@fb.com> parents: 27042 diff changeset	1203 if back is not None and _toolbool(ui, tool, "fixeol"):
34034 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1204 _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	1205
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1206 return r
d60815664c34 filemerge: move post-merge checks into a separate function Siddharth Agarwal <sid0@fb.com> parents: 26574 diff changeset	1207
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1208
34034 7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1209 def _workingpath(repo, ctx):
7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1210 return repo.wjoin(ctx.path())
7558917f291e filemerge: add `_workingpath` Phil Cohen <phillco@fb.com> parents: 34033 diff changeset	1211
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1212
34122 c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34076 diff changeset	1213 def premerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1214 return _filemerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1215 True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1216 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1217
26607 45a6233d5f50 filemerge: introduce a premerge flag and function Siddharth Agarwal <sid0@fb.com> parents: 26606 diff changeset	1218
34122 c0ce60459d84 merge: pass wctx to premerge, filemerge Phil Cohen <phillco@fb.com> parents: 34076 diff changeset	1219 def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1220 return _filemerge(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1221 False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1222 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1223
26605 ef21a2c41629 filemerge: add a wrapper around the filemerge function Siddharth Agarwal <sid0@fb.com> parents: 26589 diff changeset	1224
33699 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	1225 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	1226 """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	1227 """
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	1228 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	1229 fullname = ':' + name
50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	1230 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	1231 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	1232 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	1233
39126 e09fad982ef5 filemerge: show actual capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39125 diff changeset	1234 capabilities = sorted([k for k, v in func.capabilities.items() if v])
e09fad982ef5 filemerge: show actual capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39125 diff changeset	1235 if capabilities:
39267 88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1236 capdesc = " (actual capabilities: %s)" % ', '.join(capabilities)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1237 func.__doc__ = func.__doc__ + pycompat.sysstr("\n\n%s" % capdesc)
39267 88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1238
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1239 # to put i18n comments into hg.pot for automatically generated texts
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1240
39359 bc0eb1dc6aae filemerge: fix an i18n comment typo Matt Harbison <matt_harbison@yahoo.com> parents: 39285 diff changeset	1241 # i18n: "binary" and "symlink" are keywords
39267 88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1242 # i18n: this text is added automatically
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1243 _(" (actual capabilities: binary, symlink)")
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1244 # i18n: "binary" is keyword
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1245 # i18n: this text is added automatically
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1246 _(" (actual capabilities: binary)")
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1247 # i18n: "symlink" is keyword
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1248 # i18n: this text is added automatically
88c5a3ef54b1 filemerge: avoid putting translated text into docstring FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39266 diff changeset	1249 _(" (actual capabilities: symlink)")
39126 e09fad982ef5 filemerge: show actual capabilities of internal merge tools FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 39125 diff changeset	1250
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42565 diff changeset	1251
33699 50c44dee741a filemerge: move decorator definition for internal merge tools to registrar FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 33523 diff changeset	1252 # 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	1253 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	1254
16126 0c4bec9596d8 filemerge: create detail of internal merge tools from documentation string FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 16125 diff changeset	1255 # 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	1256 i18nfunctions = internals.values()

Mercurial > public > mercurial-scm > hg

annotate mercurial/filemerge.py @ 43076:2372284d9457