bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
1  | 
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
 | 
2  | 
#
 | 
|
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
"""Simple popup menu for revisions."""
 | 
|
17  | 
||
18  | 
try:  | 
|
19  | 
import pygtk  | 
|
20  | 
pygtk.require("2.0")  | 
|
21  | 
except:  | 
|
22  | 
    pass
 | 
|
23  | 
||
24  | 
import bzrlib  | 
|
25  | 
import gtk  | 
|
| 
423.7.8
by Daniel Schierbeck
 Made the revision popup menu correctly add tags.  | 
26  | 
import gobject  | 
| 
313.2.1
by Gary van der Merwe
 Add a revert option to the revision menu.  | 
27  | 
from bzrlib import (errors, ui)  | 
| 
330.4.3
by Daniel Schierbeck
 Switched to using NULL_REVISION instead of None.  | 
28  | 
from bzrlib.revision import NULL_REVISION  | 
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
29  | 
|
30  | 
class RevisionPopupMenu(gtk.Menu):  | 
|
| 
423.7.8
by Daniel Schierbeck
 Made the revision popup menu correctly add tags.  | 
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  | 
||
| 
328
by Jelmer Vernooij
 Use repository instead of branch in more places, to make it easier to support multiple branches in viz.  | 
40  | 
def __init__(self, repository, revids, branch=None, wt=None):  | 
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
41  | 
super(RevisionPopupMenu, self).__init__()  | 
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
42  | 
self.branch = branch  | 
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
43  | 
self.repository = repository  | 
| 
328
by Jelmer Vernooij
 Use repository instead of branch in more places, to make it easier to support multiple branches in viz.  | 
44  | 
self.wt = wt  | 
| 
230
by Jelmer Vernooij
 Initial work towards supporting multiple revisions.  | 
45  | 
self.revids = revids  | 
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
46  | 
self.create_items()  | 
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
47  | 
|
48  | 
def create_items(self):  | 
|
| 
230
by Jelmer Vernooij
 Initial work towards supporting multiple revisions.  | 
49  | 
if len(self.revids) == 1:  | 
| 
343
by Daniel Schierbeck
 Renamed diff into changes.  | 
50  | 
item = gtk.MenuItem("View _Changes")  | 
| 
230
by Jelmer Vernooij
 Initial work towards supporting multiple revisions.  | 
51  | 
item.connect('activate', self.show_diff)  | 
52  | 
self.append(item)  | 
|
53  | 
self.show_all()  | 
|
54  | 
||
55  | 
item = gtk.MenuItem("_Push")  | 
|
56  | 
item.connect('activate', self.show_push)  | 
|
57  | 
self.append(item)  | 
|
58  | 
self.show_all()  | 
|
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
59  | 
|
| 
232
by Jelmer Vernooij
 Make 'Add tag' dialog accessible from bzrk.  | 
60  | 
item = gtk.MenuItem("_Tag Revision")  | 
61  | 
item.connect('activate', self.show_tag)  | 
|
62  | 
self.append(item)  | 
|
63  | 
self.show_all()  | 
|
64  | 
||
| 
254.1.1
by Jelmer Vernooij
 Add Merge Directive option to revision menu.  | 
65  | 
item = gtk.MenuItem("_Merge Directive")  | 
66  | 
item.connect('activate', self.store_merge_directive)  | 
|
| 
270
by Jelmer Vernooij
 Hie merge directive menu for now.  | 
67  | 
            # FIXME: self.append(item)
 | 
| 
254.1.1
by Jelmer Vernooij
 Add Merge Directive option to revision menu.  | 
68  | 
self.show_all()  | 
| 
313.2.1
by Gary van der Merwe
 Add a revert option to the revision menu.  | 
69  | 
|
| 
328
by Jelmer Vernooij
 Use repository instead of branch in more places, to make it easier to support multiple branches in viz.  | 
70  | 
if self.wt:  | 
| 
318.1.1
by Gary van der Merwe
 * Adjust ui test according to review comments.  | 
71  | 
item = gtk.MenuItem("_Revert to this revision")  | 
| 
313.2.1
by Gary van der Merwe
 Add a revert option to the revision menu.  | 
72  | 
item.connect('activate', self.revert)  | 
73  | 
self.append(item)  | 
|
74  | 
self.show_all()  | 
|
| 
254.1.1
by Jelmer Vernooij
 Add Merge Directive option to revision menu.  | 
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  | 
||
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
81  | 
def show_diff(self, item):  | 
82  | 
from bzrlib.plugins.gtk.diff import DiffWindow  | 
|
| 
313
by Daniel Schierbeck
 Fixed bug in the revision menu, where the parent property was not set on the diff window.  | 
83  | 
window = DiffWindow(parent=self.parent)  | 
| 
330.4.2
by Daniel Schierbeck
 Made it work when right-clicking, too.  | 
84  | 
parentids = self.repository.revision_parents(self.revids[0])  | 
85  | 
||
86  | 
if len(parentids) == 0:  | 
|
| 
330.4.3
by Daniel Schierbeck
 Switched to using NULL_REVISION instead of None.  | 
87  | 
parentid = NULL_REVISION  | 
| 
330.4.2
by Daniel Schierbeck
 Made it work when right-clicking, too.  | 
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)  | 
|
| 
230
by Jelmer Vernooij
 Initial work towards supporting multiple revisions.  | 
93  | 
window.set_diff(self.revids[0], rev_tree, parent_tree)  | 
| 
226
by Jelmer Vernooij
 Add context menu in bzrk.  | 
94  | 
window.show()  | 
| 
227
by Jelmer Vernooij
 Add push item in revision menu, clean up push code.  | 
95  | 
|
96  | 
def show_push(self, item):  | 
|
97  | 
from bzrlib.plugins.gtk.push import PushDialog  | 
|
| 
230
by Jelmer Vernooij
 Initial work towards supporting multiple revisions.  | 
98  | 
dialog = PushDialog(self.repository, self.revids[0], self.branch)  | 
| 
401
by Daniel Schierbeck
 Made the push dialog close when the cancel button is clicked.  | 
99  | 
response = dialog.run()  | 
100  | 
||
101  | 
if response != gtk.RESPONSE_NONE:  | 
|
102  | 
dialog.destroy()  | 
|
| 
232
by Jelmer Vernooij
 Make 'Add tag' dialog accessible from bzrk.  | 
103  | 
|
104  | 
def show_tag(self, item):  | 
|
105  | 
from bzrlib.plugins.gtk.tags import AddTagDialog  | 
|
106  | 
dialog = AddTagDialog(self.repository, self.revids[0], self.branch)  | 
|
107  | 
response = dialog.run()  | 
|
| 
401
by Daniel Schierbeck
 Made the push dialog close when the cancel button is clicked.  | 
108  | 
|
| 
232
by Jelmer Vernooij
 Make 'Add tag' dialog accessible from bzrk.  | 
109  | 
if response != gtk.RESPONSE_NONE:  | 
110  | 
dialog.hide()  | 
|
111  | 
||
112  | 
if response == gtk.RESPONSE_OK:  | 
|
| 
423.7.8
by Daniel Schierbeck
 Made the revision popup menu correctly add tags.  | 
113  | 
self.emit('tag-added', dialog.tagname, dialog._revid)  | 
| 
232
by Jelmer Vernooij
 Make 'Add tag' dialog accessible from bzrk.  | 
114  | 
|
115  | 
dialog.destroy()  | 
|
| 
313.2.1
by Gary van der Merwe
 Add a revert option to the revision menu.  | 
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()  |