To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
« back to all changes in this revision
Viewing changes to commit.py
- browse files at revision 774.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 774.1.1
- Committer: Curtis Hovey
- Date: 2012-02-05 05:14:11 UTC
- mto: This revision was merged to the branch mainline in revision 775.
- Revision ID: sinzui.is@verizon.net-20120205051411-y9ra08wae1wsfv52
Remove unneeded gtksourceview1 support.
- files added:
- avatarproviders.py
- branchview
- preferences
- files removed:
- cmenu.ui
- olive
- files renamed:
- bazaar-properties.desktop => bazaar-properties.desktop.in
- viz/graphcell.py => branchview/graphcell.py
- viz/linegraph.py => branchview/linegraph.py
- viz/treemodel.py => branchview/treemodel.py
- viz/treeview.py => branchview/treeview.py
- bzr-notify.desktop => bzr-notify.desktop.in
- bzr-icon-64.png => icons/bzr-icon-64.png
- preferences.py => preferences/__init__.py
- files modified:
- .bzrignore
added
removed
commit.py
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
16
16
17
try:
18
import pygtk
19
pygtk.require("2.0")
20
except:
21
pass
22
23
import gtk
24
import gobject
25
import pango
26
27
import os.path
28
17
import re
29
18
30
from bzrlib import errors, osutils
31
from bzrlib.trace import mutter
32
from bzrlib.util import bencode
19
from gi.repository import Gdk
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
33
23
34
from dialog import error_dialog, question_dialog
35
from errors import show_bzr_error
24
from bzrlib import (
25
bencode,
26
errors,
27
osutils,
28
trace,
29
)
30
from bzrlib.plugins.gtk.dialog import question_dialog
31
from bzrlib.plugins.gtk.errors import show_bzr_error
32
from bzrlib.plugins.gtk.i18n import _i18n
33
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
36
34
37
35
try:
38
36
import dbus
61
59
last_revision = parents[0]
62
60
63
61
if last_revision is not None:
64
try:
65
ignore = set(branch.repository.get_ancestry(last_revision,
66
topo_sorted=False))
67
except errors.NoSuchRevision:
68
# the last revision is a ghost : assume everything is new
69
# except for it
70
ignore = set([None, last_revision])
62
graph = branch.repository.get_graph()
63
ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
71
64
else:
72
ignore = set([None])
65
ignore = set([])
73
66
74
67
pm = []
75
68
for merge in pending:
96
89
return pm
97
90
98
91
99
class CommitDialog(gtk.Dialog):
92
_newline_variants_re = re.compile(r'\r\n?')
93
def _sanitize_and_decode_message(utf8_message):
94
"""Turn a utf-8 message into a sanitized Unicode message."""
95
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
96
return osutils.safe_unicode(fixed_newline)
97
98
99
class CommitDialog(Gtk.Dialog):
100
100
"""Implementation of Commit."""
101
101
102
102
def __init__(self, wt, selected=None, parent=None):
103
gtk.Dialog.__init__(self, title="Commit - Olive",
104
parent=parent,
105
flags=0,
106
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
103
super(CommitDialog, self).__init__(
104
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
105
self.connect('delete-event', self._on_delete_window)
107
106
self._question_dialog = question_dialog
108
107
108
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
109
109
110
self._wt = wt
110
111
# TODO: Do something with this value, it is used by Olive
111
112
# It used to set all changes but this one to False
113
114
self._enable_per_file_commits = True
114
115
self._commit_all_changes = True
115
116
self.committed_revision_id = None # Nothing has been committed yet
117
self._last_selected_file = None
118
self._saved_commit_messages_manager = SavedCommitMessagesManager(
119
self._wt, self._wt.branch)
116
120
117
121
self.setup_params()
118
122
self.construct()
122
126
"""Setup the member variables for state."""
123
127
self._basis_tree = self._wt.basis_tree()
124
128
self._delta = None
125
self._pending = pending_revisions(self._wt)
129
self._wt.lock_read()
130
try:
131
self._pending = pending_revisions(self._wt)
132
finally:
133
self._wt.unlock()
126
134
127
135
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
128
136
164
172
store = self._files_store
165
173
self._treeview_files.set_model(None)
166
174
167
added = _('added')
168
removed = _('removed')
169
renamed = _('renamed')
170
renamed_and_modified = _('renamed and modified')
171
modified = _('modified')
172
kind_changed = _('kind changed')
175
added = _i18n('added')
176
removed = _i18n('removed')
177
renamed = _i18n('renamed')
178
renamed_and_modified = _i18n('renamed and modified')
179
modified = _i18n('modified')
180
kind_changed = _i18n('kind changed')
173
181
174
182
# The store holds:
175
183
# [file_id, real path, checkbox, display path, changes type, message]
176
# _iter_changes returns:
184
# iter_changes returns:
177
185
# (file_id, (path_in_source, path_in_target),
178
186
# changed_content, versioned, parent, name, kind,
179
187
# executable)
180
188
181
189
all_enabled = (self._selected is None)
182
190
# The first entry is always the 'whole tree'
183
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
191
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
184
192
initial_cursor = store.get_path(all_iter)
185
193
# should we pass specific_files?
186
194
self._wt.lock_read()
187
195
self._basis_tree.lock_read()
188
196
try:
189
from diff import _iter_changes_to_status
197
from diff import iter_changes_to_status
198
saved_file_messages = self._saved_commit_messages_manager.get()[1]
190
199
for (file_id, real_path, change_type, display_path
191
) in _iter_changes_to_status(self._basis_tree, self._wt):
200
) in iter_changes_to_status(self._basis_tree, self._wt):
192
201
if self._selected and real_path != self._selected:
193
202
enabled = False
194
203
else:
195
204
enabled = True
205
try:
206
default_message = saved_file_messages[file_id]
207
except KeyError:
208
default_message = ''
196
209
item_iter = store.append([
197
210
file_id,
198
211
real_path.encode('UTF-8'),
199
212
enabled,
200
213
display_path.encode('UTF-8'),
201
214
change_type,
202
'', # Initial comment
215
default_message, # Initial comment
203
216
])
204
217
if self._selected and enabled:
205
218
initial_cursor = store.get_path(item_iter)
212
225
# This sets the cursor, which causes the expander to close, which
213
226
# causes the _file_message_text_view to never get realized. So we have
214
227
# to give it a little kick, or it warns when we try to grab the focus
215
self._treeview_files.set_cursor(initial_cursor)
228
self._treeview_files.set_cursor(initial_cursor, None, False)
216
229
217
230
def _realize_file_message_tree_view(*args):
218
231
self._file_message_text_view.realize()
227
240
return
228
241
if have_dbus:
229
242
bus = dbus.SystemBus()
230
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
231
'/org/freedesktop/NetworkManager')
243
try:
244
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
245
'/org/freedesktop/NetworkManager')
246
except dbus.DBusException:
247
trace.mutter("networkmanager not available.")
248
self._check_local.show()
249
return
250
232
251
dbus_iface = dbus.Interface(proxy_obj,
233
252
'org.freedesktop.NetworkManager')
234
253
try:
237
256
except dbus.DBusException, e:
238
257
# Silently drop errors. While DBus may be
239
258
# available, NetworkManager doesn't necessarily have to be
240
mutter("unable to get networkmanager state: %r" % e)
259
trace.mutter("unable to get networkmanager state: %r" % e)
241
260
self._check_local.show()
242
261
243
262
def _fill_in_per_file_info(self):
251
270
self._enable_per_file_commits = True
252
271
if not self._enable_per_file_commits:
253
272
self._file_message_expander.hide()
254
self._global_message_label.set_markup(_('<b>Commit Message</b>'))
273
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
255
274
256
275
def _compute_delta(self):
257
276
self._delta = self._wt.changes_from(self._basis_tree)
260
279
"""Build up the dialog widgets."""
261
280
# The primary pane which splits it into left and right (adjustable)
262
281
# sections.
263
self._hpane = gtk.HPaned()
282
self._hpane = Gtk.HPaned()
264
283
265
284
self._construct_left_pane()
266
285
self._construct_right_pane()
267
286
self._construct_action_pane()
268
287
269
self.vbox.pack_start(self._hpane)
288
self.get_content_area().pack_start(self._hpane, True, True, 0)
270
289
self._hpane.show()
271
290
self.set_focus(self._global_message_text_view)
272
291
291
310
self._hpane.set_position(300)
292
311
293
312
def _construct_accelerators(self):
294
group = gtk.AccelGroup()
295
group.connect_group(gtk.gdk.keyval_from_name('N'),
296
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
313
group = Gtk.AccelGroup()
314
group.connect(Gdk.keyval_from_name('N'),
315
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
297
316
self.add_accel_group(group)
298
317
318
# ignore the escape key (avoid closing the window)
319
self.connect_object('close', self.emit_stop_by_name, 'close')
320
299
321
def _construct_left_pane(self):
300
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
322
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
301
323
self._construct_file_list()
302
324
self._construct_pending_list()
303
325
304
self._check_local = gtk.CheckButton(_("_Only commit locally"),
326
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
305
327
use_underline=True)
306
self._left_pane_box.pack_end(self._check_local, False, False)
328
self._left_pane_box.pack_end(self._check_local, False, False, 0)
307
329
self._check_local.set_active(False)
308
330
309
331
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
316
338
# commit, and 1 for file commit, and it looked good. But I don't seem
317
339
# to have a way to do that with the gtk boxes... :( (Which is extra
318
340
# weird since wx uses gtk on Linux...)
319
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
341
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
320
342
self._right_pane_table.set_row_spacings(5)
321
343
self._right_pane_table.set_col_spacings(5)
322
344
self._right_pane_table_row = 0
328
350
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
329
351
330
352
def _construct_action_pane(self):
331
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
353
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
354
self._button_cancel.connect('clicked', self._on_cancel_clicked)
355
self._button_cancel.show()
356
self.get_action_area().pack_end(
357
self._button_cancel, True, True, 0)
358
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
332
359
self._button_commit.connect('clicked', self._on_commit_clicked)
333
self._button_commit.set_flags(gtk.CAN_DEFAULT)
360
self._button_commit.set_can_default(True)
334
361
self._button_commit.show()
335
self.action_area.pack_end(self._button_commit)
362
self.get_action_area().pack_end(
363
self._button_commit, True, True, 0)
336
364
self._button_commit.grab_default()
337
365
338
366
def _add_to_right_table(self, widget, weight, expanding=False):
344
372
"""
345
373
end_row = self._right_pane_table_row + weight
346
374
options = 0
347
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
375
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
348
376
if expanding:
349
377
options = expand_opts
350
378
self._right_pane_table.attach(widget, 0, 1,
353
381
self._right_pane_table_row = end_row
354
382
355
383
def _construct_file_list(self):
356
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
357
file_label = gtk.Label(_('Files'))
384
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
385
file_label = Gtk.Label(label=_i18n('Files'))
358
386
# file_label.show()
359
self._files_box.pack_start(file_label, expand=False)
387
self._files_box.pack_start(file_label, False, True, 0)
360
388
361
self._commit_all_files_radio = gtk.RadioButton(
362
None, _("Commit all changes"))
363
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
389
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
390
None, _i18n("Commit all changes"))
391
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
364
392
self._commit_all_files_radio.show()
365
393
self._commit_all_files_radio.connect('toggled',
366
394
self._toggle_commit_selection)
367
self._commit_selected_radio = gtk.RadioButton(
368
self._commit_all_files_radio, _("Only commit selected changes"))
369
self._files_box.pack_start(self._commit_selected_radio, expand=False)
395
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
396
self._commit_all_files_radio, _i18n("Only commit selected changes"))
397
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
370
398
self._commit_selected_radio.show()
371
399
self._commit_selected_radio.connect('toggled',
372
400
self._toggle_commit_selection)
373
401
if self._pending:
374
self._commit_all_files_radio.set_label(_('Commit all changes*'))
402
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
375
403
self._commit_all_files_radio.set_sensitive(False)
376
404
self._commit_selected_radio.set_sensitive(False)
377
405
378
scroller = gtk.ScrolledWindow()
379
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
380
self._treeview_files = gtk.TreeView()
406
scroller = Gtk.ScrolledWindow()
407
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
408
self._treeview_files = Gtk.TreeView()
381
409
self._treeview_files.show()
382
410
scroller.add(self._treeview_files)
383
scroller.set_shadow_type(gtk.SHADOW_IN)
411
scroller.set_shadow_type(Gtk.ShadowType.IN)
384
412
scroller.show()
385
self._files_box.pack_start(scroller,
386
expand=True, fill=True)
413
self._files_box.pack_start(scroller, True, True, 0)
387
414
self._files_box.show()
388
self._left_pane_box.pack_start(self._files_box)
415
self._left_pane_box.pack_start(self._files_box, True, True, 0)
389
416
390
417
# Keep note that all strings stored in a ListStore must be UTF-8
391
418
# strings. GTK does not support directly setting and restoring Unicode
392
419
# objects.
393
liststore = gtk.ListStore(
394
gobject.TYPE_STRING, # [0] file_id
395
gobject.TYPE_STRING, # [1] real path
396
gobject.TYPE_BOOLEAN, # [2] checkbox
397
gobject.TYPE_STRING, # [3] display path
398
gobject.TYPE_STRING, # [4] changes type
399
gobject.TYPE_STRING, # [5] commit message
420
liststore = Gtk.ListStore(
421
GObject.TYPE_STRING, # [0] file_id
422
GObject.TYPE_STRING, # [1] real path
423
GObject.TYPE_BOOLEAN, # [2] checkbox
424
GObject.TYPE_STRING, # [3] display path
425
GObject.TYPE_STRING, # [4] changes type
426
GObject.TYPE_STRING, # [5] commit message
400
427
)
401
428
self._files_store = liststore
402
429
self._treeview_files.set_model(liststore)
403
crt = gtk.CellRendererToggle()
430
crt = Gtk.CellRendererToggle()
404
431
crt.set_property('activatable', not bool(self._pending))
405
432
crt.connect("toggled", self._toggle_commit, self._files_store)
406
433
if self._pending:
407
name = _('Commit*')
434
name = _i18n('Commit*')
408
435
else:
409
name = _('Commit')
410
commit_col = gtk.TreeViewColumn(name, crt, active=2)
436
name = _i18n('Commit')
437
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
411
438
commit_col.set_visible(False)
412
439
self._treeview_files.append_column(commit_col)
413
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
414
gtk.CellRendererText(), text=3))
415
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
416
gtk.CellRendererText(), text=4))
440
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
441
Gtk.CellRendererText(), text=3))
442
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
443
Gtk.CellRendererText(), text=4))
417
444
self._treeview_files.connect('cursor-changed',
418
445
self._on_treeview_files_cursor_changed)
419
446
420
447
def _toggle_commit(self, cell, path, model):
421
if model[path][0] is None: # No file_id means 'All Files'
448
if model[path][0] == "": # No file_id means 'All Files'
422
449
new_val = not model[path][2]
423
450
for node in model:
424
451
node[2] = new_val
434
461
checked_col.set_visible(False)
435
462
else:
436
463
checked_col.set_visible(True)
437
renderer = checked_col.get_cell_renderers()[0]
464
renderer = checked_col.get_cells()[0]
438
465
renderer.set_property('activatable', not all_files)
439
466
440
467
def _construct_pending_list(self):
441
468
# Pending information defaults to hidden, we put it all in 1 box, so
442
469
# that we can show/hide all of them at once
443
self._pending_box = gtk.VBox()
470
self._pending_box = Gtk.VBox()
444
471
self._pending_box.hide()
445
472
446
pending_message = gtk.Label()
473
pending_message = Gtk.Label()
447
474
pending_message.set_markup(
448
_('<i>* Cannot select specific files when merging</i>'))
449
self._pending_box.pack_start(pending_message, expand=False, padding=5)
475
_i18n('<i>* Cannot select specific files when merging</i>'))
476
self._pending_box.pack_start(pending_message, False, True, 5)
450
477
pending_message.show()
451
478
452
pending_label = gtk.Label(_('Pending Revisions'))
453
self._pending_box.pack_start(pending_label, expand=False, padding=0)
479
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
480
self._pending_box.pack_start(pending_label, False, True, 0)
454
481
pending_label.show()
455
482
456
scroller = gtk.ScrolledWindow()
457
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
458
self._treeview_pending = gtk.TreeView()
483
scroller = Gtk.ScrolledWindow()
484
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
485
self._treeview_pending = Gtk.TreeView()
459
486
scroller.add(self._treeview_pending)
460
scroller.set_shadow_type(gtk.SHADOW_IN)
487
scroller.set_shadow_type(Gtk.ShadowType.IN)
461
488
scroller.show()
462
self._pending_box.pack_start(scroller,
463
expand=True, fill=True, padding=5)
489
self._pending_box.pack_start(scroller, True, True, 5)
464
490
self._treeview_pending.show()
465
self._left_pane_box.pack_start(self._pending_box)
491
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
466
492
467
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
468
gobject.TYPE_STRING, # date
469
gobject.TYPE_STRING, # committer
470
gobject.TYPE_STRING, # summary
493
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
494
GObject.TYPE_STRING, # date
495
GObject.TYPE_STRING, # committer
496
GObject.TYPE_STRING, # summary
471
497
)
472
498
self._pending_store = liststore
473
499
self._treeview_pending.set_model(liststore)
474
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
475
gtk.CellRendererText(), text=1))
476
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
477
gtk.CellRendererText(), text=2))
478
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
479
gtk.CellRendererText(), text=3))
500
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
501
Gtk.CellRendererText(), text=1))
502
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
503
Gtk.CellRendererText(), text=2))
504
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
505
Gtk.CellRendererText(), text=3))
480
506
481
507
def _construct_diff_view(self):
482
from diff import DiffView
508
from bzrlib.plugins.gtk.diff import DiffView
483
509
484
510
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
485
511
# decide that we really don't ever want to display it, we should
486
512
# actually remove it, and other references to it, along with the
487
513
# tests that it is set properly.
488
self._diff_label = gtk.Label(_('Diff for whole tree'))
514
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
489
515
self._diff_label.set_alignment(0, 0)
490
516
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
491
517
self._add_to_right_table(self._diff_label, 1, False)
496
522
self._diff_view.show()
497
523
498
524
def _construct_file_message(self):
499
scroller = gtk.ScrolledWindow()
500
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
525
scroller = Gtk.ScrolledWindow()
526
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
501
527
502
self._file_message_text_view = gtk.TextView()
528
self._file_message_text_view = Gtk.TextView()
503
529
scroller.add(self._file_message_text_view)
504
scroller.set_shadow_type(gtk.SHADOW_IN)
530
scroller.set_shadow_type(Gtk.ShadowType.IN)
505
531
scroller.show()
506
532
507
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
508
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
533
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
534
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
509
535
self._file_message_text_view.set_accepts_tab(False)
510
536
self._file_message_text_view.show()
511
537
512
self._file_message_expander = gtk.Expander(_('File commit message'))
538
self._file_message_expander = Gtk.Expander(
539
label=_i18n('File commit message'))
513
540
self._file_message_expander.set_expanded(True)
514
541
self._file_message_expander.add(scroller)
515
542
self._add_to_right_table(self._file_message_expander, 1, False)
516
543
self._file_message_expander.show()
517
544
518
545
def _construct_global_message(self):
519
self._global_message_label = gtk.Label(_('Global Commit Message'))
520
self._global_message_label.set_markup(_('<b>Global Commit Message</b>'))
546
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
547
self._global_message_label.set_markup(
548
_i18n('<b>Global Commit Message</b>'))
521
549
self._global_message_label.set_alignment(0, 0)
522
550
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
523
551
self._add_to_right_table(self._global_message_label, 1, False)
524
552
# Can we remove the spacing between the label and the box?
525
553
self._global_message_label.show()
526
554
527
scroller = gtk.ScrolledWindow()
528
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
555
scroller = Gtk.ScrolledWindow()
556
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
529
557
530
self._global_message_text_view = gtk.TextView()
531
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
558
self._global_message_text_view = Gtk.TextView()
559
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
560
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
532
561
scroller.add(self._global_message_text_view)
533
scroller.set_shadow_type(gtk.SHADOW_IN)
562
scroller.set_shadow_type(Gtk.ShadowType.IN)
534
563
scroller.show()
535
564
self._add_to_right_table(scroller, 2, True)
536
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
565
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
537
566
self._file_message_text_view.set_accepts_tab(False)
538
567
self._global_message_text_view.show()
539
568
540
569
def _on_treeview_files_cursor_changed(self, treeview):
541
570
treeselection = treeview.get_selection()
571
if treeselection is None:
572
# The treeview was probably destroyed as the dialog closes.
573
return
542
574
(model, selection) = treeselection.get_selected()
543
575
544
576
if selection is not None:
545
577
path, display_path = model.get(selection, 1, 3)
546
self._diff_label.set_text(_('Diff for ') + display_path)
547
if path is None:
578
self._diff_label.set_text(_i18n('Diff for ') + display_path)
579
if path == "":
548
580
self._diff_view.show_diff(None)
549
581
else:
550
self._diff_view.show_diff([path.decode('UTF-8')])
582
self._diff_view.show_diff([osutils.safe_unicode(path)])
551
583
self._update_per_file_info(selection)
552
584
553
585
def _on_accel_next(self, accel_group, window, keyval, modifier):
564
596
# We have either made it to the end of the list, or nothing was
565
597
# selected. Either way, select All Files, and jump to the global
566
598
# commit message.
567
self._treeview_files.set_cursor((0,))
599
self._treeview_files.set_cursor(
600
Gtk.TreePath(path=0), "", False)
568
601
self._global_message_text_view.grab_focus()
569
602
else:
570
603
# Set the cursor to this entry, and jump to the per-file commit
571
604
# message
572
self._treeview_files.set_cursor(model.get_path(next))
605
self._treeview_files.set_cursor(model.get_path(next), None, False)
573
606
self._file_message_text_view.grab_focus()
574
607
575
608
def _save_current_file_message(self):
577
610
return # Nothing to save
578
611
text_buffer = self._file_message_text_view.get_buffer()
579
612
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
580
text_buffer.get_end_iter())
613
text_buffer.get_end_iter(), True)
581
614
last_selected = self._files_store.get_iter(self._last_selected_file)
582
615
self._files_store.set_value(last_selected, 5, cur_text)
583
616
589
622
self._save_current_file_message()
590
623
text_buffer = self._file_message_text_view.get_buffer()
591
624
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
592
if file_id is None: # Whole tree
593
self._file_message_expander.set_label(_('File commit message'))
625
if file_id == "": # Whole tree
626
self._file_message_expander.set_label(_i18n('File commit message'))
594
627
self._file_message_expander.set_expanded(False)
595
628
self._file_message_expander.set_sensitive(False)
596
629
text_buffer.set_text('')
597
630
self._last_selected_file = None
598
631
else:
599
self._file_message_expander.set_label(_('Commit message for ')
632
self._file_message_expander.set_label(_i18n('Commit message for ')
600
633
+ display_path)
601
634
self._file_message_expander.set_expanded(True)
602
635
self._file_message_expander.set_sensitive(True)
612
645
files = []
613
646
records = iter(self._files_store)
614
647
rec = records.next() # Skip the All Files record
615
assert rec[0] is None, "Are we skipping the wrong record?"
648
assert rec[0] == "", "Are we skipping the wrong record?"
616
649
617
650
file_info = []
618
651
for record in records:
619
652
if self._commit_all_changes or record[2]:# [2] checkbox
620
file_id = record[0] # [0] file_id
621
path = record[1] # [1] real path
622
file_message = record[5] # [5] commit message
653
file_id = osutils.safe_utf8(record[0]) # [0] file_id
654
path = osutils.safe_utf8(record[1]) # [1] real path
655
# [5] commit message
656
file_message = _sanitize_and_decode_message(record[5])
623
657
files.append(path.decode('UTF-8'))
624
658
if self._enable_per_file_commits and file_message:
625
659
# All of this needs to be utf-8 information
660
file_message = file_message.encode('UTF-8')
626
661
file_info.append({'path':path, 'file_id':file_id,
627
662
'message':file_message})
628
663
file_info.sort(key=lambda x:(x['path'], x['file_id']))
632
667
return files, []
633
668
634
669
@show_bzr_error
670
def _on_cancel_clicked(self, button):
671
""" Cancel button clicked handler. """
672
self._do_cancel()
673
674
@show_bzr_error
675
def _on_delete_window(self, source, event):
676
""" Delete window handler. """
677
self._do_cancel()
678
679
def _do_cancel(self):
680
"""If requested, saves commit messages when cancelling gcommit; they are re-used by a next gcommit"""
681
mgr = SavedCommitMessagesManager()
682
self._saved_commit_messages_manager = mgr
683
mgr.insert(self._get_global_commit_message(),
684
self._get_specific_files()[1])
685
if mgr.is_not_empty(): # maybe worth saving
686
response = self._question_dialog(
687
_i18n('Commit cancelled'),
688
_i18n('Do you want to save your commit messages ?'),
689
parent=self)
690
if response == Gtk.ResponseType.NO:
691
# save nothing and destroy old comments if any
692
mgr = SavedCommitMessagesManager()
693
mgr.save(self._wt, self._wt.branch)
694
self.response(Gtk.ResponseType.CANCEL) # close window
695
696
@show_bzr_error
635
697
def _on_commit_clicked(self, button):
636
698
""" Commit button clicked handler. """
637
699
self._do_commit()
641
703
642
704
if message == '':
643
705
response = self._question_dialog(
644
_('Commit with an empty message?'),
645
_('You can describe your commit intent in the message.'))
646
if response == gtk.RESPONSE_NO:
706
_i18n('Commit with an empty message?'),
707
_i18n('You can describe your commit intent in the message.'),
708
parent=self)
709
if response == Gtk.ResponseType.NO:
647
710
# Kindly give focus to message area
648
711
self._global_message_text_view.grab_focus()
649
712
return
661
724
# files at this point.
662
725
for path in self._wt.unknowns():
663
726
response = self._question_dialog(
664
_("Commit with unknowns?"),
665
_("Unknown files exist in the working tree. Commit anyway?"))
666
if response == gtk.RESPONSE_NO:
727
_i18n("Commit with unknowns?"),
728
_i18n("Unknown files exist in the working tree. Commit anyway?"),
729
parent=self)
730
# Doesn't set a parent for the dialog..
731
if response == Gtk.ResponseType.NO:
667
732
return
668
733
break
669
734
680
745
revprops=revprops)
681
746
except errors.PointlessCommit:
682
747
response = self._question_dialog(
683
_('Commit with no changes?'),
684
_('There are no changes in the working tree.'
685
' Do you want to commit anyway?'))
686
if response == gtk.RESPONSE_YES:
748
_i18n('Commit with no changes?'),
749
_i18n('There are no changes in the working tree.'
750
' Do you want to commit anyway?'),
751
parent=self)
752
if response == Gtk.ResponseType.YES:
687
753
rev_id = self._wt.commit(message,
688
754
allow_pointless=True,
689
755
strict=False,
691
757
specific_files=specific_files,
692
758
revprops=revprops)
693
759
self.committed_revision_id = rev_id
694
self.response(gtk.RESPONSE_OK)
760
# destroy old comments if any
761
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
762
self.response(Gtk.ResponseType.OK)
695
763
696
764
def _get_global_commit_message(self):
697
765
buf = self._global_message_text_view.get_buffer()
698
766
start, end = buf.get_bounds()
699
return buf.get_text(start, end).decode('utf-8')
767
text = buf.get_text(start, end, True)
768
return _sanitize_and_decode_message(text)
700
769
701
770
def _set_global_commit_message(self, message):
702
771
"""Just a helper for the test suite."""
723
792
show_offset=False)
724
793
rev_dict['revision_id'] = rev.revision_id
725
794
return rev_dict
795
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0