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 729
- compare with another revision
- download diff
- download tarball
- view history from revision 729
- Committer: Jelmer Vernooij
- Date: 2011-04-06 14:53:44 UTC
- Revision ID: jelmer@samba.org-20110406145344-m6s0i7q7ssjwhmwq
Support use without gtk.Spinner, which is only available in pygtk >= 2.22.
- files added:
- keyring.py
- files removed:
- commitmsgs.py
- files modified:
- AUTHORS
added
removed
commit.py
16
16
17
17
import re
18
18
19
from gi.repository import Gdk
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
19
try:
20
import pygtk
21
pygtk.require("2.0")
22
except:
23
pass
24
25
import gtk
26
import gobject
27
import pango
23
28
24
29
from bzrlib import (
25
bencode,
26
30
errors,
27
31
osutils,
28
32
trace,
29
33
)
34
try:
35
from bzrlib import bencode
36
except ImportError:
37
from bzrlib.util import bencode
38
39
from bzrlib.plugins.gtk import _i18n
30
40
from bzrlib.plugins.gtk.dialog import question_dialog
31
41
from bzrlib.plugins.gtk.errors import show_bzr_error
32
from bzrlib.plugins.gtk.i18n import _i18n
33
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
34
42
35
43
try:
36
44
import dbus
59
67
last_revision = parents[0]
60
68
61
69
if last_revision is not None:
62
graph = branch.repository.get_graph()
63
ignore = set([r for r,ps in graph.iter_ancestry([last_revision])])
70
try:
71
ignore = set(branch.repository.get_ancestry(last_revision,
72
topo_sorted=False))
73
except errors.NoSuchRevision:
74
# the last revision is a ghost : assume everything is new
75
# except for it
76
ignore = set([None, last_revision])
64
77
else:
65
ignore = set([])
78
ignore = set([None])
66
79
67
80
pm = []
68
81
for merge in pending:
93
106
def _sanitize_and_decode_message(utf8_message):
94
107
"""Turn a utf-8 message into a sanitized Unicode message."""
95
108
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
96
return osutils.safe_unicode(fixed_newline)
97
98
99
class CommitDialog(Gtk.Dialog):
109
return fixed_newline.decode('utf-8')
110
111
112
class CommitDialog(gtk.Dialog):
100
113
"""Implementation of Commit."""
101
114
102
115
def __init__(self, wt, selected=None, parent=None):
103
super(CommitDialog, self).__init__(
104
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
116
gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
117
parent=parent, flags=0,)
105
118
self.connect('delete-event', self._on_delete_window)
106
119
self._question_dialog = question_dialog
107
120
108
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
121
self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
109
122
110
123
self._wt = wt
111
124
# TODO: Do something with this value, it is used by Olive
114
127
self._enable_per_file_commits = True
115
128
self._commit_all_changes = True
116
129
self.committed_revision_id = None # Nothing has been committed yet
117
self._last_selected_file = None
118
self._saved_commit_messages_manager = SavedCommitMessagesManager(
119
self._wt, self._wt.branch)
130
self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
120
131
121
132
self.setup_params()
122
133
self.construct()
126
137
"""Setup the member variables for state."""
127
138
self._basis_tree = self._wt.basis_tree()
128
139
self._delta = None
129
self._wt.lock_read()
130
try:
131
self._pending = pending_revisions(self._wt)
132
finally:
133
self._wt.unlock()
140
self._pending = pending_revisions(self._wt)
134
141
135
142
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
136
143
188
195
189
196
all_enabled = (self._selected is None)
190
197
# The first entry is always the 'whole tree'
191
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
198
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
192
199
initial_cursor = store.get_path(all_iter)
193
200
# should we pass specific_files?
194
201
self._wt.lock_read()
225
232
# This sets the cursor, which causes the expander to close, which
226
233
# causes the _file_message_text_view to never get realized. So we have
227
234
# to give it a little kick, or it warns when we try to grab the focus
228
self._treeview_files.set_cursor(initial_cursor, None, False)
235
self._treeview_files.set_cursor(initial_cursor)
229
236
230
237
def _realize_file_message_tree_view(*args):
231
238
self._file_message_text_view.realize()
279
286
"""Build up the dialog widgets."""
280
287
# The primary pane which splits it into left and right (adjustable)
281
288
# sections.
282
self._hpane = Gtk.HPaned()
289
self._hpane = gtk.HPaned()
283
290
284
291
self._construct_left_pane()
285
292
self._construct_right_pane()
286
293
self._construct_action_pane()
287
294
288
self.get_content_area().pack_start(self._hpane, True, True, 0)
295
self.vbox.pack_start(self._hpane)
289
296
self._hpane.show()
290
297
self.set_focus(self._global_message_text_view)
291
298
310
317
self._hpane.set_position(300)
311
318
312
319
def _construct_accelerators(self):
313
group = Gtk.AccelGroup()
314
group.connect(Gdk.keyval_from_name('N'),
315
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
320
group = gtk.AccelGroup()
321
group.connect_group(gtk.gdk.keyval_from_name('N'),
322
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
316
323
self.add_accel_group(group)
317
324
318
325
# ignore the escape key (avoid closing the window)
319
326
self.connect_object('close', self.emit_stop_by_name, 'close')
320
327
321
328
def _construct_left_pane(self):
322
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
329
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
323
330
self._construct_file_list()
324
331
self._construct_pending_list()
325
332
326
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
333
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
327
334
use_underline=True)
328
self._left_pane_box.pack_end(self._check_local, False, False, 0)
335
self._left_pane_box.pack_end(self._check_local, False, False)
329
336
self._check_local.set_active(False)
330
337
331
338
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
338
345
# commit, and 1 for file commit, and it looked good. But I don't seem
339
346
# to have a way to do that with the gtk boxes... :( (Which is extra
340
347
# weird since wx uses gtk on Linux...)
341
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
348
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
342
349
self._right_pane_table.set_row_spacings(5)
343
350
self._right_pane_table.set_col_spacings(5)
344
351
self._right_pane_table_row = 0
350
357
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
351
358
352
359
def _construct_action_pane(self):
353
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
360
self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
354
361
self._button_cancel.connect('clicked', self._on_cancel_clicked)
355
362
self._button_cancel.show()
356
self.get_action_area().pack_end(
357
self._button_cancel, True, True, 0)
358
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
363
self.action_area.pack_end(self._button_cancel)
364
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
359
365
self._button_commit.connect('clicked', self._on_commit_clicked)
360
self._button_commit.set_can_default(True)
366
self._button_commit.set_flags(gtk.CAN_DEFAULT)
361
367
self._button_commit.show()
362
self.get_action_area().pack_end(
363
self._button_commit, True, True, 0)
368
self.action_area.pack_end(self._button_commit)
364
369
self._button_commit.grab_default()
365
370
366
371
def _add_to_right_table(self, widget, weight, expanding=False):
372
377
"""
373
378
end_row = self._right_pane_table_row + weight
374
379
options = 0
375
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
380
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
376
381
if expanding:
377
382
options = expand_opts
378
383
self._right_pane_table.attach(widget, 0, 1,
381
386
self._right_pane_table_row = end_row
382
387
383
388
def _construct_file_list(self):
384
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
385
file_label = Gtk.Label(label=_i18n('Files'))
389
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
390
file_label = gtk.Label(_i18n('Files'))
386
391
# file_label.show()
387
self._files_box.pack_start(file_label, False, True, 0)
392
self._files_box.pack_start(file_label, expand=False)
388
393
389
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
394
self._commit_all_files_radio = gtk.RadioButton(
390
395
None, _i18n("Commit all changes"))
391
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
396
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
392
397
self._commit_all_files_radio.show()
393
398
self._commit_all_files_radio.connect('toggled',
394
399
self._toggle_commit_selection)
395
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
400
self._commit_selected_radio = gtk.RadioButton(
396
401
self._commit_all_files_radio, _i18n("Only commit selected changes"))
397
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
402
self._files_box.pack_start(self._commit_selected_radio, expand=False)
398
403
self._commit_selected_radio.show()
399
404
self._commit_selected_radio.connect('toggled',
400
405
self._toggle_commit_selection)
403
408
self._commit_all_files_radio.set_sensitive(False)
404
409
self._commit_selected_radio.set_sensitive(False)
405
410
406
scroller = Gtk.ScrolledWindow()
407
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
408
self._treeview_files = Gtk.TreeView()
411
scroller = gtk.ScrolledWindow()
412
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
413
self._treeview_files = gtk.TreeView()
409
414
self._treeview_files.show()
410
415
scroller.add(self._treeview_files)
411
scroller.set_shadow_type(Gtk.ShadowType.IN)
416
scroller.set_shadow_type(gtk.SHADOW_IN)
412
417
scroller.show()
413
self._files_box.pack_start(scroller, True, True, 0)
418
self._files_box.pack_start(scroller,
419
expand=True, fill=True)
414
420
self._files_box.show()
415
self._left_pane_box.pack_start(self._files_box, True, True, 0)
421
self._left_pane_box.pack_start(self._files_box)
416
422
417
423
# Keep note that all strings stored in a ListStore must be UTF-8
418
424
# strings. GTK does not support directly setting and restoring Unicode
419
425
# objects.
420
liststore = Gtk.ListStore(
421
GObject.TYPE_STRING, # [0] file_id
422
GObject.TYPE_STRING, # [1] real path
423
GObject.TYPE_BOOLEAN, # [2] checkbox
424
GObject.TYPE_STRING, # [3] display path
425
GObject.TYPE_STRING, # [4] changes type
426
GObject.TYPE_STRING, # [5] commit message
426
liststore = gtk.ListStore(
427
gobject.TYPE_STRING, # [0] file_id
428
gobject.TYPE_STRING, # [1] real path
429
gobject.TYPE_BOOLEAN, # [2] checkbox
430
gobject.TYPE_STRING, # [3] display path
431
gobject.TYPE_STRING, # [4] changes type
432
gobject.TYPE_STRING, # [5] commit message
427
433
)
428
434
self._files_store = liststore
429
435
self._treeview_files.set_model(liststore)
430
crt = Gtk.CellRendererToggle()
436
crt = gtk.CellRendererToggle()
431
437
crt.set_property('activatable', not bool(self._pending))
432
438
crt.connect("toggled", self._toggle_commit, self._files_store)
433
439
if self._pending:
434
440
name = _i18n('Commit*')
435
441
else:
436
442
name = _i18n('Commit')
437
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
443
commit_col = gtk.TreeViewColumn(name, crt, active=2)
438
444
commit_col.set_visible(False)
439
445
self._treeview_files.append_column(commit_col)
440
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
441
Gtk.CellRendererText(), text=3))
442
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
443
Gtk.CellRendererText(), text=4))
446
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
447
gtk.CellRendererText(), text=3))
448
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
449
gtk.CellRendererText(), text=4))
444
450
self._treeview_files.connect('cursor-changed',
445
451
self._on_treeview_files_cursor_changed)
446
452
447
453
def _toggle_commit(self, cell, path, model):
448
if model[path][0] == "": # No file_id means 'All Files'
454
if model[path][0] is None: # No file_id means 'All Files'
449
455
new_val = not model[path][2]
450
456
for node in model:
451
457
node[2] = new_val
461
467
checked_col.set_visible(False)
462
468
else:
463
469
checked_col.set_visible(True)
464
renderer = checked_col.get_cells()[0]
470
renderer = checked_col.get_cell_renderers()[0]
465
471
renderer.set_property('activatable', not all_files)
466
472
467
473
def _construct_pending_list(self):
468
474
# Pending information defaults to hidden, we put it all in 1 box, so
469
475
# that we can show/hide all of them at once
470
self._pending_box = Gtk.VBox()
476
self._pending_box = gtk.VBox()
471
477
self._pending_box.hide()
472
478
473
pending_message = Gtk.Label()
479
pending_message = gtk.Label()
474
480
pending_message.set_markup(
475
481
_i18n('<i>* Cannot select specific files when merging</i>'))
476
self._pending_box.pack_start(pending_message, False, True, 5)
482
self._pending_box.pack_start(pending_message, expand=False, padding=5)
477
483
pending_message.show()
478
484
479
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
480
self._pending_box.pack_start(pending_label, False, True, 0)
485
pending_label = gtk.Label(_i18n('Pending Revisions'))
486
self._pending_box.pack_start(pending_label, expand=False, padding=0)
481
487
pending_label.show()
482
488
483
scroller = Gtk.ScrolledWindow()
484
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
485
self._treeview_pending = Gtk.TreeView()
489
scroller = gtk.ScrolledWindow()
490
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
491
self._treeview_pending = gtk.TreeView()
486
492
scroller.add(self._treeview_pending)
487
scroller.set_shadow_type(Gtk.ShadowType.IN)
493
scroller.set_shadow_type(gtk.SHADOW_IN)
488
494
scroller.show()
489
self._pending_box.pack_start(scroller, True, True, 5)
495
self._pending_box.pack_start(scroller,
496
expand=True, fill=True, padding=5)
490
497
self._treeview_pending.show()
491
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
498
self._left_pane_box.pack_start(self._pending_box)
492
499
493
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
494
GObject.TYPE_STRING, # date
495
GObject.TYPE_STRING, # committer
496
GObject.TYPE_STRING, # summary
500
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
501
gobject.TYPE_STRING, # date
502
gobject.TYPE_STRING, # committer
503
gobject.TYPE_STRING, # summary
497
504
)
498
505
self._pending_store = liststore
499
506
self._treeview_pending.set_model(liststore)
500
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
501
Gtk.CellRendererText(), text=1))
502
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
503
Gtk.CellRendererText(), text=2))
504
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
505
Gtk.CellRendererText(), text=3))
507
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
508
gtk.CellRendererText(), text=1))
509
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
510
gtk.CellRendererText(), text=2))
511
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
512
gtk.CellRendererText(), text=3))
506
513
507
514
def _construct_diff_view(self):
508
from bzrlib.plugins.gtk.diff import DiffView
515
from diff import DiffView
509
516
510
517
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
511
518
# decide that we really don't ever want to display it, we should
512
519
# actually remove it, and other references to it, along with the
513
520
# tests that it is set properly.
514
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
521
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
515
522
self._diff_label.set_alignment(0, 0)
516
523
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
517
524
self._add_to_right_table(self._diff_label, 1, False)
522
529
self._diff_view.show()
523
530
524
531
def _construct_file_message(self):
525
scroller = Gtk.ScrolledWindow()
526
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
532
scroller = gtk.ScrolledWindow()
533
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
527
534
528
self._file_message_text_view = Gtk.TextView()
535
self._file_message_text_view = gtk.TextView()
529
536
scroller.add(self._file_message_text_view)
530
scroller.set_shadow_type(Gtk.ShadowType.IN)
537
scroller.set_shadow_type(gtk.SHADOW_IN)
531
538
scroller.show()
532
539
533
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
534
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
540
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
541
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
535
542
self._file_message_text_view.set_accepts_tab(False)
536
543
self._file_message_text_view.show()
537
544
538
self._file_message_expander = Gtk.Expander(
539
label=_i18n('File commit message'))
545
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
540
546
self._file_message_expander.set_expanded(True)
541
547
self._file_message_expander.add(scroller)
542
548
self._add_to_right_table(self._file_message_expander, 1, False)
543
549
self._file_message_expander.show()
544
550
545
551
def _construct_global_message(self):
546
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
552
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
547
553
self._global_message_label.set_markup(
548
554
_i18n('<b>Global Commit Message</b>'))
549
555
self._global_message_label.set_alignment(0, 0)
552
558
# Can we remove the spacing between the label and the box?
553
559
self._global_message_label.show()
554
560
555
scroller = Gtk.ScrolledWindow()
556
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
561
scroller = gtk.ScrolledWindow()
562
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
557
563
558
self._global_message_text_view = Gtk.TextView()
564
self._global_message_text_view = gtk.TextView()
559
565
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
560
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
566
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
561
567
scroller.add(self._global_message_text_view)
562
scroller.set_shadow_type(Gtk.ShadowType.IN)
568
scroller.set_shadow_type(gtk.SHADOW_IN)
563
569
scroller.show()
564
570
self._add_to_right_table(scroller, 2, True)
565
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
571
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
566
572
self._file_message_text_view.set_accepts_tab(False)
567
573
self._global_message_text_view.show()
568
574
569
575
def _on_treeview_files_cursor_changed(self, treeview):
570
576
treeselection = treeview.get_selection()
571
if treeselection is None:
572
# The treeview was probably destroyed as the dialog closes.
573
return
574
577
(model, selection) = treeselection.get_selected()
575
578
576
579
if selection is not None:
577
580
path, display_path = model.get(selection, 1, 3)
578
581
self._diff_label.set_text(_i18n('Diff for ') + display_path)
579
if path == "":
582
if path is None:
580
583
self._diff_view.show_diff(None)
581
584
else:
582
self._diff_view.show_diff([osutils.safe_unicode(path)])
585
self._diff_view.show_diff([path.decode('UTF-8')])
583
586
self._update_per_file_info(selection)
584
587
585
588
def _on_accel_next(self, accel_group, window, keyval, modifier):
596
599
# We have either made it to the end of the list, or nothing was
597
600
# selected. Either way, select All Files, and jump to the global
598
601
# commit message.
599
self._treeview_files.set_cursor(
600
Gtk.TreePath(path=0), "", False)
602
self._treeview_files.set_cursor((0,))
601
603
self._global_message_text_view.grab_focus()
602
604
else:
603
605
# Set the cursor to this entry, and jump to the per-file commit
604
606
# message
605
self._treeview_files.set_cursor(model.get_path(next), None, False)
607
self._treeview_files.set_cursor(model.get_path(next))
606
608
self._file_message_text_view.grab_focus()
607
609
608
610
def _save_current_file_message(self):
610
612
return # Nothing to save
611
613
text_buffer = self._file_message_text_view.get_buffer()
612
614
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
613
text_buffer.get_end_iter(), True)
615
text_buffer.get_end_iter())
614
616
last_selected = self._files_store.get_iter(self._last_selected_file)
615
617
self._files_store.set_value(last_selected, 5, cur_text)
616
618
622
624
self._save_current_file_message()
623
625
text_buffer = self._file_message_text_view.get_buffer()
624
626
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
625
if file_id == "": # Whole tree
627
if file_id is None: # Whole tree
626
628
self._file_message_expander.set_label(_i18n('File commit message'))
627
629
self._file_message_expander.set_expanded(False)
628
630
self._file_message_expander.set_sensitive(False)
645
647
files = []
646
648
records = iter(self._files_store)
647
649
rec = records.next() # Skip the All Files record
648
assert rec[0] == "", "Are we skipping the wrong record?"
650
assert rec[0] is None, "Are we skipping the wrong record?"
649
651
650
652
file_info = []
651
653
for record in records:
652
654
if self._commit_all_changes or record[2]:# [2] checkbox
653
file_id = osutils.safe_utf8(record[0]) # [0] file_id
654
path = osutils.safe_utf8(record[1]) # [1] real path
655
file_id = record[0] # [0] file_id
656
path = record[1] # [1] real path
655
657
# [5] commit message
656
658
file_message = _sanitize_and_decode_message(record[5])
657
659
files.append(path.decode('UTF-8'))
687
689
_i18n('Commit cancelled'),
688
690
_i18n('Do you want to save your commit messages ?'),
689
691
parent=self)
690
if response == Gtk.ResponseType.NO:
692
if response == gtk.RESPONSE_NO:
691
693
# save nothing and destroy old comments if any
692
694
mgr = SavedCommitMessagesManager()
693
695
mgr.save(self._wt, self._wt.branch)
694
self.response(Gtk.ResponseType.CANCEL) # close window
696
self.response(gtk.RESPONSE_CANCEL) # close window
695
697
696
698
@show_bzr_error
697
699
def _on_commit_clicked(self, button):
706
708
_i18n('Commit with an empty message?'),
707
709
_i18n('You can describe your commit intent in the message.'),
708
710
parent=self)
709
if response == Gtk.ResponseType.NO:
711
if response == gtk.RESPONSE_NO:
710
712
# Kindly give focus to message area
711
713
self._global_message_text_view.grab_focus()
712
714
return
728
730
_i18n("Unknown files exist in the working tree. Commit anyway?"),
729
731
parent=self)
730
732
# Doesn't set a parent for the dialog..
731
if response == Gtk.ResponseType.NO:
733
if response == gtk.RESPONSE_NO:
732
734
return
733
735
break
734
736
749
751
_i18n('There are no changes in the working tree.'
750
752
' Do you want to commit anyway?'),
751
753
parent=self)
752
if response == Gtk.ResponseType.YES:
754
if response == gtk.RESPONSE_YES:
753
755
rev_id = self._wt.commit(message,
754
756
allow_pointless=True,
755
757
strict=False,
759
761
self.committed_revision_id = rev_id
760
762
# destroy old comments if any
761
763
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
762
self.response(Gtk.ResponseType.OK)
764
self.response(gtk.RESPONSE_OK)
763
765
764
766
def _get_global_commit_message(self):
765
767
buf = self._global_message_text_view.get_buffer()
766
768
start, end = buf.get_bounds()
767
text = buf.get_text(start, end, True)
769
text = buf.get_text(start, end)
768
770
return _sanitize_and_decode_message(text)
769
771
770
772
def _set_global_commit_message(self, message):
793
795
rev_dict['revision_id'] = rev.revision_id
794
796
return rev_dict
795
797
798
799
class SavedCommitMessagesManager:
800
"""Save glogal and per-file commit messages.
801
802
Saves global commit message and utf-8 file_id->message dictionary
803
of per-file commit messages on disk. Re-reads them later for re-using.
804
"""
805
806
def __init__(self, tree=None, branch=None):
807
"""If branch is None, builds empty messages, otherwise reads them
808
from branch's disk storage. 'tree' argument is for the future."""
809
if branch is None:
810
self.global_message = u''
811
self.file_messages = {}
812
else:
813
config = branch.get_config()
814
self.global_message = config.get_user_option(
815
'gtk_global_commit_message')
816
if self.global_message is None:
817
self.global_message = u''
818
file_messages = config.get_user_option('gtk_file_commit_messages')
819
if file_messages: # unicode and B-encoded:
820
self.file_messages = bencode.bdecode(
821
file_messages.encode('UTF-8'))
822
else:
823
self.file_messages = {}
824
825
def get(self):
826
return self.global_message, self.file_messages
827
828
def is_not_empty(self):
829
return bool(self.global_message or self.file_messages)
830
831
def insert(self, global_message, file_info):
832
"""Formats per-file commit messages (list of dictionaries, one per file)
833
into one utf-8 file_id->message dictionary and merges this with
834
previously existing dictionary. Merges global commit message too."""
835
file_messages = {}
836
for fi in file_info:
837
file_message = fi['message']
838
if file_message:
839
file_messages[fi['file_id']] = file_message # utf-8 strings
840
for k,v in file_messages.iteritems():
841
try:
842
self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
843
except KeyError:
844
self.file_messages[k] = v
845
if self.global_message:
846
self.global_message = global_message + '\n******\n' \
847
+ self.global_message
848
else:
849
self.global_message = global_message
850
851
def save(self, tree, branch):
852
# We store in branch's config, which can be a problem if two gcommit
853
# are done in two checkouts of one single branch (comments overwrite
854
# each other). Ideally should be in working tree. But uncommit does
855
# not always have a working tree, though it always has a branch.
856
# 'tree' argument is for the future
857
config = branch.get_config()
858
# should it be named "gtk_" or some more neutral name ("gui_" ?) to
859
# be compatible with qbzr in the future?
860
config.set_user_option('gtk_global_commit_message', self.global_message)
861
# bencode() does not know unicode objects but set_user_option()
862
# requires one:
863
config.set_user_option(
864
'gtk_file_commit_messages',
865
bencode.bencode(self.file_messages).decode('UTF-8'))
866
867
868
def save_commit_messages(local, master, old_revno, old_revid,
869
new_revno, new_revid):
870
b = local
871
if b is None:
872
b = master
873
mgr = SavedCommitMessagesManager(None, b)
874
revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
875
cur_revno = old_revno
876
new_revision_id = old_revid
877
graph = b.repository.get_graph()
878
for rev_id in revid_iterator:
879
if cur_revno == new_revno:
880
break
881
cur_revno -= 1
882
rev = b.repository.get_revision(rev_id)
883
file_info = rev.properties.get('file-info', None)
884
if file_info is None:
885
file_info = {}
886
else:
887
file_info = bencode.bdecode(file_info.encode('UTF-8'))
888
global_message = osutils.safe_unicode(rev.message)
889
# Concatenate comment of the uncommitted revision
890
mgr.insert(global_message, file_info)
891
892
parents = graph.get_parent_map([rev_id]).get(rev_id, None)
893
if not parents:
894
continue
895
mgr.save(None, b)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0