explorer does not understand unicode in pending merges messages

[Alexander Belchenko]

I'm trying to open branch with pending merges. And in fact I can't because it seems like bzr explorer trying to show message(s) for pending merges and can't. Bad.

Traceback in the console:

Traceback (most recent call last):
  File "C:\work\Bazaar\plugins\explorer\lib\explorer.py", line 500, in callable_
with_cleanup
    task_callable()
  File "C:\work\Bazaar\plugins\explorer\lib\explorer.py", line 544, in _open_loc
ation_task
    self.location_views.add_location(model)
  File "C:\work\Bazaar\plugins\explorer\lib\location.py", line 291, in add_locat
ion
    view = model.view()
  File "C:\work\Bazaar\plugins\explorer\lib\location.py", line 257, in view
    return view.ui()
  File "C:\work\Bazaar\plugins\explorer\lib\view_workingtree.py", line 60, in ui

    self.refresh_view()
  File "C:\work\Bazaar\plugins\explorer\lib\view_workingtree.py", line 64, in re
fresh_view
    self._collect_data()
  File "C:\work\Bazaar\plugins\explorer\lib\view_workingtree.py", line 77, in _c
ollect_data
    pending_merges = _get_pending_merges(wt)
  File "C:\work\Bazaar\plugins\explorer\lib\view_workingtree.py", line 207, in _
get_pending_merges
    status.show_pending_merges(wt, to_file=sio, verbose=verbose)
  File "bzrlib\status.pyo", line 232, in show_pending_merges
UnicodeEncodeError: 'ascii' codec can't encode characters in position 33-41: ord
inal not in range(128)

[Alexander Belchenko (bialix)]

fixed in my branch