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