##// END OF EJS Templates
mergetools: add new conflict marker format with diffs in...
mergetools: add new conflict marker format with diffs in I use 3-way conflict markers. Often when I resolve them, I manually compare one the base with one side and apply the differences to the other side. That can be hard when the conflict marker is large. This patch introduces a new type of conflict marker, which I'm hoping will make it easier to resolve conflicts. The new format uses `<<<<<<<` and `>>>>>>>` to open and close the markers, just like our existing 2-way and 3-way conflict markers. Instead of having 2 or 3 snapshots (left+right or left+base+right), it has a sequence of diffs. A diff looks like this: ``` ------- base +++++++ left a -b +c d ``` A diff that adds one side ("diff from nothing") has a `=======` header instead and does not have have `+` prefixed on its lines. A regular 3-way merge can be viewed as adding one side plus a diff between the base and the other side. It thus has two ways of being represented, depending on which side is being diffed: ``` <<<<<<< ======= left contents on left ------- base +++++++ right contents on -left +right >>>>>>> ``` or ``` <<<<<<< ------- base +++++++ left contents on -right +left ======= right contents on right >>>>>>> ``` I've made it so the new merge tool tries to pick a version that has the most common lines (no difference in the example above). I've called the new tool "mergediff" to stick to the convention of starting with "merge" if the tool tries a regular 3-way merge. The idea came from my pet VCS (placeholder name `jj`), which has support for octopus merges and other ways of ending up with merges of more than 3 versions. I wanted to be able to represent such conflicts in the working copy and therefore thought of this format (although I have not yet implemented it in my VCS). I then attended a meeting with Larry McVoy, who said BitKeeper has an option (`bk smerge -g`) for showing a similar format, which reminded me to actually attempt this in Mercurial. Differential Revision: https://phab.mercurial-scm.org/D9551

File last commit:

r44069:f0bee3b1 default
r46724:bdc2bf68 default
Show More
i18n.py
115 lines | 3.8 KiB | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # i18n.py - internationalization support for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Benoit Boissinot
i18n first part: make '_' available for files who need it
r1400
Gregory Szorc
i18n: use absolute_import
r25955 from __future__ import absolute_import
import gettext as gettextmod
import locale
import os
import sys
Gregory Szorc
py3: manually import getattr where it is needed...
r43359 from .pycompat import getattr
Martin von Zweigbergk
i18n: get datapath directly from resourceutil...
r44069 from .utils import resourceutil
Pulkit Goyal
py3: convert to unicode to pass into encode()...
r30050 from . import (
encoding,
pycompat,
)
Martin Geisler
i18n: lookup .mo files in private locale/ directory...
r7650
# modelled after templater.templatepath:
Augie Fackler
i18n: use getattr instead of hasattr...
r14975 if getattr(sys, 'frozen', None) is not None:
Pulkit Goyal
py3: replace sys.executable with pycompat.sysexecutable...
r30669 module = pycompat.sysexecutable
Martin Geisler
i18n: lookup .mo files in private locale/ directory...
r7650 else:
Pulkit Goyal
py3: use pycompat.fsencode() to convert __file__ to bytes...
r31074 module = pycompat.fsencode(__file__)
Martin Geisler
i18n: lookup .mo files in private locale/ directory...
r7650
Yuya Nishihara
i18n: detect UI language without POSIX-style locale variable on Windows (BC)...
r21987 _languages = None
Augie Fackler
formatting: blacken the codebase...
r43346 if (
pycompat.iswindows
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and b'LANGUAGE' not in encoding.environ
and b'LC_ALL' not in encoding.environ
and b'LC_MESSAGES' not in encoding.environ
and b'LANG' not in encoding.environ
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Yuya Nishihara
i18n: detect UI language without POSIX-style locale variable on Windows (BC)...
r21987 # Try to detect UI language by "User Interface Language Management" API
# if no locale variables are set. Note that locale.getdefaultlocale()
# uses GetLocaleInfo(), which may be different from UI language.
# (See http://msdn.microsoft.com/en-us/library/dd374098(v=VS.85).aspx )
try:
import ctypes
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
i18n: detect UI language without POSIX-style locale variable on Windows (BC)...
r21987 langid = ctypes.windll.kernel32.GetUserDefaultUILanguage()
_languages = [locale.windows_locale[langid]]
except (ImportError, AttributeError, KeyError):
# ctypes not found or unknown langid
pass
Mads Kiilerich
i18n: use datapath for i18n like for templates and help...
r22638
Martin von Zweigbergk
i18n: get datapath directly from resourceutil...
r44069 datapath = pycompat.fsdecode(resourceutil.datapath)
localedir = os.path.join(datapath, 'locale')
t = gettextmod.translation('hg', localedir, _languages, fallback=True)
try:
_ugettext = t.ugettext
except AttributeError:
_ugettext = t.gettext
Martin Geisler
i18n: encode output in user's local encoding...
r7651
Augie Fackler
formatting: blacken the codebase...
r43346
Yuya Nishihara
i18n: cache translated messages per encoding...
r34661 _msgcache = {} # encoding: {message: translation}
Augie Fackler
i18n: cache the result of every gettext call...
r23031
Augie Fackler
formatting: blacken the codebase...
r43346
Martin Geisler
i18n: encode output in user's local encoding...
r7651 def gettext(message):
"""Translate message.
The message is looked up in the catalog to get a Unicode string,
which is encoded in the local encoding before being returned.
Important: message is restricted to characters in the encoding
given by sys.getdefaultencoding() which is most likely 'ascii'.
"""
# If message is None, t.ugettext will return u'None' as the
# translation whereas our callers expect us to return None.
Mads Kiilerich
i18n: use datapath for i18n like for templates and help...
r22638 if message is None or not _ugettext:
Martin Geisler
i18n: encode output in user's local encoding...
r7651 return message
Yuya Nishihara
i18n: cache translated messages per encoding...
r34661 cache = _msgcache.setdefault(encoding.encoding, {})
if message not in cache:
Pulkit Goyal
py3: replace `unicode` with pycompat.unicode...
r38332 if type(message) is pycompat.unicode:
Augie Fackler
i18n: cache the result of every gettext call...
r23031 # goofy unicode docstrings in test
paragraphs = message.split(u'\n\n')
else:
Yuya Nishihara
py3: get around unicode docstrings in test-encoding-textwrap.t and test-help.t...
r40290 # should be ascii, but we have unicode docstrings in test, which
# are converted to utf-8 bytes on Python 3.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 paragraphs = [p.decode("utf-8") for p in message.split(b'\n\n')]
Augie Fackler
i18n: cache the result of every gettext call...
r23031 # Be careful not to translate the empty string -- it holds the
# meta data of the .po file.
Gregory Szorc
i18n: use unicode literal...
r29415 u = u'\n\n'.join([p and _ugettext(p) or u'' for p in paragraphs])
Augie Fackler
i18n: cache the result of every gettext call...
r23031 try:
# encoding.tolocal cannot be used since it will first try to
# decode the Unicode string. Calling u.decode(enc) really
# means u.encode(sys.getdefaultencoding()).decode(enc). Since
# the Python encoding defaults to 'ascii', this fails if the
# translated string use non-ASCII characters.
Pulkit Goyal
py3: convert to unicode to pass into encode()...
r30050 encodingstr = pycompat.sysstr(encoding.encoding)
Yuya Nishihara
i18n: cache translated messages per encoding...
r34661 cache[message] = u.encode(encodingstr, "replace")
Augie Fackler
i18n: cache the result of every gettext call...
r23031 except LookupError:
# An unknown encoding results in a LookupError.
Yuya Nishihara
i18n: cache translated messages per encoding...
r34661 cache[message] = message
return cache[message]
Martin Geisler
i18n: encode output in user's local encoding...
r7651
Augie Fackler
formatting: blacken the codebase...
r43346
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 def _plain():
Augie Fackler
formatting: blacken the codebase...
r43346 if (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'HGPLAIN' not in encoding.environ
and b'HGPLAINEXCEPT' not in encoding.environ
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 return False
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 exceptions = encoding.environ.get(b'HGPLAINEXCEPT', b'').strip().split(b',')
return b'i18n' not in exceptions
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849
Augie Fackler
formatting: blacken the codebase...
r43346
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 if _plain():
Brodie Rao
ui: add HGPLAIN environment variable for easier scripting...
r10455 _ = lambda message: message
else:
_ = gettext