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 278.1.18
- compare with another revision
- download diff
- download tarball
- view history from revision 278.1.18
- Committer: John Arbash Meinel
- Date: 2007-10-01 22:04:43 UTC
- mto: (322.1.1 trunk) (330.3.3 trunk)
- mto: This revision was merged to the branch mainline in revision 368.
- Revision ID: john@arbash-meinel.com-20071001220443-q4jqupexf5wx2sqa
Start checking the diff view is correct.
- files added:
- prototype_gcommit.wxg
- files removed:
- branchview
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- preferences/__init__.py => preferences.py
- branchview/graphcell.py => viz/graphcell.py
- branchview/linegraph.py => viz/linegraph.py
- branchview/treemodel.py => viz/treemodel.py
- files modified:
- AUTHORS
added
removed
commit.py
29
29
30
30
from bzrlib import errors, osutils
31
31
from bzrlib.trace import mutter
32
from bzrlib.util import bencode
33
32
34
from bzrlib.plugins.gtk import _i18n
35
33
from dialog import error_dialog, question_dialog
36
34
from errors import show_bzr_error
37
35
105
103
parent=parent,
106
104
flags=0,
107
105
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
108
self._question_dialog = question_dialog
109
110
106
self._wt = wt
111
# TODO: Do something with this value, it is used by Olive
112
# It used to set all changes but this one to False
113
107
self._selected = selected
114
self._enable_per_file_commits = True
115
self._commit_all_changes = True
116
self.committed_revision_id = None # Nothing has been committed yet
117
108
118
109
self.setup_params()
119
110
self.construct()
130
121
def fill_in_data(self):
131
122
# Now that we are built, handle changes to the view based on the state
132
123
self._fill_in_pending()
124
self._fill_in_files()
133
125
self._fill_in_diff()
134
self._fill_in_files()
135
self._fill_in_checkout()
136
self._fill_in_per_file_info()
137
126
138
127
def _fill_in_pending(self):
139
128
if not self._pending:
160
149
self._pending_box.show()
161
150
162
151
def _fill_in_files(self):
163
# We should really use add a progress bar of some kind.
152
# We should really use _iter_changes, and then add a progress bar of
153
# some kind.
164
154
# While we fill in the view, hide the store
165
155
store = self._files_store
166
156
self._treeview_files.set_model(None)
167
157
168
added = _i18n('added')
169
removed = _i18n('removed')
170
renamed = _i18n('renamed')
171
renamed_and_modified = _i18n('renamed and modified')
172
modified = _i18n('modified')
173
kind_changed = _i18n('kind changed')
158
added = _('added')
159
removed = _('removed')
160
renamed = _('renamed')
161
renamed_and_modified = _('renamed and modified')
162
modified = _('modified')
163
kind_changed = _('kind changed')
174
164
175
165
# The store holds:
176
# [file_id, real path, checkbox, display path, changes type, message]
177
# iter_changes returns:
166
# [file_id, real path, checkbox, display path, changes type]
167
# _iter_changes returns:
178
168
# (file_id, (path_in_source, path_in_target),
179
169
# changed_content, versioned, parent, name, kind,
180
170
# executable)
181
171
182
all_enabled = (self._selected is None)
183
# The first entry is always the 'whole tree'
184
all_iter = store.append([None, None, all_enabled, 'All Files', '', ''])
185
initial_cursor = store.get_path(all_iter)
186
172
# should we pass specific_files?
187
173
self._wt.lock_read()
188
174
self._basis_tree.lock_read()
189
175
try:
190
from diff import iter_changes_to_status
191
for (file_id, real_path, change_type, display_path
192
) in iter_changes_to_status(self._basis_tree, self._wt):
193
if self._selected and real_path != self._selected:
194
enabled = False
195
else:
196
enabled = True
197
item_iter = store.append([
198
file_id,
199
real_path.encode('UTF-8'),
200
enabled,
201
display_path.encode('UTF-8'),
202
change_type,
203
'', # Initial comment
204
])
205
if self._selected and enabled:
206
initial_cursor = store.get_path(item_iter)
176
for (file_id, paths, changed_content, versioned, parent_ids, names,
177
kinds, executables) in self._wt._iter_changes(self._basis_tree):
178
179
# Skip the root entry.
180
if parent_ids == (None, None):
181
continue
182
183
change_type = None
184
if kinds[0] is None:
185
source_marker = ''
186
else:
187
source_marker = osutils.kind_marker(kinds[0])
188
if kinds[1] is None:
189
assert kinds[0] is not None
190
marker = osutils.kind_marker(kinds[0])
191
else:
192
marker = osutils.kind_marker(kinds[1])
193
194
real_path = paths[1]
195
if real_path is None:
196
real_path = paths[0]
197
assert real_path is not None
198
display_path = real_path + marker
199
200
present_source = versioned[0] and kinds[0] is not None
201
present_target = versioned[1] and kinds[1] is not None
202
203
if present_source != present_target:
204
if present_target:
205
change_type = added
206
else:
207
change_type = removed
208
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
209
# Renamed
210
if changed_content or executables[0] != executables[1]:
211
# and modified
212
change_type = renamed_and_modified
213
else:
214
change_type = renamed
215
display_path = (paths[0] + source_marker
216
+ ' => ' + paths[1] + marker)
217
elif kinds[0] != kinds[1]:
218
change_type = kind_changed
219
display_path = (paths[0] + source_marker
220
+ ' => ' + paths[1] + marker)
221
elif changed_content is True or executables[0] != executables[1]:
222
change_type = modified
223
else:
224
assert False, "How did we get here?"
225
226
store.append([file_id, real_path, True, display_path, change_type])
207
227
finally:
208
228
self._basis_tree.unlock()
209
229
self._wt.unlock()
210
230
211
231
self._treeview_files.set_model(store)
212
self._last_selected_file = None
213
# This sets the cursor, which causes the expander to close, which
214
# causes the _file_message_text_view to never get realized. So we have
215
# to give it a little kick, or it warns when we try to grab the focus
216
self._treeview_files.set_cursor(initial_cursor)
217
218
def _realize_file_message_tree_view(*args):
219
self._file_message_text_view.realize()
220
self.connect_after('realize', _realize_file_message_tree_view)
221
232
222
233
def _fill_in_diff(self):
234
self._diff_label.set_text(_('Diff for whole tree'))
223
235
self._diff_view.set_trees(self._wt, self._basis_tree)
224
225
def _fill_in_checkout(self):
226
if not self._is_checkout:
227
self._check_local.hide()
228
return
229
if have_dbus:
230
bus = dbus.SystemBus()
231
try:
232
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
233
'/org/freedesktop/NetworkManager')
234
except dbus.DBusException:
235
mutter("networkmanager not available.")
236
self._check_local.show()
237
return
238
239
dbus_iface = dbus.Interface(proxy_obj,
240
'org.freedesktop.NetworkManager')
241
try:
242
# 3 is the enum value for STATE_CONNECTED
243
self._check_local.set_active(dbus_iface.state() != 3)
244
except dbus.DBusException, e:
245
# Silently drop errors. While DBus may be
246
# available, NetworkManager doesn't necessarily have to be
247
mutter("unable to get networkmanager state: %r" % e)
248
self._check_local.show()
249
250
def _fill_in_per_file_info(self):
251
config = self._wt.branch.get_config()
252
enable_per_file_commits = config.get_user_option('per_file_commits')
253
if (enable_per_file_commits is None
254
or enable_per_file_commits.lower()
255
not in ('y', 'yes', 'on', 'enable', '1', 't', 'true')):
256
self._enable_per_file_commits = False
257
else:
258
self._enable_per_file_commits = True
259
if not self._enable_per_file_commits:
260
self._file_message_expander.hide()
261
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
236
self._diff_view.show_diff(None)
262
237
263
238
def _compute_delta(self):
264
239
self._delta = self._wt.changes_from(self._basis_tree)
271
246
272
247
self._construct_left_pane()
273
248
self._construct_right_pane()
274
self._construct_action_pane()
275
249
276
250
self.vbox.pack_start(self._hpane)
277
251
self._hpane.show()
278
252
self.set_focus(self._global_message_text_view)
279
253
280
self._construct_accelerators()
281
self._set_sizes()
282
283
def _set_sizes(self):
284
254
# This seems like a reasonable default, we might like it to
285
255
# be a bit wider, so that by default we can fit an 80-line diff in the
286
256
# diff window.
297
267
self.set_default_size(width, height)
298
268
self._hpane.set_position(300)
299
269
300
def _construct_accelerators(self):
301
group = gtk.AccelGroup()
302
group.connect_group(gtk.gdk.keyval_from_name('N'),
303
gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
304
self.add_accel_group(group)
305
306
# ignore the escape key (avoid closing the window)
307
self.connect_object('close', self.emit_stop_by_name, 'close')
308
309
270
def _construct_left_pane(self):
310
271
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
311
272
self._construct_file_list()
312
273
self._construct_pending_list()
313
274
314
self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
315
use_underline=True)
316
self._left_pane_box.pack_end(self._check_local, False, False)
317
self._check_local.set_active(False)
318
319
275
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
320
276
self._left_pane_box.show()
321
277
337
293
self._right_pane_table.show()
338
294
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
339
295
340
def _construct_action_pane(self):
341
self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
342
self._button_commit.connect('clicked', self._on_commit_clicked)
343
self._button_commit.set_flags(gtk.CAN_DEFAULT)
344
self._button_commit.show()
345
self.action_area.pack_end(self._button_commit)
346
self._button_commit.grab_default()
347
348
296
def _add_to_right_table(self, widget, weight, expanding=False):
349
297
"""Add another widget to the table
350
298
364
312
365
313
def _construct_file_list(self):
366
314
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
367
file_label = gtk.Label(_i18n('Files'))
368
# file_label.show()
315
file_label = gtk.Label(_('Files'))
316
file_label.show()
369
317
self._files_box.pack_start(file_label, expand=False)
370
318
371
self._commit_all_files_radio = gtk.RadioButton(
372
None, _i18n("Commit all changes"))
373
self._files_box.pack_start(self._commit_all_files_radio, expand=False)
374
self._commit_all_files_radio.show()
375
self._commit_all_files_radio.connect('toggled',
376
self._toggle_commit_selection)
377
self._commit_selected_radio = gtk.RadioButton(
378
self._commit_all_files_radio, _i18n("Only commit selected changes"))
379
self._files_box.pack_start(self._commit_selected_radio, expand=False)
380
self._commit_selected_radio.show()
381
self._commit_selected_radio.connect('toggled',
382
self._toggle_commit_selection)
383
if self._pending:
384
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
385
self._commit_all_files_radio.set_sensitive(False)
386
self._commit_selected_radio.set_sensitive(False)
387
388
319
scroller = gtk.ScrolledWindow()
389
320
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
390
321
self._treeview_files = gtk.TreeView()
391
322
self._treeview_files.show()
392
323
scroller.add(self._treeview_files)
324
scroller.show()
393
325
scroller.set_shadow_type(gtk.SHADOW_IN)
394
scroller.show()
395
326
self._files_box.pack_start(scroller,
396
327
expand=True, fill=True)
397
328
self._files_box.show()
398
329
self._left_pane_box.pack_start(self._files_box)
399
330
400
# Keep note that all strings stored in a ListStore must be UTF-8
401
# strings. GTK does not support directly setting and restoring Unicode
402
# objects.
403
331
liststore = gtk.ListStore(
404
332
gobject.TYPE_STRING, # [0] file_id
405
333
gobject.TYPE_STRING, # [1] real path
406
334
gobject.TYPE_BOOLEAN, # [2] checkbox
407
335
gobject.TYPE_STRING, # [3] display path
408
336
gobject.TYPE_STRING, # [4] changes type
409
gobject.TYPE_STRING, # [5] commit message
410
337
)
411
338
self._files_store = liststore
412
339
self._treeview_files.set_model(liststore)
413
340
crt = gtk.CellRendererToggle()
414
crt.set_property('activatable', not bool(self._pending))
341
crt.set_property("activatable", not bool(self._pending))
415
342
crt.connect("toggled", self._toggle_commit, self._files_store)
416
343
if self._pending:
417
name = _i18n('Commit*')
344
name = _('Commit*')
418
345
else:
419
name = _i18n('Commit')
420
commit_col = gtk.TreeViewColumn(name, crt, active=2)
421
commit_col.set_visible(False)
422
self._treeview_files.append_column(commit_col)
423
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
346
name = _('Commit')
347
self._treeview_files.append_column(gtk.TreeViewColumn(name,
348
crt, active=2))
349
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
424
350
gtk.CellRendererText(), text=3))
425
self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
351
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
426
352
gtk.CellRendererText(), text=4))
427
353
self._treeview_files.connect('cursor-changed',
428
354
self._on_treeview_files_cursor_changed)
429
355
430
356
def _toggle_commit(self, cell, path, model):
431
if model[path][0] is None: # No file_id means 'All Files'
432
new_val = not model[path][2]
433
for node in model:
434
node[2] = new_val
435
else:
436
model[path][2] = not model[path][2]
437
438
def _toggle_commit_selection(self, button):
439
all_files = self._commit_all_files_radio.get_active()
440
if self._commit_all_changes != all_files:
441
checked_col = self._treeview_files.get_column(0)
442
self._commit_all_changes = all_files
443
if all_files:
444
checked_col.set_visible(False)
445
else:
446
checked_col.set_visible(True)
447
renderer = checked_col.get_cell_renderers()[0]
448
renderer.set_property('activatable', not all_files)
357
model[path][2] = not model[path][2]
449
358
450
359
def _construct_pending_list(self):
451
360
# Pending information defaults to hidden, we put it all in 1 box, so
455
364
456
365
pending_message = gtk.Label()
457
366
pending_message.set_markup(
458
_i18n('<i>* Cannot select specific files when merging</i>'))
367
_('<i>* Cannot select specific files when merging</i>'))
459
368
self._pending_box.pack_start(pending_message, expand=False, padding=5)
460
369
pending_message.show()
461
370
462
pending_label = gtk.Label(_i18n('Pending Revisions'))
371
pending_label = gtk.Label(_('Pending Revisions'))
463
372
self._pending_box.pack_start(pending_label, expand=False, padding=0)
464
373
pending_label.show()
465
374
467
376
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
468
377
self._treeview_pending = gtk.TreeView()
469
378
scroller.add(self._treeview_pending)
379
scroller.show()
470
380
scroller.set_shadow_type(gtk.SHADOW_IN)
471
scroller.show()
472
381
self._pending_box.pack_start(scroller,
473
382
expand=True, fill=True, padding=5)
474
383
self._treeview_pending.show()
481
390
)
482
391
self._pending_store = liststore
483
392
self._treeview_pending.set_model(liststore)
484
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
393
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
485
394
gtk.CellRendererText(), text=1))
486
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
395
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
487
396
gtk.CellRendererText(), text=2))
488
self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
397
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
489
398
gtk.CellRendererText(), text=3))
490
399
491
400
def _construct_diff_view(self):
492
401
from diff import DiffView
493
402
494
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
495
# decide that we really don't ever want to display it, we should
496
# actually remove it, and other references to it, along with the
497
# tests that it is set properly.
498
self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
403
self._diff_label = gtk.Label(_('Diff for whole tree'))
499
404
self._diff_label.set_alignment(0, 0)
500
405
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
501
406
self._add_to_right_table(self._diff_label, 1, False)
502
# self._diff_label.show()
407
self._diff_label.show()
503
408
504
409
self._diff_view = DiffView()
505
410
self._add_to_right_table(self._diff_view, 4, True)
506
411
self._diff_view.show()
507
412
508
413
def _construct_file_message(self):
414
file_message_box = gtk.VBox()
509
415
scroller = gtk.ScrolledWindow()
510
416
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
511
417
512
418
self._file_message_text_view = gtk.TextView()
513
419
scroller.add(self._file_message_text_view)
420
scroller.show()
514
421
scroller.set_shadow_type(gtk.SHADOW_IN)
515
scroller.show()
422
file_message_box.pack_start(scroller, expand=True, fill=True)
516
423
517
424
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
518
425
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
519
426
self._file_message_text_view.set_accepts_tab(False)
520
427
self._file_message_text_view.show()
521
428
522
self._file_message_expander = gtk.Expander(_i18n('File commit message'))
523
self._file_message_expander.set_expanded(True)
524
self._file_message_expander.add(scroller)
429
self._file_message_expander = gtk.Expander(_('Per File Message'))
430
self._file_message_expander.add(file_message_box)
431
file_message_box.show()
525
432
self._add_to_right_table(self._file_message_expander, 1, False)
526
433
self._file_message_expander.show()
527
434
528
435
def _construct_global_message(self):
529
self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
530
self._global_message_label.set_markup(
531
_i18n('<b>Global Commit Message</b>'))
436
self._global_message_label = gtk.Label(_('Global Commit Message'))
532
437
self._global_message_label.set_alignment(0, 0)
533
438
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
534
439
self._add_to_right_table(self._global_message_label, 1, False)
541
446
self._global_message_text_view = gtk.TextView()
542
447
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
543
448
scroller.add(self._global_message_text_view)
449
scroller.show()
544
450
scroller.set_shadow_type(gtk.SHADOW_IN)
545
scroller.show()
546
451
self._add_to_right_table(scroller, 2, True)
547
452
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
548
453
self._file_message_text_view.set_accepts_tab(False)
550
455
551
456
def _on_treeview_files_cursor_changed(self, treeview):
552
457
treeselection = treeview.get_selection()
553
(model, selection) = treeselection.get_selected()
554
555
if selection is not None:
556
path, display_path = model.get(selection, 1, 3)
557
self._diff_label.set_text(_i18n('Diff for ') + display_path)
558
if path is None:
559
self._diff_view.show_diff(None)
560
else:
561
self._diff_view.show_diff([path.decode('UTF-8')])
562
self._update_per_file_info(selection)
563
564
def _on_accel_next(self, accel_group, window, keyval, modifier):
565
# We don't really care about any of the parameters, because we know
566
# where this message came from
567
tree_selection = self._treeview_files.get_selection()
568
(model, selection) = tree_selection.get_selected()
569
if selection is None:
570
next = None
571
else:
572
next = model.iter_next(selection)
573
574
if next is None:
575
# We have either made it to the end of the list, or nothing was
576
# selected. Either way, select All Files, and jump to the global
577
# commit message.
578
self._treeview_files.set_cursor((0,))
579
self._global_message_text_view.grab_focus()
580
else:
581
# Set the cursor to this entry, and jump to the per-file commit
582
# message
583
self._treeview_files.set_cursor(model.get_path(next))
584
self._file_message_text_view.grab_focus()
585
586
def _save_current_file_message(self):
587
if self._last_selected_file is None:
588
return # Nothing to save
589
text_buffer = self._file_message_text_view.get_buffer()
590
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
591
text_buffer.get_end_iter())
592
last_selected = self._files_store.get_iter(self._last_selected_file)
593
self._files_store.set_value(last_selected, 5, cur_text)
594
595
def _update_per_file_info(self, selection):
596
# The node is changing, so cache the current message
597
if not self._enable_per_file_commits:
598
return
599
600
self._save_current_file_message()
601
text_buffer = self._file_message_text_view.get_buffer()
602
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
603
if file_id is None: # Whole tree
604
self._file_message_expander.set_label(_i18n('File commit message'))
605
self._file_message_expander.set_expanded(False)
606
self._file_message_expander.set_sensitive(False)
607
text_buffer.set_text('')
608
self._last_selected_file = None
609
else:
610
self._file_message_expander.set_label(_i18n('Commit message for ')
611
+ display_path)
612
self._file_message_expander.set_expanded(True)
613
self._file_message_expander.set_sensitive(True)
614
text_buffer.set_text(message)
615
self._last_selected_file = self._files_store.get_path(selection)
616
617
def _get_specific_files(self):
618
"""Return the list of selected paths, and file info.
619
620
:return: ([unicode paths], [{utf-8 file info}]
621
"""
622
self._save_current_file_message()
623
files = []
624
records = iter(self._files_store)
625
rec = records.next() # Skip the All Files record
626
assert rec[0] is None, "Are we skipping the wrong record?"
627
628
file_info = []
629
for record in records:
630
if self._commit_all_changes or record[2]:# [2] checkbox
631
file_id = record[0] # [0] file_id
632
path = record[1] # [1] real path
633
file_message = record[5] # [5] commit message
634
files.append(path.decode('UTF-8'))
635
if self._enable_per_file_commits and file_message:
636
# All of this needs to be utf-8 information
637
file_info.append({'path':path, 'file_id':file_id,
638
'message':file_message})
639
file_info.sort(key=lambda x:(x['path'], x['file_id']))
640
if self._enable_per_file_commits:
641
return files, file_info
642
else:
643
return files, []
644
645
@show_bzr_error
646
def _on_commit_clicked(self, button):
647
""" Commit button clicked handler. """
648
self._do_commit()
649
650
def _do_commit(self):
651
message = self._get_global_commit_message()
652
653
if message == '':
654
response = self._question_dialog(
655
_i18n('Commit with an empty message?'),
656
_i18n('You can describe your commit intent in the message.'))
657
if response == gtk.RESPONSE_NO:
658
# Kindly give focus to message area
659
self._global_message_text_view.grab_focus()
660
return
661
662
specific_files, file_info = self._get_specific_files()
663
if self._pending:
664
specific_files = None
665
666
local = self._check_local.get_active()
667
668
# All we care about is if there is a single unknown, so if this loop is
669
# entered, then there are unknown files.
670
# TODO: jam 20071002 It seems like this should cancel the dialog
671
# entirely, since there isn't a way for them to add the unknown
672
# files at this point.
673
for path in self._wt.unknowns():
674
response = self._question_dialog(
675
_i18n("Commit with unknowns?"),
676
_i18n("Unknown files exist in the working tree. Commit anyway?"))
677
if response == gtk.RESPONSE_NO:
678
return
679
break
680
681
rev_id = None
682
revprops = {}
683
if file_info:
684
revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8')
685
try:
686
rev_id = self._wt.commit(message,
687
allow_pointless=False,
688
strict=False,
689
local=local,
690
specific_files=specific_files,
691
revprops=revprops)
692
except errors.PointlessCommit:
693
response = self._question_dialog(
694
_i18n('Commit with no changes?'),
695
_i18n('There are no changes in the working tree.'
696
' Do you want to commit anyway?'))
697
if response == gtk.RESPONSE_YES:
698
rev_id = self._wt.commit(message,
699
allow_pointless=True,
700
strict=False,
701
local=local,
702
specific_files=specific_files,
703
revprops=revprops)
704
self.committed_revision_id = rev_id
705
self.response(gtk.RESPONSE_OK)
706
707
def _get_global_commit_message(self):
708
buf = self._global_message_text_view.get_buffer()
709
start, end = buf.get_bounds()
710
return buf.get_text(start, end).decode('utf-8')
711
712
def _set_global_commit_message(self, message):
713
"""Just a helper for the test suite."""
714
if isinstance(message, unicode):
715
message = message.encode('UTF-8')
716
self._global_message_text_view.get_buffer().set_text(message)
717
718
def _set_file_commit_message(self, message):
719
"""Helper for the test suite."""
720
if isinstance(message, unicode):
721
message = message.encode('UTF-8')
722
self._file_message_text_view.get_buffer().set_text(message)
458
(model, iterable) = treeselection.get_selected()
459
460
if iterable is not None:
461
path, display_path = model.get(iterable, 1, 3) # Get the real_path attribute
462
self._diff_label.set_text(_('Diff for ') + display_path)
463
self._diff_view.show_diff([path])
723
464
724
465
@staticmethod
725
466
def _rev_to_pending_info(rev):
726
467
"""Get the information from a pending merge."""
727
468
from bzrlib.osutils import format_date
469
728
470
rev_dict = {}
729
471
rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
730
472
rev_dict['summary'] = rev.get_summary()
734
476
show_offset=False)
735
477
rev_dict['revision_id'] = rev.revision_id
736
478
return rev_dict
479
480
481
# class CommitDialog(gtk.Dialog):
482
# """ New implementation of the Commit dialog. """
483
# def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
484
# """ Initialize the Commit Dialog. """
485
# gtk.Dialog.__init__(self, title="Commit - Olive",
486
# parent=parent,
487
# flags=0,
488
# buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
489
#
490
# # Get arguments
491
# self.wt = wt
492
# self.wtpath = wtpath
493
# self.notbranch = notbranch
494
# self.selected = selected
495
#
496
# # Set the delta
497
# self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
498
# self.delta = self.wt.changes_from(self.old_tree)
499
#
500
# # Get pending merges
501
# self.pending = self._pending_merges(self.wt)
502
#
503
# # Do some preliminary checks
504
# self._is_checkout = False
505
# self._is_pending = False
506
# if self.wt is None and not self.notbranch:
507
# error_dialog(_('Directory does not have a working tree'),
508
# _('Operation aborted.'))
509
# self.close()
510
# return
511
#
512
# if self.notbranch:
513
# error_dialog(_('Directory is not a branch'),
514
# _('You can perform this action only in a branch.'))
515
# self.close()
516
# return
517
# else:
518
# if self.wt.branch.get_bound_location() is not None:
519
# # we have a checkout, so the local commit checkbox must appear
520
# self._is_checkout = True
521
#
522
# if self.pending:
523
# # There are pending merges, file selection not supported
524
# self._is_pending = True
525
#
526
# # Create the widgets
527
# # This is the main horizontal box, which is used to separate the commit
528
# # info from the diff window.
529
# self._hpane = gtk.HPaned()
530
# self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
531
# self._expander_files = gtk.Expander(_("File(s) to commit"))
532
# self._vpaned_main = gtk.VPaned()
533
# self._scrolledwindow_files = gtk.ScrolledWindow()
534
# self._scrolledwindow_message = gtk.ScrolledWindow()
535
# self._treeview_files = gtk.TreeView()
536
# self._vbox_message = gtk.VBox()
537
# self._label_message = gtk.Label(_("Commit message:"))
538
# self._textview_message = gtk.TextView()
539
#
540
# if self._is_pending:
541
# self._expander_merges = gtk.Expander(_("Pending merges"))
542
# self._vpaned_list = gtk.VPaned()
543
# self._scrolledwindow_merges = gtk.ScrolledWindow()
544
# self._treeview_merges = gtk.TreeView()
545
#
546
# # Set callbacks
547
# self._button_commit.connect('clicked', self._on_commit_clicked)
548
# self._treeview_files.connect('cursor-changed', self._on_treeview_files_cursor_changed)
549
# self._treeview_files.connect('row-activated', self._on_treeview_files_row_activated)
550
#
551
# # Set properties
552
# self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
553
# gtk.POLICY_AUTOMATIC)
554
# self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
555
# gtk.POLICY_AUTOMATIC)
556
# self._textview_message.modify_font(pango.FontDescription("Monospace"))
557
# self.set_default_size(500, 500)
558
# self._vpaned_main.set_position(200)
559
# self._button_commit.set_flags(gtk.CAN_DEFAULT)
560
#
561
# if self._is_pending:
562
# self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
563
# gtk.POLICY_AUTOMATIC)
564
# self._treeview_files.set_sensitive(False)
565
#
566
# # Construct the dialog
567
# self.action_area.pack_end(self._button_commit)
568
#
569
# self._scrolledwindow_files.add(self._treeview_files)
570
# self._scrolledwindow_message.add(self._textview_message)
571
#
572
# self._expander_files.add(self._scrolledwindow_files)
573
#
574
# self._vbox_message.pack_start(self._label_message, False, False)
575
# self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
576
#
577
# if self._is_pending:
578
# self._expander_merges.add(self._scrolledwindow_merges)
579
# self._scrolledwindow_merges.add(self._treeview_merges)
580
# self._vpaned_list.add1(self._expander_files)
581
# self._vpaned_list.add2(self._expander_merges)
582
# self._vpaned_main.add1(self._vpaned_list)
583
# else:
584
# self._vpaned_main.add1(self._expander_files)
585
#
586
# self._vpaned_main.add2(self._vbox_message)
587
#
588
# self._hpane.pack1(self._vpaned_main)
589
# self.vbox.pack_start(self._hpane, expand=True, fill=True)
590
# if self._is_checkout:
591
# self._check_local = gtk.CheckButton(_("_Only commit locally"),
592
# use_underline=True)
593
# self.vbox.pack_start(self._check_local, False, False)
594
# if have_dbus:
595
# bus = dbus.SystemBus()
596
# proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
597
# '/org/freedesktop/NetworkManager')
598
# dbus_iface = dbus.Interface(
599
# proxy_obj, 'org.freedesktop.NetworkManager')
600
# try:
601
# # 3 is the enum value for STATE_CONNECTED
602
# self._check_local.set_active(dbus_iface.state() != 3)
603
# except dbus.DBusException, e:
604
# # Silently drop errors. While DBus may be
605
# # available, NetworkManager doesn't necessarily have to be
606
# mutter("unable to get networkmanager state: %r" % e)
607
#
608
# # Create the file list
609
# self._create_file_view()
610
# # Create the pending merges
611
# self._create_pending_merges()
612
# self._create_diff_view()
613
#
614
# # Expand the corresponding expander
615
# if self._is_pending:
616
# self._expander_merges.set_expanded(True)
617
# else:
618
# self._expander_files.set_expanded(True)
619
#
620
# # Display dialog
621
# self.vbox.show_all()
622
#
623
# # Default to Commit button
624
# self._button_commit.grab_default()
625
#
626
# def _show_diff_view(self, treeview):
627
# # FIXME: the diff window freezes for some reason
628
# treeselection = treeview.get_selection()
629
# (model, iter) = treeselection.get_selected()
630
#
631
# if iter is not None:
632
# selected = model.get_value(iter, 3) # Get the real_path attribute
633
# self._diff_display.show_diff([selected])
634
#
635
# def _on_treeview_files_cursor_changed(self, treeview):
636
# self._show_diff_view(treeview)
637
#
638
# def _on_treeview_files_row_activated(self, treeview, path, view_column):
639
# self._show_diff_view(treeview)
640
#
641
# @show_bzr_error
642
# def _on_commit_clicked(self, button):
643
# """ Commit button clicked handler. """
644
# textbuffer = self._textview_message.get_buffer()
645
# start, end = textbuffer.get_bounds()
646
# message = textbuffer.get_text(start, end).decode('utf-8')
647
#
648
# if not self.pending:
649
# specific_files = self._get_specific_files()
650
# else:
651
# specific_files = None
652
#
653
# if message == '':
654
# response = question_dialog(_('Commit with an empty message?'),
655
# _('You can describe your commit intent in the message.'))
656
# if response == gtk.RESPONSE_NO:
657
# # Kindly give focus to message area
658
# self._textview_message.grab_focus()
659
# return
660
#
661
# if self._is_checkout:
662
# local = self._check_local.get_active()
663
# else:
664
# local = False
665
#
666
# if list(self.wt.unknowns()) != []:
667
# response = question_dialog(_("Commit with unknowns?"),
668
# _("Unknown files exist in the working tree. Commit anyway?"))
669
# if response == gtk.RESPONSE_NO:
670
# return
671
#
672
# try:
673
# self.wt.commit(message,
674
# allow_pointless=False,
675
# strict=False,
676
# local=local,
677
# specific_files=specific_files)
678
# except errors.PointlessCommit:
679
# response = question_dialog(_('Commit with no changes?'),
680
# _('There are no changes in the working tree.'))
681
# if response == gtk.RESPONSE_YES:
682
# self.wt.commit(message,
683
# allow_pointless=True,
684
# strict=False,
685
# local=local,
686
# specific_files=specific_files)
687
# self.response(gtk.RESPONSE_OK)
688
#
689
# def _pending_merges(self, wt):
690
# """ Return a list of pending merges or None if there are none of them. """
691
# parents = wt.get_parent_ids()
692
# if len(parents) < 2:
693
# return None
694
#
695
# import re
696
# from bzrlib.osutils import format_date
697
#
698
# pending = parents[1:]
699
# branch = wt.branch
700
# last_revision = parents[0]
701
#
702
# if last_revision is not None:
703
# try:
704
# ignore = set(branch.repository.get_ancestry(last_revision))
705
# except errors.NoSuchRevision:
706
# # the last revision is a ghost : assume everything is new
707
# # except for it
708
# ignore = set([None, last_revision])
709
# else:
710
# ignore = set([None])
711
#
712
# pm = []
713
# for merge in pending:
714
# ignore.add(merge)
715
# try:
716
# m_revision = branch.repository.get_revision(merge)
717
#
718
# rev = {}
719
# rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
720
# rev['summary'] = m_revision.get_summary()
721
# rev['date'] = format_date(m_revision.timestamp,
722
# m_revision.timezone or 0,
723
# 'original', date_fmt="%Y-%m-%d",
724
# show_offset=False)
725
#
726
# pm.append(rev)
727
#
728
# inner_merges = branch.repository.get_ancestry(merge)
729
# assert inner_merges[0] is None
730
# inner_merges.pop(0)
731
# inner_merges.reverse()
732
# for mmerge in inner_merges:
733
# if mmerge in ignore:
734
# continue
735
# mm_revision = branch.repository.get_revision(mmerge)
736
#
737
# rev = {}
738
# rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
739
# rev['summary'] = mm_revision.get_summary()
740
# rev['date'] = format_date(mm_revision.timestamp,
741
# mm_revision.timezone or 0,
742
# 'original', date_fmt="%Y-%m-%d",
743
# show_offset=False)
744
#
745
# pm.append(rev)
746
#
747
# ignore.add(mmerge)
748
# except errors.NoSuchRevision:
749
# print "DEBUG: NoSuchRevision:", merge
750
#
751
# return pm
752
#
753
# def _create_file_view(self):
754
# self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox
755
# gobject.TYPE_STRING, # [1] path to display
756
# gobject.TYPE_STRING, # [2] changes type
757
# gobject.TYPE_STRING) # [3] real path
758
# self._treeview_files.set_model(self._file_store)
759
# crt = gtk.CellRendererToggle()
760
# crt.set_property("activatable", True)
761
# crt.connect("toggled", self._toggle_commit, self._file_store)
762
# self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
763
# crt, active=0))
764
# self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
765
# gtk.CellRendererText(), text=1))
766
# self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
767
# gtk.CellRendererText(), text=2))
768
#
769
# for path, id, kind in self.delta.added:
770
# marker = osutils.kind_marker(kind)
771
# if self.selected is not None:
772
# if path == os.path.join(self.wtpath, self.selected):
773
# self._file_store.append([ True, path+marker, _('added'), path ])
774
# else:
775
# self._file_store.append([ False, path+marker, _('added'), path ])
776
# else:
777
# self._file_store.append([ True, path+marker, _('added'), path ])
778
#
779
# for path, id, kind in self.delta.removed:
780
# marker = osutils.kind_marker(kind)
781
# if self.selected is not None:
782
# if path == os.path.join(self.wtpath, self.selected):
783
# self._file_store.append([ True, path+marker, _('removed'), path ])
784
# else:
785
# self._file_store.append([ False, path+marker, _('removed'), path ])
786
# else:
787
# self._file_store.append([ True, path+marker, _('removed'), path ])
788
#
789
# for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
790
# marker = osutils.kind_marker(kind)
791
# if text_modified or meta_modified:
792
# changes = _('renamed and modified')
793
# else:
794
# changes = _('renamed')
795
# if self.selected is not None:
796
# if newpath == os.path.join(self.wtpath, self.selected):
797
# self._file_store.append([ True,
798
# oldpath+marker + ' => ' + newpath+marker,
799
# changes,
800
# newpath
801
# ])
802
# else:
803
# self._file_store.append([ False,
804
# oldpath+marker + ' => ' + newpath+marker,
805
# changes,
806
# newpath
807
# ])
808
# else:
809
# self._file_store.append([ True,
810
# oldpath+marker + ' => ' + newpath+marker,
811
# changes,
812
# newpath
813
# ])
814
#
815
# for path, id, kind, text_modified, meta_modified in self.delta.modified:
816
# marker = osutils.kind_marker(kind)
817
# if self.selected is not None:
818
# if path == os.path.join(self.wtpath, self.selected):
819
# self._file_store.append([ True, path+marker, _('modified'), path ])
820
# else:
821
# self._file_store.append([ False, path+marker, _('modified'), path ])
822
# else:
823
# self._file_store.append([ True, path+marker, _('modified'), path ])
824
#
825
# def _create_pending_merges(self):
826
# if not self.pending:
827
# return
828
#
829
# liststore = gtk.ListStore(gobject.TYPE_STRING,
830
# gobject.TYPE_STRING,
831
# gobject.TYPE_STRING)
832
# self._treeview_merges.set_model(liststore)
833
#
834
# self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
835
# gtk.CellRendererText(), text=0))
836
# self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
837
# gtk.CellRendererText(), text=1))
838
# self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
839
# gtk.CellRendererText(), text=2))
840
#
841
# for item in self.pending:
842
# liststore.append([ item['date'],
843
# item['committer'],
844
# item['summary'] ])
845
#
846
#
847
# def _create_diff_view(self):
848
# from diff import DiffView
849
#
850
# self._diff_display = DiffView()
851
# self._diff_display.set_trees(self.wt, self.wt.basis_tree())
852
# self._diff_display.show_diff(None)
853
# self._diff_display.show()
854
# self._hpane.pack2(self._diff_display)
855
#
856
# def _get_specific_files(self):
857
# ret = []
858
# it = self._file_store.get_iter_first()
859
# while it:
860
# if self._file_store.get_value(it, 0):
861
# # get real path from hidden column 3
862
# ret.append(self._file_store.get_value(it, 3))
863
# it = self._file_store.iter_next(it)
864
#
865
# return ret
866
#
867
# def _toggle_commit(self, cell, path, model):
868
# model[path][0] = not model[path][0]
869
# return
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0