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 778
- compare with another revision
- download diff
- download tarball
- view history from revision 778
- Committer: Jelmer Vernooij
- Date: 2012-02-19 15:00:34 UTC
- Revision ID: jelmer@samba.org-20120219150034-2yt7lhd0o6zam8q5
Cope with AppIndicator3 being missing during test run.
- files added:
- avatarproviders.py
- files removed:
- cmenu.ui
- olive
- files renamed:
- bazaar-properties.desktop => bazaar-properties.desktop.in
- bzr-handle-patch.desktop => bzr-handle-patch.desktop.in
- bzr-notify.desktop => bzr-notify.desktop.in
- files modified:
- AUTHORS
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
import os.path
18
17
import re
19
18
20
try:
21
import pygtk
22
pygtk.require("2.0")
23
except:
24
pass
25
26
import gtk
27
import gobject
28
import pango
19
from gi.repository import Gdk
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
29
23
30
24
from bzrlib import (
31
branch,
25
bencode,
32
26
errors,
33
27
osutils,
28
revision as _mod_revision,
34
29
trace,
30
tsort,
35
31
)
36
try:
37
from bzrlib import bencode
38
except ImportError:
39
from bzrlib.util import bencode
40
41
from bzrlib.plugins.gtk import _i18n
42
32
from bzrlib.plugins.gtk.dialog import question_dialog
43
33
from bzrlib.plugins.gtk.errors import show_bzr_error
34
from bzrlib.plugins.gtk.i18n import _i18n
35
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
44
36
45
37
try:
46
38
import dbus
50
42
have_dbus = False
51
43
52
44
45
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
46
"""Get an iterator which will return the revisions in merge sorted order.
47
48
This will build up a list of all nodes, such that only nodes in the list
49
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
50
order.
51
52
:param revision_ids: A set of revision_ids
53
:param parent_map: The parent information for each node. Revisions which
54
are considered ghosts should not be present in the map.
55
:return: iterator from MergeSorter.iter_topo_order()
56
"""
57
# MergeSorter requires that all nodes be present in the graph, so get rid
58
# of any references pointing outside of this graph.
59
parent_graph = {}
60
for revision_id in revision_ids:
61
if revision_id not in parent_map: # ghost
62
parent_graph[revision_id] = []
63
else:
64
# Only include parents which are in this sub-graph
65
parent_graph[revision_id] = [p for p in parent_map[revision_id]
66
if p in revision_ids]
67
sorter = tsort.MergeSorter(parent_graph, tip_revision)
68
return sorter.iter_topo_order()
69
70
53
71
def pending_revisions(wt):
54
72
"""Return a list of pending merges or None if there are none of them.
55
73
60
78
"""
61
79
parents = wt.get_parent_ids()
62
80
if len(parents) < 2:
63
return None
81
return
64
82
65
83
# The basic pending merge algorithm uses the same algorithm as
66
84
# bzrlib.status.show_pending_merges
68
86
branch = wt.branch
69
87
last_revision = parents[0]
70
88
71
if last_revision is not None:
72
try:
73
ignore = set(branch.repository.get_ancestry(last_revision,
74
topo_sorted=False))
75
except errors.NoSuchRevision:
76
# the last revision is a ghost : assume everything is new
77
# except for it
78
ignore = set([None, last_revision])
79
else:
80
ignore = set([None])
89
graph = branch.repository.get_graph()
90
other_revisions = [last_revision]
81
91
82
92
pm = []
83
93
for merge in pending:
84
ignore.add(merge)
85
try:
86
rev = branch.repository.get_revision(merge)
87
children = []
88
pm.append((rev, children))
89
90
# This does need to be topo sorted, so we search backwards
91
inner_merges = branch.repository.get_ancestry(merge)
92
assert inner_merges[0] is None
93
inner_merges.pop(0)
94
for mmerge in reversed(inner_merges):
95
if mmerge in ignore:
96
continue
97
rev = branch.repository.get_revision(mmerge)
98
children.append(rev)
99
100
ignore.add(mmerge)
101
except errors.NoSuchRevision:
102
print "DEBUG: NoSuchRevision:", merge
103
104
return pm
94
try:
95
merge_rev = branch.repository.get_revision(merge)
96
except errors.NoSuchRevision:
97
# If we are missing a revision, just print out the revision id
98
trace.mutter("ghost: %r", merge)
99
other_revisions.append(merge)
100
continue
101
102
# Find all of the revisions in the merge source, which are not in the
103
# last committed revision.
104
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
105
other_revisions.append(merge)
106
merge_extra.discard(_mod_revision.NULL_REVISION)
107
108
# Get a handle to all of the revisions we will need
109
try:
110
revisions = dict((rev.revision_id, rev) for rev in
111
branch.repository.get_revisions(merge_extra))
112
except errors.NoSuchRevision:
113
# One of the sub nodes is a ghost, check each one
114
revisions = {}
115
for revision_id in merge_extra:
116
try:
117
rev = branch.repository.get_revisions([revision_id])[0]
118
except errors.NoSuchRevision:
119
revisions[revision_id] = None
120
else:
121
revisions[revision_id] = rev
122
123
# Display the revisions brought in by this merge.
124
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
125
branch.repository.get_parent_map(merge_extra))
126
# Skip the first node
127
num, first, depth, eom = rev_id_iterator.next()
128
if first != merge:
129
raise AssertionError('Somehow we misunderstood how'
130
' iter_topo_order works %s != %s' % (first, merge))
131
children = []
132
for num, sub_merge, depth, eom in rev_id_iterator:
133
rev = revisions[sub_merge]
134
if rev is None:
135
trace.warning("ghost: %r", sub_merge)
136
continue
137
children.append(rev)
138
yield (merge_rev, children)
105
139
106
140
107
141
_newline_variants_re = re.compile(r'\r\n?')
108
142
def _sanitize_and_decode_message(utf8_message):
109
143
"""Turn a utf-8 message into a sanitized Unicode message."""
110
144
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
111
return fixed_newline.decode('utf-8')
112
113
114
class CommitDialog(gtk.Dialog):
145
return osutils.safe_unicode(fixed_newline)
146
147
148
class CommitDialog(Gtk.Dialog):
115
149
"""Implementation of Commit."""
116
150
117
151
def __init__(self, wt, selected=None, parent=None):
118
gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
119
parent=parent, flags=0,)
152
super(CommitDialog, self).__init__(
153
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
120
154
self.connect('delete-event', self._on_delete_window)
121
155
self._question_dialog = question_dialog
122
156
123
self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
157
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
124
158
125
159
self._wt = wt
126
160
# TODO: Do something with this value, it is used by Olive
129
163
self._enable_per_file_commits = True
130
164
self._commit_all_changes = True
131
165
self.committed_revision_id = None # Nothing has been committed yet
132
self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
166
self._last_selected_file = None
167
self._saved_commit_messages_manager = SavedCommitMessagesManager(
168
self._wt, self._wt.branch)
133
169
134
170
self.setup_params()
135
171
self.construct()
139
175
"""Setup the member variables for state."""
140
176
self._basis_tree = self._wt.basis_tree()
141
177
self._delta = None
142
self._pending = pending_revisions(self._wt)
178
self._wt.lock_read()
179
try:
180
self._pending = list(pending_revisions(self._wt))
181
finally:
182
self._wt.unlock()
143
183
144
184
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
145
185
197
237
198
238
all_enabled = (self._selected is None)
199
239
# The first entry is always the 'whole tree'
200
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
240
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
201
241
initial_cursor = store.get_path(all_iter)
202
242
# should we pass specific_files?
203
243
self._wt.lock_read()
234
274
# This sets the cursor, which causes the expander to close, which
235
275
# causes the _file_message_text_view to never get realized. So we have
236
276
# to give it a little kick, or it warns when we try to grab the focus
237
self._treeview_files.set_cursor(initial_cursor)
277
self._treeview_files.set_cursor(initial_cursor, None, False)
238
278
239
279
def _realize_file_message_tree_view(*args):
240
280
self._file_message_text_view.realize()
256
296
trace.mutter("networkmanager not available.")
257
297
self._check_local.show()
258
298
return
259
299
260
300
dbus_iface = dbus.Interface(proxy_obj,
261
301
'org.freedesktop.NetworkManager')
262
302
try:
288
328
"""Build up the dialog widgets."""
289
329
# The primary pane which splits it into left and right (adjustable)
290
330
# sections.
291
self._hpane = gtk.HPaned()
331
self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
292
332
293
333
self._construct_left_pane()
294
334
self._construct_right_pane()
295
335
self._construct_action_pane()
296
336
297
self.vbox.pack_start(self._hpane)
337
self.get_content_area().pack_start(self._hpane, True, True, 0)
298
338
self._hpane.show()
299
339
self.set_focus(self._global_message_text_view)
300
340
319
359
self._hpane.set_position(300)
320
360
321
361
def _construct_accelerators(self):
322
group = gtk.AccelGroup()
323
group.connect_group(gtk.gdk.keyval_from_name('N'),
324
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
362
group = Gtk.AccelGroup()
363
group.connect(Gdk.keyval_from_name('N'),
364
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
325
365
self.add_accel_group(group)
326
366
327
367
# ignore the escape key (avoid closing the window)
328
368
self.connect_object('close', self.emit_stop_by_name, 'close')
329
369
330
370
def _construct_left_pane(self):
331
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
371
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
332
372
self._construct_file_list()
333
373
self._construct_pending_list()
334
374
335
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
375
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
336
376
use_underline=True)
337
self._left_pane_box.pack_end(self._check_local, False, False)
377
self._left_pane_box.pack_end(self._check_local, False, False, 0)
338
378
self._check_local.set_active(False)
339
379
340
380
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
347
387
# commit, and 1 for file commit, and it looked good. But I don't seem
348
388
# to have a way to do that with the gtk boxes... :( (Which is extra
349
389
# weird since wx uses gtk on Linux...)
350
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
390
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
351
391
self._right_pane_table.set_row_spacings(5)
352
392
self._right_pane_table.set_col_spacings(5)
353
393
self._right_pane_table_row = 0
359
399
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
360
400
361
401
def _construct_action_pane(self):
362
self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
402
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
363
403
self._button_cancel.connect('clicked', self._on_cancel_clicked)
364
404
self._button_cancel.show()
365
self.action_area.pack_end(self._button_cancel)
366
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
405
self.get_action_area().pack_end(
406
self._button_cancel, True, True, 0)
407
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
367
408
self._button_commit.connect('clicked', self._on_commit_clicked)
368
self._button_commit.set_flags(gtk.CAN_DEFAULT)
409
self._button_commit.set_can_default(True)
369
410
self._button_commit.show()
370
self.action_area.pack_end(self._button_commit)
411
self.get_action_area().pack_end(
412
self._button_commit, True, True, 0)
371
413
self._button_commit.grab_default()
372
414
373
415
def _add_to_right_table(self, widget, weight, expanding=False):
379
421
"""
380
422
end_row = self._right_pane_table_row + weight
381
423
options = 0
382
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
424
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
383
425
if expanding:
384
426
options = expand_opts
385
427
self._right_pane_table.attach(widget, 0, 1,
388
430
self._right_pane_table_row = end_row
389
431
390
432
def _construct_file_list(self):
391
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
392
file_label = gtk.Label(_i18n('Files'))
433
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
434
file_label = Gtk.Label(label=_i18n('Files'))
393
435
# file_label.show()
394
self._files_box.pack_start(file_label, expand=False)
436
self._files_box.pack_start(file_label, False, True, 0)
395
437
396
self._commit_all_files_radio = gtk.RadioButton(
438
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
397
439
None, _i18n("Commit all changes"))
398
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
440
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
399
441
self._commit_all_files_radio.show()
400
442
self._commit_all_files_radio.connect('toggled',
401
443
self._toggle_commit_selection)
402
self._commit_selected_radio = gtk.RadioButton(
444
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
403
445
self._commit_all_files_radio, _i18n("Only commit selected changes"))
404
self._files_box.pack_start(self._commit_selected_radio, expand=False)
446
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
405
447
self._commit_selected_radio.show()
406
448
self._commit_selected_radio.connect('toggled',
407
449
self._toggle_commit_selection)
410
452
self._commit_all_files_radio.set_sensitive(False)
411
453
self._commit_selected_radio.set_sensitive(False)
412
454
413
scroller = gtk.ScrolledWindow()
414
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
415
self._treeview_files = gtk.TreeView()
455
scroller = Gtk.ScrolledWindow()
456
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
457
self._treeview_files = Gtk.TreeView()
416
458
self._treeview_files.show()
417
459
scroller.add(self._treeview_files)
418
scroller.set_shadow_type(gtk.SHADOW_IN)
460
scroller.set_shadow_type(Gtk.ShadowType.IN)
419
461
scroller.show()
420
self._files_box.pack_start(scroller,
421
expand=True, fill=True)
462
self._files_box.pack_start(scroller, True, True, 0)
422
463
self._files_box.show()
423
self._left_pane_box.pack_start(self._files_box)
464
self._left_pane_box.pack_start(self._files_box, True, True, 0)
424
465
425
466
# Keep note that all strings stored in a ListStore must be UTF-8
426
467
# strings. GTK does not support directly setting and restoring Unicode
427
468
# objects.
428
liststore = gtk.ListStore(
429
gobject.TYPE_STRING, # [0] file_id
430
gobject.TYPE_STRING, # [1] real path
431
gobject.TYPE_BOOLEAN, # [2] checkbox
432
gobject.TYPE_STRING, # [3] display path
433
gobject.TYPE_STRING, # [4] changes type
434
gobject.TYPE_STRING, # [5] commit message
469
liststore = Gtk.ListStore(
470
GObject.TYPE_STRING, # [0] file_id
471
GObject.TYPE_STRING, # [1] real path
472
GObject.TYPE_BOOLEAN, # [2] checkbox
473
GObject.TYPE_STRING, # [3] display path
474
GObject.TYPE_STRING, # [4] changes type
475
GObject.TYPE_STRING, # [5] commit message
435
476
)
436
477
self._files_store = liststore
437
478
self._treeview_files.set_model(liststore)
438
crt = gtk.CellRendererToggle()
479
crt = Gtk.CellRendererToggle()
439
480
crt.set_property('activatable', not bool(self._pending))
440
481
crt.connect("toggled", self._toggle_commit, self._files_store)
441
482
if self._pending:
442
483
name = _i18n('Commit*')
443
484
else:
444
485
name = _i18n('Commit')
445
commit_col = gtk.TreeViewColumn(name, crt, active=2)
486
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
446
487
commit_col.set_visible(False)
447
488
self._treeview_files.append_column(commit_col)
448
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
449
gtk.CellRendererText(), text=3))
450
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
451
gtk.CellRendererText(), text=4))
489
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
490
Gtk.CellRendererText(), text=3))
491
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
492
Gtk.CellRendererText(), text=4))
452
493
self._treeview_files.connect('cursor-changed',
453
494
self._on_treeview_files_cursor_changed)
454
495
455
496
def _toggle_commit(self, cell, path, model):
456
if model[path][0] is None: # No file_id means 'All Files'
497
if model[path][0] == "": # No file_id means 'All Files'
457
498
new_val = not model[path][2]
458
499
for node in model:
459
500
node[2] = new_val
469
510
checked_col.set_visible(False)
470
511
else:
471
512
checked_col.set_visible(True)
472
renderer = checked_col.get_cell_renderers()[0]
513
renderer = checked_col.get_cells()[0]
473
514
renderer.set_property('activatable', not all_files)
474
515
475
516
def _construct_pending_list(self):
476
517
# Pending information defaults to hidden, we put it all in 1 box, so
477
518
# that we can show/hide all of them at once
478
self._pending_box = gtk.VBox()
519
self._pending_box = Gtk.VBox()
479
520
self._pending_box.hide()
480
521
481
pending_message = gtk.Label()
522
pending_message = Gtk.Label()
482
523
pending_message.set_markup(
483
524
_i18n('<i>* Cannot select specific files when merging</i>'))
484
self._pending_box.pack_start(pending_message, expand=False, padding=5)
525
self._pending_box.pack_start(pending_message, False, True, 5)
485
526
pending_message.show()
486
527
487
pending_label = gtk.Label(_i18n('Pending Revisions'))
488
self._pending_box.pack_start(pending_label, expand=False, padding=0)
528
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
529
self._pending_box.pack_start(pending_label, False, True, 0)
489
530
pending_label.show()
490
531
491
scroller = gtk.ScrolledWindow()
492
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
493
self._treeview_pending = gtk.TreeView()
532
scroller = Gtk.ScrolledWindow()
533
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
534
self._treeview_pending = Gtk.TreeView()
494
535
scroller.add(self._treeview_pending)
495
scroller.set_shadow_type(gtk.SHADOW_IN)
536
scroller.set_shadow_type(Gtk.ShadowType.IN)
496
537
scroller.show()
497
self._pending_box.pack_start(scroller,
498
expand=True, fill=True, padding=5)
538
self._pending_box.pack_start(scroller, True, True, 5)
499
539
self._treeview_pending.show()
500
self._left_pane_box.pack_start(self._pending_box)
540
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
501
541
502
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
503
gobject.TYPE_STRING, # date
504
gobject.TYPE_STRING, # committer
505
gobject.TYPE_STRING, # summary
542
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
543
GObject.TYPE_STRING, # date
544
GObject.TYPE_STRING, # committer
545
GObject.TYPE_STRING, # summary
506
546
)
507
547
self._pending_store = liststore
508
548
self._treeview_pending.set_model(liststore)
509
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
510
gtk.CellRendererText(), text=1))
511
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
512
gtk.CellRendererText(), text=2))
513
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
514
gtk.CellRendererText(), text=3))
549
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
550
Gtk.CellRendererText(), text=1))
551
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
552
Gtk.CellRendererText(), text=2))
553
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
554
Gtk.CellRendererText(), text=3))
515
555
516
556
def _construct_diff_view(self):
517
from diff import DiffView
557
from bzrlib.plugins.gtk.diff import DiffView
518
558
519
559
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
520
560
# decide that we really don't ever want to display it, we should
521
561
# actually remove it, and other references to it, along with the
522
562
# tests that it is set properly.
523
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
563
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
524
564
self._diff_label.set_alignment(0, 0)
525
565
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
526
566
self._add_to_right_table(self._diff_label, 1, False)
531
571
self._diff_view.show()
532
572
533
573
def _construct_file_message(self):
534
scroller = gtk.ScrolledWindow()
535
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
574
scroller = Gtk.ScrolledWindow()
575
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
536
576
537
self._file_message_text_view = gtk.TextView()
577
self._file_message_text_view = Gtk.TextView()
538
578
scroller.add(self._file_message_text_view)
539
scroller.set_shadow_type(gtk.SHADOW_IN)
579
scroller.set_shadow_type(Gtk.ShadowType.IN)
540
580
scroller.show()
541
581
542
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
543
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
582
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
583
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
544
584
self._file_message_text_view.set_accepts_tab(False)
545
585
self._file_message_text_view.show()
546
586
547
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
587
self._file_message_expander = Gtk.Expander(
588
label=_i18n('File commit message'))
548
589
self._file_message_expander.set_expanded(True)
549
590
self._file_message_expander.add(scroller)
550
591
self._add_to_right_table(self._file_message_expander, 1, False)
551
592
self._file_message_expander.show()
552
593
553
594
def _construct_global_message(self):
554
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
595
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
555
596
self._global_message_label.set_markup(
556
597
_i18n('<b>Global Commit Message</b>'))
557
598
self._global_message_label.set_alignment(0, 0)
560
601
# Can we remove the spacing between the label and the box?
561
602
self._global_message_label.show()
562
603
563
scroller = gtk.ScrolledWindow()
564
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
604
scroller = Gtk.ScrolledWindow()
605
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
565
606
566
self._global_message_text_view = gtk.TextView()
607
self._global_message_text_view = Gtk.TextView()
567
608
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
568
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
609
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
569
610
scroller.add(self._global_message_text_view)
570
scroller.set_shadow_type(gtk.SHADOW_IN)
611
scroller.set_shadow_type(Gtk.ShadowType.IN)
571
612
scroller.show()
572
613
self._add_to_right_table(scroller, 2, True)
573
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
614
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
574
615
self._file_message_text_view.set_accepts_tab(False)
575
616
self._global_message_text_view.show()
576
617
577
618
def _on_treeview_files_cursor_changed(self, treeview):
578
619
treeselection = treeview.get_selection()
620
if treeselection is None:
621
# The treeview was probably destroyed as the dialog closes.
622
return
579
623
(model, selection) = treeselection.get_selected()
580
624
581
625
if selection is not None:
582
626
path, display_path = model.get(selection, 1, 3)
583
627
self._diff_label.set_text(_i18n('Diff for ') + display_path)
584
if path is None:
628
if path == "":
585
629
self._diff_view.show_diff(None)
586
630
else:
587
self._diff_view.show_diff([path.decode('UTF-8')])
631
self._diff_view.show_diff([osutils.safe_unicode(path)])
588
632
self._update_per_file_info(selection)
589
633
590
634
def _on_accel_next(self, accel_group, window, keyval, modifier):
601
645
# We have either made it to the end of the list, or nothing was
602
646
# selected. Either way, select All Files, and jump to the global
603
647
# commit message.
604
self._treeview_files.set_cursor((0,))
648
self._treeview_files.set_cursor(
649
Gtk.TreePath(path=0), "", False)
605
650
self._global_message_text_view.grab_focus()
606
651
else:
607
652
# Set the cursor to this entry, and jump to the per-file commit
608
653
# message
609
self._treeview_files.set_cursor(model.get_path(next))
654
self._treeview_files.set_cursor(model.get_path(next), None, False)
610
655
self._file_message_text_view.grab_focus()
611
656
612
657
def _save_current_file_message(self):
614
659
return # Nothing to save
615
660
text_buffer = self._file_message_text_view.get_buffer()
616
661
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
617
text_buffer.get_end_iter())
662
text_buffer.get_end_iter(), True)
618
663
last_selected = self._files_store.get_iter(self._last_selected_file)
619
664
self._files_store.set_value(last_selected, 5, cur_text)
620
665
626
671
self._save_current_file_message()
627
672
text_buffer = self._file_message_text_view.get_buffer()
628
673
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
629
if file_id is None: # Whole tree
674
if file_id == "": # Whole tree
630
675
self._file_message_expander.set_label(_i18n('File commit message'))
631
676
self._file_message_expander.set_expanded(False)
632
677
self._file_message_expander.set_sensitive(False)
649
694
files = []
650
695
records = iter(self._files_store)
651
696
rec = records.next() # Skip the All Files record
652
assert rec[0] is None, "Are we skipping the wrong record?"
697
assert rec[0] == "", "Are we skipping the wrong record?"
653
698
654
699
file_info = []
655
700
for record in records:
656
701
if self._commit_all_changes or record[2]:# [2] checkbox
657
file_id = record[0] # [0] file_id
658
path = record[1] # [1] real path
702
file_id = osutils.safe_utf8(record[0]) # [0] file_id
703
path = osutils.safe_utf8(record[1]) # [1] real path
659
704
# [5] commit message
660
705
file_message = _sanitize_and_decode_message(record[5])
661
706
files.append(path.decode('UTF-8'))
691
736
_i18n('Commit cancelled'),
692
737
_i18n('Do you want to save your commit messages ?'),
693
738
parent=self)
694
if response == gtk.RESPONSE_NO:
739
if response == Gtk.ResponseType.NO:
695
740
# save nothing and destroy old comments if any
696
741
mgr = SavedCommitMessagesManager()
697
742
mgr.save(self._wt, self._wt.branch)
698
self.response(gtk.RESPONSE_CANCEL) # close window
743
self.response(Gtk.ResponseType.CANCEL) # close window
699
744
700
745
@show_bzr_error
701
746
def _on_commit_clicked(self, button):
710
755
_i18n('Commit with an empty message?'),
711
756
_i18n('You can describe your commit intent in the message.'),
712
757
parent=self)
713
if response == gtk.RESPONSE_NO:
758
if response == Gtk.ResponseType.NO:
714
759
# Kindly give focus to message area
715
760
self._global_message_text_view.grab_focus()
716
761
return
732
777
_i18n("Unknown files exist in the working tree. Commit anyway?"),
733
778
parent=self)
734
779
# Doesn't set a parent for the dialog..
735
if response == gtk.RESPONSE_NO:
780
if response == Gtk.ResponseType.NO:
736
781
return
737
782
break
738
783
753
798
_i18n('There are no changes in the working tree.'
754
799
' Do you want to commit anyway?'),
755
800
parent=self)
756
if response == gtk.RESPONSE_YES:
801
if response == Gtk.ResponseType.YES:
757
802
rev_id = self._wt.commit(message,
758
803
allow_pointless=True,
759
804
strict=False,
763
808
self.committed_revision_id = rev_id
764
809
# destroy old comments if any
765
810
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
766
self.response(gtk.RESPONSE_OK)
811
self.response(Gtk.ResponseType.OK)
767
812
768
813
def _get_global_commit_message(self):
769
814
buf = self._global_message_text_view.get_buffer()
770
815
start, end = buf.get_bounds()
771
text = buf.get_text(start, end)
816
text = buf.get_text(start, end, True)
772
817
return _sanitize_and_decode_message(text)
773
818
774
819
def _set_global_commit_message(self, message):
797
842
rev_dict['revision_id'] = rev.revision_id
798
843
return rev_dict
799
844
800
801
class SavedCommitMessagesManager:
802
"""Save glogal and per-file commit messages.
803
804
Saves global commit message and utf-8 file_id->message dictionary
805
of per-file commit messages on disk. Re-reads them later for re-using.
806
"""
807
808
def __init__(self, tree=None, branch=None):
809
"""If branch is None, builds empty messages, otherwise reads them
810
from branch's disk storage. 'tree' argument is for the future."""
811
if branch is None:
812
self.global_message = u''
813
self.file_messages = {}
814
else:
815
config = branch.get_config()._get_branch_data_config()
816
self.global_message = config.get_user_option(
817
'gtk_global_commit_message')
818
if self.global_message is None:
819
self.global_message = u''
820
file_messages = config.get_user_option('gtk_file_commit_messages')
821
if file_messages: # unicode and B-encoded:
822
self.file_messages = bencode.bdecode(
823
file_messages.encode('UTF-8'))
824
else:
825
self.file_messages = {}
826
827
def get(self):
828
return self.global_message, self.file_messages
829
830
def is_not_empty(self):
831
return bool(self.global_message or self.file_messages)
832
833
def insert(self, global_message, file_info):
834
"""Formats per-file commit messages (list of dictionaries, one per file)
835
into one utf-8 file_id->message dictionary and merges this with
836
previously existing dictionary. Merges global commit message too."""
837
file_messages = {}
838
for fi in file_info:
839
file_message = fi['message']
840
if file_message:
841
file_messages[fi['file_id']] = file_message # utf-8 strings
842
for k,v in file_messages.iteritems():
843
try:
844
self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
845
except KeyError:
846
self.file_messages[k] = v
847
if self.global_message:
848
self.global_message = global_message + '\n******\n' \
849
+ self.global_message
850
else:
851
self.global_message = global_message
852
853
def save(self, tree, branch):
854
# We store in branch's config, which can be a problem if two gcommit
855
# are done in two checkouts of one single branch (comments overwrite
856
# each other). Ideally should be in working tree. But uncommit does
857
# not always have a working tree, though it always has a branch.
858
# 'tree' argument is for the future
859
config = branch.get_config()
860
# should it be named "gtk_" or some more neutral name ("gui_" ?) to
861
# be compatible with qbzr in the future?
862
config.set_user_option('gtk_global_commit_message', self.global_message)
863
# bencode() does not know unicode objects but set_user_option()
864
# requires one:
865
config.set_user_option(
866
'gtk_file_commit_messages',
867
bencode.bencode(self.file_messages).decode('UTF-8'))
868
869
870
def save_commit_messages(local, master, old_revno, old_revid,
871
new_revno, new_revid):
872
b = local
873
if b is None:
874
b = master
875
mgr = SavedCommitMessagesManager(None, b)
876
revid_iterator = b.repository.iter_reverse_revision_history(old_revid)
877
cur_revno = old_revno
878
new_revision_id = old_revid
879
graph = b.repository.get_graph()
880
for rev_id in revid_iterator:
881
if cur_revno == new_revno:
882
break
883
cur_revno -= 1
884
rev = b.repository.get_revision(rev_id)
885
file_info = rev.properties.get('file-info', None)
886
if file_info is None:
887
file_info = {}
888
else:
889
file_info = bencode.bdecode(file_info.encode('UTF-8'))
890
global_message = osutils.safe_unicode(rev.message)
891
# Concatenate comment of the uncommitted revision
892
mgr.insert(global_message, file_info)
893
894
parents = graph.get_parent_map([rev_id]).get(rev_id, None)
895
if not parents:
896
continue
897
mgr.save(None, b)
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0