/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: matkor
  • Date: 2007-08-23 10:17:40 UTC
  • mto: This revision was merged to the branch mainline in revision 265.
  • Revision ID: matkor@laptop-hp-20070823101740-s17kf9qa383wiuje
Code for "branch update" menuitem and toolbox. Typo fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
revisionmenu.py
23
23
 
24
24
import bzrlib
25
25
import gtk
26
 
from bzrlib import (errors, ui)
27
 
from bzrlib.revision import NULL_REVISION
28
26
 
29
27
class RevisionPopupMenu(gtk.Menu):
30
 
    def __init__(self, repository, revids, branch=None, wt=None):
 
28
    def __init__(self, repository, revids, branch=None):
31
29
        super(RevisionPopupMenu, self).__init__()
32
30
        self.branch = branch
33
31
        self.repository = repository
34
 
        self.wt = wt
35
32
        self.revids = revids
36
33
        self.create_items()
37
34
 
38
35
    def create_items(self):
39
36
        if len(self.revids) == 1:
40
 
            item = gtk.MenuItem("View _Changes")
 
37
            item = gtk.MenuItem("View _Diff")
41
38
            item.connect('activate', self.show_diff)
42
39
            self.append(item)
43
40
            self.show_all()
54
51
 
55
52
            item = gtk.MenuItem("_Merge Directive")
56
53
            item.connect('activate', self.store_merge_directive)
57
 
            # FIXME: self.append(item)
 
54
            self.append(item)
58
55
            self.show_all()
59
 
            
60
 
            if self.wt:
61
 
                item = gtk.MenuItem("_Revert to this revision")
62
 
                item.connect('activate', self.revert)
63
 
                self.append(item)
64
 
                self.show_all()
65
56
 
66
57
    def store_merge_directive(self, item):
67
58
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
70
61
 
71
62
    def show_diff(self, item):
72
63
        from bzrlib.plugins.gtk.diff import DiffWindow
73
 
        window = DiffWindow(parent=self.parent)
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)
 
64
        window = DiffWindow()
 
65
        parentid = self.repository.revision_parents(self.revids[0])[0]
 
66
        (parent_tree, rev_tree) = self.repository.revision_trees(
 
67
            [parentid, self.revids[0]])
83
68
        window.set_diff(self.revids[0], rev_tree, parent_tree)
84
69
        window.show()
85
70
 
96
81
            dialog.hide()
97
82
        
98
83
            if response == gtk.RESPONSE_OK:
99
 
                try:
100
 
                    self.branch.lock_write()
101
 
                    self.branch.tags.set_tag(dialog.tagname, dialog._revid)
102
 
                finally:
103
 
                    self.branch.unlock()
 
84
                self.branch.lock_write()
 
85
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
 
86
                self.branch.unlock()
104
87
            
105
88
            dialog.destroy()
106
 
    
107
 
    def revert(self, item):
108
 
        pb = ui.ui_factory.nested_progress_bar()
109
 
        revision_tree = self.branch.repository.revision_tree(self.revids[0])
110
 
        try:
111
 
            self.wt.revert(old_tree = revision_tree, pb = pb)
112
 
        finally:
113
 
            pb.finished()