##// END OF EJS Templates
wireprotov2: add phases to "changesetdata" command...
wireprotov2: add phases to "changesetdata" command This commit teaches the "changesetdata" wire protocol command to emit the phase state for each changeset. This is a different approach from existing phase transfer in a few ways. Previously, if there are no new revisions (or we're not using bundle2), we perform a "listkeys" request to retrieve phase heads. And when revision data is being transferred with bundle2, phases data is encoded in a standalone bundle2 part. In both cases, phases data is logically decoupled from the changeset data and is encountered/applied after changeset revision data is received. The new wire protocol purposefully tries to more tightly associate changeset metadata (phases, bookmarks, obsolescence markers, etc) with the changeset revision and index data itself, rather than have it live as a separate entity that must be fetched and processed separately. I reckon that one reason we didn't do this before was it was difficult to add new data types/fields without breaking existing consumers. By using CBOR maps to transfer changeset data and putting clients in control of what fields are requested / present in those maps, we can easily add additional changeset data while maintaining backwards compatibility. I believe this to be a superior approach to the problem. That being said, for performance reasons, we may need to resort to alternative mechanisms for transferring data like phases. But for now, I think giving the wire protocol the ability to transfer changeset metadata next to the changeset itself is a powerful feature because it is a raw, changeset-centric data API. And if you build simple APIs for accessing the fundamental units of repository data, you enable client-side experimentation (partial clone, etc). If it turns out that we need specialized APIs or mechanisms for transferring data like phases, we can build in those APIs later. For now, I'd like to see how far we can get on simple APIs. It's worth noting that when phase data is being requested, the server will also emit changeset records for nodes in the bases specified by the "noderange" argument. This is to ensure that phase-only updates for nodes the client has are available to the client, even if no new changesets will be transferred. Differential Revision: https://phab.mercurial-scm.org/D4483

File last commit:

r38332:79dd61a4 default
r39668:c1aacb0d default
Show More
i18n.py
105 lines | 3.6 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
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
Jun Wu
codemod: use pycompat.iswindows...
r34646 if (pycompat.iswindows
Yuya Nishihara
py3: make i18n use encoding.environ
r30035 and 'LANGUAGE' not in encoding.environ
and 'LC_ALL' not in encoding.environ
and 'LC_MESSAGES' not in encoding.environ
and 'LANG' not in encoding.environ):
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
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 _ugettext = None
def setdatapath(datapath):
Pulkit Goyal
py3: make util.datapath a bytes variable...
r30301 datapath = pycompat.fsdecode(datapath)
Yuya Nishihara
py3: use r'' instead of sysstr('') to get around code transformer...
r36853 localedir = os.path.join(datapath, r'locale')
Yuya Nishihara
py3: make gettext domain a system string
r36710 t = gettextmod.translation(r'hg', localedir, _languages, fallback=True)
Mads Kiilerich
i18n: use datapath for i18n like for templates and help...
r22638 global _ugettext
timeless
py3: handle ugettext + unicode in i18n
r28674 try:
_ugettext = t.ugettext
except AttributeError:
_ugettext = t.gettext
Martin Geisler
i18n: encode output in user's local encoding...
r7651
Yuya Nishihara
i18n: cache translated messages per encoding...
r34661 _msgcache = {} # encoding: {message: translation}
Augie Fackler
i18n: cache the result of every gettext call...
r23031
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:
paragraphs = [p.decode("ascii") for p in message.split('\n\n')]
# 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
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 def _plain():
Yuya Nishihara
py3: make i18n use encoding.environ
r30035 if ('HGPLAIN' not in encoding.environ
and 'HGPLAINEXCEPT' not in encoding.environ):
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 return False
Yuya Nishihara
py3: make i18n use encoding.environ
r30035 exceptions = encoding.environ.get('HGPLAINEXCEPT', '').strip().split(',')
Brodie Rao
HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT...
r13849 return 'i18n' not in exceptions
if _plain():
Brodie Rao
ui: add HGPLAIN environment variable for easier scripting...
r10455 _ = lambda message: message
else:
_ = gettext