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 625.9.1
- compare with another revision
- download diff
- download tarball
- view history from revision 625.9.1
- Committer: Markus Korn
- Date: 2009-03-05 16:50:39 UTC
- mto: (635.2.4 trunk)
- mto: This revision was merged to the branch mainline in revision 639.
- Revision ID: thekorn@gmx.de-20090305165039-h6xh48wr9lwe1661
* register BranchSelectionBox() as a gobject type to fix (LP: #294396)
- 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)
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
140
98
141
99
142
100
_newline_variants_re = re.compile(r'\r\n?')
143
101
def _sanitize_and_decode_message(utf8_message):
144
102
"""Turn a utf-8 message into a sanitized Unicode message."""
145
103
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
146
return osutils.safe_unicode(fixed_newline)
147
148
149
class CommitDialog(Gtk.Dialog):
104
return fixed_newline.decode('utf-8')
105
106
107
class CommitDialog(gtk.Dialog):
150
108
"""Implementation of Commit."""
151
109
152
110
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)
111
gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
112
parent=parent,
113
flags=0,
114
buttons=(gtk.STOCK_CANCEL,
115
gtk.RESPONSE_CANCEL))
156
116
self._question_dialog = question_dialog
157
117
158
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
159
160
118
self._wt = wt
161
119
# TODO: Do something with this value, it is used by Olive
162
120
# It used to set all changes but this one to False
164
122
self._enable_per_file_commits = True
165
123
self._commit_all_changes = True
166
124
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
125
171
126
self.setup_params()
172
127
self.construct()
176
131
"""Setup the member variables for state."""
177
132
self._basis_tree = self._wt.basis_tree()
178
133
self._delta = None
179
self._wt.lock_read()
180
try:
181
self._pending = list(pending_revisions(self._wt))
182
finally:
183
self._wt.unlock()
134
self._pending = pending_revisions(self._wt)
184
135
185
136
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
186
137
238
189
239
190
all_enabled = (self._selected is None)
240
191
# The first entry is always the 'whole tree'
241
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
192
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
242
193
initial_cursor = store.get_path(all_iter)
243
194
# should we pass specific_files?
244
195
self._wt.lock_read()
245
196
self._basis_tree.lock_read()
246
197
try:
247
198
from diff import iter_changes_to_status
248
saved_file_messages = self._saved_commit_messages_manager.get()[1]
249
199
for (file_id, real_path, change_type, display_path
250
200
) in iter_changes_to_status(self._basis_tree, self._wt):
251
201
if self._selected and real_path != self._selected:
252
202
enabled = False
253
203
else:
254
204
enabled = True
255
try:
256
default_message = saved_file_messages[file_id]
257
except KeyError:
258
default_message = ''
259
205
item_iter = store.append([
260
206
file_id,
261
207
real_path.encode('UTF-8'),
262
208
enabled,
263
209
display_path.encode('UTF-8'),
264
210
change_type,
265
default_message, # Initial comment
211
'', # Initial comment
266
212
])
267
213
if self._selected and enabled:
268
214
initial_cursor = store.get_path(item_iter)
275
221
# This sets the cursor, which causes the expander to close, which
276
222
# causes the _file_message_text_view to never get realized. So we have
277
223
# 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)
224
self._treeview_files.set_cursor(initial_cursor)
279
225
280
226
def _realize_file_message_tree_view(*args):
281
227
self._file_message_text_view.realize()
289
235
self._check_local.hide()
290
236
return
291
237
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
238
bus = dbus.SystemBus()
298
239
try:
299
240
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
300
241
'/org/freedesktop/NetworkManager')
301
242
except dbus.DBusException:
302
trace.mutter("networkmanager not available.")
243
mutter("networkmanager not available.")
303
244
self._check_local.show()
304
245
return
305
246
306
247
dbus_iface = dbus.Interface(proxy_obj,
307
248
'org.freedesktop.NetworkManager')
308
249
try:
311
252
except dbus.DBusException, e:
312
253
# Silently drop errors. While DBus may be
313
254
# available, NetworkManager doesn't necessarily have to be
314
trace.mutter("unable to get networkmanager state: %r" % e)
255
mutter("unable to get networkmanager state: %r" % e)
315
256
self._check_local.show()
316
257
317
258
def _fill_in_per_file_info(self):
334
275
"""Build up the dialog widgets."""
335
276
# The primary pane which splits it into left and right (adjustable)
336
277
# sections.
337
self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
278
self._hpane = gtk.HPaned()
338
279
339
280
self._construct_left_pane()
340
281
self._construct_right_pane()
341
282
self._construct_action_pane()
342
283
343
self.get_content_area().pack_start(self._hpane, True, True, 0)
284
self.vbox.pack_start(self._hpane)
344
285
self._hpane.show()
345
286
self.set_focus(self._global_message_text_view)
346
287
365
306
self._hpane.set_position(300)
366
307
367
308
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)
309
group = gtk.AccelGroup()
310
group.connect_group(gtk.gdk.keyval_from_name('N'),
311
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
371
312
self.add_accel_group(group)
372
313
373
314
# ignore the escape key (avoid closing the window)
374
315
self.connect_object('close', self.emit_stop_by_name, 'close')
375
316
376
317
def _construct_left_pane(self):
377
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
318
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
378
319
self._construct_file_list()
379
320
self._construct_pending_list()
380
321
381
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
322
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
382
323
use_underline=True)
383
self._left_pane_box.pack_end(self._check_local, False, False, 0)
324
self._left_pane_box.pack_end(self._check_local, False, False)
384
325
self._check_local.set_active(False)
385
326
386
327
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
393
334
# commit, and 1 for file commit, and it looked good. But I don't seem
394
335
# to have a way to do that with the gtk boxes... :( (Which is extra
395
336
# weird since wx uses gtk on Linux...)
396
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
337
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
397
338
self._right_pane_table.set_row_spacings(5)
398
339
self._right_pane_table.set_col_spacings(5)
399
340
self._right_pane_table_row = 0
405
346
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
406
347
407
348
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)
349
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
414
350
self._button_commit.connect('clicked', self._on_commit_clicked)
415
self._button_commit.set_can_default(True)
351
self._button_commit.set_flags(gtk.CAN_DEFAULT)
416
352
self._button_commit.show()
417
self.get_action_area().pack_end(
418
self._button_commit, True, True, 0)
353
self.action_area.pack_end(self._button_commit)
419
354
self._button_commit.grab_default()
420
355
421
356
def _add_to_right_table(self, widget, weight, expanding=False):
427
362
"""
428
363
end_row = self._right_pane_table_row + weight
429
364
options = 0
430
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
365
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
431
366
if expanding:
432
367
options = expand_opts
433
368
self._right_pane_table.attach(widget, 0, 1,
436
371
self._right_pane_table_row = end_row
437
372
438
373
def _construct_file_list(self):
439
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
440
file_label = Gtk.Label(label=_i18n('Files'))
374
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
375
file_label = gtk.Label(_i18n('Files'))
441
376
# file_label.show()
442
self._files_box.pack_start(file_label, False, True, 0)
377
self._files_box.pack_start(file_label, expand=False)
443
378
444
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
379
self._commit_all_files_radio = gtk.RadioButton(
445
380
None, _i18n("Commit all changes"))
446
self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
381
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
447
382
self._commit_all_files_radio.show()
448
383
self._commit_all_files_radio.connect('toggled',
449
384
self._toggle_commit_selection)
450
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
385
self._commit_selected_radio = gtk.RadioButton(
451
386
self._commit_all_files_radio, _i18n("Only commit selected changes"))
452
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
387
self._files_box.pack_start(self._commit_selected_radio, expand=False)
453
388
self._commit_selected_radio.show()
454
389
self._commit_selected_radio.connect('toggled',
455
390
self._toggle_commit_selection)
458
393
self._commit_all_files_radio.set_sensitive(False)
459
394
self._commit_selected_radio.set_sensitive(False)
460
395
461
scroller = Gtk.ScrolledWindow()
462
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
463
self._treeview_files = Gtk.TreeView()
396
scroller = gtk.ScrolledWindow()
397
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
398
self._treeview_files = gtk.TreeView()
464
399
self._treeview_files.show()
465
400
scroller.add(self._treeview_files)
466
scroller.set_shadow_type(Gtk.ShadowType.IN)
401
scroller.set_shadow_type(gtk.SHADOW_IN)
467
402
scroller.show()
468
self._files_box.pack_start(scroller, True, True, 0)
403
self._files_box.pack_start(scroller,
404
expand=True, fill=True)
469
405
self._files_box.show()
470
self._left_pane_box.pack_start(self._files_box, True, True, 0)
406
self._left_pane_box.pack_start(self._files_box)
471
407
472
408
# Keep note that all strings stored in a ListStore must be UTF-8
473
409
# strings. GTK does not support directly setting and restoring Unicode
474
410
# 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
411
liststore = gtk.ListStore(
412
gobject.TYPE_STRING, # [0] file_id
413
gobject.TYPE_STRING, # [1] real path
414
gobject.TYPE_BOOLEAN, # [2] checkbox
415
gobject.TYPE_STRING, # [3] display path
416
gobject.TYPE_STRING, # [4] changes type
417
gobject.TYPE_STRING, # [5] commit message
482
418
)
483
419
self._files_store = liststore
484
420
self._treeview_files.set_model(liststore)
485
crt = Gtk.CellRendererToggle()
421
crt = gtk.CellRendererToggle()
486
422
crt.set_property('activatable', not bool(self._pending))
487
423
crt.connect("toggled", self._toggle_commit, self._files_store)
488
424
if self._pending:
489
425
name = _i18n('Commit*')
490
426
else:
491
427
name = _i18n('Commit')
492
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
428
commit_col = gtk.TreeViewColumn(name, crt, active=2)
493
429
commit_col.set_visible(False)
494
430
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))
431
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
432
gtk.CellRendererText(), text=3))
433
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
434
gtk.CellRendererText(), text=4))
499
435
self._treeview_files.connect('cursor-changed',
500
436
self._on_treeview_files_cursor_changed)
501
437
502
438
def _toggle_commit(self, cell, path, model):
503
if model[path][0] == "": # No file_id means 'All Files'
439
if model[path][0] is None: # No file_id means 'All Files'
504
440
new_val = not model[path][2]
505
441
for node in model:
506
442
node[2] = new_val
516
452
checked_col.set_visible(False)
517
453
else:
518
454
checked_col.set_visible(True)
519
renderer = checked_col.get_cells()[0]
455
renderer = checked_col.get_cell_renderers()[0]
520
456
renderer.set_property('activatable', not all_files)
521
457
522
458
def _construct_pending_list(self):
523
459
# Pending information defaults to hidden, we put it all in 1 box, so
524
460
# that we can show/hide all of them at once
525
self._pending_box = Gtk.VBox()
461
self._pending_box = gtk.VBox()
526
462
self._pending_box.hide()
527
463
528
pending_message = Gtk.Label()
464
pending_message = gtk.Label()
529
465
pending_message.set_markup(
530
466
_i18n('<i>* Cannot select specific files when merging</i>'))
531
self._pending_box.pack_start(pending_message, False, True, 5)
467
self._pending_box.pack_start(pending_message, expand=False, padding=5)
532
468
pending_message.show()
533
469
534
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
535
self._pending_box.pack_start(pending_label, False, True, 0)
470
pending_label = gtk.Label(_i18n('Pending Revisions'))
471
self._pending_box.pack_start(pending_label, expand=False, padding=0)
536
472
pending_label.show()
537
473
538
scroller = Gtk.ScrolledWindow()
539
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
540
self._treeview_pending = Gtk.TreeView()
474
scroller = gtk.ScrolledWindow()
475
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
476
self._treeview_pending = gtk.TreeView()
541
477
scroller.add(self._treeview_pending)
542
scroller.set_shadow_type(Gtk.ShadowType.IN)
478
scroller.set_shadow_type(gtk.SHADOW_IN)
543
479
scroller.show()
544
self._pending_box.pack_start(scroller, True, True, 5)
480
self._pending_box.pack_start(scroller,
481
expand=True, fill=True, padding=5)
545
482
self._treeview_pending.show()
546
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
483
self._left_pane_box.pack_start(self._pending_box)
547
484
548
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
549
GObject.TYPE_STRING, # date
550
GObject.TYPE_STRING, # committer
551
GObject.TYPE_STRING, # summary
485
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
486
gobject.TYPE_STRING, # date
487
gobject.TYPE_STRING, # committer
488
gobject.TYPE_STRING, # summary
552
489
)
553
490
self._pending_store = liststore
554
491
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))
492
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
493
gtk.CellRendererText(), text=1))
494
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
495
gtk.CellRendererText(), text=2))
496
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
497
gtk.CellRendererText(), text=3))
561
498
562
499
def _construct_diff_view(self):
500
from diff import DiffView
501
563
502
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
564
503
# decide that we really don't ever want to display it, we should
565
504
# actually remove it, and other references to it, along with the
566
505
# tests that it is set properly.
567
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
506
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
568
507
self._diff_label.set_alignment(0, 0)
569
508
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
570
509
self._add_to_right_table(self._diff_label, 1, False)
574
513
self._add_to_right_table(self._diff_view, 4, True)
575
514
self._diff_view.show()
576
515
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
516
def _construct_file_message(self):
584
scroller = Gtk.ScrolledWindow()
585
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
517
scroller = gtk.ScrolledWindow()
518
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
586
519
587
self._file_message_text_view = Gtk.TextView()
520
self._file_message_text_view = gtk.TextView()
588
521
scroller.add(self._file_message_text_view)
589
scroller.set_shadow_type(Gtk.ShadowType.IN)
522
scroller.set_shadow_type(gtk.SHADOW_IN)
590
523
scroller.show()
591
524
592
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
593
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
525
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
526
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
594
527
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
528
self._file_message_text_view.show()
598
529
599
self._file_message_expander = Gtk.Expander(
600
label=_i18n('File commit message'))
530
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
601
531
self._file_message_expander.set_expanded(True)
602
532
self._file_message_expander.add(scroller)
603
533
self._add_to_right_table(self._file_message_expander, 1, False)
604
534
self._file_message_expander.show()
605
535
606
536
def _construct_global_message(self):
607
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
537
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
608
538
self._global_message_label.set_markup(
609
539
_i18n('<b>Global Commit Message</b>'))
610
540
self._global_message_label.set_alignment(0, 0)
613
543
# Can we remove the spacing between the label and the box?
614
544
self._global_message_label.show()
615
545
616
scroller = Gtk.ScrolledWindow()
617
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
546
scroller = gtk.ScrolledWindow()
547
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
618
548
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"))
549
self._global_message_text_view = gtk.TextView()
550
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
622
551
scroller.add(self._global_message_text_view)
623
scroller.set_shadow_type(Gtk.ShadowType.IN)
552
scroller.set_shadow_type(gtk.SHADOW_IN)
624
553
scroller.show()
625
554
self._add_to_right_table(scroller, 2, True)
626
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
555
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
627
556
self._file_message_text_view.set_accepts_tab(False)
628
557
self._global_message_text_view.show()
629
558
630
559
def _on_treeview_files_cursor_changed(self, treeview):
631
560
treeselection = treeview.get_selection()
632
if treeselection is None:
633
# The treeview was probably destroyed as the dialog closes.
634
return
635
561
(model, selection) = treeselection.get_selected()
636
562
637
563
if selection is not None:
638
564
path, display_path = model.get(selection, 1, 3)
639
565
self._diff_label.set_text(_i18n('Diff for ') + display_path)
640
if path == "":
566
if path is None:
641
567
self._diff_view.show_diff(None)
642
568
else:
643
self._diff_view.show_diff([osutils.safe_unicode(path)])
569
self._diff_view.show_diff([path.decode('UTF-8')])
644
570
self._update_per_file_info(selection)
645
571
646
572
def _on_accel_next(self, accel_group, window, keyval, modifier):
657
583
# We have either made it to the end of the list, or nothing was
658
584
# selected. Either way, select All Files, and jump to the global
659
585
# commit message.
660
self._treeview_files.set_cursor(
661
Gtk.TreePath(path=0), "", False)
586
self._treeview_files.set_cursor((0,))
662
587
self._global_message_text_view.grab_focus()
663
588
else:
664
589
# Set the cursor to this entry, and jump to the per-file commit
665
590
# message
666
self._treeview_files.set_cursor(model.get_path(next), None, False)
591
self._treeview_files.set_cursor(model.get_path(next))
667
592
self._file_message_text_view.grab_focus()
668
593
669
594
def _save_current_file_message(self):
671
596
return # Nothing to save
672
597
text_buffer = self._file_message_text_view.get_buffer()
673
598
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
674
text_buffer.get_end_iter(), True)
599
text_buffer.get_end_iter())
675
600
last_selected = self._files_store.get_iter(self._last_selected_file)
676
601
self._files_store.set_value(last_selected, 5, cur_text)
677
602
683
608
self._save_current_file_message()
684
609
text_buffer = self._file_message_text_view.get_buffer()
685
610
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
686
if file_id == "": # Whole tree
611
if file_id is None: # Whole tree
687
612
self._file_message_expander.set_label(_i18n('File commit message'))
688
613
self._file_message_expander.set_expanded(False)
689
614
self._file_message_expander.set_sensitive(False)
706
631
files = []
707
632
records = iter(self._files_store)
708
633
rec = records.next() # Skip the All Files record
709
assert rec[0] == "", "Are we skipping the wrong record?"
634
assert rec[0] is None, "Are we skipping the wrong record?"
710
635
711
636
file_info = []
712
637
for record in records:
713
638
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
639
file_id = record[0] # [0] file_id
640
path = record[1] # [1] real path
716
641
# [5] commit message
717
642
file_message = _sanitize_and_decode_message(record[5])
718
643
files.append(path.decode('UTF-8'))
728
653
return files, []
729
654
730
655
@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
656
def _on_commit_clicked(self, button):
759
657
""" Commit button clicked handler. """
760
658
self._do_commit()
767
665
_i18n('Commit with an empty message?'),
768
666
_i18n('You can describe your commit intent in the message.'),
769
667
parent=self)
770
if response == Gtk.ResponseType.NO:
668
if response == gtk.RESPONSE_NO:
771
669
# Kindly give focus to message area
772
670
self._global_message_text_view.grab_focus()
773
671
return
789
687
_i18n("Unknown files exist in the working tree. Commit anyway?"),
790
688
parent=self)
791
689
# Doesn't set a parent for the dialog..
792
if response == Gtk.ResponseType.NO:
690
if response == gtk.RESPONSE_NO:
793
691
return
794
692
break
795
693
810
708
_i18n('There are no changes in the working tree.'
811
709
' Do you want to commit anyway?'),
812
710
parent=self)
813
if response == Gtk.ResponseType.YES:
711
if response == gtk.RESPONSE_YES:
814
712
rev_id = self._wt.commit(message,
815
713
allow_pointless=True,
816
714
strict=False,
818
716
specific_files=specific_files,
819
717
revprops=revprops)
820
718
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)
719
self.response(gtk.RESPONSE_OK)
824
720
825
721
def _get_global_commit_message(self):
826
722
buf = self._global_message_text_view.get_buffer()
827
723
start, end = buf.get_bounds()
828
text = buf.get_text(start, end, True)
724
text = buf.get_text(start, end)
829
725
return _sanitize_and_decode_message(text)
830
726
831
727
def _set_global_commit_message(self, message):
853
749
show_offset=False)
854
750
rev_dict['revision_id'] = rev.revision_id
855
751
return rev_dict
856
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0