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 666.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 666.2.1
- Committer: John Ferlito
- Date: 2009-10-06 13:57:12 UTC
- mto: This revision was merged to the branch mainline in revision 668.
- Revision ID: johnf@inodes.org-20091006135712-22vfb36os1toe5qb
Encoding key is now deprecated in the FreeDesktop standard
- files added:
- bzr-notify
- olive
- files removed:
- avatarproviders.py
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- bzr-handle-patch.desktop.in => bzr-handle-patch.desktop
- 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
17
18
import re
18
19
19
from gi.repository import Gdk
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
20
try:
21
import pygtk
22
pygtk.require("2.0")
23
except:
24
pass
25
26
import gtk
27
import gobject
28
import pango
23
29
24
30
from bzrlib import (
25
bencode,
31
branch,
26
32
errors,
27
33
osutils,
28
revision as _mod_revision,
29
34
trace,
30
tsort,
31
35
)
36
try:
37
from bzrlib import bencode
38
except ImportError:
39
from bzrlib.util import bencode
40
41
from bzrlib.plugins.gtk import _i18n
32
42
from bzrlib.plugins.gtk.dialog import question_dialog
33
from bzrlib.plugins.gtk.diff import DiffView
34
43
from bzrlib.plugins.gtk.errors import show_bzr_error
35
from bzrlib.plugins.gtk.i18n import _i18n
36
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
37
44
38
45
try:
39
46
import dbus
43
50
have_dbus = False
44
51
45
52
46
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
47
"""Get an iterator which will return the revisions in merge sorted order.
48
49
This will build up a list of all nodes, such that only nodes in the list
50
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
51
order.
52
53
:param revision_ids: A set of revision_ids
54
:param parent_map: The parent information for each node. Revisions which
55
are considered ghosts should not be present in the map.
56
:return: iterator from MergeSorter.iter_topo_order()
57
"""
58
# MergeSorter requires that all nodes be present in the graph, so get rid
59
# of any references pointing outside of this graph.
60
parent_graph = {}
61
for revision_id in revision_ids:
62
if revision_id not in parent_map: # ghost
63
parent_graph[revision_id] = []
64
else:
65
# Only include parents which are in this sub-graph
66
parent_graph[revision_id] = [p for p in parent_map[revision_id]
67
if p in revision_ids]
68
sorter = tsort.MergeSorter(parent_graph, tip_revision)
69
return sorter.iter_topo_order()
70
71
72
53
def pending_revisions(wt):
73
54
"""Return a list of pending merges or None if there are none of them.
74
55
79
60
"""
80
61
parents = wt.get_parent_ids()
81
62
if len(parents) < 2:
82
return
63
return None
83
64
84
65
# The basic pending merge algorithm uses the same algorithm as
85
66
# bzrlib.status.show_pending_merges
87
68
branch = wt.branch
88
69
last_revision = parents[0]
89
70
90
graph = branch.repository.get_graph()
91
other_revisions = [last_revision]
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])
92
81
93
82
pm = []
94
83
for merge in pending:
95
try:
96
merge_rev = branch.repository.get_revision(merge)
97
except errors.NoSuchRevision:
98
# If we are missing a revision, just print out the revision id
99
trace.mutter("ghost: %r", merge)
100
other_revisions.append(merge)
101
continue
102
103
# Find all of the revisions in the merge source, which are not in the
104
# last committed revision.
105
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
106
other_revisions.append(merge)
107
merge_extra.discard(_mod_revision.NULL_REVISION)
108
109
# Get a handle to all of the revisions we will need
110
try:
111
revisions = dict((rev.revision_id, rev) for rev in
112
branch.repository.get_revisions(merge_extra))
113
except errors.NoSuchRevision:
114
# One of the sub nodes is a ghost, check each one
115
revisions = {}
116
for revision_id in merge_extra:
117
try:
118
rev = branch.repository.get_revisions([revision_id])[0]
119
except errors.NoSuchRevision:
120
revisions[revision_id] = None
121
else:
122
revisions[revision_id] = rev
123
124
# Display the revisions brought in by this merge.
125
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
126
branch.repository.get_parent_map(merge_extra))
127
# Skip the first node
128
num, first, depth, eom = rev_id_iterator.next()
129
if first != merge:
130
raise AssertionError('Somehow we misunderstood how'
131
' iter_topo_order works %s != %s' % (first, merge))
132
children = []
133
for num, sub_merge, depth, eom in rev_id_iterator:
134
rev = revisions[sub_merge]
135
if rev is None:
136
trace.warning("ghost: %r", sub_merge)
137
continue
138
children.append(rev)
139
yield (merge_rev, children)
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
140
105
141
106
142
107
_newline_variants_re = re.compile(r'\r\n?')
143
108
def _sanitize_and_decode_message(utf8_message):
144
109
"""Turn a utf-8 message into a sanitized Unicode message."""
145
110
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
146
return osutils.safe_unicode(fixed_newline)
147
148
149
class CommitDialog(Gtk.Dialog):
111
return fixed_newline.decode('utf-8')
112
113
114
class CommitDialog(gtk.Dialog):
150
115
"""Implementation of Commit."""
151
116
152
117
def __init__(self, wt, selected=None, parent=None):
153
super(CommitDialog, self).__init__(
154
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
118
gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
119
parent=parent, flags=0,)
155
120
self.connect('delete-event', self._on_delete_window)
156
121
self._question_dialog = question_dialog
157
122
158
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
123
self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
159
124
160
125
self._wt = wt
161
126
# TODO: Do something with this value, it is used by Olive
164
129
self._enable_per_file_commits = True
165
130
self._commit_all_changes = True
166
131
self.committed_revision_id = None # Nothing has been committed yet
167
self._last_selected_file = None
168
self._saved_commit_messages_manager = SavedCommitMessagesManager(
169
self._wt, self._wt.branch)
132
self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
170
133
171
134
self.setup_params()
172
135
self.construct()
176
139
"""Setup the member variables for state."""
177
140
self._basis_tree = self._wt.basis_tree()
178
141
self._delta = None
179
self._wt.lock_read()
180
try:
181
self._pending = list(pending_revisions(self._wt))
182
finally:
183
self._wt.unlock()
142
self._pending = pending_revisions(self._wt)
184
143
185
144
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
186
145
238
197
239
198
all_enabled = (self._selected is None)
240
199
# The first entry is always the 'whole tree'
241
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
200
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
242
201
initial_cursor = store.get_path(all_iter)
243
202
# should we pass specific_files?
244
203
self._wt.lock_read()
275
234
# This sets the cursor, which causes the expander to close, which
276
235
# causes the _file_message_text_view to never get realized. So we have
277
236
# to give it a little kick, or it warns when we try to grab the focus
278
self._treeview_files.set_cursor(initial_cursor, None, False)
237
self._treeview_files.set_cursor(initial_cursor)
279
238
280
239
def _realize_file_message_tree_view(*args):
281
240
self._file_message_text_view.realize()
289
248
self._check_local.hide()
290
249
return
291
250
if have_dbus:
292
try:
293
bus = dbus.SystemBus()
294
except dbus.DBusException:
295
trace.mutter("DBus system bus not available")
296
self._check_local.show()
297
return
251
bus = dbus.SystemBus()
298
252
try:
299
253
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
300
254
'/org/freedesktop/NetworkManager')
302
256
trace.mutter("networkmanager not available.")
303
257
self._check_local.show()
304
258
return
305
259
306
260
dbus_iface = dbus.Interface(proxy_obj,
307
261
'org.freedesktop.NetworkManager')
308
262
try:
334
288
"""Build up the dialog widgets."""
335
289
# The primary pane which splits it into left and right (adjustable)
336
290
# sections.
337
self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
291
self._hpane = gtk.HPaned()
338
292
339
293
self._construct_left_pane()
340
294
self._construct_right_pane()
341
295
self._construct_action_pane()
342
296
343
self.get_content_area().pack_start(self._hpane, True, True, 0)
297
self.vbox.pack_start(self._hpane)
344
298
self._hpane.show()
345
299
self.set_focus(self._global_message_text_view)
346
300
365
319
self._hpane.set_position(300)
366
320
367
321
def _construct_accelerators(self):
368
group = Gtk.AccelGroup()
369
group.connect(Gdk.keyval_from_name('N'),
370
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
322
group = gtk.AccelGroup()
323
group.connect_group(gtk.gdk.keyval_from_name('N'),
324
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
371
325
self.add_accel_group(group)
372
326
373
327
# ignore the escape key (avoid closing the window)
374
328
self.connect_object('close', self.emit_stop_by_name, 'close')
375
329
376
330
def _construct_left_pane(self):
377
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
331
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
378
332
self._construct_file_list()
379
333
self._construct_pending_list()
380
334
381
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
335
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
382
336
use_underline=True)
383
self._left_pane_box.pack_end(self._check_local, False, False, 0)
337
self._left_pane_box.pack_end(self._check_local, False, False)
384
338
self._check_local.set_active(False)
385
339
386
340
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
393
347
# commit, and 1 for file commit, and it looked good. But I don't seem
394
348
# to have a way to do that with the gtk boxes... :( (Which is extra
395
349
# weird since wx uses gtk on Linux...)
396
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
350
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
397
351
self._right_pane_table.set_row_spacings(5)
398
352
self._right_pane_table.set_col_spacings(5)
399
353
self._right_pane_table_row = 0
405
359
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
406
360
407
361
def _construct_action_pane(self):
408
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
362
self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
409
363
self._button_cancel.connect('clicked', self._on_cancel_clicked)
410
364
self._button_cancel.show()
411
self.get_action_area().pack_end(
412
self._button_cancel, True, True, 0)
413
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
365
self.action_area.pack_end(self._button_cancel)
366
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
414
367
self._button_commit.connect('clicked', self._on_commit_clicked)
415
self._button_commit.set_can_default(True)
368
self._button_commit.set_flags(gtk.CAN_DEFAULT)
416
369
self._button_commit.show()
417
self.get_action_area().pack_end(
418
self._button_commit, True, True, 0)
370
self.action_area.pack_end(self._button_commit)
419
371
self._button_commit.grab_default()
420
372
421
373
def _add_to_right_table(self, widget, weight, expanding=False):
427
379
"""
428
380
end_row = self._right_pane_table_row + weight
429
381
options = 0
430
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
382
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
431
383
if expanding:
432
384
options = expand_opts
433
385
self._right_pane_table.attach(widget, 0, 1,
436
388
self._right_pane_table_row = end_row
437
389
438
390
def _construct_file_list(self):
439
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
440
file_label = Gtk.Label(label=_i18n('Files'))
391
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
392
file_label = gtk.Label(_i18n('Files'))
441
393
# file_label.show()
442
self._files_box.pack_start(file_label, False, True, 0)
394
self._files_box.pack_start(file_label, expand=False)
443
395
444
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
396
self._commit_all_files_radio = gtk.RadioButton(
445
397
None, _i18n("Commit all changes"))
446
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
398
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
447
399
self._commit_all_files_radio.show()
448
400
self._commit_all_files_radio.connect('toggled',
449
401
self._toggle_commit_selection)
450
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
402
self._commit_selected_radio = gtk.RadioButton(
451
403
self._commit_all_files_radio, _i18n("Only commit selected changes"))
452
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
404
self._files_box.pack_start(self._commit_selected_radio, expand=False)
453
405
self._commit_selected_radio.show()
454
406
self._commit_selected_radio.connect('toggled',
455
407
self._toggle_commit_selection)
458
410
self._commit_all_files_radio.set_sensitive(False)
459
411
self._commit_selected_radio.set_sensitive(False)
460
412
461
scroller = Gtk.ScrolledWindow()
462
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
463
self._treeview_files = Gtk.TreeView()
413
scroller = gtk.ScrolledWindow()
414
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
415
self._treeview_files = gtk.TreeView()
464
416
self._treeview_files.show()
465
417
scroller.add(self._treeview_files)
466
scroller.set_shadow_type(Gtk.ShadowType.IN)
418
scroller.set_shadow_type(gtk.SHADOW_IN)
467
419
scroller.show()
468
self._files_box.pack_start(scroller, True, True, 0)
420
self._files_box.pack_start(scroller,
421
expand=True, fill=True)
469
422
self._files_box.show()
470
self._left_pane_box.pack_start(self._files_box, True, True, 0)
423
self._left_pane_box.pack_start(self._files_box)
471
424
472
425
# Keep note that all strings stored in a ListStore must be UTF-8
473
426
# strings. GTK does not support directly setting and restoring Unicode
474
427
# objects.
475
liststore = Gtk.ListStore(
476
GObject.TYPE_STRING, # [0] file_id
477
GObject.TYPE_STRING, # [1] real path
478
GObject.TYPE_BOOLEAN, # [2] checkbox
479
GObject.TYPE_STRING, # [3] display path
480
GObject.TYPE_STRING, # [4] changes type
481
GObject.TYPE_STRING, # [5] commit message
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
482
435
)
483
436
self._files_store = liststore
484
437
self._treeview_files.set_model(liststore)
485
crt = Gtk.CellRendererToggle()
438
crt = gtk.CellRendererToggle()
486
439
crt.set_property('activatable', not bool(self._pending))
487
440
crt.connect("toggled", self._toggle_commit, self._files_store)
488
441
if self._pending:
489
442
name = _i18n('Commit*')
490
443
else:
491
444
name = _i18n('Commit')
492
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
445
commit_col = gtk.TreeViewColumn(name, crt, active=2)
493
446
commit_col.set_visible(False)
494
447
self._treeview_files.append_column(commit_col)
495
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
496
Gtk.CellRendererText(), text=3))
497
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
498
Gtk.CellRendererText(), text=4))
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))
499
452
self._treeview_files.connect('cursor-changed',
500
453
self._on_treeview_files_cursor_changed)
501
454
502
455
def _toggle_commit(self, cell, path, model):
503
if model[path][0] == "": # No file_id means 'All Files'
456
if model[path][0] is None: # No file_id means 'All Files'
504
457
new_val = not model[path][2]
505
458
for node in model:
506
459
node[2] = new_val
516
469
checked_col.set_visible(False)
517
470
else:
518
471
checked_col.set_visible(True)
519
renderer = checked_col.get_cells()[0]
472
renderer = checked_col.get_cell_renderers()[0]
520
473
renderer.set_property('activatable', not all_files)
521
474
522
475
def _construct_pending_list(self):
523
476
# Pending information defaults to hidden, we put it all in 1 box, so
524
477
# that we can show/hide all of them at once
525
self._pending_box = Gtk.VBox()
478
self._pending_box = gtk.VBox()
526
479
self._pending_box.hide()
527
480
528
pending_message = Gtk.Label()
481
pending_message = gtk.Label()
529
482
pending_message.set_markup(
530
483
_i18n('<i>* Cannot select specific files when merging</i>'))
531
self._pending_box.pack_start(pending_message, False, True, 5)
484
self._pending_box.pack_start(pending_message, expand=False, padding=5)
532
485
pending_message.show()
533
486
534
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
535
self._pending_box.pack_start(pending_label, False, True, 0)
487
pending_label = gtk.Label(_i18n('Pending Revisions'))
488
self._pending_box.pack_start(pending_label, expand=False, padding=0)
536
489
pending_label.show()
537
490
538
scroller = Gtk.ScrolledWindow()
539
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
540
self._treeview_pending = Gtk.TreeView()
491
scroller = gtk.ScrolledWindow()
492
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
493
self._treeview_pending = gtk.TreeView()
541
494
scroller.add(self._treeview_pending)
542
scroller.set_shadow_type(Gtk.ShadowType.IN)
495
scroller.set_shadow_type(gtk.SHADOW_IN)
543
496
scroller.show()
544
self._pending_box.pack_start(scroller, True, True, 5)
497
self._pending_box.pack_start(scroller,
498
expand=True, fill=True, padding=5)
545
499
self._treeview_pending.show()
546
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
500
self._left_pane_box.pack_start(self._pending_box)
547
501
548
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
549
GObject.TYPE_STRING, # date
550
GObject.TYPE_STRING, # committer
551
GObject.TYPE_STRING, # summary
502
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
503
gobject.TYPE_STRING, # date
504
gobject.TYPE_STRING, # committer
505
gobject.TYPE_STRING, # summary
552
506
)
553
507
self._pending_store = liststore
554
508
self._treeview_pending.set_model(liststore)
555
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
556
Gtk.CellRendererText(), text=1))
557
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
558
Gtk.CellRendererText(), text=2))
559
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
560
Gtk.CellRendererText(), text=3))
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))
561
515
562
516
def _construct_diff_view(self):
517
from diff import DiffView
518
563
519
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
564
520
# decide that we really don't ever want to display it, we should
565
521
# actually remove it, and other references to it, along with the
566
522
# tests that it is set properly.
567
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
523
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
568
524
self._diff_label.set_alignment(0, 0)
569
525
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
570
526
self._add_to_right_table(self._diff_label, 1, False)
574
530
self._add_to_right_table(self._diff_view, 4, True)
575
531
self._diff_view.show()
576
532
577
@staticmethod
578
def get_line_height(widget):
579
pango_layout = widget.create_pango_layout("X");
580
ink_rectangle, logical_rectangle = pango_layout.get_pixel_extents()
581
return logical_rectangle.height
582
583
533
def _construct_file_message(self):
584
scroller = Gtk.ScrolledWindow()
585
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
534
scroller = gtk.ScrolledWindow()
535
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
586
536
587
self._file_message_text_view = Gtk.TextView()
537
self._file_message_text_view = gtk.TextView()
588
538
scroller.add(self._file_message_text_view)
589
scroller.set_shadow_type(Gtk.ShadowType.IN)
539
scroller.set_shadow_type(gtk.SHADOW_IN)
590
540
scroller.show()
591
541
592
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
593
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
542
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
543
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
594
544
self._file_message_text_view.set_accepts_tab(False)
595
line_height = self.get_line_height(self._file_message_text_view)
596
self._file_message_text_view.set_size_request(-1, line_height * 2)
597
545
self._file_message_text_view.show()
598
546
599
self._file_message_expander = Gtk.Expander(
600
label=_i18n('File commit message'))
547
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
601
548
self._file_message_expander.set_expanded(True)
602
549
self._file_message_expander.add(scroller)
603
550
self._add_to_right_table(self._file_message_expander, 1, False)
604
551
self._file_message_expander.show()
605
552
606
553
def _construct_global_message(self):
607
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
554
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
608
555
self._global_message_label.set_markup(
609
556
_i18n('<b>Global Commit Message</b>'))
610
557
self._global_message_label.set_alignment(0, 0)
613
560
# Can we remove the spacing between the label and the box?
614
561
self._global_message_label.show()
615
562
616
scroller = Gtk.ScrolledWindow()
617
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
563
scroller = gtk.ScrolledWindow()
564
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
618
565
619
self._global_message_text_view = Gtk.TextView()
566
self._global_message_text_view = gtk.TextView()
620
567
self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
621
self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
568
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
622
569
scroller.add(self._global_message_text_view)
623
scroller.set_shadow_type(Gtk.ShadowType.IN)
570
scroller.set_shadow_type(gtk.SHADOW_IN)
624
571
scroller.show()
625
572
self._add_to_right_table(scroller, 2, True)
626
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
573
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
627
574
self._file_message_text_view.set_accepts_tab(False)
628
575
self._global_message_text_view.show()
629
576
630
577
def _on_treeview_files_cursor_changed(self, treeview):
631
578
treeselection = treeview.get_selection()
632
if treeselection is None:
633
# The treeview was probably destroyed as the dialog closes.
634
return
635
579
(model, selection) = treeselection.get_selected()
636
580
637
581
if selection is not None:
638
582
path, display_path = model.get(selection, 1, 3)
639
583
self._diff_label.set_text(_i18n('Diff for ') + display_path)
640
if path == "":
584
if path is None:
641
585
self._diff_view.show_diff(None)
642
586
else:
643
self._diff_view.show_diff([osutils.safe_unicode(path)])
587
self._diff_view.show_diff([path.decode('UTF-8')])
644
588
self._update_per_file_info(selection)
645
589
646
590
def _on_accel_next(self, accel_group, window, keyval, modifier):
657
601
# We have either made it to the end of the list, or nothing was
658
602
# selected. Either way, select All Files, and jump to the global
659
603
# commit message.
660
self._treeview_files.set_cursor(
661
Gtk.TreePath(path=0), "", False)
604
self._treeview_files.set_cursor((0,))
662
605
self._global_message_text_view.grab_focus()
663
606
else:
664
607
# Set the cursor to this entry, and jump to the per-file commit
665
608
# message
666
self._treeview_files.set_cursor(model.get_path(next), None, False)
609
self._treeview_files.set_cursor(model.get_path(next))
667
610
self._file_message_text_view.grab_focus()
668
611
669
612
def _save_current_file_message(self):
671
614
return # Nothing to save
672
615
text_buffer = self._file_message_text_view.get_buffer()
673
616
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
674
text_buffer.get_end_iter(), True)
617
text_buffer.get_end_iter())
675
618
last_selected = self._files_store.get_iter(self._last_selected_file)
676
619
self._files_store.set_value(last_selected, 5, cur_text)
677
620
683
626
self._save_current_file_message()
684
627
text_buffer = self._file_message_text_view.get_buffer()
685
628
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
686
if file_id == "": # Whole tree
629
if file_id is None: # Whole tree
687
630
self._file_message_expander.set_label(_i18n('File commit message'))
688
631
self._file_message_expander.set_expanded(False)
689
632
self._file_message_expander.set_sensitive(False)
706
649
files = []
707
650
records = iter(self._files_store)
708
651
rec = records.next() # Skip the All Files record
709
assert rec[0] == "", "Are we skipping the wrong record?"
652
assert rec[0] is None, "Are we skipping the wrong record?"
710
653
711
654
file_info = []
712
655
for record in records:
713
656
if self._commit_all_changes or record[2]:# [2] checkbox
714
file_id = osutils.safe_utf8(record[0]) # [0] file_id
715
path = osutils.safe_utf8(record[1]) # [1] real path
657
file_id = record[0] # [0] file_id
658
path = record[1] # [1] real path
716
659
# [5] commit message
717
660
file_message = _sanitize_and_decode_message(record[5])
718
661
files.append(path.decode('UTF-8'))
748
691
_i18n('Commit cancelled'),
749
692
_i18n('Do you want to save your commit messages ?'),
750
693
parent=self)
751
if response == Gtk.ResponseType.NO:
694
if response == gtk.RESPONSE_NO:
752
695
# save nothing and destroy old comments if any
753
696
mgr = SavedCommitMessagesManager()
754
697
mgr.save(self._wt, self._wt.branch)
755
self.response(Gtk.ResponseType.CANCEL) # close window
698
self.response(gtk.RESPONSE_CANCEL) # close window
756
699
757
700
@show_bzr_error
758
701
def _on_commit_clicked(self, button):
767
710
_i18n('Commit with an empty message?'),
768
711
_i18n('You can describe your commit intent in the message.'),
769
712
parent=self)
770
if response == Gtk.ResponseType.NO:
713
if response == gtk.RESPONSE_NO:
771
714
# Kindly give focus to message area
772
715
self._global_message_text_view.grab_focus()
773
716
return
789
732
_i18n("Unknown files exist in the working tree. Commit anyway?"),
790
733
parent=self)
791
734
# Doesn't set a parent for the dialog..
792
if response == Gtk.ResponseType.NO:
735
if response == gtk.RESPONSE_NO:
793
736
return
794
737
break
795
738
810
753
_i18n('There are no changes in the working tree.'
811
754
' Do you want to commit anyway?'),
812
755
parent=self)
813
if response == Gtk.ResponseType.YES:
756
if response == gtk.RESPONSE_YES:
814
757
rev_id = self._wt.commit(message,
815
758
allow_pointless=True,
816
759
strict=False,
820
763
self.committed_revision_id = rev_id
821
764
# destroy old comments if any
822
765
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
823
self.response(Gtk.ResponseType.OK)
766
self.response(gtk.RESPONSE_OK)
824
767
825
768
def _get_global_commit_message(self):
826
769
buf = self._global_message_text_view.get_buffer()
827
770
start, end = buf.get_bounds()
828
text = buf.get_text(start, end, True)
771
text = buf.get_text(start, end)
829
772
return _sanitize_and_decode_message(text)
830
773
831
774
def _set_global_commit_message(self, message):
854
797
rev_dict['revision_id'] = rev.revision_id
855
798
return rev_dict
856
799
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