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 gtk |
|
423.7.8
by Daniel Schierbeck
Made the revision popup menu correctly add tags. |
25 |
import gobject |
724
by Jelmer Vernooij
Fix formatting, imports. |
26 |
from bzrlib import ui |
330.4.3
by Daniel Schierbeck
Switched to using NULL_REVISION instead of None. |
27 |
from bzrlib.revision import NULL_REVISION |
226
by Jelmer Vernooij
Add context menu in bzrk. |
28 |
|
523.3.1
by Jelmer Vernooij
Rename RevisionPopupMenu -> RevisionMenu. |
29 |
class RevisionMenu(gtk.Menu): |
423.7.8
by Daniel Schierbeck
Made the revision popup menu correctly add tags. |
30 |
|
31 |
__gsignals__ = { |
|
32 |
'tag-added': ( |
|
33 |
gobject.SIGNAL_RUN_FIRST, |
|
34 |
gobject.TYPE_NONE, |
|
35 |
(gobject.TYPE_STRING, gobject.TYPE_STRING) |
|
36 |
)
|
|
37 |
}
|
|
38 |
||
523.3.2
by Jelmer Vernooij
Share same menu for context menu and main menu. |
39 |
def __init__(self, repository, revids, branch=None, wt=None, parent=None): |
523.3.1
by Jelmer Vernooij
Rename RevisionPopupMenu -> RevisionMenu. |
40 |
super(RevisionMenu, self).__init__() |
523.3.2
by Jelmer Vernooij
Share same menu for context menu and main menu. |
41 |
self._parent = parent |
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 |
523.3.1
by Jelmer Vernooij
Rename RevisionPopupMenu -> RevisionMenu. |
45 |
self.set_revision_ids(revids) |
46 |
||
47 |
def set_revision_ids(self, revids): |
|
523.3.2
by Jelmer Vernooij
Share same menu for context menu and main menu. |
48 |
assert isinstance(revids, list) |
523.3.1
by Jelmer Vernooij
Rename RevisionPopupMenu -> RevisionMenu. |
49 |
for c in self.get_children(): |
50 |
self.remove(c) |
|
230
by Jelmer Vernooij
Initial work towards supporting multiple revisions. |
51 |
self.revids = revids |
227
by Jelmer Vernooij
Add push item in revision menu, clean up push code. |
52 |
self.create_items() |
226
by Jelmer Vernooij
Add context menu in bzrk. |
53 |
|
54 |
def create_items(self): |
|
230
by Jelmer Vernooij
Initial work towards supporting multiple revisions. |
55 |
if len(self.revids) == 1: |
343
by Daniel Schierbeck
Renamed diff into changes. |
56 |
item = gtk.MenuItem("View _Changes") |
230
by Jelmer Vernooij
Initial work towards supporting multiple revisions. |
57 |
item.connect('activate', self.show_diff) |
58 |
self.append(item) |
|
59 |
||
60 |
item = gtk.MenuItem("_Push") |
|
61 |
item.connect('activate', self.show_push) |
|
62 |
self.append(item) |
|
226
by Jelmer Vernooij
Add context menu in bzrk. |
63 |
|
232
by Jelmer Vernooij
Make 'Add tag' dialog accessible from bzrk. |
64 |
item = gtk.MenuItem("_Tag Revision") |
65 |
item.connect('activate', self.show_tag) |
|
66 |
self.append(item) |
|
67 |
||
254.1.1
by Jelmer Vernooij
Add Merge Directive option to revision menu. |
68 |
item = gtk.MenuItem("_Merge Directive") |
69 |
item.connect('activate', self.store_merge_directive) |
|
270
by Jelmer Vernooij
Hie merge directive menu for now. |
70 |
# FIXME: self.append(item)
|
523.1.2
by Jelmer Vernooij
Add 'Send Merge Directive' option in viz popup menu. |
71 |
|
72 |
item = gtk.MenuItem("_Send Merge Directive") |
|
73 |
item.connect('activate', self.send_merge_directive) |
|
74 |
self.append(item) |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
75 |
|
328
by Jelmer Vernooij
Use repository instead of branch in more places, to make it easier to support multiple branches in viz. |
76 |
if self.wt: |
318.1.1
by Gary van der Merwe
* Adjust ui test according to review comments. |
77 |
item = gtk.MenuItem("_Revert to this revision") |
313.2.1
by Gary van der Merwe
Add a revert option to the revision menu. |
78 |
item.connect('activate', self.revert) |
79 |
self.append(item) |
|
523.1.2
by Jelmer Vernooij
Add 'Send Merge Directive' option in viz popup menu. |
80 |
|
81 |
self.show_all() |
|
254.1.1
by Jelmer Vernooij
Add Merge Directive option to revision menu. |
82 |
|
83 |
def store_merge_directive(self, item): |
|
84 |
from bzrlib.plugins.gtk.mergedirective import CreateMergeDirectiveDialog |
|
85 |
window = CreateMergeDirectiveDialog(self.branch, self.revids[0]) |
|
86 |
window.show() |
|
87 |
||
523.1.2
by Jelmer Vernooij
Add 'Send Merge Directive' option in viz popup menu. |
88 |
def send_merge_directive(self, item): |
89 |
from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog |
|
90 |
from cStringIO import StringIO |
|
91 |
window = SendMergeDirectiveDialog(self.branch, self.revids[0]) |
|
92 |
if window.run() == gtk.RESPONSE_OK: |
|
93 |
outf = StringIO() |
|
523.1.3
by Jelmer Vernooij
Fix syntax. |
94 |
outf.writelines(window.get_merge_directive().to_lines()) |
523.1.2
by Jelmer Vernooij
Add 'Send Merge Directive' option in viz popup menu. |
95 |
mail_client = self.branch.get_config().get_mail_client() |
96 |
mail_client.compose_merge_request(window.get_mail_to(), "[MERGE]", |
|
97 |
outf.getvalue()) |
|
98 |
window.destroy() |
|
99 |
||
226
by Jelmer Vernooij
Add context menu in bzrk. |
100 |
def show_diff(self, item): |
101 |
from bzrlib.plugins.gtk.diff import DiffWindow |
|
523.3.2
by Jelmer Vernooij
Share same menu for context menu and main menu. |
102 |
window = DiffWindow(parent=self._parent) |
522
by Jelmer Vernooij
Remove use of upstream removed Repository.revision_parents() |
103 |
parentids = self.repository.get_revision(self.revids[0]).parent_ids |
330.4.2
by Daniel Schierbeck
Made it work when right-clicking, too. |
104 |
if len(parentids) == 0: |
330.4.3
by Daniel Schierbeck
Switched to using NULL_REVISION instead of None. |
105 |
parentid = NULL_REVISION |
330.4.2
by Daniel Schierbeck
Made it work when right-clicking, too. |
106 |
else: |
107 |
parentid = parentids[0] |
|
108 |
rev_tree = self.repository.revision_tree(self.revids[0]) |
|
109 |
parent_tree = self.repository.revision_tree(parentid) |
|
230
by Jelmer Vernooij
Initial work towards supporting multiple revisions. |
110 |
window.set_diff(self.revids[0], rev_tree, parent_tree) |
226
by Jelmer Vernooij
Add context menu in bzrk. |
111 |
window.show() |
227
by Jelmer Vernooij
Add push item in revision menu, clean up push code. |
112 |
|
113 |
def show_push(self, item): |
|
114 |
from bzrlib.plugins.gtk.push import PushDialog |
|
230
by Jelmer Vernooij
Initial work towards supporting multiple revisions. |
115 |
dialog = PushDialog(self.repository, self.revids[0], self.branch) |
401
by Daniel Schierbeck
Made the push dialog close when the cancel button is clicked. |
116 |
response = dialog.run() |
117 |
||
118 |
if response != gtk.RESPONSE_NONE: |
|
119 |
dialog.destroy() |
|
232
by Jelmer Vernooij
Make 'Add tag' dialog accessible from bzrk. |
120 |
|
121 |
def show_tag(self, item): |
|
122 |
from bzrlib.plugins.gtk.tags import AddTagDialog |
|
123 |
dialog = AddTagDialog(self.repository, self.revids[0], self.branch) |
|
124 |
response = dialog.run() |
|
401
by Daniel Schierbeck
Made the push dialog close when the cancel button is clicked. |
125 |
|
232
by Jelmer Vernooij
Make 'Add tag' dialog accessible from bzrk. |
126 |
if response != gtk.RESPONSE_NONE: |
127 |
dialog.hide() |
|
724
by Jelmer Vernooij
Fix formatting, imports. |
128 |
|
232
by Jelmer Vernooij
Make 'Add tag' dialog accessible from bzrk. |
129 |
if response == gtk.RESPONSE_OK: |
423.7.8
by Daniel Schierbeck
Made the revision popup menu correctly add tags. |
130 |
self.emit('tag-added', dialog.tagname, dialog._revid) |
724
by Jelmer Vernooij
Fix formatting, imports. |
131 |
|
232
by Jelmer Vernooij
Make 'Add tag' dialog accessible from bzrk. |
132 |
dialog.destroy() |
724
by Jelmer Vernooij
Fix formatting, imports. |
133 |
|
313.2.1
by Gary van der Merwe
Add a revert option to the revision menu. |
134 |
def revert(self, item): |
135 |
pb = ui.ui_factory.nested_progress_bar() |
|
136 |
revision_tree = self.branch.repository.revision_tree(self.revids[0]) |
|
137 |
try: |
|
138 |
self.wt.revert(old_tree = revision_tree, pb = pb) |
|
139 |
finally: |
|
140 |
pb.finished() |