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 411.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 411.1.2
- Committer: Jelmer Vernooij
- Date: 2007-12-21 20:20:37 UTC
- mto: This revision was merged to the branch mainline in revision 422.
- Revision ID: jelmer@samba.org-20071221202037-6zvbwefvrte3e2zy
Fix URL.
- files added:
- cmenu.ui
- olive
- files removed:
- avatarproviders.py
- branchview
- preferences
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- icons/bzr-icon-64.png => bzr-icon-64.png
- bzr-notify.desktop.in => bzr-notify.desktop
- preferences/__init__.py => preferences.py
- branchview/graphcell.py => viz/graphcell.py
- branchview/linegraph.py => viz/linegraph.py
- branchview/treemodel.py => viz/treemodel.py
- branchview/treeview.py => viz/treeview.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
17
28
import re
18
29
19
from gi.repository import Gdk
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
23
24
from bzrlib import (
25
errors,
26
osutils,
27
trace,
28
)
29
try:
30
from bzrlib import bencode
31
except ImportError:
32
from bzrlib.util import bencode
33
34
from bzrlib.plugins.gtk.dialog import question_dialog
35
from bzrlib.plugins.gtk.errors import show_bzr_error
36
from bzrlib.plugins.gtk.i18n import _i18n
30
from bzrlib import errors, osutils
31
from bzrlib.trace import mutter
32
from bzrlib.util import bencode
33
34
from dialog import error_dialog, question_dialog
35
from errors import show_bzr_error
37
36
38
37
try:
39
38
import dbus
97
96
return pm
98
97
99
98
100
_newline_variants_re = re.compile(r'\r\n?')
101
def _sanitize_and_decode_message(utf8_message):
102
"""Turn a utf-8 message into a sanitized Unicode message."""
103
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
104
return fixed_newline.decode('utf-8')
105
106
107
class CommitDialog(Gtk.Dialog):
99
class CommitDialog(gtk.Dialog):
108
100
"""Implementation of Commit."""
109
101
110
102
def __init__(self, wt, selected=None, parent=None):
111
Gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
112
parent=parent, flags=0,)
113
self.connect('delete-event', self._on_delete_window)
103
gtk.Dialog.__init__(self, title="Commit - Olive",
104
parent=parent,
105
flags=0,
106
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
114
107
self._question_dialog = question_dialog
115
108
116
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
117
118
109
self._wt = wt
119
110
# TODO: Do something with this value, it is used by Olive
120
111
# It used to set all changes but this one to False
122
113
self._enable_per_file_commits = True
123
114
self._commit_all_changes = True
124
115
self.committed_revision_id = None # Nothing has been committed yet
125
self._saved_commit_messages_manager = SavedCommitMessagesManager(
126
self._wt, self._wt.branch)
127
116
128
117
self.setup_params()
129
118
self.construct()
175
164
store = self._files_store
176
165
self._treeview_files.set_model(None)
177
166
178
added = _i18n('added')
179
removed = _i18n('removed')
180
renamed = _i18n('renamed')
181
renamed_and_modified = _i18n('renamed and modified')
182
modified = _i18n('modified')
183
kind_changed = _i18n('kind changed')
167
added = _('added')
168
removed = _('removed')
169
renamed = _('renamed')
170
renamed_and_modified = _('renamed and modified')
171
modified = _('modified')
172
kind_changed = _('kind changed')
184
173
185
174
# The store holds:
186
175
# [file_id, real path, checkbox, display path, changes type, message]
187
# iter_changes returns:
176
# _iter_changes returns:
188
177
# (file_id, (path_in_source, path_in_target),
189
178
# changed_content, versioned, parent, name, kind,
190
179
# executable)
197
186
self._wt.lock_read()
198
187
self._basis_tree.lock_read()
199
188
try:
200
from diff import iter_changes_to_status
201
saved_file_messages = self._saved_commit_messages_manager.get()[1]
189
from diff import _iter_changes_to_status
202
190
for (file_id, real_path, change_type, display_path
203
) in iter_changes_to_status(self._basis_tree, self._wt):
191
) in _iter_changes_to_status(self._basis_tree, self._wt):
204
192
if self._selected and real_path != self._selected:
205
193
enabled = False
206
194
else:
207
195
enabled = True
208
try:
209
default_message = saved_file_messages[file_id]
210
except KeyError:
211
default_message = ''
212
196
item_iter = store.append([
213
197
file_id,
214
198
real_path.encode('UTF-8'),
215
199
enabled,
216
200
display_path.encode('UTF-8'),
217
201
change_type,
218
default_message, # Initial comment
202
'', # Initial comment
219
203
])
220
204
if self._selected and enabled:
221
205
initial_cursor = store.get_path(item_iter)
228
212
# This sets the cursor, which causes the expander to close, which
229
213
# causes the _file_message_text_view to never get realized. So we have
230
214
# to give it a little kick, or it warns when we try to grab the focus
231
self._treeview_files.set_cursor(initial_cursor, None, False)
215
self._treeview_files.set_cursor(initial_cursor)
232
216
233
217
def _realize_file_message_tree_view(*args):
234
218
self._file_message_text_view.realize()
243
227
return
244
228
if have_dbus:
245
229
bus = dbus.SystemBus()
246
try:
247
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
248
'/org/freedesktop/NetworkManager')
249
except dbus.DBusException:
250
trace.mutter("networkmanager not available.")
251
self._check_local.show()
252
return
253
230
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
231
'/org/freedesktop/NetworkManager')
254
232
dbus_iface = dbus.Interface(proxy_obj,
255
233
'org.freedesktop.NetworkManager')
256
234
try:
259
237
except dbus.DBusException, e:
260
238
# Silently drop errors. While DBus may be
261
239
# available, NetworkManager doesn't necessarily have to be
262
trace.mutter("unable to get networkmanager state: %r" % e)
240
mutter("unable to get networkmanager state: %r" % e)
263
241
self._check_local.show()
264
242
265
243
def _fill_in_per_file_info(self):
273
251
self._enable_per_file_commits = True
274
252
if not self._enable_per_file_commits:
275
253
self._file_message_expander.hide()
276
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
254
self._global_message_label.set_markup(_('<b>Commit Message</b>'))
277
255
278
256
def _compute_delta(self):
279
257
self._delta = self._wt.changes_from(self._basis_tree)
282
260
"""Build up the dialog widgets."""
283
261
# The primary pane which splits it into left and right (adjustable)
284
262
# sections.
285
self._hpane = Gtk.HPaned()
263
self._hpane = gtk.HPaned()
286
264
287
265
self._construct_left_pane()
288
266
self._construct_right_pane()
289
267
self._construct_action_pane()
290
268
291
self.get_content_area().pack_start(self._hpane, True, True, 0)
269
self.vbox.pack_start(self._hpane)
292
270
self._hpane.show()
293
271
self.set_focus(self._global_message_text_view)
294
272
313
291
self._hpane.set_position(300)
314
292
315
293
def _construct_accelerators(self):
316
group = Gtk.AccelGroup()
317
group.connect(Gdk.keyval_from_name('N'),
318
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
294
group = gtk.AccelGroup()
295
group.connect_group(gtk.gdk.keyval_from_name('N'),
296
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
319
297
self.add_accel_group(group)
320
298
321
# ignore the escape key (avoid closing the window)
322
self.connect_object('close', self.emit_stop_by_name, 'close')
323
324
299
def _construct_left_pane(self):
325
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
300
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
326
301
self._construct_file_list()
327
302
self._construct_pending_list()
328
303
329
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
304
self._check_local = gtk.CheckButton(_("_Only commit locally"),
330
305
use_underline=True)
331
self._left_pane_box.pack_end(self._check_local, False, False, 0)
306
self._left_pane_box.pack_end(self._check_local, False, False)
332
307
self._check_local.set_active(False)
333
308
334
309
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
341
316
# commit, and 1 for file commit, and it looked good. But I don't seem
342
317
# to have a way to do that with the gtk boxes... :( (Which is extra
343
318
# weird since wx uses gtk on Linux...)
344
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
319
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
345
320
self._right_pane_table.set_row_spacings(5)
346
321
self._right_pane_table.set_col_spacings(5)
347
322
self._right_pane_table_row = 0
353
328
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
354
329
355
330
def _construct_action_pane(self):
356
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
357
self._button_cancel.connect('clicked', self._on_cancel_clicked)
358
self._button_cancel.show()
359
self.get_action_area().pack_end(
360
self._button_cancel, True, True, 0)
361
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
331
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
362
332
self._button_commit.connect('clicked', self._on_commit_clicked)
363
self._button_commit.set_can_default(True)
333
self._button_commit.set_flags(gtk.CAN_DEFAULT)
364
334
self._button_commit.show()
365
self.get_action_area().pack_end(
366
self._button_commit, True, True, 0)
335
self.action_area.pack_end(self._button_commit)
367
336
self._button_commit.grab_default()
368
337
369
338
def _add_to_right_table(self, widget, weight, expanding=False):
375
344
"""
376
345
end_row = self._right_pane_table_row + weight
377
346
options = 0
378
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
347
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
379
348
if expanding:
380
349
options = expand_opts
381
350
self._right_pane_table.attach(widget, 0, 1,
384
353
self._right_pane_table_row = end_row
385
354
386
355
def _construct_file_list(self):
387
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
388
file_label = Gtk.Label(label=_i18n('Files'))
356
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
357
file_label = gtk.Label(_('Files'))
389
358
# file_label.show()
390
self._files_box.pack_start(file_label, False, True, 0)
359
self._files_box.pack_start(file_label, expand=False)
391
360
392
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
393
None, _i18n("Commit all changes"))
394
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
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)
395
364
self._commit_all_files_radio.show()
396
365
self._commit_all_files_radio.connect('toggled',
397
366
self._toggle_commit_selection)
398
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
399
self._commit_all_files_radio, _i18n("Only commit selected changes"))
400
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
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)
401
370
self._commit_selected_radio.show()
402
371
self._commit_selected_radio.connect('toggled',
403
372
self._toggle_commit_selection)
404
373
if self._pending:
405
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
374
self._commit_all_files_radio.set_label(_('Commit all changes*'))
406
375
self._commit_all_files_radio.set_sensitive(False)
407
376
self._commit_selected_radio.set_sensitive(False)
408
377
409
scroller = Gtk.ScrolledWindow()
410
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
411
self._treeview_files = Gtk.TreeView()
378
scroller = gtk.ScrolledWindow()
379
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
380
self._treeview_files = gtk.TreeView()
412
381
self._treeview_files.show()
413
382
scroller.add(self._treeview_files)
414
scroller.set_shadow_type(Gtk.ShadowType.IN)
383
scroller.set_shadow_type(gtk.SHADOW_IN)
415
384
scroller.show()
416
self._files_box.pack_start(scroller, True, True, 0)
385
self._files_box.pack_start(scroller,
386
expand=True, fill=True)
417
387
self._files_box.show()
418
self._left_pane_box.pack_start(self._files_box, True, True, 0)
388
self._left_pane_box.pack_start(self._files_box)
419
389
420
390
# Keep note that all strings stored in a ListStore must be UTF-8
421
391
# strings. GTK does not support directly setting and restoring Unicode
422
392
# objects.
423
liststore = Gtk.ListStore(
424
GObject.TYPE_STRING, # [0] file_id
425
GObject.TYPE_STRING, # [1] real path
426
GObject.TYPE_BOOLEAN, # [2] checkbox
427
GObject.TYPE_STRING, # [3] display path
428
GObject.TYPE_STRING, # [4] changes type
429
GObject.TYPE_STRING, # [5] commit message
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
430
400
)
431
401
self._files_store = liststore
432
402
self._treeview_files.set_model(liststore)
433
crt = Gtk.CellRendererToggle()
403
crt = gtk.CellRendererToggle()
434
404
crt.set_property('activatable', not bool(self._pending))
435
405
crt.connect("toggled", self._toggle_commit, self._files_store)
436
406
if self._pending:
437
name = _i18n('Commit*')
407
name = _('Commit*')
438
408
else:
439
name = _i18n('Commit')
440
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
409
name = _('Commit')
410
commit_col = gtk.TreeViewColumn(name, crt, active=2)
441
411
commit_col.set_visible(False)
442
412
self._treeview_files.append_column(commit_col)
443
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
444
Gtk.CellRendererText(), text=3))
445
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
446
Gtk.CellRendererText(), text=4))
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))
447
417
self._treeview_files.connect('cursor-changed',
448
418
self._on_treeview_files_cursor_changed)
449
419
464
434
checked_col.set_visible(False)
465
435
else:
466
436
checked_col.set_visible(True)
467
renderer = checked_col.get_cells()[0]
437
renderer = checked_col.get_cell_renderers()[0]
468
438
renderer.set_property('activatable', not all_files)
469
439
470
440
def _construct_pending_list(self):
471
441
# Pending information defaults to hidden, we put it all in 1 box, so
472
442
# that we can show/hide all of them at once
473
self._pending_box = Gtk.VBox()
443
self._pending_box = gtk.VBox()
474
444
self._pending_box.hide()
475
445
476
pending_message = Gtk.Label()
446
pending_message = gtk.Label()
477
447
pending_message.set_markup(
478
_i18n('<i>* Cannot select specific files when merging</i>'))
479
self._pending_box.pack_start(pending_message, False, True, 5)
448
_('<i>* Cannot select specific files when merging</i>'))
449
self._pending_box.pack_start(pending_message, expand=False, padding=5)
480
450
pending_message.show()
481
451
482
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
483
self._pending_box.pack_start(pending_label, False, True, 0)
452
pending_label = gtk.Label(_('Pending Revisions'))
453
self._pending_box.pack_start(pending_label, expand=False, padding=0)
484
454
pending_label.show()
485
455
486
scroller = Gtk.ScrolledWindow()
487
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
488
self._treeview_pending = Gtk.TreeView()
456
scroller = gtk.ScrolledWindow()
457
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
458
self._treeview_pending = gtk.TreeView()
489
459
scroller.add(self._treeview_pending)
490
scroller.set_shadow_type(Gtk.ShadowType.IN)
460
scroller.set_shadow_type(gtk.SHADOW_IN)
491
461
scroller.show()
492
self._pending_box.pack_start(scroller, True, True, 5)
462
self._pending_box.pack_start(scroller,
463
expand=True, fill=True, padding=5)
493
464
self._treeview_pending.show()
494
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
465
self._left_pane_box.pack_start(self._pending_box)
495
466
496
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
497
GObject.TYPE_STRING, # date
498
GObject.TYPE_STRING, # committer
499
GObject.TYPE_STRING, # summary
467
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
468
gobject.TYPE_STRING, # date
469
gobject.TYPE_STRING, # committer
470
gobject.TYPE_STRING, # summary
500
471
)
501
472
self._pending_store = liststore
502
473
self._treeview_pending.set_model(liststore)
503
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
504
Gtk.CellRendererText(), text=1))
505
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
506
Gtk.CellRendererText(), text=2))
507
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
508
Gtk.CellRendererText(), text=3))
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))
509
480
510
481
def _construct_diff_view(self):
511
from bzrlib.plugins.gtk.diff import DiffView
482
from diff import DiffView
512
483
513
484
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
514
485
# decide that we really don't ever want to display it, we should
515
486
# actually remove it, and other references to it, along with the
516
487
# tests that it is set properly.
517
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
488
self._diff_label = gtk.Label(_('Diff for whole tree'))
518
489
self._diff_label.set_alignment(0, 0)
519
490
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
520
491
self._add_to_right_table(self._diff_label, 1, False)
525
496
self._diff_view.show()
526
497
527
498
def _construct_file_message(self):
528
scroller = Gtk.ScrolledWindow()
529
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
499
scroller = gtk.ScrolledWindow()
500
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
530
501
531
self._file_message_text_view = Gtk.TextView()
502
self._file_message_text_view = gtk.TextView()
532
503
scroller.add(self._file_message_text_view)
533
scroller.set_shadow_type(Gtk.ShadowType.IN)
504
scroller.set_shadow_type(gtk.SHADOW_IN)
534
505
scroller.show()
535
506
536
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
537
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
507
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
508
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
538
509
self._file_message_text_view.set_accepts_tab(False)
539
510
self._file_message_text_view.show()
540
511
541
self._file_message_expander = Gtk.Expander(
542
label=_i18n('File commit message'))
512
self._file_message_expander = gtk.Expander(_('File commit message'))
543
513
self._file_message_expander.set_expanded(True)
544
514
self._file_message_expander.add(scroller)
545
515
self._add_to_right_table(self._file_message_expander, 1, False)
546
516
self._file_message_expander.show()
547
517
548
518
def _construct_global_message(self):
549
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
550
self._global_message_label.set_markup(
551
_i18n('<b>Global Commit Message</b>'))
519
self._global_message_label = gtk.Label(_('Global Commit Message'))
520
self._global_message_label.set_markup(_('<b>Global Commit Message</b>'))
552
521
self._global_message_label.set_alignment(0, 0)
553
522
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
554
523
self._add_to_right_table(self._global_message_label, 1, False)
555
524
# Can we remove the spacing between the label and the box?
556
525
self._global_message_label.show()
557
526
558
scroller = Gtk.ScrolledWindow()
559
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
527
scroller = gtk.ScrolledWindow()
528
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
560
529
561
self._global_message_text_view = Gtk.TextView()
562
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
563
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
530
self._global_message_text_view = gtk.TextView()
531
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
564
532
scroller.add(self._global_message_text_view)
565
scroller.set_shadow_type(Gtk.ShadowType.IN)
533
scroller.set_shadow_type(gtk.SHADOW_IN)
566
534
scroller.show()
567
535
self._add_to_right_table(scroller, 2, True)
568
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
536
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
569
537
self._file_message_text_view.set_accepts_tab(False)
570
538
self._global_message_text_view.show()
571
539
575
543
576
544
if selection is not None:
577
545
path, display_path = model.get(selection, 1, 3)
578
self._diff_label.set_text(_i18n('Diff for ') + display_path)
546
self._diff_label.set_text(_('Diff for ') + display_path)
579
547
if path is None:
580
548
self._diff_view.show_diff(None)
581
549
else:
596
564
# We have either made it to the end of the list, or nothing was
597
565
# selected. Either way, select All Files, and jump to the global
598
566
# commit message.
599
self._treeview_files.set_cursor(
600
Gtk.TreePath(path=0), None, False)
567
self._treeview_files.set_cursor((0,))
601
568
self._global_message_text_view.grab_focus()
602
569
else:
603
570
# Set the cursor to this entry, and jump to the per-file commit
604
571
# message
605
self._treeview_files.set_cursor(model.get_path(next), None, False)
572
self._treeview_files.set_cursor(model.get_path(next))
606
573
self._file_message_text_view.grab_focus()
607
574
608
575
def _save_current_file_message(self):
610
577
return # Nothing to save
611
578
text_buffer = self._file_message_text_view.get_buffer()
612
579
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
613
text_buffer.get_end_iter(), True)
580
text_buffer.get_end_iter())
614
581
last_selected = self._files_store.get_iter(self._last_selected_file)
615
582
self._files_store.set_value(last_selected, 5, cur_text)
616
583
623
590
text_buffer = self._file_message_text_view.get_buffer()
624
591
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
592
if file_id is None: # Whole tree
626
self._file_message_expander.set_label(_i18n('File commit message'))
593
self._file_message_expander.set_label(_('File commit message'))
627
594
self._file_message_expander.set_expanded(False)
628
595
self._file_message_expander.set_sensitive(False)
629
596
text_buffer.set_text('')
630
597
self._last_selected_file = None
631
598
else:
632
self._file_message_expander.set_label(_i18n('Commit message for ')
599
self._file_message_expander.set_label(_('Commit message for ')
633
600
+ display_path)
634
601
self._file_message_expander.set_expanded(True)
635
602
self._file_message_expander.set_sensitive(True)
652
619
if self._commit_all_changes or record[2]:# [2] checkbox
653
620
file_id = record[0] # [0] file_id
654
621
path = record[1] # [1] real path
655
# [5] commit message
656
file_message = _sanitize_and_decode_message(record[5])
622
file_message = record[5] # [5] commit message
657
623
files.append(path.decode('UTF-8'))
658
624
if self._enable_per_file_commits and file_message:
659
625
# All of this needs to be utf-8 information
660
file_message = file_message.encode('UTF-8')
661
626
file_info.append({'path':path, 'file_id':file_id,
662
627
'message':file_message})
663
628
file_info.sort(key=lambda x:(x['path'], x['file_id']))
667
632
return files, []
668
633
669
634
@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
697
635
def _on_commit_clicked(self, button):
698
636
""" Commit button clicked handler. """
699
637
self._do_commit()
703
641
704
642
if message == '':
705
643
response = self._question_dialog(
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:
644
_('Commit with an empty message?'),
645
_('You can describe your commit intent in the message.'))
646
if response == gtk.RESPONSE_NO:
710
647
# Kindly give focus to message area
711
648
self._global_message_text_view.grab_focus()
712
649
return
724
661
# files at this point.
725
662
for path in self._wt.unknowns():
726
663
response = self._question_dialog(
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:
664
_("Commit with unknowns?"),
665
_("Unknown files exist in the working tree. Commit anyway?"))
666
if response == gtk.RESPONSE_NO:
732
667
return
733
668
break
734
669
745
680
revprops=revprops)
746
681
except errors.PointlessCommit:
747
682
response = self._question_dialog(
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:
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:
753
687
rev_id = self._wt.commit(message,
754
688
allow_pointless=True,
755
689
strict=False,
757
691
specific_files=specific_files,
758
692
revprops=revprops)
759
693
self.committed_revision_id = rev_id
760
# destroy old comments if any
761
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
762
self.response(Gtk.ResponseType.OK)
694
self.response(gtk.RESPONSE_OK)
763
695
764
696
def _get_global_commit_message(self):
765
697
buf = self._global_message_text_view.get_buffer()
766
698
start, end = buf.get_bounds()
767
text = buf.get_text(start, end, True)
768
return _sanitize_and_decode_message(text)
699
return buf.get_text(start, end).decode('utf-8')
769
700
770
701
def _set_global_commit_message(self, message):
771
702
"""Just a helper for the test suite."""
792
723
show_offset=False)
793
724
rev_dict['revision_id'] = rev.revision_id
794
725
return rev_dict
795
796
797
class SavedCommitMessagesManager:
798
"""Save glogal and per-file commit messages.
799
800
Saves global commit message and utf-8 file_id->message dictionary
801
of per-file commit messages on disk. Re-reads them later for re-using.
802
"""
803
804
def __init__(self, tree=None, branch=None):
805
"""If branch is None, builds empty messages, otherwise reads them
806
from branch's disk storage. 'tree' argument is for the future."""
807
if branch is None:
808
self.global_message = u''
809
self.file_messages = {}
810
else:
811
config = branch.get_config()
812
self.global_message = config.get_user_option(
813
'gtk_global_commit_message')
814
if self.global_message is None:
815
self.global_message = u''
816
file_messages = config.get_user_option('gtk_file_commit_messages')
817
if file_messages: # unicode and B-encoded:
818
self.file_messages = bencode.bdecode(
819
file_messages.encode('UTF-8'))
820
else:
821
self.file_messages = {}
822
823
def get(self):
824
return self.global_message, self.file_messages
825
826
def is_not_empty(self):
827
return bool(self.global_message or self.file_messages)
828
829
def insert(self, global_message, file_info):
830
"""Formats per-file commit messages (list of dictionaries, one per file)
831
into one utf-8 file_id->message dictionary and merges this with
832
previously existing dictionary. Merges global commit message too."""
833
file_messages = {}
834
for fi in file_info:
835
file_message = fi['message']
836
if file_message:
837
file_messages[fi['file_id']] = file_message # utf-8 strings
838
for k,v in file_messages.iteritems():
839
try:
840
self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
841
except KeyError:
842
self.file_messages[k] = v
843
if self.global_message:
844
self.global_message = global_message + '\n******\n' \
845
+ self.global_message
846
else:
847
self.global_message = global_message
848
849
def save(self, tree, branch):
850
# We store in branch's config, which can be a problem if two gcommit
851
# are done in two checkouts of one single branch (comments overwrite
852
# each other). Ideally should be in working tree. But uncommit does
853
# not always have a working tree, though it always has a branch.
854
# 'tree' argument is for the future
855
config = branch.get_config()
856
# should it be named "gtk_" or some more neutral name ("gui_" ?) to
857
# be compatible with qbzr in the future?
858
config.set_user_option('gtk_global_commit_message', self.global_message)
859
# bencode() does not know unicode objects but set_user_option()
860
# requires one:
861
config.set_user_option(
862
'gtk_file_commit_messages',
863
bencode.bencode(self.file_messages).decode('UTF-8'))
864
865
866
def save_commit_messages(local, master, old_revno, old_revid,
867
new_revno, new_revid):
868
b = local
869
if b is None:
870
b = master
871
mgr = SavedCommitMessagesManager(None, b)
872
revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
873
cur_revno = old_revno
874
new_revision_id = old_revid
875
graph = b.repository.get_graph()
876
for rev_id in revid_iterator:
877
if cur_revno == new_revno:
878
break
879
cur_revno -= 1
880
rev = b.repository.get_revision(rev_id)
881
file_info = rev.properties.get('file-info', None)
882
if file_info is None:
883
file_info = {}
884
else:
885
file_info = bencode.bdecode(file_info.encode('UTF-8'))
886
global_message = osutils.safe_unicode(rev.message)
887
# Concatenate comment of the uncommitted revision
888
mgr.insert(global_message, file_info)
889
890
parents = graph.get_parent_map([rev_id]).get(rev_id, None)
891
if not parents:
892
continue
893
mgr.save(None, b)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0