31
31
from bzrlib.trace import mutter
32
32
from bzrlib.util import bencode
34
from bzrlib.plugins.gtk import _i18n
34
35
from dialog import error_dialog, question_dialog
35
36
from errors import show_bzr_error
111
112
# It used to set all changes but this one to False
112
113
self._selected = selected
113
114
self._enable_per_file_commits = True
115
self._commit_all_changes = True
114
116
self.committed_revision_id = None # Nothing has been committed yet
116
118
self.setup_params()
163
165
store = self._files_store
164
166
self._treeview_files.set_model(None)
167
removed = _('removed')
168
renamed = _('renamed')
169
renamed_and_modified = _('renamed and modified')
170
modified = _('modified')
171
kind_changed = _('kind changed')
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')
173
175
# The store holds:
174
176
# [file_id, real path, checkbox, display path, changes type, message]
175
# _iter_changes returns:
177
# iter_changes returns:
176
178
# (file_id, (path_in_source, path_in_target),
177
179
# changed_content, versioned, parent, name, kind,
185
187
self._wt.lock_read()
186
188
self._basis_tree.lock_read()
188
from diff import _iter_changes_to_status
190
from diff import iter_changes_to_status
189
191
for (file_id, real_path, change_type, display_path
190
) in _iter_changes_to_status(self._basis_tree, self._wt):
192
) in iter_changes_to_status(self._basis_tree, self._wt):
191
193
if self._selected and real_path != self._selected:
228
230
bus = dbus.SystemBus()
229
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
230
'/org/freedesktop/NetworkManager')
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()
231
239
dbus_iface = dbus.Interface(proxy_obj,
232
240
'org.freedesktop.NetworkManager')
250
258
self._enable_per_file_commits = True
251
259
if not self._enable_per_file_commits:
252
260
self._file_message_expander.hide()
253
self._global_message_label.set_markup(_('<b>Commit Message</b>'))
261
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
255
263
def _compute_delta(self):
256
264
self._delta = self._wt.changes_from(self._basis_tree)
295
303
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
296
304
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')
298
309
def _construct_left_pane(self):
299
310
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
300
311
self._construct_file_list()
301
312
self._construct_pending_list()
303
self._check_local = gtk.CheckButton(_("_Only commit locally"),
314
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
304
315
use_underline=True)
305
316
self._left_pane_box.pack_end(self._check_local, False, False)
306
317
self._check_local.set_active(False)
327
338
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
329
340
def _construct_action_pane(self):
330
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
341
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
331
342
self._button_commit.connect('clicked', self._on_commit_clicked)
332
343
self._button_commit.set_flags(gtk.CAN_DEFAULT)
333
344
self._button_commit.show()
354
365
def _construct_file_list(self):
355
366
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
356
file_label = gtk.Label(_('Files'))
367
file_label = gtk.Label(_i18n('Files'))
357
368
# file_label.show()
358
369
self._files_box.pack_start(file_label, expand=False)
360
371
self._commit_all_files_radio = gtk.RadioButton(
361
None, _("Commit all changes"))
372
None, _i18n("Commit all changes"))
362
373
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
363
374
self._commit_all_files_radio.show()
375
self._commit_all_files_radio.connect('toggled',
376
self._toggle_commit_selection)
364
377
self._commit_selected_radio = gtk.RadioButton(
365
self._commit_all_files_radio, _("Only commit selected changes"))
378
self._commit_all_files_radio, _i18n("Only commit selected changes"))
366
379
self._files_box.pack_start(self._commit_selected_radio, expand=False)
367
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)
369
388
scroller = gtk.ScrolledWindow()
370
389
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
395
414
crt.set_property('activatable', not bool(self._pending))
396
415
crt.connect("toggled", self._toggle_commit, self._files_store)
397
416
if self._pending:
417
name = _i18n('Commit*')
401
self._treeview_files.append_column(gtk.TreeViewColumn(name,
403
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
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'),
404
424
gtk.CellRendererText(), text=3))
405
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
425
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
406
426
gtk.CellRendererText(), text=4))
407
427
self._treeview_files.connect('cursor-changed',
408
428
self._on_treeview_files_cursor_changed)
416
436
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)
418
450
def _construct_pending_list(self):
419
451
# Pending information defaults to hidden, we put it all in 1 box, so
420
452
# that we can show/hide all of them at once
424
456
pending_message = gtk.Label()
425
457
pending_message.set_markup(
426
_('<i>* Cannot select specific files when merging</i>'))
458
_i18n('<i>* Cannot select specific files when merging</i>'))
427
459
self._pending_box.pack_start(pending_message, expand=False, padding=5)
428
460
pending_message.show()
430
pending_label = gtk.Label(_('Pending Revisions'))
462
pending_label = gtk.Label(_i18n('Pending Revisions'))
431
463
self._pending_box.pack_start(pending_label, expand=False, padding=0)
432
464
pending_label.show()
450
482
self._pending_store = liststore
451
483
self._treeview_pending.set_model(liststore)
452
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
484
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
453
485
gtk.CellRendererText(), text=1))
454
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
486
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
455
487
gtk.CellRendererText(), text=2))
456
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
488
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
457
489
gtk.CellRendererText(), text=3))
459
491
def _construct_diff_view(self):
463
495
# decide that we really don't ever want to display it, we should
464
496
# actually remove it, and other references to it, along with the
465
497
# tests that it is set properly.
466
self._diff_label = gtk.Label(_('Diff for whole tree'))
498
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
467
499
self._diff_label.set_alignment(0, 0)
468
500
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
469
501
self._add_to_right_table(self._diff_label, 1, False)
487
519
self._file_message_text_view.set_accepts_tab(False)
488
520
self._file_message_text_view.show()
490
self._file_message_expander = gtk.Expander(_('File commit message'))
522
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
491
523
self._file_message_expander.set_expanded(True)
492
524
self._file_message_expander.add(scroller)
493
525
self._add_to_right_table(self._file_message_expander, 1, False)
494
526
self._file_message_expander.show()
496
528
def _construct_global_message(self):
497
self._global_message_label = gtk.Label(_('Global Commit Message'))
498
self._global_message_label.set_markup(_('<b>Global Commit Message</b>'))
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>'))
499
532
self._global_message_label.set_alignment(0, 0)
500
533
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
501
534
self._add_to_right_table(self._global_message_label, 1, False)
522
555
if selection is not None:
523
556
path, display_path = model.get(selection, 1, 3)
524
self._diff_label.set_text(_('Diff for ') + display_path)
557
self._diff_label.set_text(_i18n('Diff for ') + display_path)
526
559
self._diff_view.show_diff(None)
568
601
text_buffer = self._file_message_text_view.get_buffer()
569
602
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
570
603
if file_id is None: # Whole tree
571
self._file_message_expander.set_label(_('File commit message'))
604
self._file_message_expander.set_label(_i18n('File commit message'))
572
605
self._file_message_expander.set_expanded(False)
573
606
self._file_message_expander.set_sensitive(False)
574
607
text_buffer.set_text('')
575
608
self._last_selected_file = None
577
self._file_message_expander.set_label(_('Commit message for ')
610
self._file_message_expander.set_label(_i18n('Commit message for ')
579
612
self._file_message_expander.set_expanded(True)
580
613
self._file_message_expander.set_sensitive(True)
596
629
for record in records:
597
if record[2]: # [2] checkbox
630
if self._commit_all_changes or record[2]:# [2] checkbox
598
631
file_id = record[0] # [0] file_id
599
632
path = record[1] # [1] real path
600
633
file_message = record[5] # [5] commit message
620
653
if message == '':
621
654
response = self._question_dialog(
622
_('Commit with an empty message?'),
623
_('You can describe your commit intent in the message.'))
655
_i18n('Commit with an empty message?'),
656
_i18n('You can describe your commit intent in the message.'))
624
657
if response == gtk.RESPONSE_NO:
625
658
# Kindly give focus to message area
626
659
self._global_message_text_view.grab_focus()
639
672
# files at this point.
640
673
for path in self._wt.unknowns():
641
674
response = self._question_dialog(
642
_("Commit with unknowns?"),
643
_("Unknown files exist in the working tree. Commit anyway?"))
675
_i18n("Commit with unknowns?"),
676
_i18n("Unknown files exist in the working tree. Commit anyway?"))
644
677
if response == gtk.RESPONSE_NO:
658
691
revprops=revprops)
659
692
except errors.PointlessCommit:
660
693
response = self._question_dialog(
661
_('Commit with no changes?'),
662
_('There are no changes in the working tree.'
663
' Do you want to commit anyway?'))
694
_i18n('Commit with no changes?'),
695
_i18n('There are no changes in the working tree.'
696
' Do you want to commit anyway?'))
664
697
if response == gtk.RESPONSE_YES:
665
698
rev_id = self._wt.commit(message,
666
699
allow_pointless=True,
added
removed
commit.py
