##// END OF EJS Templates
encoding: use hint markup for "please check your locale settings"...
Mads Kiilerich -
r15769:afdf4f5b default
parent child Browse files
Show More
@@ -105,7 +105,7 b' def tolocal(s):'
105 return localstr(u.encode('UTF-8'), r)
105 return localstr(u.encode('UTF-8'), r)
106
106
107 except LookupError, k:
107 except LookupError, k:
108 raise error.Abort("%s, please check your locale settings" % k)
108 raise error.Abort(k, hint="please check your locale settings")
109 except UnicodeDecodeError:
109 except UnicodeDecodeError:
110 pass
110 pass
111 u = s.decode("utf-8", "replace") # last ditch
111 u = s.decode("utf-8", "replace") # last ditch
@@ -132,7 +132,7 b' def fromlocal(s):'
132 sub = s[max(0, inst.start - 10):inst.start + 10]
132 sub = s[max(0, inst.start - 10):inst.start + 10]
133 raise error.Abort("decoding near '%s': %s!" % (sub, inst))
133 raise error.Abort("decoding near '%s': %s!" % (sub, inst))
134 except LookupError, k:
134 except LookupError, k:
135 raise error.Abort("%s, please check your locale settings" % k)
135 raise error.Abort(k, hint="please check your locale settings")
136
136
137 # How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
137 # How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
138 wide = (os.environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
138 wide = (os.environ.get("HGENCODINGAMBIGUOUS", "narrow") == "wide"
@@ -235,7 +235,8 b' hg log (utf-8)'
235 hg log (dolphin)
235 hg log (dolphin)
236
236
237 $ HGENCODING=dolphin hg log
237 $ HGENCODING=dolphin hg log
238 abort: unknown encoding: dolphin, please check your locale settings
238 abort: unknown encoding: dolphin
239 (please check your locale settings)
239 [255]
240 [255]
240 $ HGENCODING=ascii hg branch `cat latin-1-tag`
241 $ HGENCODING=ascii hg branch `cat latin-1-tag`
241 abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
242 abort: decoding near '\xe9': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! (esc)
General Comments 0
You need to be logged in to leave comments. Login now