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
165
164
store = self._files_store
166
165
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')
168
removed = _('removed')
169
renamed = _('renamed')
170
renamed_and_modified = _('renamed and modified')
171
modified = _('modified')
172
kind_changed = _('kind changed')
175
174
# The store holds:
176
175
# [file_id, real path, checkbox, display path, changes type, message]
177
# iter_changes returns:
176
# _iter_changes returns:
178
177
# (file_id, (path_in_source, path_in_target),
179
178
# changed_content, versioned, parent, name, kind,
187
186
self._wt.lock_read()
188
187
self._basis_tree.lock_read()
190
from diff import iter_changes_to_status
189
from diff import _iter_changes_to_status
191
190
for (file_id, real_path, change_type, display_path
192
) in iter_changes_to_status(self._basis_tree, self._wt):
191
) in _iter_changes_to_status(self._basis_tree, self._wt):
193
192
if self._selected and real_path != self._selected:
258
257
self._enable_per_file_commits = True
259
258
if not self._enable_per_file_commits:
260
259
self._file_message_expander.hide()
261
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
260
self._global_message_label.set_markup(_('<b>Commit Message</b>'))
263
262
def _compute_delta(self):
264
263
self._delta = self._wt.changes_from(self._basis_tree)
308
307
self._construct_file_list()
309
308
self._construct_pending_list()
311
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
310
self._check_local = gtk.CheckButton(_("_Only commit locally"),
312
311
use_underline=True)
313
312
self._left_pane_box.pack_end(self._check_local, False, False)
314
313
self._check_local.set_active(False)
335
334
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
337
336
def _construct_action_pane(self):
338
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
337
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
339
338
self._button_commit.connect('clicked', self._on_commit_clicked)
340
339
self._button_commit.set_flags(gtk.CAN_DEFAULT)
341
340
self._button_commit.show()
362
361
def _construct_file_list(self):
363
362
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
364
file_label = gtk.Label(_i18n('Files'))
363
file_label = gtk.Label(_('Files'))
365
364
# file_label.show()
366
365
self._files_box.pack_start(file_label, expand=False)
368
367
self._commit_all_files_radio = gtk.RadioButton(
369
None, _i18n("Commit all changes"))
368
None, _("Commit all changes"))
370
369
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
371
370
self._commit_all_files_radio.show()
372
371
self._commit_all_files_radio.connect('toggled',
373
372
self._toggle_commit_selection)
374
373
self._commit_selected_radio = gtk.RadioButton(
375
self._commit_all_files_radio, _i18n("Only commit selected changes"))
374
self._commit_all_files_radio, _("Only commit selected changes"))
376
375
self._files_box.pack_start(self._commit_selected_radio, expand=False)
377
376
self._commit_selected_radio.show()
378
377
self._commit_selected_radio.connect('toggled',
379
378
self._toggle_commit_selection)
380
379
if self._pending:
381
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
380
self._commit_all_files_radio.set_label(_('Commit all changes*'))
382
381
self._commit_all_files_radio.set_sensitive(False)
383
382
self._commit_selected_radio.set_sensitive(False)
411
410
crt.set_property('activatable', not bool(self._pending))
412
411
crt.connect("toggled", self._toggle_commit, self._files_store)
413
412
if self._pending:
414
name = _i18n('Commit*')
416
name = _i18n('Commit')
417
416
commit_col = gtk.TreeViewColumn(name, crt, active=2)
418
417
commit_col.set_visible(False)
419
418
self._treeview_files.append_column(commit_col)
420
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
419
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
421
420
gtk.CellRendererText(), text=3))
422
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
421
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
423
422
gtk.CellRendererText(), text=4))
424
423
self._treeview_files.connect('cursor-changed',
425
424
self._on_treeview_files_cursor_changed)
453
452
pending_message = gtk.Label()
454
453
pending_message.set_markup(
455
_i18n('<i>* Cannot select specific files when merging</i>'))
454
_('<i>* Cannot select specific files when merging</i>'))
456
455
self._pending_box.pack_start(pending_message, expand=False, padding=5)
457
456
pending_message.show()
459
pending_label = gtk.Label(_i18n('Pending Revisions'))
458
pending_label = gtk.Label(_('Pending Revisions'))
460
459
self._pending_box.pack_start(pending_label, expand=False, padding=0)
461
460
pending_label.show()
479
478
self._pending_store = liststore
480
479
self._treeview_pending.set_model(liststore)
481
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
480
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
482
481
gtk.CellRendererText(), text=1))
483
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
482
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
484
483
gtk.CellRendererText(), text=2))
485
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
484
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
486
485
gtk.CellRendererText(), text=3))
488
487
def _construct_diff_view(self):
492
491
# decide that we really don't ever want to display it, we should
493
492
# actually remove it, and other references to it, along with the
494
493
# tests that it is set properly.
495
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
494
self._diff_label = gtk.Label(_('Diff for whole tree'))
496
495
self._diff_label.set_alignment(0, 0)
497
496
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
498
497
self._add_to_right_table(self._diff_label, 1, False)
516
515
self._file_message_text_view.set_accepts_tab(False)
517
516
self._file_message_text_view.show()
519
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
518
self._file_message_expander = gtk.Expander(_('File commit message'))
520
519
self._file_message_expander.set_expanded(True)
521
520
self._file_message_expander.add(scroller)
522
521
self._add_to_right_table(self._file_message_expander, 1, False)
523
522
self._file_message_expander.show()
525
524
def _construct_global_message(self):
526
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
527
self._global_message_label.set_markup(
528
_i18n('<b>Global Commit Message</b>'))
525
self._global_message_label = gtk.Label(_('Global Commit Message'))
526
self._global_message_label.set_markup(_('<b>Global Commit Message</b>'))
529
527
self._global_message_label.set_alignment(0, 0)
530
528
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
531
529
self._add_to_right_table(self._global_message_label, 1, False)
552
550
if selection is not None:
553
551
path, display_path = model.get(selection, 1, 3)
554
self._diff_label.set_text(_i18n('Diff for ') + display_path)
552
self._diff_label.set_text(_('Diff for ') + display_path)
556
554
self._diff_view.show_diff(None)
598
596
text_buffer = self._file_message_text_view.get_buffer()
599
597
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
600
598
if file_id is None: # Whole tree
601
self._file_message_expander.set_label(_i18n('File commit message'))
599
self._file_message_expander.set_label(_('File commit message'))
602
600
self._file_message_expander.set_expanded(False)
603
601
self._file_message_expander.set_sensitive(False)
604
602
text_buffer.set_text('')
605
603
self._last_selected_file = None
607
self._file_message_expander.set_label(_i18n('Commit message for ')
605
self._file_message_expander.set_label(_('Commit message for ')
609
607
self._file_message_expander.set_expanded(True)
610
608
self._file_message_expander.set_sensitive(True)
650
648
if message == '':
651
649
response = self._question_dialog(
652
_i18n('Commit with an empty message?'),
653
_i18n('You can describe your commit intent in the message.'))
650
_('Commit with an empty message?'),
651
_('You can describe your commit intent in the message.'))
654
652
if response == gtk.RESPONSE_NO:
655
653
# Kindly give focus to message area
656
654
self._global_message_text_view.grab_focus()
669
667
# files at this point.
670
668
for path in self._wt.unknowns():
671
669
response = self._question_dialog(
672
_i18n("Commit with unknowns?"),
673
_i18n("Unknown files exist in the working tree. Commit anyway?"))
670
_("Commit with unknowns?"),
671
_("Unknown files exist in the working tree. Commit anyway?"))
674
672
if response == gtk.RESPONSE_NO:
688
686
revprops=revprops)
689
687
except errors.PointlessCommit:
690
688
response = self._question_dialog(
691
_i18n('Commit with no changes?'),
692
_i18n('There are no changes in the working tree.'
693
' Do you want to commit anyway?'))
689
_('Commit with no changes?'),
690
_('There are no changes in the working tree.'
691
' Do you want to commit anyway?'))
694
692
if response == gtk.RESPONSE_YES:
695
693
rev_id = self._wt.commit(message,
696
694
allow_pointless=True,
added
removed
commit.py
