Opening branch with contents conflict fails with traceback

[Alexander Belchenko]

I've tried to open branch after merge. It has several conflicts, some of them are: text conflicts, contents conflicts and conflict adding file without parent. Explorer fails with traceback:

bzr: ERROR: exceptions.TypeError: sequence item 2: expected string or Unicode, ContentsConflict found

Traceback (most recent call last):
  File "C:\work\Bazaar\plugins\explorer\lib\explorer.py", line 1007, in callable_with_cleanup
  File "C:\work\Bazaar\plugins\explorer\lib\explorer.py", line 1106, in _open_location_task
  File "C:\work\Bazaar\plugins\explorer\lib\location.py", line 379, in add_location
  File "C:\work\Bazaar\plugins\explorer\lib\location.py", line 328, in view
  File "C:\work\Bazaar\plugins\explorer\lib\html_report_view.py", line 51, in ui
  File "C:\work\Bazaar\plugins\explorer\lib\html_report_view.py", line 55, in refresh_view
  File "C:\work\Bazaar\plugins\explorer\lib\view_workingtree.py", line 31, in report_text
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 83, in full_report
TypeError: sequence item 2: expected string or Unicode, ContentsConflict found

bzr 1.17 on python 2.5.4 (win32)
arguments: ['bzr', 'explore', '.']
encoding: 'cp1251', fsenc: 'mbcs', lang: None
plugins:
  acad C:\work\Bazaar\plugins\acad [0.8]
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [1.17]
  explorer C:\work\Bazaar\plugins\explorer [0.7dev]
  fastimport C:\work\Bazaar\plugins\fastimport [0.9dev]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [1.17]
  qbzr C:\work\Bazaar\plugins\qbzr [0.14dev]
  rebase C:\work\Bazaar\plugins\rebase [0.5.4dev]
  repoalias C:\work\Bazaar\plugins\repoalias [unknown]
  scmproj C:\work\Bazaar\plugins\scmproj [0.4.5.dev.2]
  x_bit C:\work\Bazaar\plugins\x_bit [1.0]

[Ian Clatworthy (ian-clatworthy)]

Should be fixed in rev 223. Please reopen otherwise.

[Alexander Belchenko (bialix)]

Still not fixed:

bzr: ERROR: exceptions.AttributeError: 'ContentsConflict' object has no attribute 'replace'

Traceback (most recent call last):
  File "C:\work\Bazaar\plugins\explorer\lib\explorer.py", line 1170, in do_refresh
  File "C:\work\Bazaar\plugins\explorer\lib\location.py", line 437, in refresh_current
  File "C:\work\Bazaar\plugins\explorer\lib\location.py", line 349, in refresh_view
  File "C:\work\Bazaar\plugins\explorer\lib\html_report_view.py", line 55, in refresh_view
  File "C:\work\Bazaar\plugins\explorer\lib\view_workingtree.py", line 31, in report_text
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 84, in full_report
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 238, in body_lines
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 161, in section_lines
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 125, in _conflicts_formatter
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 66, in _text_decorator
  File "C:\work\Bazaar\plugins\explorer\lib\status_report.py", line 70, in _text_with_actions_decorator
  File "cgi.pyo", line 1055, in escape
AttributeError: 'ContentsConflict' object has no attribute 'replace'

bzr 1.17 on python 2.5.4 (win32)
arguments: ['C:\\Program Files\\Bazaar\\bzr.EXE', 'explore', '.']
encoding: 'cp1251', fsenc: 'mbcs', lang: None
plugins:
  acad C:\work\Bazaar\plugins\acad [0.8]
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [1.17]
  explorer C:\work\Bazaar\plugins\explorer [0.7dev]
  fastimport C:\work\Bazaar\plugins\fastimport [0.9dev]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [1.17]
  qbzr C:\work\Bazaar\plugins\qbzr [0.14dev]
  rebase C:\work\Bazaar\plugins\rebase [0.5.4dev]
  repoalias C:\work\Bazaar\plugins\repoalias [unknown]
  scmproj C:\work\Bazaar\plugins\scmproj [0.4.5.dev.2]
  x_bit C:\work\Bazaar\plugins\x_bit [1.0]

[Ian Clatworthy (ian-clatworthy)]

Please try rev 226.

[Craig Hewetson (craighewetson-deactivatedaccount)]

rev226, works on my side.

[Alexander Belchenko (bialix)]

Ian Clatworthy пишет:
> Please try rev 226.
>
works for me, thanks.