##// END OF EJS Templates
narrow: allow merging non-conflicting change outside of the narrow spec...
narrow: allow merging non-conflicting change outside of the narrow spec We use the mergestate to carry information about these merge action and reprocess them at commit time to apply the necessary update. The dirstate itself is never affected and remains "pure", with content only in the narrow-spec. This file involved in such merge are therefor not listed in `hg status`. The current testing is based on a modification of the previous testing, that refused to do such merges. As a result it is a bit simple and more extensive code and testing testing will have to be introduced later. I am planning to do this extra testing, soon. In addition, this only works for flat manifest. Support for tree manifest will need more work. I am not currently planning to do this work. Differential Revision: https://phab.mercurial-scm.org/D12119

File last commit:

r47575:d4ba4d51 default
r49565:f1eb77dc default
Show More
i18n.py
126 lines | 4.0 KiB | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # i18n.py - internationalization support for mercurial
#
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 # Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>
Martin Geisler
put license and copyright info into comment blocks
r8226 #
# 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
Matt Harbison
typing: add type annotations to mercurial/i18n.py...
r47388 if pycompat.TYPE_CHECKING:
from typing import (
Callable,
List,
)
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
Matt Harbison
typing: add type annotations to mercurial/i18n.py...
r47388 # pytype: disable=module-attr
Yuya Nishihara
i18n: detect UI language without POSIX-style locale variable on Windows (BC)...
r21987 langid = ctypes.windll.kernel32.GetUserDefaultUILanguage()
Matt Harbison
typing: add type annotations to mercurial/i18n.py...
r47388 # pytype: enable=module-attr
Yuya Nishihara
i18n: detect UI language without POSIX-style locale variable on Windows (BC)...
r21987 _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:
Matt Harbison
typing: add type annotations to mercurial/i18n.py...
r47388 _ugettext = t.ugettext # pytype: disable=attribute-error
Martin von Zweigbergk
i18n: get datapath directly from resourceutil...
r44069 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):
Matt Harbison
typing: mark the argument to mercurial.i18n.gettext() non-Optional...
r47564 # type: (bytes) -> bytes
Martin Geisler
i18n: encode output in user's local encoding...
r7651 """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
Matt Harbison
typing: add type annotations to mercurial/i18n.py...
r47388 paragraphs = message.split(u'\n\n') # type: List[pycompat.unicode]
Augie Fackler
i18n: cache the result of every gettext call...
r23031 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():
Matt Harbison
typing: add type annotations to mercurial/i18n.py...
r47388 _ = lambda message: message # type: Callable[[bytes], bytes]
Brodie Rao
ui: add HGPLAIN environment variable for easier scripting...
r10455 else:
_ = gettext