ext diff from qlog->qdiff->external diff fails

Bug #461882 reported by Craig Hewetson on 2009-10-27
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Juniper Openstack
Status tracked in Trunk
Trunk
In Progress
High
Gary van der Merwe
QBzr
High
Gary van der Merwe

Bug Description

Open qlog
Then double click on a revision to show the qdiff view.
Then select a configured diff tool from combo box.

The result:

bzr: ERROR: exceptions.AttributeError: 'RevisionTree' object has no attribute 'basedir'

Traceback (most recent call last):
  File "/home/craig/.bazaar/plugins/qbzr/lib/diffwindow.py", line 416, in ext_diff_triggered
    show_diff(self.arg_provider, ext_diff=ext_diff, parent_window = self)
  File "/home/craig/.bazaar/plugins/qbzr/lib/diff.py", line 60, in show_diff
    QtCore.QCoreApplication.processEvents)
  File "/home/craig/.bazaar/plugins/qbzr/lib/diff_arg.py", line 110, in get_ext_diff_args
    old_base = get_base(self.old_branch, self.old_tree)
  File "/home/craig/.bazaar/plugins/qbzr/lib/diff_arg.py", line 107, in get_base
    return urlutils.local_path_to_url(tree.basedir)
AttributeError: 'RevisionTree' object has no attribute 'basedir'

NOTE:
This does work from bzr qdiff.

Related branches

Changed in qbzr:
importance: Undecided → High
tags: added: extdiff
Changed in qbzr:
status: New → Confirmed
Changed in qbzr:
assignee: nobody → Gary van der Merwe (garyvdm)
milestone: none → 0.16
status: Confirmed → Fix Released

I get this error:

bzr: ERROR: exceptions.NameError: global name 'WorkingTree' is not defined

Traceback (most recent call last):

File "/home/craig/.bazaar/plugins/qbzr/lib/diffwindow.py", line 416, in
ext_diff_triggered

show_diff(self.arg_provider, ext_diff=ext_diff, parent_window = self)

File "/home/craig/.bazaar/plugins/qbzr/lib/diff.py", line 60, in show_diff

QtCore.QCoreApplication.processEvents)

File "/home/craig/.bazaar/plugins/qbzr/lib/diff_arg.py", line 110, in
get_ext_diff_args

old_base = get_base(self.old_branch, self.old_tree)

File "/home/craig/.bazaar/plugins/qbzr/lib/diff_arg.py", line 106, in
get_base

if tree and isinstance(tree, WorkingTree):

NameError: global name 'WorkingTree' is not defined

NOTE:
Its important to open qlog then double click on a revision to get the
builtin diff tool (qdiff) and then from qdiff go to the combo box and select
the extdiff tool.

Review in progress for https://review.opencontrail.org/25208
Submitter: Divakar Dharanalakota (<email address hidden>)

To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers