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
373
# ignore the escape key (avoid closing the window)
374
self.connect_object('close', self.emit_stop_by_name, 'close')
375
306
376
def _construct_left_pane(self):
307
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
377
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
308
378
self._construct_file_list()
309
379
self._construct_pending_list()
310
380
311
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
381
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
312
382
use_underline=True)
313
self._left_pane_box.pack_end(self._check_local, False, False)
383
self._left_pane_box.pack_end(self._check_local, False, False, 0)
314
384
self._check_local.set_active(False)
315
385
316
386
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
323
393
# commit, and 1 for file commit, and it looked good. But I don't seem
324
394
# to have a way to do that with the gtk boxes... :( (Which is extra
325
395
# weird since wx uses gtk on Linux...)
326
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)
327
397
self._right_pane_table.set_row_spacings(5)
328
398
self._right_pane_table.set_col_spacings(5)
329
399
self._right_pane_table_row = 0
335
405
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
336
406
337
407
def _construct_action_pane(self):
338
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)
339
414
self._button_commit.connect('clicked', self._on_commit_clicked)
340
self._button_commit.set_flags(gtk.CAN_DEFAULT)
415
self._button_commit.set_can_default(True)
341
416
self._button_commit.show()
342
self.action_area.pack_end(self._button_commit)
417
self.get_action_area().pack_end(
418
self._button_commit, True, True, 0)
343
419
self._button_commit.grab_default()
344
420
345
421
def _add_to_right_table(self, widget, weight, expanding=False):
351
427
"""
352
428
end_row = self._right_pane_table_row + weight
353
429
options = 0
354
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
430
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
355
431
if expanding:
356
432
options = expand_opts
357
433
self._right_pane_table.attach(widget, 0, 1,
360
436
self._right_pane_table_row = end_row
361
437
362
438
def _construct_file_list(self):
363
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
364
file_label = gtk.Label(_i18n('Files'))
439
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
440
file_label = Gtk.Label(label=_i18n('Files'))
365
441
# file_label.show()
366
self._files_box.pack_start(file_label, expand=False)
442
self._files_box.pack_start(file_label, False, True, 0)
367
443
368
self._commit_all_files_radio = gtk.RadioButton(
444
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
369
445
None, _i18n("Commit all changes"))
370
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)
371
447
self._commit_all_files_radio.show()
372
448
self._commit_all_files_radio.connect('toggled',
373
449
self._toggle_commit_selection)
374
self._commit_selected_radio = gtk.RadioButton(
450
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
375
451
self._commit_all_files_radio, _i18n("Only commit selected changes"))
376
self._files_box.pack_start(self._commit_selected_radio, expand=False)
452
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
377
453
self._commit_selected_radio.show()
378
454
self._commit_selected_radio.connect('toggled',
379
455
self._toggle_commit_selection)
382
458
self._commit_all_files_radio.set_sensitive(False)
383
459
self._commit_selected_radio.set_sensitive(False)
384
460
385
scroller = gtk.ScrolledWindow()
386
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
387
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()
388
464
self._treeview_files.show()
389
465
scroller.add(self._treeview_files)
390
scroller.set_shadow_type(gtk.SHADOW_IN)
466
scroller.set_shadow_type(Gtk.ShadowType.IN)
391
467
scroller.show()
392
self._files_box.pack_start(scroller,
393
expand=True, fill=True)
468
self._files_box.pack_start(scroller, True, True, 0)
394
469
self._files_box.show()
395
self._left_pane_box.pack_start(self._files_box)
470
self._left_pane_box.pack_start(self._files_box, True, True, 0)
396
471
397
472
# Keep note that all strings stored in a ListStore must be UTF-8
398
473
# strings. GTK does not support directly setting and restoring Unicode
399
474
# objects.
400
liststore = gtk.ListStore(
401
gobject.TYPE_STRING, # [0] file_id
402
gobject.TYPE_STRING, # [1] real path
403
gobject.TYPE_BOOLEAN, # [2] checkbox
404
gobject.TYPE_STRING, # [3] display path
405
gobject.TYPE_STRING, # [4] changes type
406
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
407
482
)
408
483
self._files_store = liststore
409
484
self._treeview_files.set_model(liststore)
410
crt = gtk.CellRendererToggle()
485
crt = Gtk.CellRendererToggle()
411
486
crt.set_property('activatable', not bool(self._pending))
412
487
crt.connect("toggled", self._toggle_commit, self._files_store)
413
488
if self._pending:
414
489
name = _i18n('Commit*')
415
490
else:
416
491
name = _i18n('Commit')
417
commit_col = gtk.TreeViewColumn(name, crt, active=2)
492
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
418
493
commit_col.set_visible(False)
419
494
self._treeview_files.append_column(commit_col)
420
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
421
gtk.CellRendererText(), text=3))
422
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
423
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))
424
499
self._treeview_files.connect('cursor-changed',
425
500
self._on_treeview_files_cursor_changed)
426
501
427
502
def _toggle_commit(self, cell, path, model):
428
if model[path][0] is None: # No file_id means 'All Files'
503
if model[path][0] == "": # No file_id means 'All Files'
429
504
new_val = not model[path][2]
430
505
for node in model:
431
506
node[2] = new_val
441
516
checked_col.set_visible(False)
442
517
else:
443
518
checked_col.set_visible(True)
444
renderer = checked_col.get_cell_renderers()[0]
519
renderer = checked_col.get_cells()[0]
445
520
renderer.set_property('activatable', not all_files)
446
521
447
522
def _construct_pending_list(self):
448
523
# Pending information defaults to hidden, we put it all in 1 box, so
449
524
# that we can show/hide all of them at once
450
self._pending_box = gtk.VBox()
525
self._pending_box = Gtk.VBox()
451
526
self._pending_box.hide()
452
527
453
pending_message = gtk.Label()
528
pending_message = Gtk.Label()
454
529
pending_message.set_markup(
455
530
_i18n('<i>* Cannot select specific files when merging</i>'))
456
self._pending_box.pack_start(pending_message, expand=False, padding=5)
531
self._pending_box.pack_start(pending_message, False, True, 5)
457
532
pending_message.show()
458
533
459
pending_label = gtk.Label(_i18n('Pending Revisions'))
460
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)
461
536
pending_label.show()
462
537
463
scroller = gtk.ScrolledWindow()
464
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
465
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()
466
541
scroller.add(self._treeview_pending)
467
scroller.set_shadow_type(gtk.SHADOW_IN)
542
scroller.set_shadow_type(Gtk.ShadowType.IN)
468
543
scroller.show()
469
self._pending_box.pack_start(scroller,
470
expand=True, fill=True, padding=5)
544
self._pending_box.pack_start(scroller, True, True, 5)
471
545
self._treeview_pending.show()
472
self._left_pane_box.pack_start(self._pending_box)
546
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
473
547
474
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
475
gobject.TYPE_STRING, # date
476
gobject.TYPE_STRING, # committer
477
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
478
552
)
479
553
self._pending_store = liststore
480
554
self._treeview_pending.set_model(liststore)
481
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
482
gtk.CellRendererText(), text=1))
483
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
484
gtk.CellRendererText(), text=2))
485
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
486
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))
487
561
488
562
def _construct_diff_view(self):
489
from diff import DiffView
490
491
563
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
492
564
# decide that we really don't ever want to display it, we should
493
565
# actually remove it, and other references to it, along with the
494
566
# tests that it is set properly.
495
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
567
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
496
568
self._diff_label.set_alignment(0, 0)
497
569
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
498
570
self._add_to_right_table(self._diff_label, 1, False)
502
574
self._add_to_right_table(self._diff_view, 4, True)
503
575
self._diff_view.show()
504
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
505
583
def _construct_file_message(self):
506
scroller = gtk.ScrolledWindow()
507
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
584
scroller = Gtk.ScrolledWindow()
585
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
508
586
509
self._file_message_text_view = gtk.TextView()
587
self._file_message_text_view = Gtk.TextView()
510
588
scroller.add(self._file_message_text_view)
511
scroller.set_shadow_type(gtk.SHADOW_IN)
589
scroller.set_shadow_type(Gtk.ShadowType.IN)
512
590
scroller.show()
513
591
514
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
515
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)
516
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)
517
597
self._file_message_text_view.show()
518
598
519
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
599
self._file_message_expander = Gtk.Expander(
600
label=_i18n('File commit message'))
520
601
self._file_message_expander.set_expanded(True)
521
602
self._file_message_expander.add(scroller)
522
603
self._add_to_right_table(self._file_message_expander, 1, False)
523
604
self._file_message_expander.show()
524
605
525
606
def _construct_global_message(self):
526
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
607
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
527
608
self._global_message_label.set_markup(
528
609
_i18n('<b>Global Commit Message</b>'))
529
610
self._global_message_label.set_alignment(0, 0)
532
613
# Can we remove the spacing between the label and the box?
533
614
self._global_message_label.show()
534
615
535
scroller = gtk.ScrolledWindow()
536
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
616
scroller = Gtk.ScrolledWindow()
617
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
537
618
538
self._global_message_text_view = gtk.TextView()
539
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"))
540
622
scroller.add(self._global_message_text_view)
541
scroller.set_shadow_type(gtk.SHADOW_IN)
623
scroller.set_shadow_type(Gtk.ShadowType.IN)
542
624
scroller.show()
543
625
self._add_to_right_table(scroller, 2, True)
544
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
626
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
545
627
self._file_message_text_view.set_accepts_tab(False)
546
628
self._global_message_text_view.show()
547
629
548
630
def _on_treeview_files_cursor_changed(self, treeview):
549
631
treeselection = treeview.get_selection()
632
if treeselection is None:
633
# The treeview was probably destroyed as the dialog closes.
634
return
550
635
(model, selection) = treeselection.get_selected()
551
636
552
637
if selection is not None:
553
638
path, display_path = model.get(selection, 1, 3)
554
639
self._diff_label.set_text(_i18n('Diff for ') + display_path)
555
if path is None:
640
if path == "":
556
641
self._diff_view.show_diff(None)
557
642
else:
558
self._diff_view.show_diff([path.decode('UTF-8')])
643
self._diff_view.show_diff([osutils.safe_unicode(path)])
559
644
self._update_per_file_info(selection)
560
645
561
646
def _on_accel_next(self, accel_group, window, keyval, modifier):
572
657
# We have either made it to the end of the list, or nothing was
573
658
# selected. Either way, select All Files, and jump to the global
574
659
# commit message.
575
self._treeview_files.set_cursor((0,))
660
self._treeview_files.set_cursor(
661
Gtk.TreePath(path=0), "", False)
576
662
self._global_message_text_view.grab_focus()
577
663
else:
578
664
# Set the cursor to this entry, and jump to the per-file commit
579
665
# message
580
self._treeview_files.set_cursor(model.get_path(next))
666
self._treeview_files.set_cursor(model.get_path(next), None, False)
581
667
self._file_message_text_view.grab_focus()
582
668
583
669
def _save_current_file_message(self):
585
671
return # Nothing to save
586
672
text_buffer = self._file_message_text_view.get_buffer()
587
673
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
588
text_buffer.get_end_iter())
674
text_buffer.get_end_iter(), True)
589
675
last_selected = self._files_store.get_iter(self._last_selected_file)
590
676
self._files_store.set_value(last_selected, 5, cur_text)
591
677
597
683
self._save_current_file_message()
598
684
text_buffer = self._file_message_text_view.get_buffer()
599
685
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
600
if file_id is None: # Whole tree
686
if file_id == "": # Whole tree
601
687
self._file_message_expander.set_label(_i18n('File commit message'))
602
688
self._file_message_expander.set_expanded(False)
603
689
self._file_message_expander.set_sensitive(False)
620
706
files = []
621
707
records = iter(self._files_store)
622
708
rec = records.next() # Skip the All Files record
623
assert rec[0] is None, "Are we skipping the wrong record?"
709
assert rec[0] == "", "Are we skipping the wrong record?"
624
710
625
711
file_info = []
626
712
for record in records:
627
713
if self._commit_all_changes or record[2]:# [2] checkbox
628
file_id = record[0] # [0] file_id
629
path = record[1] # [1] real path
630
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])
631
718
files.append(path.decode('UTF-8'))
632
719
if self._enable_per_file_commits and file_message:
633
720
# All of this needs to be utf-8 information
721
file_message = file_message.encode('UTF-8')
634
722
file_info.append({'path':path, 'file_id':file_id,
635
723
'message':file_message})
636
724
file_info.sort(key=lambda x:(x['path'], x['file_id']))
640
728
return files, []
641
729
642
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
643
758
def _on_commit_clicked(self, button):
644
759
""" Commit button clicked handler. """
645
760
self._do_commit()
650
765
if message == '':
651
766
response = self._question_dialog(
652
767
_i18n('Commit with an empty message?'),
653
_i18n('You can describe your commit intent in the message.'))
654
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:
655
771
# Kindly give focus to message area
656
772
self._global_message_text_view.grab_focus()
657
773
return
670
786
for path in self._wt.unknowns():
671
787
response = self._question_dialog(
672
788
_i18n("Commit with unknowns?"),
673
_i18n("Unknown files exist in the working tree. Commit anyway?"))
674
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:
675
793
return
676
794
break
677
795
690
808
response = self._question_dialog(
691
809
_i18n('Commit with no changes?'),
692
810
_i18n('There are no changes in the working tree.'
693
' Do you want to commit anyway?'))
694
if response == gtk.RESPONSE_YES:
811
' Do you want to commit anyway?'),
812
parent=self)
813
if response == Gtk.ResponseType.YES:
695
814
rev_id = self._wt.commit(message,
696
815
allow_pointless=True,
697
816
strict=False,
699
818
specific_files=specific_files,
700
819
revprops=revprops)
701
820
self.committed_revision_id = rev_id
702
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)
703
824
704
825
def _get_global_commit_message(self):
705
826
buf = self._global_message_text_view.get_buffer()
706
827
start, end = buf.get_bounds()
707
return buf.get_text(start, end).decode('utf-8')
828
text = buf.get_text(start, end, True)
829
return _sanitize_and_decode_message(text)
708
830
709
831
def _set_global_commit_message(self, message):
710
832
"""Just a helper for the test suite."""
731
853
show_offset=False)
732
854
rev_dict['revision_id'] = rev.revision_id
733
855
return rev_dict
856
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0