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:
- cmenu.ui
- 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
- bzr-notify.desktop.in => bzr-notify.desktop
- 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.errors import show_bzr_error
34
from bzrlib.plugins.gtk.i18n import _i18n
35
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
34
from dialog import error_dialog, question_dialog
35
from errors import show_bzr_error
36
36
37
37
try:
38
38
import dbus
42
42
have_dbus = False
43
43
44
44
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
45
def pending_revisions(wt):
72
46
"""Return a list of pending merges or None if there are none of them.
73
47
78
52
"""
79
53
parents = wt.get_parent_ids()
80
54
if len(parents) < 2:
81
return
55
return None
82
56
83
57
# The basic pending merge algorithm uses the same algorithm as
84
58
# bzrlib.status.show_pending_merges
86
60
branch = wt.branch
87
61
last_revision = parents[0]
88
62
89
graph = branch.repository.get_graph()
90
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])
91
73
92
74
pm = []
93
75
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):
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):
149
100
"""Implementation of Commit."""
150
101
151
102
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)
103
gtk.Dialog.__init__(self, title="Commit - Olive",
104
parent=parent,
105
flags=0,
106
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
155
107
self._question_dialog = question_dialog
156
108
157
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
158
159
109
self._wt = wt
160
110
# TODO: Do something with this value, it is used by Olive
161
111
# It used to set all changes but this one to False
163
113
self._enable_per_file_commits = True
164
114
self._commit_all_changes = True
165
115
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
116
170
117
self.setup_params()
171
118
self.construct()
175
122
"""Setup the member variables for state."""
176
123
self._basis_tree = self._wt.basis_tree()
177
124
self._delta = None
178
self._wt.lock_read()
179
try:
180
self._pending = list(pending_revisions(self._wt))
181
finally:
182
self._wt.unlock()
125
self._pending = pending_revisions(self._wt)
183
126
184
127
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
185
128
221
164
store = self._files_store
222
165
self._treeview_files.set_model(None)
223
166
224
added = _i18n('added')
225
removed = _i18n('removed')
226
renamed = _i18n('renamed')
227
renamed_and_modified = _i18n('renamed and modified')
228
modified = _i18n('modified')
229
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')
230
173
231
174
# The store holds:
232
175
# [file_id, real path, checkbox, display path, changes type, message]
233
# iter_changes returns:
176
# _iter_changes returns:
234
177
# (file_id, (path_in_source, path_in_target),
235
178
# changed_content, versioned, parent, name, kind,
236
179
# executable)
237
180
238
181
all_enabled = (self._selected is None)
239
182
# The first entry is always the 'whole tree'
240
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
183
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
241
184
initial_cursor = store.get_path(all_iter)
242
185
# should we pass specific_files?
243
186
self._wt.lock_read()
244
187
self._basis_tree.lock_read()
245
188
try:
246
from diff import iter_changes_to_status
247
saved_file_messages = self._saved_commit_messages_manager.get()[1]
189
from diff import _iter_changes_to_status
248
190
for (file_id, real_path, change_type, display_path
249
) in iter_changes_to_status(self._basis_tree, self._wt):
191
) in _iter_changes_to_status(self._basis_tree, self._wt):
250
192
if self._selected and real_path != self._selected:
251
193
enabled = False
252
194
else:
253
195
enabled = True
254
try:
255
default_message = saved_file_messages[file_id]
256
except KeyError:
257
default_message = ''
258
196
item_iter = store.append([
259
197
file_id,
260
198
real_path.encode('UTF-8'),
261
199
enabled,
262
200
display_path.encode('UTF-8'),
263
201
change_type,
264
default_message, # Initial comment
202
'', # Initial comment
265
203
])
266
204
if self._selected and enabled:
267
205
initial_cursor = store.get_path(item_iter)
274
212
# This sets the cursor, which causes the expander to close, which
275
213
# causes the _file_message_text_view to never get realized. So we have
276
214
# 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)
215
self._treeview_files.set_cursor(initial_cursor)
278
216
279
217
def _realize_file_message_tree_view(*args):
280
218
self._file_message_text_view.realize()
288
226
self._check_local.hide()
289
227
return
290
228
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
297
try:
298
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
299
'/org/freedesktop/NetworkManager')
300
except dbus.DBusException:
301
trace.mutter("networkmanager not available.")
302
self._check_local.show()
303
return
304
229
bus = dbus.SystemBus()
230
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
231
'/org/freedesktop/NetworkManager')
305
232
dbus_iface = dbus.Interface(proxy_obj,
306
233
'org.freedesktop.NetworkManager')
307
234
try:
310
237
except dbus.DBusException, e:
311
238
# Silently drop errors. While DBus may be
312
239
# available, NetworkManager doesn't necessarily have to be
313
trace.mutter("unable to get networkmanager state: %r" % e)
240
mutter("unable to get networkmanager state: %r" % e)
314
241
self._check_local.show()
315
242
316
243
def _fill_in_per_file_info(self):
324
251
self._enable_per_file_commits = True
325
252
if not self._enable_per_file_commits:
326
253
self._file_message_expander.hide()
327
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
254
self._global_message_label.set_markup(_('<b>Commit Message</b>'))
328
255
329
256
def _compute_delta(self):
330
257
self._delta = self._wt.changes_from(self._basis_tree)
333
260
"""Build up the dialog widgets."""
334
261
# The primary pane which splits it into left and right (adjustable)
335
262
# sections.
336
self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
263
self._hpane = gtk.HPaned()
337
264
338
265
self._construct_left_pane()
339
266
self._construct_right_pane()
340
267
self._construct_action_pane()
341
268
342
self.get_content_area().pack_start(self._hpane, True, True, 0)
269
self.vbox.pack_start(self._hpane)
343
270
self._hpane.show()
344
271
self.set_focus(self._global_message_text_view)
345
272
364
291
self._hpane.set_position(300)
365
292
366
293
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)
294
group = gtk.AccelGroup()
295
group.connect_group(gtk.gdk.keyval_from_name('N'),
296
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
370
297
self.add_accel_group(group)
371
298
372
# ignore the escape key (avoid closing the window)
373
self.connect_object('close', self.emit_stop_by_name, 'close')
374
375
299
def _construct_left_pane(self):
376
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
300
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
377
301
self._construct_file_list()
378
302
self._construct_pending_list()
379
303
380
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
304
self._check_local = gtk.CheckButton(_("_Only commit locally"),
381
305
use_underline=True)
382
self._left_pane_box.pack_end(self._check_local, False, False, 0)
306
self._left_pane_box.pack_end(self._check_local, False, False)
383
307
self._check_local.set_active(False)
384
308
385
309
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
392
316
# commit, and 1 for file commit, and it looked good. But I don't seem
393
317
# to have a way to do that with the gtk boxes... :( (Which is extra
394
318
# weird since wx uses gtk on Linux...)
395
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)
396
320
self._right_pane_table.set_row_spacings(5)
397
321
self._right_pane_table.set_col_spacings(5)
398
322
self._right_pane_table_row = 0
404
328
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
405
329
406
330
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)
331
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
413
332
self._button_commit.connect('clicked', self._on_commit_clicked)
414
self._button_commit.set_can_default(True)
333
self._button_commit.set_flags(gtk.CAN_DEFAULT)
415
334
self._button_commit.show()
416
self.get_action_area().pack_end(
417
self._button_commit, True, True, 0)
335
self.action_area.pack_end(self._button_commit)
418
336
self._button_commit.grab_default()
419
337
420
338
def _add_to_right_table(self, widget, weight, expanding=False):
426
344
"""
427
345
end_row = self._right_pane_table_row + weight
428
346
options = 0
429
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
347
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
430
348
if expanding:
431
349
options = expand_opts
432
350
self._right_pane_table.attach(widget, 0, 1,
435
353
self._right_pane_table_row = end_row
436
354
437
355
def _construct_file_list(self):
438
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
439
file_label = Gtk.Label(label=_i18n('Files'))
356
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
357
file_label = gtk.Label(_('Files'))
440
358
# file_label.show()
441
self._files_box.pack_start(file_label, False, True, 0)
359
self._files_box.pack_start(file_label, expand=False)
442
360
443
self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
444
None, _i18n("Commit all changes"))
445
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)
446
364
self._commit_all_files_radio.show()
447
365
self._commit_all_files_radio.connect('toggled',
448
366
self._toggle_commit_selection)
449
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
450
self._commit_all_files_radio, _i18n("Only commit selected changes"))
451
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)
452
370
self._commit_selected_radio.show()
453
371
self._commit_selected_radio.connect('toggled',
454
372
self._toggle_commit_selection)
455
373
if self._pending:
456
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
374
self._commit_all_files_radio.set_label(_('Commit all changes*'))
457
375
self._commit_all_files_radio.set_sensitive(False)
458
376
self._commit_selected_radio.set_sensitive(False)
459
377
460
scroller = Gtk.ScrolledWindow()
461
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
462
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()
463
381
self._treeview_files.show()
464
382
scroller.add(self._treeview_files)
465
scroller.set_shadow_type(Gtk.ShadowType.IN)
383
scroller.set_shadow_type(gtk.SHADOW_IN)
466
384
scroller.show()
467
self._files_box.pack_start(scroller, True, True, 0)
385
self._files_box.pack_start(scroller,
386
expand=True, fill=True)
468
387
self._files_box.show()
469
self._left_pane_box.pack_start(self._files_box, True, True, 0)
388
self._left_pane_box.pack_start(self._files_box)
470
389
471
390
# Keep note that all strings stored in a ListStore must be UTF-8
472
391
# strings. GTK does not support directly setting and restoring Unicode
473
392
# 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
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
481
400
)
482
401
self._files_store = liststore
483
402
self._treeview_files.set_model(liststore)
484
crt = Gtk.CellRendererToggle()
403
crt = gtk.CellRendererToggle()
485
404
crt.set_property('activatable', not bool(self._pending))
486
405
crt.connect("toggled", self._toggle_commit, self._files_store)
487
406
if self._pending:
488
name = _i18n('Commit*')
407
name = _('Commit*')
489
408
else:
490
name = _i18n('Commit')
491
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
409
name = _('Commit')
410
commit_col = gtk.TreeViewColumn(name, crt, active=2)
492
411
commit_col.set_visible(False)
493
412
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))
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))
498
417
self._treeview_files.connect('cursor-changed',
499
418
self._on_treeview_files_cursor_changed)
500
419
501
420
def _toggle_commit(self, cell, path, model):
502
if model[path][0] == "": # No file_id means 'All Files'
421
if model[path][0] is None: # No file_id means 'All Files'
503
422
new_val = not model[path][2]
504
423
for node in model:
505
424
node[2] = new_val
515
434
checked_col.set_visible(False)
516
435
else:
517
436
checked_col.set_visible(True)
518
renderer = checked_col.get_cells()[0]
437
renderer = checked_col.get_cell_renderers()[0]
519
438
renderer.set_property('activatable', not all_files)
520
439
521
440
def _construct_pending_list(self):
522
441
# Pending information defaults to hidden, we put it all in 1 box, so
523
442
# that we can show/hide all of them at once
524
self._pending_box = Gtk.VBox()
443
self._pending_box = gtk.VBox()
525
444
self._pending_box.hide()
526
445
527
pending_message = Gtk.Label()
446
pending_message = gtk.Label()
528
447
pending_message.set_markup(
529
_i18n('<i>* Cannot select specific files when merging</i>'))
530
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)
531
450
pending_message.show()
532
451
533
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
534
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)
535
454
pending_label.show()
536
455
537
scroller = Gtk.ScrolledWindow()
538
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
539
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()
540
459
scroller.add(self._treeview_pending)
541
scroller.set_shadow_type(Gtk.ShadowType.IN)
460
scroller.set_shadow_type(gtk.SHADOW_IN)
542
461
scroller.show()
543
self._pending_box.pack_start(scroller, True, True, 5)
462
self._pending_box.pack_start(scroller,
463
expand=True, fill=True, padding=5)
544
464
self._treeview_pending.show()
545
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
465
self._left_pane_box.pack_start(self._pending_box)
546
466
547
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
548
GObject.TYPE_STRING, # date
549
GObject.TYPE_STRING, # committer
550
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
551
471
)
552
472
self._pending_store = liststore
553
473
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))
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))
560
480
561
481
def _construct_diff_view(self):
562
from bzrlib.plugins.gtk.diff import DiffView
482
from diff import DiffView
563
483
564
484
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
565
485
# decide that we really don't ever want to display it, we should
566
486
# actually remove it, and other references to it, along with the
567
487
# tests that it is set properly.
568
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
488
self._diff_label = gtk.Label(_('Diff for whole tree'))
569
489
self._diff_label.set_alignment(0, 0)
570
490
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
571
491
self._add_to_right_table(self._diff_label, 1, False)
576
496
self._diff_view.show()
577
497
578
498
def _construct_file_message(self):
579
scroller = Gtk.ScrolledWindow()
580
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
499
scroller = gtk.ScrolledWindow()
500
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
581
501
582
self._file_message_text_view = Gtk.TextView()
502
self._file_message_text_view = gtk.TextView()
583
503
scroller.add(self._file_message_text_view)
584
scroller.set_shadow_type(Gtk.ShadowType.IN)
504
scroller.set_shadow_type(gtk.SHADOW_IN)
585
505
scroller.show()
586
506
587
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
588
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)
589
509
self._file_message_text_view.set_accepts_tab(False)
590
510
self._file_message_text_view.show()
591
511
592
self._file_message_expander = Gtk.Expander(
593
label=_i18n('File commit message'))
512
self._file_message_expander = gtk.Expander(_('File commit message'))
594
513
self._file_message_expander.set_expanded(True)
595
514
self._file_message_expander.add(scroller)
596
515
self._add_to_right_table(self._file_message_expander, 1, False)
597
516
self._file_message_expander.show()
598
517
599
518
def _construct_global_message(self):
600
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
601
self._global_message_label.set_markup(
602
_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>'))
603
521
self._global_message_label.set_alignment(0, 0)
604
522
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
605
523
self._add_to_right_table(self._global_message_label, 1, False)
606
524
# Can we remove the spacing between the label and the box?
607
525
self._global_message_label.show()
608
526
609
scroller = Gtk.ScrolledWindow()
610
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
527
scroller = gtk.ScrolledWindow()
528
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
611
529
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"))
530
self._global_message_text_view = gtk.TextView()
531
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
615
532
scroller.add(self._global_message_text_view)
616
scroller.set_shadow_type(Gtk.ShadowType.IN)
533
scroller.set_shadow_type(gtk.SHADOW_IN)
617
534
scroller.show()
618
535
self._add_to_right_table(scroller, 2, True)
619
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
536
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
620
537
self._file_message_text_view.set_accepts_tab(False)
621
538
self._global_message_text_view.show()
622
539
623
540
def _on_treeview_files_cursor_changed(self, treeview):
624
541
treeselection = treeview.get_selection()
625
if treeselection is None:
626
# The treeview was probably destroyed as the dialog closes.
627
return
628
542
(model, selection) = treeselection.get_selected()
629
543
630
544
if selection is not None:
631
545
path, display_path = model.get(selection, 1, 3)
632
self._diff_label.set_text(_i18n('Diff for ') + display_path)
633
if path == "":
546
self._diff_label.set_text(_('Diff for ') + display_path)
547
if path is None:
634
548
self._diff_view.show_diff(None)
635
549
else:
636
self._diff_view.show_diff([osutils.safe_unicode(path)])
550
self._diff_view.show_diff([path.decode('UTF-8')])
637
551
self._update_per_file_info(selection)
638
552
639
553
def _on_accel_next(self, accel_group, window, keyval, modifier):
650
564
# We have either made it to the end of the list, or nothing was
651
565
# selected. Either way, select All Files, and jump to the global
652
566
# commit message.
653
self._treeview_files.set_cursor(
654
Gtk.TreePath(path=0), "", False)
567
self._treeview_files.set_cursor((0,))
655
568
self._global_message_text_view.grab_focus()
656
569
else:
657
570
# Set the cursor to this entry, and jump to the per-file commit
658
571
# message
659
self._treeview_files.set_cursor(model.get_path(next), None, False)
572
self._treeview_files.set_cursor(model.get_path(next))
660
573
self._file_message_text_view.grab_focus()
661
574
662
575
def _save_current_file_message(self):
664
577
return # Nothing to save
665
578
text_buffer = self._file_message_text_view.get_buffer()
666
579
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
667
text_buffer.get_end_iter(), True)
580
text_buffer.get_end_iter())
668
581
last_selected = self._files_store.get_iter(self._last_selected_file)
669
582
self._files_store.set_value(last_selected, 5, cur_text)
670
583
676
589
self._save_current_file_message()
677
590
text_buffer = self._file_message_text_view.get_buffer()
678
591
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
679
if file_id == "": # Whole tree
680
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'))
681
594
self._file_message_expander.set_expanded(False)
682
595
self._file_message_expander.set_sensitive(False)
683
596
text_buffer.set_text('')
684
597
self._last_selected_file = None
685
598
else:
686
self._file_message_expander.set_label(_i18n('Commit message for ')
599
self._file_message_expander.set_label(_('Commit message for ')
687
600
+ display_path)
688
601
self._file_message_expander.set_expanded(True)
689
602
self._file_message_expander.set_sensitive(True)
699
612
files = []
700
613
records = iter(self._files_store)
701
614
rec = records.next() # Skip the All Files record
702
assert rec[0] == "", "Are we skipping the wrong record?"
615
assert rec[0] is None, "Are we skipping the wrong record?"
703
616
704
617
file_info = []
705
618
for record in records:
706
619
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])
620
file_id = record[0] # [0] file_id
621
path = record[1] # [1] real path
622
file_message = record[5] # [5] commit message
711
623
files.append(path.decode('UTF-8'))
712
624
if self._enable_per_file_commits and file_message:
713
625
# All of this needs to be utf-8 information
714
file_message = file_message.encode('UTF-8')
715
626
file_info.append({'path':path, 'file_id':file_id,
716
627
'message':file_message})
717
628
file_info.sort(key=lambda x:(x['path'], x['file_id']))
721
632
return files, []
722
633
723
634
@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
635
def _on_commit_clicked(self, button):
752
636
""" Commit button clicked handler. """
753
637
self._do_commit()
757
641
758
642
if message == '':
759
643
response = self._question_dialog(
760
_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:
644
_('Commit with an empty message?'),
645
_('You can describe your commit intent in the message.'))
646
if response == gtk.RESPONSE_NO:
764
647
# Kindly give focus to message area
765
648
self._global_message_text_view.grab_focus()
766
649
return
778
661
# files at this point.
779
662
for path in self._wt.unknowns():
780
663
response = self._question_dialog(
781
_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:
664
_("Commit with unknowns?"),
665
_("Unknown files exist in the working tree. Commit anyway?"))
666
if response == gtk.RESPONSE_NO:
786
667
return
787
668
break
788
669
799
680
revprops=revprops)
800
681
except errors.PointlessCommit:
801
682
response = self._question_dialog(
802
_i18n('Commit with no changes?'),
803
_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:
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:
807
687
rev_id = self._wt.commit(message,
808
688
allow_pointless=True,
809
689
strict=False,
811
691
specific_files=specific_files,
812
692
revprops=revprops)
813
693
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)
694
self.response(gtk.RESPONSE_OK)
817
695
818
696
def _get_global_commit_message(self):
819
697
buf = self._global_message_text_view.get_buffer()
820
698
start, end = buf.get_bounds()
821
text = buf.get_text(start, end, True)
822
return _sanitize_and_decode_message(text)
699
return buf.get_text(start, end).decode('utf-8')
823
700
824
701
def _set_global_commit_message(self, message):
825
702
"""Just a helper for the test suite."""
846
723
show_offset=False)
847
724
rev_dict['revision_id'] = rev.revision_id
848
725
return rev_dict
849
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0