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