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 505.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 505.1.2
- Committer: Jelmer Vernooij
- Date: 2008-06-27 16:55:09 UTC
- mto: This revision was merged to the branch mainline in revision 506.
- Revision ID: jelmer@samba.org-20080627165509-7b68w2chzvvgc8vz
Use helper script to open patches.
- files added:
- cmenu.ui
- olive
- files removed:
- avatarproviders.py
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- bzr-handle-patch.desktop.in => bzr-handle-patch.desktop
- bzr-notify.desktop.in => bzr-notify.desktop
- 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 bzrlib.plugins.gtk import _i18n
35
from dialog import error_dialog, question_dialog
36
from errors import show_bzr_error
37
37
38
38
try:
39
39
import dbus
97
97
return pm
98
98
99
99
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):
100
class CommitDialog(gtk.Dialog):
108
101
"""Implementation of Commit."""
109
102
110
103
def __init__(self, wt, selected=None, parent=None):
111
super(CommitDialog, self).__init__(
112
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
113
self.connect('delete-event', self._on_delete_window)
104
gtk.Dialog.__init__(self, title="Commit - Olive",
105
parent=parent,
106
flags=0,
107
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
114
108
self._question_dialog = question_dialog
115
109
116
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
117
118
110
self._wt = wt
119
111
# TODO: Do something with this value, it is used by Olive
120
112
# It used to set all changes but this one to False
122
114
self._enable_per_file_commits = True
123
115
self._commit_all_changes = True
124
116
self.committed_revision_id = None # Nothing has been committed yet
125
self._saved_commit_messages_manager = SavedCommitMessagesManager(
126
self._wt, self._wt.branch)
127
117
128
118
self.setup_params()
129
119
self.construct()
198
188
self._basis_tree.lock_read()
199
189
try:
200
190
from diff import iter_changes_to_status
201
saved_file_messages = self._saved_commit_messages_manager.get()[1]
202
191
for (file_id, real_path, change_type, display_path
203
192
) in iter_changes_to_status(self._basis_tree, self._wt):
204
193
if self._selected and real_path != self._selected:
205
194
enabled = False
206
195
else:
207
196
enabled = True
208
try:
209
default_message = saved_file_messages[file_id]
210
except KeyError:
211
default_message = ''
212
197
item_iter = store.append([
213
198
file_id,
214
199
real_path.encode('UTF-8'),
215
200
enabled,
216
201
display_path.encode('UTF-8'),
217
202
change_type,
218
default_message, # Initial comment
203
'', # Initial comment
219
204
])
220
205
if self._selected and enabled:
221
206
initial_cursor = store.get_path(item_iter)
228
213
# This sets the cursor, which causes the expander to close, which
229
214
# causes the _file_message_text_view to never get realized. So we have
230
215
# 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)
216
self._treeview_files.set_cursor(initial_cursor)
232
217
233
218
def _realize_file_message_tree_view(*args):
234
219
self._file_message_text_view.realize()
247
232
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
248
233
'/org/freedesktop/NetworkManager')
249
234
except dbus.DBusException:
250
trace.mutter("networkmanager not available.")
235
mutter("networkmanager not available.")
251
236
self._check_local.show()
252
237
return
253
238
259
244
except dbus.DBusException, e:
260
245
# Silently drop errors. While DBus may be
261
246
# available, NetworkManager doesn't necessarily have to be
262
trace.mutter("unable to get networkmanager state: %r" % e)
247
mutter("unable to get networkmanager state: %r" % e)
263
248
self._check_local.show()
264
249
265
250
def _fill_in_per_file_info(self):
282
267
"""Build up the dialog widgets."""
283
268
# The primary pane which splits it into left and right (adjustable)
284
269
# sections.
285
self._hpane = Gtk.HPaned()
270
self._hpane = gtk.HPaned()
286
271
287
272
self._construct_left_pane()
288
273
self._construct_right_pane()
289
274
self._construct_action_pane()
290
275
291
self.get_content_area().pack_start(self._hpane, True, True, 0)
276
self.vbox.pack_start(self._hpane)
292
277
self._hpane.show()
293
278
self.set_focus(self._global_message_text_view)
294
279
313
298
self._hpane.set_position(300)
314
299
315
300
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)
301
group = gtk.AccelGroup()
302
group.connect_group(gtk.gdk.keyval_from_name('N'),
303
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
319
304
self.add_accel_group(group)
320
305
321
# ignore the escape key (avoid closing the window)
322
self.connect_object('close', self.emit_stop_by_name, 'close')
323
324
306
def _construct_left_pane(self):
325
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
307
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
326
308
self._construct_file_list()
327
309
self._construct_pending_list()
328
310
329
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
311
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
330
312
use_underline=True)
331
self._left_pane_box.pack_end(self._check_local, False, False, 0)
313
self._left_pane_box.pack_end(self._check_local, False, False)
332
314
self._check_local.set_active(False)
333
315
334
316
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
341
323
# commit, and 1 for file commit, and it looked good. But I don't seem
342
324
# to have a way to do that with the gtk boxes... :( (Which is extra
343
325
# weird since wx uses gtk on Linux...)
344
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
326
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
345
327
self._right_pane_table.set_row_spacings(5)
346
328
self._right_pane_table.set_col_spacings(5)
347
329
self._right_pane_table_row = 0
353
335
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
354
336
355
337
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)
338
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
362
339
self._button_commit.connect('clicked', self._on_commit_clicked)
363
self._button_commit.set_can_default(True)
340
self._button_commit.set_flags(gtk.CAN_DEFAULT)
364
341
self._button_commit.show()
365
self.get_action_area().pack_end(
366
self._button_commit, True, True, 0)
342
self.action_area.pack_end(self._button_commit)
367
343
self._button_commit.grab_default()
368
344
369
345
def _add_to_right_table(self, widget, weight, expanding=False):
375
351
"""
376
352
end_row = self._right_pane_table_row + weight
377
353
options = 0
378
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
354
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
379
355
if expanding:
380
356
options = expand_opts
381
357
self._right_pane_table.attach(widget, 0, 1,
384
360
self._right_pane_table_row = end_row
385
361
386
362
def _construct_file_list(self):
387
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
388
file_label = Gtk.Label(label=_i18n('Files'))
363
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
364
file_label = gtk.Label(_i18n('Files'))
389
365
# file_label.show()
390
self._files_box.pack_start(file_label, False, True, 0)
366
self._files_box.pack_start(file_label, expand=False)
391
367
392
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
368
self._commit_all_files_radio = gtk.RadioButton(
393
369
None, _i18n("Commit all changes"))
394
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
370
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
395
371
self._commit_all_files_radio.show()
396
372
self._commit_all_files_radio.connect('toggled',
397
373
self._toggle_commit_selection)
398
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
374
self._commit_selected_radio = gtk.RadioButton(
399
375
self._commit_all_files_radio, _i18n("Only commit selected changes"))
400
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
376
self._files_box.pack_start(self._commit_selected_radio, expand=False)
401
377
self._commit_selected_radio.show()
402
378
self._commit_selected_radio.connect('toggled',
403
379
self._toggle_commit_selection)
406
382
self._commit_all_files_radio.set_sensitive(False)
407
383
self._commit_selected_radio.set_sensitive(False)
408
384
409
scroller = Gtk.ScrolledWindow()
410
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
411
self._treeview_files = Gtk.TreeView()
385
scroller = gtk.ScrolledWindow()
386
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
387
self._treeview_files = gtk.TreeView()
412
388
self._treeview_files.show()
413
389
scroller.add(self._treeview_files)
414
scroller.set_shadow_type(Gtk.ShadowType.IN)
390
scroller.set_shadow_type(gtk.SHADOW_IN)
415
391
scroller.show()
416
self._files_box.pack_start(scroller, True, True, 0)
392
self._files_box.pack_start(scroller,
393
expand=True, fill=True)
417
394
self._files_box.show()
418
self._left_pane_box.pack_start(self._files_box, True, True, 0)
395
self._left_pane_box.pack_start(self._files_box)
419
396
420
397
# Keep note that all strings stored in a ListStore must be UTF-8
421
398
# strings. GTK does not support directly setting and restoring Unicode
422
399
# 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
400
liststore = gtk.ListStore(
401
gobject.TYPE_STRING, # [0] file_id
402
gobject.TYPE_STRING, # [1] real path
403
gobject.TYPE_BOOLEAN, # [2] checkbox
404
gobject.TYPE_STRING, # [3] display path
405
gobject.TYPE_STRING, # [4] changes type
406
gobject.TYPE_STRING, # [5] commit message
430
407
)
431
408
self._files_store = liststore
432
409
self._treeview_files.set_model(liststore)
433
crt = Gtk.CellRendererToggle()
410
crt = gtk.CellRendererToggle()
434
411
crt.set_property('activatable', not bool(self._pending))
435
412
crt.connect("toggled", self._toggle_commit, self._files_store)
436
413
if self._pending:
437
414
name = _i18n('Commit*')
438
415
else:
439
416
name = _i18n('Commit')
440
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
417
commit_col = gtk.TreeViewColumn(name, crt, active=2)
441
418
commit_col.set_visible(False)
442
419
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))
420
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
421
gtk.CellRendererText(), text=3))
422
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
423
gtk.CellRendererText(), text=4))
447
424
self._treeview_files.connect('cursor-changed',
448
425
self._on_treeview_files_cursor_changed)
449
426
464
441
checked_col.set_visible(False)
465
442
else:
466
443
checked_col.set_visible(True)
467
renderer = checked_col.get_cells()[0]
444
renderer = checked_col.get_cell_renderers()[0]
468
445
renderer.set_property('activatable', not all_files)
469
446
470
447
def _construct_pending_list(self):
471
448
# Pending information defaults to hidden, we put it all in 1 box, so
472
449
# that we can show/hide all of them at once
473
self._pending_box = Gtk.VBox()
450
self._pending_box = gtk.VBox()
474
451
self._pending_box.hide()
475
452
476
pending_message = Gtk.Label()
453
pending_message = gtk.Label()
477
454
pending_message.set_markup(
478
455
_i18n('<i>* Cannot select specific files when merging</i>'))
479
self._pending_box.pack_start(pending_message, False, True, 5)
456
self._pending_box.pack_start(pending_message, expand=False, padding=5)
480
457
pending_message.show()
481
458
482
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
483
self._pending_box.pack_start(pending_label, False, True, 0)
459
pending_label = gtk.Label(_i18n('Pending Revisions'))
460
self._pending_box.pack_start(pending_label, expand=False, padding=0)
484
461
pending_label.show()
485
462
486
scroller = Gtk.ScrolledWindow()
487
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
488
self._treeview_pending = Gtk.TreeView()
463
scroller = gtk.ScrolledWindow()
464
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
465
self._treeview_pending = gtk.TreeView()
489
466
scroller.add(self._treeview_pending)
490
scroller.set_shadow_type(Gtk.ShadowType.IN)
467
scroller.set_shadow_type(gtk.SHADOW_IN)
491
468
scroller.show()
492
self._pending_box.pack_start(scroller, True, True, 5)
469
self._pending_box.pack_start(scroller,
470
expand=True, fill=True, padding=5)
493
471
self._treeview_pending.show()
494
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
472
self._left_pane_box.pack_start(self._pending_box)
495
473
496
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
497
GObject.TYPE_STRING, # date
498
GObject.TYPE_STRING, # committer
499
GObject.TYPE_STRING, # summary
474
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
475
gobject.TYPE_STRING, # date
476
gobject.TYPE_STRING, # committer
477
gobject.TYPE_STRING, # summary
500
478
)
501
479
self._pending_store = liststore
502
480
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))
481
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
482
gtk.CellRendererText(), text=1))
483
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
484
gtk.CellRendererText(), text=2))
485
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
486
gtk.CellRendererText(), text=3))
509
487
510
488
def _construct_diff_view(self):
511
from bzrlib.plugins.gtk.diff import DiffView
489
from diff import DiffView
512
490
513
491
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
514
492
# decide that we really don't ever want to display it, we should
515
493
# actually remove it, and other references to it, along with the
516
494
# tests that it is set properly.
517
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
495
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
518
496
self._diff_label.set_alignment(0, 0)
519
497
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
520
498
self._add_to_right_table(self._diff_label, 1, False)
525
503
self._diff_view.show()
526
504
527
505
def _construct_file_message(self):
528
scroller = Gtk.ScrolledWindow()
529
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
506
scroller = gtk.ScrolledWindow()
507
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
530
508
531
self._file_message_text_view = Gtk.TextView()
509
self._file_message_text_view = gtk.TextView()
532
510
scroller.add(self._file_message_text_view)
533
scroller.set_shadow_type(Gtk.ShadowType.IN)
511
scroller.set_shadow_type(gtk.SHADOW_IN)
534
512
scroller.show()
535
513
536
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
537
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
514
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
515
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
538
516
self._file_message_text_view.set_accepts_tab(False)
539
517
self._file_message_text_view.show()
540
518
541
self._file_message_expander = Gtk.Expander(
542
label=_i18n('File commit message'))
519
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
543
520
self._file_message_expander.set_expanded(True)
544
521
self._file_message_expander.add(scroller)
545
522
self._add_to_right_table(self._file_message_expander, 1, False)
546
523
self._file_message_expander.show()
547
524
548
525
def _construct_global_message(self):
549
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
526
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
550
527
self._global_message_label.set_markup(
551
528
_i18n('<b>Global Commit Message</b>'))
552
529
self._global_message_label.set_alignment(0, 0)
555
532
# Can we remove the spacing between the label and the box?
556
533
self._global_message_label.show()
557
534
558
scroller = Gtk.ScrolledWindow()
559
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
535
scroller = gtk.ScrolledWindow()
536
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
560
537
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"))
538
self._global_message_text_view = gtk.TextView()
539
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
564
540
scroller.add(self._global_message_text_view)
565
scroller.set_shadow_type(Gtk.ShadowType.IN)
541
scroller.set_shadow_type(gtk.SHADOW_IN)
566
542
scroller.show()
567
543
self._add_to_right_table(scroller, 2, True)
568
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
544
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
569
545
self._file_message_text_view.set_accepts_tab(False)
570
546
self._global_message_text_view.show()
571
547
596
572
# We have either made it to the end of the list, or nothing was
597
573
# selected. Either way, select All Files, and jump to the global
598
574
# commit message.
599
self._treeview_files.set_cursor(
600
Gtk.TreePath(path=0), None, False)
575
self._treeview_files.set_cursor((0,))
601
576
self._global_message_text_view.grab_focus()
602
577
else:
603
578
# Set the cursor to this entry, and jump to the per-file commit
604
579
# message
605
self._treeview_files.set_cursor(model.get_path(next), None, False)
580
self._treeview_files.set_cursor(model.get_path(next))
606
581
self._file_message_text_view.grab_focus()
607
582
608
583
def _save_current_file_message(self):
610
585
return # Nothing to save
611
586
text_buffer = self._file_message_text_view.get_buffer()
612
587
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
613
text_buffer.get_end_iter(), True)
588
text_buffer.get_end_iter())
614
589
last_selected = self._files_store.get_iter(self._last_selected_file)
615
590
self._files_store.set_value(last_selected, 5, cur_text)
616
591
652
627
if self._commit_all_changes or record[2]:# [2] checkbox
653
628
file_id = record[0] # [0] file_id
654
629
path = record[1] # [1] real path
655
# [5] commit message
656
file_message = _sanitize_and_decode_message(record[5])
630
file_message = record[5] # [5] commit message
657
631
files.append(path.decode('UTF-8'))
658
632
if self._enable_per_file_commits and file_message:
659
633
# All of this needs to be utf-8 information
660
file_message = file_message.encode('UTF-8')
661
634
file_info.append({'path':path, 'file_id':file_id,
662
635
'message':file_message})
663
636
file_info.sort(key=lambda x:(x['path'], x['file_id']))
667
640
return files, []
668
641
669
642
@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
643
def _on_commit_clicked(self, button):
698
644
""" Commit button clicked handler. """
699
645
self._do_commit()
704
650
if message == '':
705
651
response = self._question_dialog(
706
652
_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:
653
_i18n('You can describe your commit intent in the message.'))
654
if response == gtk.RESPONSE_NO:
710
655
# Kindly give focus to message area
711
656
self._global_message_text_view.grab_focus()
712
657
return
725
670
for path in self._wt.unknowns():
726
671
response = self._question_dialog(
727
672
_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:
673
_i18n("Unknown files exist in the working tree. Commit anyway?"))
674
if response == gtk.RESPONSE_NO:
732
675
return
733
676
break
734
677
747
690
response = self._question_dialog(
748
691
_i18n('Commit with no changes?'),
749
692
_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:
693
' Do you want to commit anyway?'))
694
if response == gtk.RESPONSE_YES:
753
695
rev_id = self._wt.commit(message,
754
696
allow_pointless=True,
755
697
strict=False,
757
699
specific_files=specific_files,
758
700
revprops=revprops)
759
701
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)
702
self.response(gtk.RESPONSE_OK)
763
703
764
704
def _get_global_commit_message(self):
765
705
buf = self._global_message_text_view.get_buffer()
766
706
start, end = buf.get_bounds()
767
text = buf.get_text(start, end, True)
768
return _sanitize_and_decode_message(text)
707
return buf.get_text(start, end).decode('utf-8')
769
708
770
709
def _set_global_commit_message(self, message):
771
710
"""Just a helper for the test suite."""
792
731
show_offset=False)
793
732
rev_dict['revision_id'] = rev.revision_id
794
733
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