##// END OF EJS Templates
update: don't translate the abort message twice...
update: don't translate the abort message twice The string representation of util.Abort() is translated when merge.update() raises the exception. For languages with characters out of the valid ascii range, if we feed them again to i18n.gettext() mercurial dies with: [...] File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/commands.py", line 4287, in postincoming ui.warn(_("not updating: %s\n" % str(inst))) File "/home/javi/src/mercurial/mercurial/hg-mpm/mercurial/i18n.py", line 42, in gettext u = u'\n\n'.join([p and t.ugettext(p) or '' for p in paragraphs]) File "/usr/lib/python2.7/gettext.py", line 404, in ugettext return unicode(message) UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 14: ordinal not in range(128) To reproduce this error, just try to pull a changeset that crosses branches with LANG=ru_RU.UTF-8

File last commit:

r13382:d747774c default
r16230:d4d35fd0 stable
Show More
repo.py
40 lines | 1.2 KiB | text/x-python | PythonLexer
mpm@selenic.com
Break apart hg.py...
r1089 # repo.py - repository base classes for mercurial
#
Thomas Arendsen Hein
Updated copyright notices and add "and others" to "hg version"
r4635 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
Vadim Gelfer
update copyrights.
r2859 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
mpm@selenic.com
Break apart hg.py...
r1089 #
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # 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.
mpm@selenic.com
Break apart hg.py...
r1089
Benoit Boissinot
import gettext since '_' is used
r5455 from i18n import _
Peter Arrenbrecht
cleanup: drop unused imports
r7873 import error
Benoit Boissinot
import gettext since '_' is used
r5455
Vadim Gelfer
add support for streaming clone....
r2612 class repository(object):
def capable(self, name):
'''tell whether repo supports named capability.
return False if not supported.
if boolean capability, return True.
if string capability, return string.'''
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259 if name in self.capabilities:
return True
Vadim Gelfer
add support for streaming clone....
r2612 name_eq = name + '='
for cap in self.capabilities:
if cap.startswith(name_eq):
return cap[len(name_eq):]
return False
Bryan O'Sullivan
Push capability checking into protocol-level code.
r5259
def requirecap(self, name, purpose):
'''raise an exception if the given capability is not present'''
if not self.capable(name):
Matt Mackall
error: move repo errors...
r7637 raise error.CapabilityError(
_('cannot %s; remote repository does not '
'support the %r capability') % (purpose, name))
John Mulligan
Add default local() and cancopy() methods to repository base class
r6311
def local(self):
return False
def cancopy(self):
return self.local()
Adrian Buehlmann
Make sure bundlerepo doesn't leak temp files (issue2491)...
r13382
def close(self):
pass