/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 revisionmenu.py

  • Committer: Daniel Schierbeck
  • Date: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionmenu.py
24
24
import bzrlib
25
25
import gtk
26
26
from bzrlib import (errors, ui)
 
27
from bzrlib.revision import NULL_REVISION
27
28
 
28
29
class RevisionPopupMenu(gtk.Menu):
29
 
    def __init__(self, repository, revids, branch=None):
 
30
    def __init__(self, repository, revids, branch=None, wt=None):
30
31
        super(RevisionPopupMenu, self).__init__()
31
32
        self.branch = branch
32
33
        self.repository = repository
 
34
        self.wt = wt
33
35
        self.revids = revids
34
36
        self.create_items()
35
37
 
36
38
    def create_items(self):
37
39
        if len(self.revids) == 1:
38
 
            item = gtk.MenuItem("View _Diff")
 
40
            item = gtk.MenuItem("View _Changes")
39
41
            item.connect('activate', self.show_diff)
40
42
            self.append(item)
41
43
            self.show_all()
55
57
            # FIXME: self.append(item)
56
58
            self.show_all()
57
59
            
58
 
            self.bzrdir = self.branch.bzrdir
59
 
            self.wt = None
60
 
            try:
61
 
                self.wt = self.bzrdir.open_workingtree()
62
 
            except errors.NoWorkingTree:
63
 
                return False
64
 
            if self.wt :
 
60
            if self.wt:
65
61
                item = gtk.MenuItem("_Revert to this revision")
66
62
                item.connect('activate', self.revert)
67
63
                self.append(item)
75
71
    def show_diff(self, item):
76
72
        from bzrlib.plugins.gtk.diff import DiffWindow
77
73
        window = DiffWindow(parent=self.parent)
78
 
        parentid = self.repository.revision_parents(self.revids[0])[0]
79
 
        (parent_tree, rev_tree) = self.repository.revision_trees(
80
 
            [parentid, self.revids[0]])
 
74
        parentids = self.repository.revision_parents(self.revids[0])
 
75
 
 
76
        if len(parentids) == 0:
 
77
            parentid = NULL_REVISION
 
78
        else:
 
79
            parentid = parentids[0]
 
80
 
 
81
        rev_tree    = self.repository.revision_tree(self.revids[0])
 
82
        parent_tree = self.repository.revision_tree(parentid)
81
83
        window.set_diff(self.revids[0], rev_tree, parent_tree)
82
84
        window.show()
83
85
 
84
86
    def show_push(self, item):
85
87
        from bzrlib.plugins.gtk.push import PushDialog
86
88
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
87
 
        dialog.run()
 
89
        response = dialog.run()
 
90
 
 
91
        if response != gtk.RESPONSE_NONE:
 
92
            dialog.destroy()
88
93
 
89
94
    def show_tag(self, item):
90
95
        from bzrlib.plugins.gtk.tags import AddTagDialog
91
96
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
92
97
        response = dialog.run()
 
98
 
93
99
        if response != gtk.RESPONSE_NONE:
94
100
            dialog.hide()
95
101
        
96
102
            if response == gtk.RESPONSE_OK:
97
 
                self.branch.lock_write()
98
 
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
99
 
                self.branch.unlock()
 
103
                try:
 
104
                    self.branch.lock_write()
 
105
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
106
                finally:
 
107
                    self.branch.unlock()
100
108
            
101
109
            dialog.destroy()
102
110