/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 olive/menu.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-30 20:36:16 UTC
  • mfrom: (322.1.1 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030203616-op14zvvmflw6ds1n
Merge in Jelmer's trunk update + conflict resolution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
306
306
    def diff(self, action):
307
307
        """ Right context menu -> Diff """
308
308
        wt = WorkingTree.open_containing(self.path)[0]
309
 
        window = DiffWindow()
 
309
        window = DiffWindow(self.app)
310
310
        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
311
311
        window.set_diff(wt.branch.nick, wt, parent_tree)
312
312
        window.set_file(wt.relpath(self.path + os.sep + self.selected))