1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import sys
try:
import pygtk
pygtk.require("2.0")
except:
pass
try:
import gtk
import gtk.glade
import gobject
import pango
except:
sys.exit(1)
from bzrlib import version_info
if version_info < (0, 9):
# function deprecated after 0.9
from bzrlib.delta import compare_trees
import bzrlib.errors as errors
from bzrlib.workingtree import WorkingTree
class OliveCommit:
""" Display Commit dialog and perform the needed actions. """
def __init__(self, gladefile, comm, dialog):
""" Initialize the Commit dialog. """
self.gladefile = gladefile
self.glade = gtk.glade.XML(self.gladefile, 'window_commit', 'olive-gtk')
# Communication object
self.comm = comm
# Dialog object
self.dialog = dialog
# Get some important widgets
self.window = self.glade.get_widget('window_commit')
self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
self.textview = self.glade.get_widget('textview_commit')
self.file_view = self.glade.get_widget('treeview_commit_select')
# Check if current location is a branch
try:
(self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
branch = self.wt.branch
except errors.NotBranchError:
self.notbranch = True
return
except:
raise
file_id = self.wt.path2id(path)
self.notbranch = False
if file_id is None:
self.notbranch = True
return
# Set the delta
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
if version_info < (0, 9):
self.delta = compare_trees(self.old_tree, self.wt)
else:
self.delta = self.wt.changes_from(self.old_tree)
# Dictionary for signal_autoconnect
dic = { "on_button_commit_commit_clicked": self.commit,
"on_button_commit_cancel_clicked": self.close }
# Connect the signals to the handlers
self.glade.signal_autoconnect(dic)
# Create the file list
self._create_file_view()
def display(self):
""" Display the Push dialog. """
if self.notbranch:
self.dialog.error_dialog(_('Directory is not a branch'),
_('You can perform this action only in a branch.'))
self.close()
else:
from olive.backend.info import is_checkout
if is_checkout(self.comm.get_path()):
# we have a checkout, so the local commit checkbox must appear
self.checkbutton_local.show()
self.textview.modify_font(pango.FontDescription("Monospace"))
self.window.show()
# This code is from Jelmer Vernooij's bzr-gtk branch
def _create_file_view(self):
self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,
gobject.TYPE_STRING,
gobject.TYPE_STRING)
self.file_view.set_model(self.file_store)
crt = gtk.CellRendererToggle()
crt.set_property("activatable", True)
crt.connect("toggled", self._toggle_commit, self.file_store)
self.file_view.append_column(gtk.TreeViewColumn(_('Commit'),
crt, active=0))
self.file_view.append_column(gtk.TreeViewColumn(_('Path'),
gtk.CellRendererText(), text=1))
self.file_view.append_column(gtk.TreeViewColumn(_('Type'),
gtk.CellRendererText(), text=2))
for path, id, kind in self.delta.added:
self.file_store.append([ True, path, _('added') ])
for path, id, kind in self.delta.removed:
self.file_store.append([ True, path, _('removed') ])
for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
self.file_store.append([ True, oldpath, _('renamed') ])
for path, id, kind, text_modified, meta_modified in self.delta.modified:
self.file_store.append([ True, path, _('modified') ])
def _get_specific_files(self):
ret = []
it = self.file_store.get_iter_first()
while it:
if self.file_store.get_value(it, 0):
ret.append(self.file_store.get_value(it, 1))
it = self.file_store.iter_next(it)
return ret
# end of bzr-gtk code
def _toggle_commit(self, cell, path, model):
model[path][0] = not model[path][0]
return
def commit(self, widget):
textbuffer = self.textview.get_buffer()
start, end = textbuffer.get_bounds()
message = textbuffer.get_text(start, end)
checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
specific_files = self._get_specific_files()
self.comm.set_busy(self.window)
# merged from Jelmer Vernooij's olive integration branch
try:
self.wt.commit(message,
allow_pointless=checkbutton_force.get_active(),
strict=checkbutton_strict.get_active(),
local=self.checkbutton_local.get_active(),
specific_files=specific_files)
except errors.NotBranchError:
self.dialog.error_dialog(_('Directory is not a branch'),
_('You can perform this action only in a branch.'))
self.comm.set_busy(self.window, False)
return
except errors.LocalRequiresBoundBranch:
self.dialog.error_dialog(_('Directory is not a checkout'),
_('You can perform local commit only on checkouts.'))
self.comm.set_busy(self.window, False)
return
except errors.PointlessCommit:
self.dialog.error_dialog(_('No changes to commit'),
_('Try force commit if you want to commit anyway.'))
self.comm.set_busy(self.window, False)
return
except errors.ConflictsInTree:
self.dialog.error_dialog(_('Conflicts in tree'),
_('You need to resolve the conflicts before committing.'))
self.comm.set_busy(self.window, False)
return
except errors.StrictCommitFailed:
self.dialog.error_dialog(_('Strict commit failed'),
_('There are unknown files in the working tree.\nPlease add or delete them.'))
self.comm.set_busy(self.window, False)
return
except errors.BoundBranchOutOfDate, errmsg:
self.dialog.error_dialog(_('Bound branch is out of date'),
_('%s') % errmsg)
self.comm.set_busy(self.window, False)
return
except:
raise
self.close()
self.comm.refresh_right()
def close(self, widget=None):
self.window.destroy()
|