/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

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
import gobject
 
27
from bzrlib import (errors, ui)
 
28
from bzrlib.revision import NULL_REVISION
26
29
 
27
30
class RevisionPopupMenu(gtk.Menu):
28
 
    def __init__(self, repository, revids, branch=None):
 
31
 
 
32
    __gsignals__ = {
 
33
            'tag-added': (
 
34
                gobject.SIGNAL_RUN_FIRST,
 
35
                gobject.TYPE_NONE,
 
36
                (gobject.TYPE_STRING, gobject.TYPE_STRING)
 
37
            )
 
38
    }
 
39
 
 
40
    def __init__(self, repository, revids, branch=None, wt=None):
29
41
        super(RevisionPopupMenu, self).__init__()
30
42
        self.branch = branch
31
43
        self.repository = repository
 
44
        self.wt = wt
32
45
        self.revids = revids
33
46
        self.create_items()
34
47
 
35
48
    def create_items(self):
36
49
        if len(self.revids) == 1:
37
 
            item = gtk.MenuItem("View _Diff")
 
50
            item = gtk.MenuItem("View _Changes")
38
51
            item.connect('activate', self.show_diff)
39
52
            self.append(item)
40
53
            self.show_all()
49
62
            self.append(item)
50
63
            self.show_all()
51
64
 
 
65
            item = gtk.MenuItem("_Merge Directive")
 
66
            item.connect('activate', self.store_merge_directive)
 
67
            # FIXME: self.append(item)
 
68
            self.show_all()
 
69
            
 
70
            if self.wt:
 
71
                item = gtk.MenuItem("_Revert to this revision")
 
72
                item.connect('activate', self.revert)
 
73
                self.append(item)
 
74
                self.show_all()
 
75
 
 
76
    def store_merge_directive(self, item):
 
77
        from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog
 
78
        window = CreateMergeDirectiveDialog(self.branch, self.revids[0])
 
79
        window.show()
 
80
 
52
81
    def show_diff(self, item):
53
82
        from bzrlib.plugins.gtk.diff import DiffWindow
54
 
        window = DiffWindow()
55
 
        parentid = self.repository.revision_parents(self.revids[0])[0]
56
 
        (parent_tree, rev_tree) = self.repository.revision_trees(
57
 
            [parentid, self.revids[0]])
 
83
        window = DiffWindow(parent=self.parent)
 
84
        parentids = self.repository.revision_parents(self.revids[0])
 
85
 
 
86
        if len(parentids) == 0:
 
87
            parentid = NULL_REVISION
 
88
        else:
 
89
            parentid = parentids[0]
 
90
 
 
91
        rev_tree    = self.repository.revision_tree(self.revids[0])
 
92
        parent_tree = self.repository.revision_tree(parentid)
58
93
        window.set_diff(self.revids[0], rev_tree, parent_tree)
59
94
        window.show()
60
95
 
61
96
    def show_push(self, item):
62
97
        from bzrlib.plugins.gtk.push import PushDialog
63
98
        dialog = PushDialog(self.repository, self.revids[0], self.branch)
64
 
        dialog.run()
 
99
        response = dialog.run()
 
100
 
 
101
        if response != gtk.RESPONSE_NONE:
 
102
            dialog.destroy()
65
103
 
66
104
    def show_tag(self, item):
67
105
        from bzrlib.plugins.gtk.tags import AddTagDialog
68
106
        dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
69
107
        response = dialog.run()
 
108
 
70
109
        if response != gtk.RESPONSE_NONE:
71
110
            dialog.hide()
72
111
        
73
112
            if response == gtk.RESPONSE_OK:
74
 
                self.branch.lock_write()
75
 
                self.branch.tags.set_tag(dialog.tagname, dialog._revid)
76
 
                self.branch.unlock()
 
113
                self.emit('tag-added', dialog.tagname, dialog._revid)
77
114
            
78
115
            dialog.destroy()
 
116
    
 
117
    def revert(self, item):
 
118
        pb = ui.ui_factory.nested_progress_bar()
 
119
        revision_tree = self.branch.repository.revision_tree(self.revids[0])
 
120
        try:
 
121
            self.wt.revert(old_tree = revision_tree, pb = pb)
 
122
        finally:
 
123
            pb.finished()