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