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