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
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
|
# 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
try:
import pygtk
pygtk.require("2.0")
except:
pass
import gtk
import gtk.glade
import gobject
import pango
import bzrlib.errors as errors
from dialog import error_dialog
from gladefile import GLADEFILENAME
class CommitDialog:
""" Display Commit dialog and perform the needed actions. """
def __init__(self, wt, wtpath):
""" Initialize the Commit dialog. """
self.glade = gtk.glade.XML(GLADEFILENAME, 'window_commit', 'olive-gtk')
self.wt = wt
self.wtpath = wtpath
# 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')
self.pending_label = self.glade.get_widget('label_commit_pending')
self.pending_view = self.glade.get_widget('treeview_commit_pending')
file_id = self.wt.path2id(wtpath)
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())
self.delta = self.wt.changes_from(self.old_tree)
# Get pending merges
self.pending = self._pending_merges(self.wt)
# 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()
# Create the pending merges
self._create_pending_merges()
def display(self):
""" Display the Push dialog. """
if self.notbranch:
error_dialog(_('Directory is not a branch'),
_('You can perform this action only in a branch.'))
self.close()
else:
if self.wt.branch.get_bound_location() is not None:
# we have a checkout, so the local commit checkbox must appear
self.checkbutton_local.show()
if self.pending:
# There are pending merges, file selection not supported
self.file_view.set_sensitive(False)
else:
# No pending merges
self.pending_view.set_sensitive(False)
self.textview.modify_font(pango.FontDescription("Monospace"))
self.window.show()
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 _create_pending_merges(self):
liststore = gtk.ListStore(gobject.TYPE_STRING,
gobject.TYPE_STRING,
gobject.TYPE_STRING)
self.pending_view.set_model(liststore)
self.pending_view.append_column(gtk.TreeViewColumn(_('Date'),
gtk.CellRendererText(), text=0))
self.pending_view.append_column(gtk.TreeViewColumn(_('Committer'),
gtk.CellRendererText(), text=1))
self.pending_view.append_column(gtk.TreeViewColumn(_('Summary'),
gtk.CellRendererText(), text=2))
if not self.pending:
return
for item in self.pending:
liststore.append([ item['date'],
item['committer'],
item['summary'] ])
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
def _toggle_commit(self, cell, path, model):
model[path][0] = not model[path][0]
return
def _pending_merges(self, wt):
""" Return a list of pending merges or None if there are none of them. """
parents = wt.get_parent_ids()
if len(parents) < 2:
return None
import re
from bzrlib.osutils import format_date
pending = parents[1:]
branch = wt.branch
last_revision = parents[0]
if last_revision is not None:
try:
ignore = set(branch.repository.get_ancestry(last_revision))
except errors.NoSuchRevision:
# the last revision is a ghost : assume everything is new
# except for it
ignore = set([None, last_revision])
else:
ignore = set([None])
pm = []
for merge in pending:
ignore.add(merge)
try:
m_revision = branch.repository.get_revision(merge)
rev = {}
rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
rev['summary'] = m_revision.get_summary()
rev['date'] = format_date(m_revision.timestamp,
m_revision.timezone or 0,
'original', date_fmt="%Y-%m-%d",
show_offset=False)
pm.append(rev)
inner_merges = branch.repository.get_ancestry(merge)
assert inner_merges[0] is None
inner_merges.pop(0)
inner_merges.reverse()
for mmerge in inner_merges:
if mmerge in ignore:
continue
mm_revision = branch.repository.get_revision(mmerge)
rev = {}
rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
rev['summary'] = mm_revision.get_summary()
rev['date'] = format_date(mm_revision.timestamp,
mm_revision.timezone or 0,
'original', date_fmt="%Y-%m-%d",
show_offset=False)
pm.append(rev)
ignore.add(mmerge)
except errors.NoSuchRevision:
print "DEBUG: NoSuchRevision:", merge
return pm
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')
if not self.pending:
specific_files = self._get_specific_files()
else:
specific_files = None
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:
error_dialog(_('Directory is not a branch'),
_('You can perform this action only in a branch.'))
return
except errors.LocalRequiresBoundBranch:
error_dialog(_('Directory is not a checkout'),
_('You can perform local commit only on checkouts.'))
return
except errors.PointlessCommit:
error_dialog(_('No changes to commit'),
_('Try force commit if you want to commit anyway.'))
return
except errors.ConflictsInTree:
error_dialog(_('Conflicts in tree'),
_('You need to resolve the conflicts before committing.'))
return
except errors.StrictCommitFailed:
error_dialog(_('Strict commit failed'),
_('There are unknown files in the working tree.\nPlease add or delete them.'))
return
except errors.BoundBranchOutOfDate, errmsg:
error_dialog(_('Bound branch is out of date'),
_('%s') % errmsg)
return
except errors.BzrError, msg:
error_dialog(_('Unknown bzr error'), str(msg))
return
except Exception, msg:
error_dialog(_('Unknown error'), str(msg))
return
self.close()
def close(self, widget=None):
self.window.destroy()
|