31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
34
from bzrlib.plugins.gtk import _i18n
35
34
from dialog import error_dialog, question_dialog
36
35
from errors import show_bzr_error
112
111
# It used to set all changes but this one to False
113
112
self._selected = selected
114
113
self._enable_per_file_commits = True
115
self._commit_all_changes = True
116
114
self.committed_revision_id = None # Nothing has been committed yet
118
116
self.setup_params()
165
163
store = self._files_store
166
164
self._treeview_files.set_model(None)
168
added = _i18n('added')
169
removed = _i18n('removed')
170
renamed = _i18n('renamed')
171
renamed_and_modified = _i18n('renamed and modified')
172
modified = _i18n('modified')
173
kind_changed = _i18n('kind changed')
167
removed = _('removed')
168
renamed = _('renamed')
169
renamed_and_modified = _('renamed and modified')
170
modified = _('modified')
171
kind_changed = _('kind changed')
175
173
# The store holds:
176
174
# [file_id, real path, checkbox, display path, changes type, message]
177
# iter_changes returns:
175
# _iter_changes returns:
178
176
# (file_id, (path_in_source, path_in_target),
179
177
# changed_content, versioned, parent, name, kind,
187
185
self._wt.lock_read()
188
186
self._basis_tree.lock_read()
190
from diff import iter_changes_to_status
188
from diff import _iter_changes_to_status
191
189
for (file_id, real_path, change_type, display_path
192
) in iter_changes_to_status(self._basis_tree, self._wt):
190
) in _iter_changes_to_status(self._basis_tree, self._wt):
193
191
if self._selected and real_path != self._selected:
230
228
bus = dbus.SystemBus()
232
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
233
'/org/freedesktop/NetworkManager')
234
except dbus.DBusException:
235
mutter("networkmanager not available.")
236
self._check_local.show()
229
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
230
'/org/freedesktop/NetworkManager')
239
231
dbus_iface = dbus.Interface(proxy_obj,
240
232
'org.freedesktop.NetworkManager')
258
250
self._enable_per_file_commits = True
259
251
if not self._enable_per_file_commits:
260
252
self._file_message_expander.hide()
261
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
263
254
def _compute_delta(self):
264
255
self._delta = self._wt.changes_from(self._basis_tree)
303
294
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
304
295
self.add_accel_group(group)
306
# ignore the escape key (avoid closing the window)
307
self.connect_object('close', self.emit_stop_by_name, 'close')
309
297
def _construct_left_pane(self):
310
298
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
311
299
self._construct_file_list()
312
300
self._construct_pending_list()
314
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
302
self._check_local = gtk.CheckButton(_("_Only commit locally"),
315
303
use_underline=True)
316
304
self._left_pane_box.pack_end(self._check_local, False, False)
317
305
self._check_local.set_active(False)
338
326
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
340
328
def _construct_action_pane(self):
341
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
329
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
342
330
self._button_commit.connect('clicked', self._on_commit_clicked)
343
331
self._button_commit.set_flags(gtk.CAN_DEFAULT)
344
332
self._button_commit.show()
365
353
def _construct_file_list(self):
366
354
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
367
file_label = gtk.Label(_i18n('Files'))
355
file_label = gtk.Label(_('Files'))
369
357
self._files_box.pack_start(file_label, expand=False)
371
self._commit_all_files_radio = gtk.RadioButton(
372
None, _i18n("Commit all changes"))
373
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
374
self._commit_all_files_radio.show()
375
self._commit_all_files_radio.connect('toggled',
376
self._toggle_commit_selection)
377
self._commit_selected_radio = gtk.RadioButton(
378
self._commit_all_files_radio, _i18n("Only commit selected changes"))
379
self._files_box.pack_start(self._commit_selected_radio, expand=False)
380
self._commit_selected_radio.show()
381
self._commit_selected_radio.connect('toggled',
382
self._toggle_commit_selection)
384
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
385
self._commit_all_files_radio.set_sensitive(False)
386
self._commit_selected_radio.set_sensitive(False)
388
359
scroller = gtk.ScrolledWindow()
389
360
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
390
361
self._treeview_files = gtk.TreeView()
411
382
self._files_store = liststore
412
383
self._treeview_files.set_model(liststore)
413
384
crt = gtk.CellRendererToggle()
414
crt.set_property('activatable', not bool(self._pending))
385
crt.set_active(not bool(self._pending))
415
386
crt.connect("toggled", self._toggle_commit, self._files_store)
416
387
if self._pending:
417
name = _i18n('Commit*')
419
name = _i18n('Commit')
420
commit_col = gtk.TreeViewColumn(name, crt, active=2)
421
commit_col.set_visible(False)
422
self._treeview_files.append_column(commit_col)
423
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
391
self._treeview_files.append_column(gtk.TreeViewColumn(name,
393
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
424
394
gtk.CellRendererText(), text=3))
425
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
395
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
426
396
gtk.CellRendererText(), text=4))
427
397
self._treeview_files.connect('cursor-changed',
428
398
self._on_treeview_files_cursor_changed)
436
406
model[path][2] = not model[path][2]
438
def _toggle_commit_selection(self, button):
439
all_files = self._commit_all_files_radio.get_active()
440
if self._commit_all_changes != all_files:
441
checked_col = self._treeview_files.get_column(0)
442
self._commit_all_changes = all_files
444
checked_col.set_visible(False)
446
checked_col.set_visible(True)
447
renderer = checked_col.get_cell_renderers()[0]
448
renderer.set_property('activatable', not all_files)
450
408
def _construct_pending_list(self):
451
409
# Pending information defaults to hidden, we put it all in 1 box, so
452
410
# that we can show/hide all of them at once
456
414
pending_message = gtk.Label()
457
415
pending_message.set_markup(
458
_i18n('<i>* Cannot select specific files when merging</i>'))
416
_('<i>* Cannot select specific files when merging</i>'))
459
417
self._pending_box.pack_start(pending_message, expand=False, padding=5)
460
418
pending_message.show()
462
pending_label = gtk.Label(_i18n('Pending Revisions'))
420
pending_label = gtk.Label(_('Pending Revisions'))
463
421
self._pending_box.pack_start(pending_label, expand=False, padding=0)
464
422
pending_label.show()
482
440
self._pending_store = liststore
483
441
self._treeview_pending.set_model(liststore)
484
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
442
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
485
443
gtk.CellRendererText(), text=1))
486
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
444
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
487
445
gtk.CellRendererText(), text=2))
488
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
446
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
489
447
gtk.CellRendererText(), text=3))
491
449
def _construct_diff_view(self):
492
450
from diff import DiffView
494
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
495
# decide that we really don't ever want to display it, we should
496
# actually remove it, and other references to it, along with the
497
# tests that it is set properly.
498
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
452
self._diff_label = gtk.Label(_('Diff for whole tree'))
499
453
self._diff_label.set_alignment(0, 0)
500
454
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
501
455
self._add_to_right_table(self._diff_label, 1, False)
502
# self._diff_label.show()
456
self._diff_label.show()
504
458
self._diff_view = DiffView()
505
459
self._add_to_right_table(self._diff_view, 4, True)
519
473
self._file_message_text_view.set_accepts_tab(False)
520
474
self._file_message_text_view.show()
522
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
476
self._file_message_expander = gtk.Expander(_('File commit message'))
523
477
self._file_message_expander.set_expanded(True)
524
478
self._file_message_expander.add(scroller)
525
479
self._add_to_right_table(self._file_message_expander, 1, False)
526
480
self._file_message_expander.show()
528
482
def _construct_global_message(self):
529
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
530
self._global_message_label.set_markup(
531
_i18n('<b>Global Commit Message</b>'))
483
self._global_message_label = gtk.Label(_('Global Commit Message'))
532
484
self._global_message_label.set_alignment(0, 0)
533
485
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
534
486
self._add_to_right_table(self._global_message_label, 1, False)
555
507
if selection is not None:
556
508
path, display_path = model.get(selection, 1, 3)
557
self._diff_label.set_text(_i18n('Diff for ') + display_path)
509
self._diff_label.set_text(_('Diff for ') + display_path)
559
511
self._diff_view.show_diff(None)
601
553
text_buffer = self._file_message_text_view.get_buffer()
602
554
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
603
555
if file_id is None: # Whole tree
604
self._file_message_expander.set_label(_i18n('File commit message'))
556
self._file_message_expander.set_label(_('File commit message'))
605
557
self._file_message_expander.set_expanded(False)
606
558
self._file_message_expander.set_sensitive(False)
607
559
text_buffer.set_text('')
608
560
self._last_selected_file = None
610
self._file_message_expander.set_label(_i18n('Commit message for ')
562
self._file_message_expander.set_label(_('Commit message for ')
612
564
self._file_message_expander.set_expanded(True)
613
565
self._file_message_expander.set_sensitive(True)
629
581
for record in records:
630
if self._commit_all_changes or record[2]:# [2] checkbox
582
if record[2]: # [2] checkbox
631
583
file_id = record[0] # [0] file_id
632
584
path = record[1] # [1] real path
633
585
file_message = record[5] # [5] commit message
653
605
if message == '':
654
606
response = self._question_dialog(
655
_i18n('Commit with an empty message?'),
656
_i18n('You can describe your commit intent in the message.'))
607
_('Commit with an empty message?'),
608
_('You can describe your commit intent in the message.'))
657
609
if response == gtk.RESPONSE_NO:
658
610
# Kindly give focus to message area
659
611
self._global_message_text_view.grab_focus()
672
624
# files at this point.
673
625
for path in self._wt.unknowns():
674
626
response = self._question_dialog(
675
_i18n("Commit with unknowns?"),
676
_i18n("Unknown files exist in the working tree. Commit anyway?"))
627
_("Commit with unknowns?"),
628
_("Unknown files exist in the working tree. Commit anyway?"))
677
629
if response == gtk.RESPONSE_NO:
691
643
revprops=revprops)
692
644
except errors.PointlessCommit:
693
645
response = self._question_dialog(
694
_i18n('Commit with no changes?'),
695
_i18n('There are no changes in the working tree.'
696
' Do you want to commit anyway?'))
646
_('Commit with no changes?'),
647
_('There are no changes in the working tree.'
648
' Do you want to commit anyway?'))
697
649
if response == gtk.RESPONSE_YES:
698
650
rev_id = self._wt.commit(message,
699
651
allow_pointless=True,
added
removed
commit.py
