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