##// END OF EJS Templates
setdiscovery: don't call "heads" wire command when heads specified...
setdiscovery: don't call "heads" wire command when heads specified Our custom server has too many heads to announce (one per code review, plus a public head), but it still lets the user request one of them by doing hg pull -r <some expression> After the client has resolved the expression to a set of nodeids by calling the "lookup" wire command, it will start the discovery phase. Before this patch, that doesn't take the requested heads into account and unconditionally calls the server's "heads" command to find all its heads. One consequence of that the "all remote heads known locally" case triggers if the client already had the public head and the user will see a "no changes found" message that's unrelated to the head they requested. That message confused me for a while. More imporantly, it also means that pullop.cgresult incorrectly (given our arguably misbehaving server) gets set to 0 (no changesets added), which confused some of our extensions. This patch makes it so the client skips the "heads" command if the user requested specific revisions. Since the "heads" command is normally batched with the first "known" command and calculating the list of heads is probably cheap, I don't expect much improvement in speed from this. Differential Revision: https://phab.mercurial-scm.org/D1962

File last commit:

r34661:d00ec62d default
r35867:5cfdf613 default
Show More
i18n.py
110 lines | 3.7 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
timeless
py3: handle ugettext + unicode in i18n
r28674 try:
unicode
except NameError:
unicode = str
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)
Augie Fackler
i18n: make the locale directory name the same string type as the datapath
r30085 localedir = os.path.join(datapath, pycompat.sysstr('locale'))
Mads Kiilerich
i18n: use datapath for i18n like for templates and help...
r22638 t = gettextmod.translation('hg', localedir, _languages, fallback=True)
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:
Augie Fackler
i18n: cache the result of every gettext call...
r23031 if type(message) is unicode:
# 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