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