ext diff from qlog->qdiff->external diff fails
Affects | Status | Importance | Assigned to | Milestone | ||
---|---|---|---|---|---|---|
Juniper Openstack | Status tracked in Trunk | |||||
Trunk |
In Progress
|
High
|
Gary van der Merwe | |||
QBzr |
Fix Released
|
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.
Traceback (most recent call last):
File "/home/
show_
File "/home/
QtCore.
File "/home/
old_base = get_base(
File "/home/
return urlutils.
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. QCoreApplicatio n.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.