/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to viz/treeview.py

  • Committer: Daniel Schierbeck
  • Date: 2007-11-03 17:38:10 UTC
  • mfrom: (330.4.3 fix-diff)
  • Revision ID: daniel.schierbeck@gmail.com-20071103173810-ex9liin4qh6td2ez
Merged diff fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
viz/treeview.py
17
17
from linegraph import linegraph, same_branch
18
18
from graphcell import CellRendererGraph
19
19
from treemodel import TreeModel
 
20
from bzrlib.revision import NULL_REVISION
20
21
 
21
22
class TreeView(gtk.ScrolledWindow):
22
23
 
146
147
 
147
148
        return False
148
149
 
149
 
    def show_diff(self, branch, revid, parentid):
 
150
    def show_diff(self, branch, revid, parentid=None):
150
151
        """Open a new window to show a diff between the given revisions."""
151
152
        from bzrlib.plugins.gtk.diff import DiffWindow
152
153
        window = DiffWindow(parent=self)
153
 
        (parent_tree, rev_tree) = branch.repository.revision_trees([parentid, 
154
 
                                                                   revid])
 
154
 
 
155
        rev_tree    = branch.repository.revision_tree(revid)
 
156
 
 
157
        if parentid is None:
 
158
            parentid = NULL_REVISION
 
159
 
 
160
        parent_tree = branch.repository.revision_tree(parentid)
 
161
 
155
162
        description = revid + " - " + branch.nick
156
163
        window.set_diff(description, rev_tree, parent_tree)
157
164
        window.show()
244
251
        """Callback for when a treeview row gets activated."""
245
252
        revision_id = self.model[path][treemodel.REVID]
246
253
        parents = self.model[path][treemodel.PARENTS]
 
254
 
247
255
        if len(parents) == 0:
248
 
            # Ignore revisions without parent
249
 
            return
250
 
        parent_id = parents[0]
 
256
            parent_id = None
 
257
        else:
 
258
            parent_id = parents[0]
 
259
 
251
260
        self.show_diff(self.branch, revision_id, parent_id)
252
261
        self.treeview.grab_focus()