14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
19
pygtk.require("2.0")
32
from bzrlib import version_info
34
if version_info < (0, 9):
35
# function deprecated after 0.9
36
from bzrlib.delta import compare_trees
38
29
import bzrlib.errors as errors
39
from bzrlib.workingtree import WorkingTree
42
""" Display Commit dialog and perform the needed actions. """
43
def __init__(self, gladefile, comm, dialog):
44
""" Initialize the Commit dialog. """
45
self.gladefile = gladefile
46
self.glade = gtk.glade.XML(self.gladefile, 'window_commit', 'olive-gtk')
48
# Communication object
53
# Get some important widgets
54
self.window = self.glade.get_widget('window_commit')
55
self.checkbutton_local = self.glade.get_widget('checkbutton_commit_local')
56
self.textview = self.glade.get_widget('textview_commit')
57
self.file_view = self.glade.get_widget('treeview_commit_select')
59
# Check if current location is a branch
61
(self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
62
branch = self.wt.branch
63
except errors.NotBranchError:
69
file_id = self.wt.path2id(path)
71
self.notbranch = False
30
from bzrlib import osutils
32
from dialog import error_dialog, question_dialog
33
from errors import show_bzr_error
38
bus = dbus.SystemBus()
39
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
40
'/org/freedesktop/NetworkManager')
41
dbus_iface = dbus.Interface(proxy_obj, 'org.freedesktop.NetworkManager')
46
class CommitDialog(gtk.Dialog):
47
""" New implementation of the Commit dialog. """
48
def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
49
""" Initialize the Commit Dialog. """
50
gtk.Dialog.__init__(self, title="Commit - Olive",
53
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
58
self.notbranch = notbranch
59
self.selected = selected
77
62
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
78
if version_info < (0, 9):
79
self.delta = compare_trees(self.old_tree, self.wt)
81
self.delta = self.wt.changes_from(self.old_tree)
83
# Dictionary for signal_autoconnect
84
dic = { "on_button_commit_commit_clicked": self.commit,
85
"on_button_commit_cancel_clicked": self.close }
87
# Connect the signals to the handlers
88
self.glade.signal_autoconnect(dic)
63
self.delta = self.wt.changes_from(self.old_tree)
66
self.pending = self._pending_merges(self.wt)
68
# Do some preliminary checks
69
self._is_checkout = False
70
self._is_pending = False
71
if self.wt is None and not self.notbranch:
72
error_dialog(_('Directory does not have a working tree'),
73
_('Operation aborted.'))
78
error_dialog(_('Directory is not a branch'),
79
_('You can perform this action only in a branch.'))
83
if self.wt.branch.get_bound_location() is not None:
84
# we have a checkout, so the local commit checkbox must appear
85
self._is_checkout = True
88
# There are pending merges, file selection not supported
89
self._is_pending = True
92
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
93
self._check_strict = gtk.CheckButton(_("_Allow unknown files"),
95
self._expander_files = gtk.Expander(_("File(s) to commit"))
96
self._vpaned_main = gtk.VPaned()
97
self._scrolledwindow_files = gtk.ScrolledWindow()
98
self._scrolledwindow_message = gtk.ScrolledWindow()
99
self._treeview_files = gtk.TreeView()
100
self._vbox_message = gtk.VBox()
101
self._label_message = gtk.Label(_("Commit message:"))
102
self._textview_message = gtk.TextView()
105
self._expander_merges = gtk.Expander(_("Pending merges"))
106
self._vpaned_list = gtk.VPaned()
107
self._scrolledwindow_merges = gtk.ScrolledWindow()
108
self._treeview_merges = gtk.TreeView()
111
self._button_commit.connect('clicked', self._on_commit_clicked)
112
self._treeview_files.connect('row_activated', self._on_treeview_files_row_activated)
115
self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
116
gtk.POLICY_AUTOMATIC)
117
self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
118
gtk.POLICY_AUTOMATIC)
119
self._textview_message.modify_font(pango.FontDescription("Monospace"))
120
self.set_default_size(500, 500)
121
self._vpaned_main.set_position(200)
122
self._button_commit.set_flags(gtk.CAN_DEFAULT)
125
self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
126
gtk.POLICY_AUTOMATIC)
127
self._treeview_files.set_sensitive(False)
129
# Construct the dialog
130
self.action_area.pack_end(self._button_commit)
132
self._scrolledwindow_files.add(self._treeview_files)
133
self._scrolledwindow_message.add(self._textview_message)
135
self._expander_files.add(self._scrolledwindow_files)
137
self._vbox_message.pack_start(self._label_message, False, False)
138
self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
141
self._expander_merges.add(self._scrolledwindow_merges)
142
self._scrolledwindow_merges.add(self._treeview_merges)
143
self._vpaned_list.add1(self._expander_files)
144
self._vpaned_list.add2(self._expander_merges)
145
self._vpaned_main.add1(self._vpaned_list)
147
self._vpaned_main.add1(self._expander_files)
149
self._vpaned_main.add2(self._vbox_message)
151
self.vbox.pack_start(self._vpaned_main, True, True)
152
if self._is_checkout:
153
self._check_local = gtk.CheckButton(_("_Only commit locally"),
155
self.vbox.pack_start(self._check_local, False, False)
157
# 3 is the enum value for STATE_CONNECTED
158
self._check_local.set_active(dbus_iface.state() != 3)
159
self.vbox.pack_start(self._check_strict, False, False)
90
161
# Create the file list
91
162
self._create_file_view()
94
""" Display the Push dialog. """
96
self.dialog.error_dialog(_('Directory is not a branch'),
97
_('You can perform this action only in a branch.'))
100
from olive.backend.info import is_checkout
101
if is_checkout(self.comm.get_path()):
102
# we have a checkout, so the local commit checkbox must appear
103
self.checkbutton_local.show()
105
self.textview.modify_font(pango.FontDescription("Monospace"))
109
# This code is from Jelmer Vernooij's bzr-gtk branch
163
# Create the pending merges
164
self._create_pending_merges()
166
# Expand the corresponding expander
168
self._expander_merges.set_expanded(True)
170
self._expander_files.set_expanded(True)
175
# Default to Commit button
176
self._button_commit.grab_default()
178
def _on_treeview_files_row_activated(self, treeview, path, view_column):
179
# FIXME: the diff window freezes for some reason
180
treeselection = treeview.get_selection()
181
(model, iter) = treeselection.get_selected()
184
from diff import DiffWindow
186
_selected = model.get_value(iter, 1)
189
diff.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
191
parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
192
diff.set_diff(self.wt.branch.nick, self.wt, parent_tree)
194
diff.set_file(_selected)
195
except errors.NoSuchFile:
200
def _on_commit_clicked(self, button):
201
""" Commit button clicked handler. """
202
textbuffer = self._textview_message.get_buffer()
203
start, end = textbuffer.get_bounds()
204
message = textbuffer.get_text(start, end).decode('utf-8')
207
specific_files = self._get_specific_files()
209
specific_files = None
212
response = question_dialog(_('Commit with an empty message?'),
213
_('You can describe your commit intent in the message.'))
214
if response == gtk.RESPONSE_NO:
215
# Kindly give focus to message area
216
self._textview_message.grab_focus()
219
if self._is_checkout:
220
local = self._check_local.get_active()
225
self.wt.commit(message,
226
allow_pointless=False,
227
strict=self._check_strict.get_active(),
229
specific_files=specific_files)
230
except errors.PointlessCommit:
231
response = question_dialog(_('Commit with no changes?'),
232
_('There are no changes in the working tree.'))
233
if response == gtk.RESPONSE_YES:
234
self.wt.commit(message,
235
allow_pointless=True,
236
strict=self._check_strict.get_active(),
238
specific_files=specific_files)
239
self.response(gtk.RESPONSE_OK)
241
def _pending_merges(self, wt):
242
""" Return a list of pending merges or None if there are none of them. """
243
parents = wt.get_parent_ids()
248
from bzrlib.osutils import format_date
250
pending = parents[1:]
252
last_revision = parents[0]
254
if last_revision is not None:
256
ignore = set(branch.repository.get_ancestry(last_revision))
257
except errors.NoSuchRevision:
258
# the last revision is a ghost : assume everything is new
260
ignore = set([None, last_revision])
265
for merge in pending:
268
m_revision = branch.repository.get_revision(merge)
271
rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
272
rev['summary'] = m_revision.get_summary()
273
rev['date'] = format_date(m_revision.timestamp,
274
m_revision.timezone or 0,
275
'original', date_fmt="%Y-%m-%d",
280
inner_merges = branch.repository.get_ancestry(merge)
281
assert inner_merges[0] is None
283
inner_merges.reverse()
284
for mmerge in inner_merges:
287
mm_revision = branch.repository.get_revision(mmerge)
290
rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
291
rev['summary'] = mm_revision.get_summary()
292
rev['date'] = format_date(mm_revision.timestamp,
293
mm_revision.timezone or 0,
294
'original', date_fmt="%Y-%m-%d",
300
except errors.NoSuchRevision:
301
print "DEBUG: NoSuchRevision:", merge
110
305
def _create_file_view(self):
111
self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN,
114
self.file_view.set_model(self.file_store)
306
self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox
307
gobject.TYPE_STRING, # [1] path to display
308
gobject.TYPE_STRING, # [2] changes type
309
gobject.TYPE_STRING) # [3] real path
310
self._treeview_files.set_model(self._file_store)
115
311
crt = gtk.CellRendererToggle()
116
312
crt.set_property("activatable", True)
117
crt.connect("toggled", self._toggle_commit, self.file_store)
118
self.file_view.append_column(gtk.TreeViewColumn(_('Commit'),
313
crt.connect("toggled", self._toggle_commit, self._file_store)
314
self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
120
self.file_view.append_column(gtk.TreeViewColumn(_('Path'),
316
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
121
317
gtk.CellRendererText(), text=1))
122
self.file_view.append_column(gtk.TreeViewColumn(_('Type'),
318
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
123
319
gtk.CellRendererText(), text=2))
125
321
for path, id, kind in self.delta.added:
126
self.file_store.append([ True, path, _('added') ])
322
marker = osutils.kind_marker(kind)
323
if self.selected is not None:
324
if path == os.path.join(self.wtpath, self.selected):
325
self._file_store.append([ True, path+marker, _('added'), path ])
327
self._file_store.append([ False, path+marker, _('added'), path ])
329
self._file_store.append([ True, path+marker, _('added'), path ])
128
331
for path, id, kind in self.delta.removed:
129
self.file_store.append([ True, path, _('removed') ])
332
marker = osutils.kind_marker(kind)
333
if self.selected is not None:
334
if path == os.path.join(self.wtpath, self.selected):
335
self._file_store.append([ True, path+marker, _('removed'), path ])
337
self._file_store.append([ False, path+marker, _('removed'), path ])
339
self._file_store.append([ True, path+marker, _('removed'), path ])
131
341
for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
132
self.file_store.append([ True, oldpath, _('renamed') ])
342
marker = osutils.kind_marker(kind)
343
if text_modified or meta_modified:
344
changes = _('renamed and modified')
346
changes = _('renamed')
347
if self.selected is not None:
348
if newpath == os.path.join(self.wtpath, self.selected):
349
self._file_store.append([ True,
350
oldpath+marker + ' => ' + newpath+marker,
355
self._file_store.append([ False,
356
oldpath+marker + ' => ' + newpath+marker,
361
self._file_store.append([ True,
362
oldpath+marker + ' => ' + newpath+marker,
134
367
for path, id, kind, text_modified, meta_modified in self.delta.modified:
135
self.file_store.append([ True, path, _('modified') ])
368
marker = osutils.kind_marker(kind)
369
if self.selected is not None:
370
if path == os.path.join(self.wtpath, self.selected):
371
self._file_store.append([ True, path+marker, _('modified'), path ])
373
self._file_store.append([ False, path+marker, _('modified'), path ])
375
self._file_store.append([ True, path+marker, _('modified'), path ])
377
def _create_pending_merges(self):
381
liststore = gtk.ListStore(gobject.TYPE_STRING,
384
self._treeview_merges.set_model(liststore)
386
self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
387
gtk.CellRendererText(), text=0))
388
self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
389
gtk.CellRendererText(), text=1))
390
self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
391
gtk.CellRendererText(), text=2))
393
for item in self.pending:
394
liststore.append([ item['date'],
137
398
def _get_specific_files(self):
139
it = self.file_store.get_iter_first()
400
it = self._file_store.get_iter_first()
141
if self.file_store.get_value(it, 0):
142
ret.append(self.file_store.get_value(it, 1))
143
it = self.file_store.iter_next(it)
402
if self._file_store.get_value(it, 0):
403
# get real path from hidden column 3
404
ret.append(self._file_store.get_value(it, 3))
405
it = self._file_store.iter_next(it)
146
# end of bzr-gtk code
148
409
def _toggle_commit(self, cell, path, model):
149
410
model[path][0] = not model[path][0]
152
def commit(self, widget):
153
textbuffer = self.textview.get_buffer()
154
start, end = textbuffer.get_bounds()
155
message = textbuffer.get_text(start, end)
157
checkbutton_strict = self.glade.get_widget('checkbutton_commit_strict')
158
checkbutton_force = self.glade.get_widget('checkbutton_commit_force')
160
specific_files = self._get_specific_files()
162
self.comm.set_busy(self.window)
163
# merged from Jelmer Vernooij's olive integration branch
165
self.wt.commit(message,
166
allow_pointless=checkbutton_force.get_active(),
167
strict=checkbutton_strict.get_active(),
168
local=self.checkbutton_local.get_active(),
169
specific_files=specific_files)
170
except errors.NotBranchError:
171
self.dialog.error_dialog(_('Directory is not a branch'),
172
_('You can perform this action only in a branch.'))
173
self.comm.set_busy(self.window, False)
175
except errors.LocalRequiresBoundBranch:
176
self.dialog.error_dialog(_('Directory is not a checkout'),
177
_('You can perform local commit only on checkouts.'))
178
self.comm.set_busy(self.window, False)
180
except errors.PointlessCommit:
181
self.dialog.error_dialog(_('No changes to commit'),
182
_('Try force commit if you want to commit anyway.'))
183
self.comm.set_busy(self.window, False)
185
except errors.ConflictsInTree:
186
self.dialog.error_dialog(_('Conflicts in tree'),
187
_('You need to resolve the conflicts before committing.'))
188
self.comm.set_busy(self.window, False)
190
except errors.StrictCommitFailed:
191
self.dialog.error_dialog(_('Strict commit failed'),
192
_('There are unknown files in the working tree.\nPlease add or delete them.'))
193
self.comm.set_busy(self.window, False)
195
except errors.BoundBranchOutOfDate, errmsg:
196
self.dialog.error_dialog(_('Bound branch is out of date'),
198
self.comm.set_busy(self.window, False)
204
self.comm.refresh_right()
206
def close(self, widget=None):
207
self.window.destroy()