Show More
@@ -248,6 +248,10 b' class converter(object):' | |||||
248 | desc = self.commitcache[c].desc |
|
248 | desc = self.commitcache[c].desc | |
249 | if "\n" in desc: |
|
249 | if "\n" in desc: | |
250 | desc = desc.splitlines()[0] |
|
250 | desc = desc.splitlines()[0] | |
|
251 | # convert log message to local encoding without using | |||
|
252 | # tolocal() because util._encoding conver() use it as | |||
|
253 | # 'utf-8' | |||
|
254 | desc = desc.decode('utf-8').encode(orig_encoding, 'replace') | |||
251 | self.ui.status("%d %s\n" % (num, desc)) |
|
255 | self.ui.status("%d %s\n" % (num, desc)) | |
252 | self.copy(c) |
|
256 | self.copy(c) | |
253 |
|
257 | |||
@@ -276,7 +280,11 b' class converter(object):' | |||||
276 | self.source.after() |
|
280 | self.source.after() | |
277 | self.map.close() |
|
281 | self.map.close() | |
278 |
|
282 | |||
|
283 | orig_encoding = 'ascii' | |||
|
284 | ||||
279 | def convert(ui, src, dest=None, revmapfile=None, **opts): |
|
285 | def convert(ui, src, dest=None, revmapfile=None, **opts): | |
|
286 | global orig_encoding | |||
|
287 | orig_encoding = util._encoding | |||
280 | util._encoding = 'UTF-8' |
|
288 | util._encoding = 'UTF-8' | |
281 |
|
289 | |||
282 | if not dest: |
|
290 | if not dest: |
General Comments 0
You need to be logged in to leave comments.
Login now