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