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