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.29
- compare with another revision
- download diff
- download tarball
- view history from revision 278.1.29
- Committer: John Arbash Meinel
- Date: 2007-10-02 23:08:12 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-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.
- files added:
- bzr-notify.desktop
- olive
- files removed:
- avatarproviders.py
- branchview
- preferences
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- icons/bzr-icon-64.png => bzr-icon-64.png
- 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:
- .bzrignore
added
removed
commit.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
try:
18
import pygtk
19
pygtk.require("2.0")
20
except:
21
pass
22
23
import gtk
24
import gobject
25
import pango
26
27
import os.path
17
28
import re
18
29
19
from gi.repository import Gdk
20
from gi.repository import Gtk
21
from gi.repository import GObject
22
from gi.repository import Pango
30
from bzrlib import errors, osutils
31
from bzrlib.trace import mutter
32
from bzrlib.util import bencode
23
33
24
from bzrlib import (
25
bencode,
26
errors,
27
osutils,
28
revision as _mod_revision,
29
trace,
30
tsort,
31
)
32
from bzrlib.plugins.gtk.dialog import question_dialog
33
from bzrlib.plugins.gtk.diff import DiffView
34
from bzrlib.plugins.gtk.errors import show_bzr_error
35
from bzrlib.plugins.gtk.i18n import _i18n
36
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
34
from dialog import error_dialog, question_dialog
35
from errors import show_bzr_error
37
36
38
37
try:
39
38
import dbus
43
42
have_dbus = False
44
43
45
44
46
def _get_sorted_revisions(tip_revision, revision_ids, parent_map):
47
"""Get an iterator which will return the revisions in merge sorted order.
48
49
This will build up a list of all nodes, such that only nodes in the list
50
are referenced. It then uses MergeSorter to return them in 'merge-sorted'
51
order.
52
53
:param revision_ids: A set of revision_ids
54
:param parent_map: The parent information for each node. Revisions which
55
are considered ghosts should not be present in the map.
56
:return: iterator from MergeSorter.iter_topo_order()
57
"""
58
# MergeSorter requires that all nodes be present in the graph, so get rid
59
# of any references pointing outside of this graph.
60
parent_graph = {}
61
for revision_id in revision_ids:
62
if revision_id not in parent_map: # ghost
63
parent_graph[revision_id] = []
64
else:
65
# Only include parents which are in this sub-graph
66
parent_graph[revision_id] = [p for p in parent_map[revision_id]
67
if p in revision_ids]
68
sorter = tsort.MergeSorter(parent_graph, tip_revision)
69
return sorter.iter_topo_order()
70
71
72
45
def pending_revisions(wt):
73
46
"""Return a list of pending merges or None if there are none of them.
74
47
79
52
"""
80
53
parents = wt.get_parent_ids()
81
54
if len(parents) < 2:
82
return
55
return None
83
56
84
57
# The basic pending merge algorithm uses the same algorithm as
85
58
# bzrlib.status.show_pending_merges
87
60
branch = wt.branch
88
61
last_revision = parents[0]
89
62
90
graph = branch.repository.get_graph()
91
other_revisions = [last_revision]
63
if last_revision is not None:
64
try:
65
ignore = set(branch.repository.get_ancestry(last_revision,
66
topo_sorted=False))
67
except errors.NoSuchRevision:
68
# the last revision is a ghost : assume everything is new
69
# except for it
70
ignore = set([None, last_revision])
71
else:
72
ignore = set([None])
92
73
93
74
pm = []
94
75
for merge in pending:
95
try:
96
merge_rev = branch.repository.get_revision(merge)
97
except errors.NoSuchRevision:
98
# If we are missing a revision, just print out the revision id
99
trace.mutter("ghost: %r", merge)
100
other_revisions.append(merge)
101
continue
102
103
# Find all of the revisions in the merge source, which are not in the
104
# last committed revision.
105
merge_extra = graph.find_unique_ancestors(merge, other_revisions)
106
other_revisions.append(merge)
107
merge_extra.discard(_mod_revision.NULL_REVISION)
108
109
# Get a handle to all of the revisions we will need
110
try:
111
revisions = dict((rev.revision_id, rev) for rev in
112
branch.repository.get_revisions(merge_extra))
113
except errors.NoSuchRevision:
114
# One of the sub nodes is a ghost, check each one
115
revisions = {}
116
for revision_id in merge_extra:
117
try:
118
rev = branch.repository.get_revisions([revision_id])[0]
119
except errors.NoSuchRevision:
120
revisions[revision_id] = None
121
else:
122
revisions[revision_id] = rev
123
124
# Display the revisions brought in by this merge.
125
rev_id_iterator = _get_sorted_revisions(merge, merge_extra,
126
branch.repository.get_parent_map(merge_extra))
127
# Skip the first node
128
num, first, depth, eom = rev_id_iterator.next()
129
if first != merge:
130
raise AssertionError('Somehow we misunderstood how'
131
' iter_topo_order works %s != %s' % (first, merge))
132
children = []
133
for num, sub_merge, depth, eom in rev_id_iterator:
134
rev = revisions[sub_merge]
135
if rev is None:
136
trace.warning("ghost: %r", sub_merge)
137
continue
138
children.append(rev)
139
yield (merge_rev, children)
140
141
142
_newline_variants_re = re.compile(r'\r\n?')
143
def _sanitize_and_decode_message(utf8_message):
144
"""Turn a utf-8 message into a sanitized Unicode message."""
145
fixed_newline = _newline_variants_re.sub('\n', utf8_message)
146
return osutils.safe_unicode(fixed_newline)
147
148
149
class CommitDialog(Gtk.Dialog):
76
ignore.add(merge)
77
try:
78
rev = branch.repository.get_revision(merge)
79
children = []
80
pm.append((rev, children))
81
82
# This does need to be topo sorted, so we search backwards
83
inner_merges = branch.repository.get_ancestry(merge)
84
assert inner_merges[0] is None
85
inner_merges.pop(0)
86
for mmerge in reversed(inner_merges):
87
if mmerge in ignore:
88
continue
89
rev = branch.repository.get_revision(mmerge)
90
children.append(rev)
91
92
ignore.add(mmerge)
93
except errors.NoSuchRevision:
94
print "DEBUG: NoSuchRevision:", merge
95
96
return pm
97
98
99
class CommitDialog(gtk.Dialog):
150
100
"""Implementation of Commit."""
151
101
152
102
def __init__(self, wt, selected=None, parent=None):
153
super(CommitDialog, self).__init__(
154
title="Commit to %s" % wt.basedir, parent=parent, flags=0)
155
self.connect('delete-event', self._on_delete_window)
103
gtk.Dialog.__init__(self, title="Commit - Olive",
104
parent=parent,
105
flags=0,
106
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
156
107
self._question_dialog = question_dialog
157
108
158
self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
159
160
109
self._wt = wt
161
# TODO: Do something with this value, it is used by Olive
162
# It used to set all changes but this one to False
163
110
self._selected = selected
164
self._enable_per_file_commits = True
165
self._commit_all_changes = True
166
111
self.committed_revision_id = None # Nothing has been committed yet
167
self._last_selected_file = None
168
self._saved_commit_messages_manager = SavedCommitMessagesManager(
169
self._wt, self._wt.branch)
170
112
171
113
self.setup_params()
172
114
self.construct()
176
118
"""Setup the member variables for state."""
177
119
self._basis_tree = self._wt.basis_tree()
178
120
self._delta = None
179
self._wt.lock_read()
180
try:
181
self._pending = list(pending_revisions(self._wt))
182
finally:
183
self._wt.unlock()
121
self._pending = pending_revisions(self._wt)
184
122
185
123
self._is_checkout = (self._wt.branch.get_bound_location() is not None)
186
124
190
128
self._fill_in_diff()
191
129
self._fill_in_files()
192
130
self._fill_in_checkout()
193
self._fill_in_per_file_info()
194
131
195
132
def _fill_in_pending(self):
196
133
if not self._pending:
222
159
store = self._files_store
223
160
self._treeview_files.set_model(None)
224
161
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')
162
added = _('added')
163
removed = _('removed')
164
renamed = _('renamed')
165
renamed_and_modified = _('renamed and modified')
166
modified = _('modified')
167
kind_changed = _('kind changed')
231
168
232
169
# The store holds:
233
170
# [file_id, real path, checkbox, display path, changes type, message]
234
# iter_changes returns:
171
# _iter_changes returns:
235
172
# (file_id, (path_in_source, path_in_target),
236
173
# changed_content, versioned, parent, name, kind,
237
174
# executable)
238
175
239
all_enabled = (self._selected is None)
240
176
# The first entry is always the 'whole tree'
241
all_iter = store.append(["", "", all_enabled, 'All Files', '', ''])
242
initial_cursor = store.get_path(all_iter)
177
store.append([None, None, True, 'All Files', '', ''])
243
178
# should we pass specific_files?
244
179
self._wt.lock_read()
245
180
self._basis_tree.lock_read()
246
181
try:
247
from diff import iter_changes_to_status
248
saved_file_messages = self._saved_commit_messages_manager.get()[1]
182
from diff import _iter_changes_to_status
249
183
for (file_id, real_path, change_type, display_path
250
) in iter_changes_to_status(self._basis_tree, self._wt):
251
if self._selected and real_path != self._selected:
252
enabled = False
253
else:
254
enabled = True
255
try:
256
default_message = saved_file_messages[file_id]
257
except KeyError:
258
default_message = ''
259
item_iter = store.append([
260
file_id,
261
real_path.encode('UTF-8'),
262
enabled,
263
display_path.encode('UTF-8'),
264
change_type,
265
default_message, # Initial comment
266
])
267
if self._selected and enabled:
268
initial_cursor = store.get_path(item_iter)
184
) in _iter_changes_to_status(self._basis_tree, self._wt):
185
store.append([file_id, real_path.encode('UTF-8'),
186
True, display_path.encode('UTF-8'),
187
change_type, ''])
269
188
finally:
270
189
self._basis_tree.unlock()
271
190
self._wt.unlock()
272
191
273
192
self._treeview_files.set_model(store)
274
193
self._last_selected_file = None
275
# This sets the cursor, which causes the expander to close, which
276
# causes the _file_message_text_view to never get realized. So we have
277
# to give it a little kick, or it warns when we try to grab the focus
278
self._treeview_files.set_cursor(initial_cursor, None, False)
279
280
def _realize_file_message_tree_view(*args):
281
self._file_message_text_view.realize()
282
self.connect_after('realize', _realize_file_message_tree_view)
194
self._treeview_files.set_cursor(0)
283
195
284
196
def _fill_in_diff(self):
285
197
self._diff_view.set_trees(self._wt, self._basis_tree)
289
201
self._check_local.hide()
290
202
return
291
203
if have_dbus:
292
try:
293
bus = dbus.SystemBus()
294
except dbus.DBusException:
295
trace.mutter("DBus system bus not available")
296
self._check_local.show()
297
return
298
try:
299
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
300
'/org/freedesktop/NetworkManager')
301
except dbus.DBusException:
302
trace.mutter("networkmanager not available.")
303
self._check_local.show()
304
return
305
204
bus = dbus.SystemBus()
205
proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
206
'/org/freedesktop/NetworkManager')
306
207
dbus_iface = dbus.Interface(proxy_obj,
307
208
'org.freedesktop.NetworkManager')
308
209
try:
311
212
except dbus.DBusException, e:
312
213
# Silently drop errors. While DBus may be
313
214
# available, NetworkManager doesn't necessarily have to be
314
trace.mutter("unable to get networkmanager state: %r" % e)
215
mutter("unable to get networkmanager state: %r" % e)
315
216
self._check_local.show()
316
217
317
def _fill_in_per_file_info(self):
318
config = self._wt.branch.get_config()
319
enable_per_file_commits = config.get_user_option('per_file_commits')
320
if (enable_per_file_commits is None
321
or enable_per_file_commits.lower()
322
not in ('y', 'yes', 'on', 'enable', '1', 't', 'true')):
323
self._enable_per_file_commits = False
324
else:
325
self._enable_per_file_commits = True
326
if not self._enable_per_file_commits:
327
self._file_message_expander.hide()
328
self._global_message_label.set_markup(_i18n('<b>Commit Message</b>'))
329
330
218
def _compute_delta(self):
331
219
self._delta = self._wt.changes_from(self._basis_tree)
332
220
334
222
"""Build up the dialog widgets."""
335
223
# The primary pane which splits it into left and right (adjustable)
336
224
# sections.
337
self._hpane = Gtk.Paned.new(Gtk.Orientation.HORIZONTAL)
225
self._hpane = gtk.HPaned()
338
226
339
227
self._construct_left_pane()
340
228
self._construct_right_pane()
341
229
self._construct_action_pane()
342
230
343
self.get_content_area().pack_start(self._hpane, True, True, 0)
231
self.vbox.pack_start(self._hpane)
344
232
self._hpane.show()
345
233
self.set_focus(self._global_message_text_view)
346
234
347
self._construct_accelerators()
348
self._set_sizes()
349
350
def _set_sizes(self):
351
235
# This seems like a reasonable default, we might like it to
352
236
# be a bit wider, so that by default we can fit an 80-line diff in the
353
237
# diff window.
364
248
self.set_default_size(width, height)
365
249
self._hpane.set_position(300)
366
250
367
def _construct_accelerators(self):
368
group = Gtk.AccelGroup()
369
group.connect(Gdk.keyval_from_name('N'),
370
Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
371
self.add_accel_group(group)
372
373
# ignore the escape key (avoid closing the window)
374
self.connect_object('close', self.emit_stop_by_name, 'close')
375
376
251
def _construct_left_pane(self):
377
self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
252
self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
378
253
self._construct_file_list()
379
254
self._construct_pending_list()
380
255
381
self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
256
self._check_local = gtk.CheckButton(_("_Only commit locally"),
382
257
use_underline=True)
383
self._left_pane_box.pack_end(self._check_local, False, False, 0)
258
self._left_pane_box.pack_end(self._check_local, False, False)
384
259
self._check_local.set_active(False)
385
260
386
261
self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
393
268
# commit, and 1 for file commit, and it looked good. But I don't seem
394
269
# to have a way to do that with the gtk boxes... :( (Which is extra
395
270
# weird since wx uses gtk on Linux...)
396
self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
271
self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
397
272
self._right_pane_table.set_row_spacings(5)
398
273
self._right_pane_table.set_col_spacings(5)
399
274
self._right_pane_table_row = 0
405
280
self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
406
281
407
282
def _construct_action_pane(self):
408
self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
409
self._button_cancel.connect('clicked', self._on_cancel_clicked)
410
self._button_cancel.show()
411
self.get_action_area().pack_end(
412
self._button_cancel, True, True, 0)
413
self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
283
self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
414
284
self._button_commit.connect('clicked', self._on_commit_clicked)
415
self._button_commit.set_can_default(True)
285
self._button_commit.set_flags(gtk.CAN_DEFAULT)
416
286
self._button_commit.show()
417
self.get_action_area().pack_end(
418
self._button_commit, True, True, 0)
287
self.action_area.pack_end(self._button_commit)
419
288
self._button_commit.grab_default()
420
289
421
290
def _add_to_right_table(self, widget, weight, expanding=False):
427
296
"""
428
297
end_row = self._right_pane_table_row + weight
429
298
options = 0
430
expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
299
expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
431
300
if expanding:
432
301
options = expand_opts
433
302
self._right_pane_table.attach(widget, 0, 1,
436
305
self._right_pane_table_row = end_row
437
306
438
307
def _construct_file_list(self):
439
self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
440
file_label = Gtk.Label(label=_i18n('Files'))
441
# file_label.show()
442
self._files_box.pack_start(file_label, False, True, 0)
443
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)
447
self._commit_all_files_radio.show()
448
self._commit_all_files_radio.connect('toggled',
449
self._toggle_commit_selection)
450
self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
451
self._commit_all_files_radio, _i18n("Only commit selected changes"))
452
self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
453
self._commit_selected_radio.show()
454
self._commit_selected_radio.connect('toggled',
455
self._toggle_commit_selection)
456
if self._pending:
457
self._commit_all_files_radio.set_label(_i18n('Commit all changes*'))
458
self._commit_all_files_radio.set_sensitive(False)
459
self._commit_selected_radio.set_sensitive(False)
460
461
scroller = Gtk.ScrolledWindow()
462
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
463
self._treeview_files = Gtk.TreeView()
308
self._files_box = gtk.VBox(homogeneous=False, spacing=0)
309
file_label = gtk.Label(_('Files'))
310
file_label.show()
311
self._files_box.pack_start(file_label, expand=False)
312
313
scroller = gtk.ScrolledWindow()
314
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
315
self._treeview_files = gtk.TreeView()
464
316
self._treeview_files.show()
465
317
scroller.add(self._treeview_files)
466
scroller.set_shadow_type(Gtk.ShadowType.IN)
467
318
scroller.show()
468
self._files_box.pack_start(scroller, True, True, 0)
319
scroller.set_shadow_type(gtk.SHADOW_IN)
320
self._files_box.pack_start(scroller,
321
expand=True, fill=True)
469
322
self._files_box.show()
470
self._left_pane_box.pack_start(self._files_box, True, True, 0)
323
self._left_pane_box.pack_start(self._files_box)
471
324
472
# Keep note that all strings stored in a ListStore must be UTF-8
473
# strings. GTK does not support directly setting and restoring Unicode
474
# objects.
475
liststore = Gtk.ListStore(
476
GObject.TYPE_STRING, # [0] file_id
477
GObject.TYPE_STRING, # [1] real path
478
GObject.TYPE_BOOLEAN, # [2] checkbox
479
GObject.TYPE_STRING, # [3] display path
480
GObject.TYPE_STRING, # [4] changes type
481
GObject.TYPE_STRING, # [5] commit message
325
liststore = gtk.ListStore(
326
gobject.TYPE_STRING, # [0] file_id
327
gobject.TYPE_STRING, # [1] real path
328
gobject.TYPE_BOOLEAN, # [2] checkbox
329
gobject.TYPE_STRING, # [3] display path
330
gobject.TYPE_STRING, # [4] changes type
331
gobject.TYPE_STRING, # [5] commit message
482
332
)
483
333
self._files_store = liststore
484
334
self._treeview_files.set_model(liststore)
485
crt = Gtk.CellRendererToggle()
486
crt.set_property('activatable', not bool(self._pending))
335
crt = gtk.CellRendererToggle()
336
crt.set_active(not bool(self._pending))
487
337
crt.connect("toggled", self._toggle_commit, self._files_store)
488
338
if self._pending:
489
name = _i18n('Commit*')
339
name = _('Commit*')
490
340
else:
491
name = _i18n('Commit')
492
commit_col = Gtk.TreeViewColumn(name, crt, active=2)
493
commit_col.set_visible(False)
494
self._treeview_files.append_column(commit_col)
495
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
496
Gtk.CellRendererText(), text=3))
497
self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
498
Gtk.CellRendererText(), text=4))
341
name = _('Commit')
342
self._treeview_files.append_column(gtk.TreeViewColumn(name,
343
crt, active=2))
344
self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
345
gtk.CellRendererText(), text=3))
346
self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
347
gtk.CellRendererText(), text=4))
499
348
self._treeview_files.connect('cursor-changed',
500
349
self._on_treeview_files_cursor_changed)
501
350
502
351
def _toggle_commit(self, cell, path, model):
503
if model[path][0] == "": # No file_id means 'All Files'
352
if model[path][0] is None: # No file_id means 'All Files'
504
353
new_val = not model[path][2]
505
354
for node in model:
506
355
node[2] = new_val
507
356
else:
508
357
model[path][2] = not model[path][2]
509
358
510
def _toggle_commit_selection(self, button):
511
all_files = self._commit_all_files_radio.get_active()
512
if self._commit_all_changes != all_files:
513
checked_col = self._treeview_files.get_column(0)
514
self._commit_all_changes = all_files
515
if all_files:
516
checked_col.set_visible(False)
517
else:
518
checked_col.set_visible(True)
519
renderer = checked_col.get_cells()[0]
520
renderer.set_property('activatable', not all_files)
521
522
359
def _construct_pending_list(self):
523
360
# Pending information defaults to hidden, we put it all in 1 box, so
524
361
# that we can show/hide all of them at once
525
self._pending_box = Gtk.VBox()
362
self._pending_box = gtk.VBox()
526
363
self._pending_box.hide()
527
364
528
pending_message = Gtk.Label()
365
pending_message = gtk.Label()
529
366
pending_message.set_markup(
530
_i18n('<i>* Cannot select specific files when merging</i>'))
531
self._pending_box.pack_start(pending_message, False, True, 5)
367
_('<i>* Cannot select specific files when merging</i>'))
368
self._pending_box.pack_start(pending_message, expand=False, padding=5)
532
369
pending_message.show()
533
370
534
pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
535
self._pending_box.pack_start(pending_label, False, True, 0)
371
pending_label = gtk.Label(_('Pending Revisions'))
372
self._pending_box.pack_start(pending_label, expand=False, padding=0)
536
373
pending_label.show()
537
374
538
scroller = Gtk.ScrolledWindow()
539
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
540
self._treeview_pending = Gtk.TreeView()
375
scroller = gtk.ScrolledWindow()
376
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
377
self._treeview_pending = gtk.TreeView()
541
378
scroller.add(self._treeview_pending)
542
scroller.set_shadow_type(Gtk.ShadowType.IN)
543
379
scroller.show()
544
self._pending_box.pack_start(scroller, True, True, 5)
380
scroller.set_shadow_type(gtk.SHADOW_IN)
381
self._pending_box.pack_start(scroller,
382
expand=True, fill=True, padding=5)
545
383
self._treeview_pending.show()
546
self._left_pane_box.pack_start(self._pending_box, True, True, 0)
384
self._left_pane_box.pack_start(self._pending_box)
547
385
548
liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
549
GObject.TYPE_STRING, # date
550
GObject.TYPE_STRING, # committer
551
GObject.TYPE_STRING, # summary
386
liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
387
gobject.TYPE_STRING, # date
388
gobject.TYPE_STRING, # committer
389
gobject.TYPE_STRING, # summary
552
390
)
553
391
self._pending_store = liststore
554
392
self._treeview_pending.set_model(liststore)
555
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
556
Gtk.CellRendererText(), text=1))
557
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
558
Gtk.CellRendererText(), text=2))
559
self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
560
Gtk.CellRendererText(), text=3))
393
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Date'),
394
gtk.CellRendererText(), text=1))
395
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Committer'),
396
gtk.CellRendererText(), text=2))
397
self._treeview_pending.append_column(gtk.TreeViewColumn(_('Summary'),
398
gtk.CellRendererText(), text=3))
561
399
562
400
def _construct_diff_view(self):
563
# TODO: jam 2007-10-30 The diff label is currently disabled. If we
564
# decide that we really don't ever want to display it, we should
565
# actually remove it, and other references to it, along with the
566
# tests that it is set properly.
567
self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
401
from diff import DiffView
402
403
self._diff_label = gtk.Label(_('Diff for whole tree'))
568
404
self._diff_label.set_alignment(0, 0)
569
405
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
570
406
self._add_to_right_table(self._diff_label, 1, False)
571
# self._diff_label.show()
407
self._diff_label.show()
572
408
573
409
self._diff_view = DiffView()
574
410
self._add_to_right_table(self._diff_view, 4, True)
575
411
self._diff_view.show()
576
412
577
@staticmethod
578
def get_line_height(widget):
579
pango_layout = widget.create_pango_layout("X");
580
ink_rectangle, logical_rectangle = pango_layout.get_pixel_extents()
581
return logical_rectangle.height
582
583
413
def _construct_file_message(self):
584
scroller = Gtk.ScrolledWindow()
585
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
414
file_message_box = gtk.VBox()
415
scroller = gtk.ScrolledWindow()
416
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
586
417
587
self._file_message_text_view = Gtk.TextView()
418
self._file_message_text_view = gtk.TextView()
588
419
scroller.add(self._file_message_text_view)
589
scroller.set_shadow_type(Gtk.ShadowType.IN)
590
420
scroller.show()
421
scroller.set_shadow_type(gtk.SHADOW_IN)
422
file_message_box.pack_start(scroller, expand=True, fill=True)
591
423
592
self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
593
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
424
self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
425
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
594
426
self._file_message_text_view.set_accepts_tab(False)
595
line_height = self.get_line_height(self._file_message_text_view)
596
self._file_message_text_view.set_size_request(-1, line_height * 2)
597
427
self._file_message_text_view.show()
598
428
599
self._file_message_expander = Gtk.Expander(
600
label=_i18n('File commit message'))
601
self._file_message_expander.set_expanded(True)
602
self._file_message_expander.add(scroller)
429
self._file_message_expander = gtk.Expander(_('File commit message'))
430
self._file_message_expander.add(file_message_box)
431
file_message_box.show()
603
432
self._add_to_right_table(self._file_message_expander, 1, False)
604
433
self._file_message_expander.show()
605
434
606
435
def _construct_global_message(self):
607
self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
608
self._global_message_label.set_markup(
609
_i18n('<b>Global Commit Message</b>'))
436
self._global_message_label = gtk.Label(_('Global Commit Message'))
610
437
self._global_message_label.set_alignment(0, 0)
611
438
self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
612
439
self._add_to_right_table(self._global_message_label, 1, False)
613
440
# Can we remove the spacing between the label and the box?
614
441
self._global_message_label.show()
615
442
616
scroller = Gtk.ScrolledWindow()
617
scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
443
scroller = gtk.ScrolledWindow()
444
scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
618
445
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"))
446
self._global_message_text_view = gtk.TextView()
447
self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
622
448
scroller.add(self._global_message_text_view)
623
scroller.set_shadow_type(Gtk.ShadowType.IN)
624
449
scroller.show()
450
scroller.set_shadow_type(gtk.SHADOW_IN)
625
451
self._add_to_right_table(scroller, 2, True)
626
self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
452
self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
627
453
self._file_message_text_view.set_accepts_tab(False)
628
454
self._global_message_text_view.show()
629
455
630
456
def _on_treeview_files_cursor_changed(self, treeview):
631
457
treeselection = treeview.get_selection()
632
if treeselection is None:
633
# The treeview was probably destroyed as the dialog closes.
634
return
635
458
(model, selection) = treeselection.get_selected()
636
459
637
460
if selection is not None:
638
461
path, display_path = model.get(selection, 1, 3)
639
self._diff_label.set_text(_i18n('Diff for ') + display_path)
640
if path == "":
462
self._diff_label.set_text(_('Diff for ') + display_path)
463
if path is None:
641
464
self._diff_view.show_diff(None)
642
465
else:
643
self._diff_view.show_diff([osutils.safe_unicode(path)])
466
self._diff_view.show_diff([path.decode('UTF-8')])
644
467
self._update_per_file_info(selection)
645
468
646
def _on_accel_next(self, accel_group, window, keyval, modifier):
647
# We don't really care about any of the parameters, because we know
648
# where this message came from
649
tree_selection = self._treeview_files.get_selection()
650
(model, selection) = tree_selection.get_selected()
651
if selection is None:
652
next = None
653
else:
654
next = model.iter_next(selection)
655
656
if next is None:
657
# We have either made it to the end of the list, or nothing was
658
# selected. Either way, select All Files, and jump to the global
659
# commit message.
660
self._treeview_files.set_cursor(
661
Gtk.TreePath(path=0), "", False)
662
self._global_message_text_view.grab_focus()
663
else:
664
# Set the cursor to this entry, and jump to the per-file commit
665
# message
666
self._treeview_files.set_cursor(model.get_path(next), None, False)
667
self._file_message_text_view.grab_focus()
668
669
469
def _save_current_file_message(self):
670
470
if self._last_selected_file is None:
671
471
return # Nothing to save
672
472
text_buffer = self._file_message_text_view.get_buffer()
673
473
cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
674
text_buffer.get_end_iter(), True)
474
text_buffer.get_end_iter())
675
475
last_selected = self._files_store.get_iter(self._last_selected_file)
676
476
self._files_store.set_value(last_selected, 5, cur_text)
677
477
678
478
def _update_per_file_info(self, selection):
679
479
# The node is changing, so cache the current message
680
if not self._enable_per_file_commits:
681
return
682
683
480
self._save_current_file_message()
684
481
text_buffer = self._file_message_text_view.get_buffer()
685
482
file_id, display_path, message = self._files_store.get(selection, 0, 3, 5)
686
if file_id == "": # Whole tree
687
self._file_message_expander.set_label(_i18n('File commit message'))
483
if file_id is None: # Whole tree
484
self._file_message_expander.set_label(_('File commit message'))
688
485
self._file_message_expander.set_expanded(False)
689
486
self._file_message_expander.set_sensitive(False)
690
487
text_buffer.set_text('')
691
488
self._last_selected_file = None
692
489
else:
693
self._file_message_expander.set_label(_i18n('Commit message for ')
490
self._file_message_expander.set_label(_('Commit message for ')
694
491
+ display_path)
695
492
self._file_message_expander.set_expanded(True)
696
493
self._file_message_expander.set_sensitive(True)
698
495
self._last_selected_file = self._files_store.get_path(selection)
699
496
700
497
def _get_specific_files(self):
701
"""Return the list of selected paths, and file info.
702
703
:return: ([unicode paths], [{utf-8 file info}]
704
"""
705
498
self._save_current_file_message()
706
499
files = []
707
500
records = iter(self._files_store)
708
501
rec = records.next() # Skip the All Files record
709
assert rec[0] == "", "Are we skipping the wrong record?"
502
assert rec[0] is None, "Are we skipping the wrong record?"
710
503
711
504
file_info = []
712
505
for record in records:
713
if self._commit_all_changes or record[2]:# [2] checkbox
714
file_id = osutils.safe_utf8(record[0]) # [0] file_id
715
path = osutils.safe_utf8(record[1]) # [1] real path
716
# [5] commit message
717
file_message = _sanitize_and_decode_message(record[5])
506
if record[2]: # [2] checkbox
507
file_id = record[0] # [0] file_id
508
path = record[1] # [1] real path
509
file_message = record[5] # [5] commit message
718
510
files.append(path.decode('UTF-8'))
719
if self._enable_per_file_commits and file_message:
511
if file_message:
720
512
# All of this needs to be utf-8 information
721
file_message = file_message.encode('UTF-8')
722
513
file_info.append({'path':path, 'file_id':file_id,
723
514
'message':file_message})
724
515
file_info.sort(key=lambda x:(x['path'], x['file_id']))
725
if self._enable_per_file_commits:
726
return files, file_info
727
else:
728
return files, []
729
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
516
return files, file_info
756
517
757
518
@show_bzr_error
758
519
def _on_commit_clicked(self, button):
764
525
765
526
if message == '':
766
527
response = self._question_dialog(
767
_i18n('Commit with an empty message?'),
768
_i18n('You can describe your commit intent in the message.'),
769
parent=self)
770
if response == Gtk.ResponseType.NO:
528
_('Commit with an empty message?'),
529
_('You can describe your commit intent in the message.'))
530
if response == gtk.RESPONSE_NO:
771
531
# Kindly give focus to message area
772
532
self._global_message_text_view.grab_focus()
773
533
return
785
545
# files at this point.
786
546
for path in self._wt.unknowns():
787
547
response = self._question_dialog(
788
_i18n("Commit with unknowns?"),
789
_i18n("Unknown files exist in the working tree. Commit anyway?"),
790
parent=self)
791
# Doesn't set a parent for the dialog..
792
if response == Gtk.ResponseType.NO:
548
_("Commit with unknowns?"),
549
_("Unknown files exist in the working tree. Commit anyway?"))
550
if response == gtk.RESPONSE_NO:
793
551
return
794
552
break
795
553
796
554
rev_id = None
797
555
revprops = {}
798
556
if file_info:
799
revprops['file-info'] = bencode.bencode(file_info).decode('UTF-8')
557
revprops['file-info'] = bencode.bencode(file_info)
800
558
try:
801
559
rev_id = self._wt.commit(message,
802
560
allow_pointless=False,
806
564
revprops=revprops)
807
565
except errors.PointlessCommit:
808
566
response = self._question_dialog(
809
_i18n('Commit with no changes?'),
810
_i18n('There are no changes in the working tree.'
811
' Do you want to commit anyway?'),
812
parent=self)
813
if response == Gtk.ResponseType.YES:
567
_('Commit with no changes?'),
568
_('There are no changes in the working tree.'
569
' Do you want to commit anyway?'))
570
if response == gtk.RESPONSE_YES:
814
571
rev_id = self._wt.commit(message,
815
572
allow_pointless=True,
816
573
strict=False,
818
575
specific_files=specific_files,
819
576
revprops=revprops)
820
577
self.committed_revision_id = rev_id
821
# destroy old comments if any
822
SavedCommitMessagesManager().save(self._wt, self._wt.branch)
823
self.response(Gtk.ResponseType.OK)
578
self.response(gtk.RESPONSE_OK)
824
579
825
580
def _get_global_commit_message(self):
826
581
buf = self._global_message_text_view.get_buffer()
827
582
start, end = buf.get_bounds()
828
text = buf.get_text(start, end, True)
829
return _sanitize_and_decode_message(text)
583
return buf.get_text(start, end).decode('utf-8')
830
584
831
585
def _set_global_commit_message(self, message):
832
586
"""Just a helper for the test suite."""
844
598
def _rev_to_pending_info(rev):
845
599
"""Get the information from a pending merge."""
846
600
from bzrlib.osutils import format_date
601
847
602
rev_dict = {}
848
603
rev_dict['committer'] = re.sub('<.*@.*>', '', rev.committer).strip(' ')
849
604
rev_dict['summary'] = rev.get_summary()
854
609
rev_dict['revision_id'] = rev.revision_id
855
610
return rev_dict
856
611
612
613
# class CommitDialog(gtk.Dialog):
614
# """ New implementation of the Commit dialog. """
615
# def __init__(self, wt, wtpath, notbranch, selected=None, parent=None):
616
# """ Initialize the Commit Dialog. """
617
# gtk.Dialog.__init__(self, title="Commit - Olive",
618
# parent=parent,
619
# flags=0,
620
# buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
621
#
622
# # Get arguments
623
# self.wt = wt
624
# self.wtpath = wtpath
625
# self.notbranch = notbranch
626
# self.selected = selected
627
#
628
# # Set the delta
629
# self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
630
# self.delta = self.wt.changes_from(self.old_tree)
631
#
632
# # Get pending merges
633
# self.pending = self._pending_merges(self.wt)
634
#
635
# # Do some preliminary checks
636
# self._is_checkout = False
637
# self._is_pending = False
638
# if self.wt is None and not self.notbranch:
639
# error_dialog(_('Directory does not have a working tree'),
640
# _('Operation aborted.'))
641
# self.close()
642
# return
643
#
644
# if self.notbranch:
645
# error_dialog(_('Directory is not a branch'),
646
# _('You can perform this action only in a branch.'))
647
# self.close()
648
# return
649
# else:
650
# if self.wt.branch.get_bound_location() is not None:
651
# # we have a checkout, so the local commit checkbox must appear
652
# self._is_checkout = True
653
#
654
# if self.pending:
655
# # There are pending merges, file selection not supported
656
# self._is_pending = True
657
#
658
# # Create the widgets
659
# # This is the main horizontal box, which is used to separate the commit
660
# # info from the diff window.
661
# self._hpane = gtk.HPaned()
662
# self._button_commit = gtk.Button(_("Comm_it"), use_underline=True)
663
# self._expander_files = gtk.Expander(_("File(s) to commit"))
664
# self._vpaned_main = gtk.VPaned()
665
# self._scrolledwindow_files = gtk.ScrolledWindow()
666
# self._scrolledwindow_message = gtk.ScrolledWindow()
667
# self._treeview_files = gtk.TreeView()
668
# self._vbox_message = gtk.VBox()
669
# self._label_message = gtk.Label(_("Commit message:"))
670
# self._textview_message = gtk.TextView()
671
#
672
# if self._is_pending:
673
# self._expander_merges = gtk.Expander(_("Pending merges"))
674
# self._vpaned_list = gtk.VPaned()
675
# self._scrolledwindow_merges = gtk.ScrolledWindow()
676
# self._treeview_merges = gtk.TreeView()
677
#
678
# # Set callbacks
679
# self._button_commit.connect('clicked', self._on_commit_clicked)
680
# self._treeview_files.connect('cursor-changed', self._on_treeview_files_cursor_changed)
681
# self._treeview_files.connect('row-activated', self._on_treeview_files_row_activated)
682
#
683
# # Set properties
684
# self._scrolledwindow_files.set_policy(gtk.POLICY_AUTOMATIC,
685
# gtk.POLICY_AUTOMATIC)
686
# self._scrolledwindow_message.set_policy(gtk.POLICY_AUTOMATIC,
687
# gtk.POLICY_AUTOMATIC)
688
# self._textview_message.modify_font(pango.FontDescription("Monospace"))
689
# self.set_default_size(500, 500)
690
# self._vpaned_main.set_position(200)
691
# self._button_commit.set_flags(gtk.CAN_DEFAULT)
692
#
693
# if self._is_pending:
694
# self._scrolledwindow_merges.set_policy(gtk.POLICY_AUTOMATIC,
695
# gtk.POLICY_AUTOMATIC)
696
# self._treeview_files.set_sensitive(False)
697
#
698
# # Construct the dialog
699
# self.action_area.pack_end(self._button_commit)
700
#
701
# self._scrolledwindow_files.add(self._treeview_files)
702
# self._scrolledwindow_message.add(self._textview_message)
703
#
704
# self._expander_files.add(self._scrolledwindow_files)
705
#
706
# self._vbox_message.pack_start(self._label_message, False, False)
707
# self._vbox_message.pack_start(self._scrolledwindow_message, True, True)
708
#
709
# if self._is_pending:
710
# self._expander_merges.add(self._scrolledwindow_merges)
711
# self._scrolledwindow_merges.add(self._treeview_merges)
712
# self._vpaned_list.add1(self._expander_files)
713
# self._vpaned_list.add2(self._expander_merges)
714
# self._vpaned_main.add1(self._vpaned_list)
715
# else:
716
# self._vpaned_main.add1(self._expander_files)
717
#
718
# self._vpaned_main.add2(self._vbox_message)
719
#
720
# self._hpane.pack1(self._vpaned_main)
721
# self.vbox.pack_start(self._hpane, expand=True, fill=True)
722
# if self._is_checkout:
723
# self._check_local = gtk.CheckButton(_("_Only commit locally"),
724
# use_underline=True)
725
# self.vbox.pack_start(self._check_local, False, False)
726
# if have_dbus:
727
# bus = dbus.SystemBus()
728
# proxy_obj = bus.get_object('org.freedesktop.NetworkManager',
729
# '/org/freedesktop/NetworkManager')
730
# dbus_iface = dbus.Interface(
731
# proxy_obj, 'org.freedesktop.NetworkManager')
732
# try:
733
# # 3 is the enum value for STATE_CONNECTED
734
# self._check_local.set_active(dbus_iface.state() != 3)
735
# except dbus.DBusException, e:
736
# # Silently drop errors. While DBus may be
737
# # available, NetworkManager doesn't necessarily have to be
738
# mutter("unable to get networkmanager state: %r" % e)
739
#
740
# # Create the file list
741
# self._create_file_view()
742
# # Create the pending merges
743
# self._create_pending_merges()
744
# self._create_diff_view()
745
#
746
# # Expand the corresponding expander
747
# if self._is_pending:
748
# self._expander_merges.set_expanded(True)
749
# else:
750
# self._expander_files.set_expanded(True)
751
#
752
# # Display dialog
753
# self.vbox.show_all()
754
#
755
# # Default to Commit button
756
# self._button_commit.grab_default()
757
#
758
# def _show_diff_view(self, treeview):
759
# # FIXME: the diff window freezes for some reason
760
# treeselection = treeview.get_selection()
761
# (model, iter) = treeselection.get_selected()
762
#
763
# if iter is not None:
764
# selected = model.get_value(iter, 3) # Get the real_path attribute
765
# self._diff_display.show_diff([selected])
766
#
767
# def _on_treeview_files_cursor_changed(self, treeview):
768
# self._show_diff_view(treeview)
769
#
770
# def _on_treeview_files_row_activated(self, treeview, path, view_column):
771
# self._show_diff_view(treeview)
772
#
773
# @show_bzr_error
774
# def _on_commit_clicked(self, button):
775
# """ Commit button clicked handler. """
776
# textbuffer = self._textview_message.get_buffer()
777
# start, end = textbuffer.get_bounds()
778
# message = textbuffer.get_text(start, end).decode('utf-8')
779
#
780
# if not self.pending:
781
# specific_files = self._get_specific_files()
782
# else:
783
# specific_files = None
784
#
785
# if message == '':
786
# response = question_dialog(_('Commit with an empty message?'),
787
# _('You can describe your commit intent in the message.'))
788
# if response == gtk.RESPONSE_NO:
789
# # Kindly give focus to message area
790
# self._textview_message.grab_focus()
791
# return
792
#
793
# if self._is_checkout:
794
# local = self._check_local.get_active()
795
# else:
796
# local = False
797
#
798
# if list(self.wt.unknowns()) != []:
799
# response = question_dialog(_("Commit with unknowns?"),
800
# _("Unknown files exist in the working tree. Commit anyway?"))
801
# if response == gtk.RESPONSE_NO:
802
# return
803
#
804
# try:
805
# self.wt.commit(message,
806
# allow_pointless=False,
807
# strict=False,
808
# local=local,
809
# specific_files=specific_files)
810
# except errors.PointlessCommit:
811
# response = question_dialog(_('Commit with no changes?'),
812
# _('There are no changes in the working tree.'))
813
# if response == gtk.RESPONSE_YES:
814
# self.wt.commit(message,
815
# allow_pointless=True,
816
# strict=False,
817
# local=local,
818
# specific_files=specific_files)
819
# self.response(gtk.RESPONSE_OK)
820
#
821
# def _pending_merges(self, wt):
822
# """ Return a list of pending merges or None if there are none of them. """
823
# parents = wt.get_parent_ids()
824
# if len(parents) < 2:
825
# return None
826
#
827
# import re
828
# from bzrlib.osutils import format_date
829
#
830
# pending = parents[1:]
831
# branch = wt.branch
832
# last_revision = parents[0]
833
#
834
# if last_revision is not None:
835
# try:
836
# ignore = set(branch.repository.get_ancestry(last_revision))
837
# except errors.NoSuchRevision:
838
# # the last revision is a ghost : assume everything is new
839
# # except for it
840
# ignore = set([None, last_revision])
841
# else:
842
# ignore = set([None])
843
#
844
# pm = []
845
# for merge in pending:
846
# ignore.add(merge)
847
# try:
848
# m_revision = branch.repository.get_revision(merge)
849
#
850
# rev = {}
851
# rev['committer'] = re.sub('<.*@.*>', '', m_revision.committer).strip(' ')
852
# rev['summary'] = m_revision.get_summary()
853
# rev['date'] = format_date(m_revision.timestamp,
854
# m_revision.timezone or 0,
855
# 'original', date_fmt="%Y-%m-%d",
856
# show_offset=False)
857
#
858
# pm.append(rev)
859
#
860
# inner_merges = branch.repository.get_ancestry(merge)
861
# assert inner_merges[0] is None
862
# inner_merges.pop(0)
863
# inner_merges.reverse()
864
# for mmerge in inner_merges:
865
# if mmerge in ignore:
866
# continue
867
# mm_revision = branch.repository.get_revision(mmerge)
868
#
869
# rev = {}
870
# rev['committer'] = re.sub('<.*@.*>', '', mm_revision.committer).strip(' ')
871
# rev['summary'] = mm_revision.get_summary()
872
# rev['date'] = format_date(mm_revision.timestamp,
873
# mm_revision.timezone or 0,
874
# 'original', date_fmt="%Y-%m-%d",
875
# show_offset=False)
876
#
877
# pm.append(rev)
878
#
879
# ignore.add(mmerge)
880
# except errors.NoSuchRevision:
881
# print "DEBUG: NoSuchRevision:", merge
882
#
883
# return pm
884
#
885
# def _create_file_view(self):
886
# self._file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox
887
# gobject.TYPE_STRING, # [1] path to display
888
# gobject.TYPE_STRING, # [2] changes type
889
# gobject.TYPE_STRING) # [3] real path
890
# self._treeview_files.set_model(self._file_store)
891
# crt = gtk.CellRendererToggle()
892
# crt.set_property("activatable", True)
893
# crt.connect("toggled", self._toggle_commit, self._file_store)
894
# self._treeview_files.append_column(gtk.TreeViewColumn(_('Commit'),
895
# crt, active=0))
896
# self._treeview_files.append_column(gtk.TreeViewColumn(_('Path'),
897
# gtk.CellRendererText(), text=1))
898
# self._treeview_files.append_column(gtk.TreeViewColumn(_('Type'),
899
# gtk.CellRendererText(), text=2))
900
#
901
# for path, id, kind in self.delta.added:
902
# marker = osutils.kind_marker(kind)
903
# if self.selected is not None:
904
# if path == os.path.join(self.wtpath, self.selected):
905
# self._file_store.append([ True, path+marker, _('added'), path ])
906
# else:
907
# self._file_store.append([ False, path+marker, _('added'), path ])
908
# else:
909
# self._file_store.append([ True, path+marker, _('added'), path ])
910
#
911
# for path, id, kind in self.delta.removed:
912
# marker = osutils.kind_marker(kind)
913
# if self.selected is not None:
914
# if path == os.path.join(self.wtpath, self.selected):
915
# self._file_store.append([ True, path+marker, _('removed'), path ])
916
# else:
917
# self._file_store.append([ False, path+marker, _('removed'), path ])
918
# else:
919
# self._file_store.append([ True, path+marker, _('removed'), path ])
920
#
921
# for oldpath, newpath, id, kind, text_modified, meta_modified in self.delta.renamed:
922
# marker = osutils.kind_marker(kind)
923
# if text_modified or meta_modified:
924
# changes = _('renamed and modified')
925
# else:
926
# changes = _('renamed')
927
# if self.selected is not None:
928
# if newpath == os.path.join(self.wtpath, self.selected):
929
# self._file_store.append([ True,
930
# oldpath+marker + ' => ' + newpath+marker,
931
# changes,
932
# newpath
933
# ])
934
# else:
935
# self._file_store.append([ False,
936
# oldpath+marker + ' => ' + newpath+marker,
937
# changes,
938
# newpath
939
# ])
940
# else:
941
# self._file_store.append([ True,
942
# oldpath+marker + ' => ' + newpath+marker,
943
# changes,
944
# newpath
945
# ])
946
#
947
# for path, id, kind, text_modified, meta_modified in self.delta.modified:
948
# marker = osutils.kind_marker(kind)
949
# if self.selected is not None:
950
# if path == os.path.join(self.wtpath, self.selected):
951
# self._file_store.append([ True, path+marker, _('modified'), path ])
952
# else:
953
# self._file_store.append([ False, path+marker, _('modified'), path ])
954
# else:
955
# self._file_store.append([ True, path+marker, _('modified'), path ])
956
#
957
# def _create_pending_merges(self):
958
# if not self.pending:
959
# return
960
#
961
# liststore = gtk.ListStore(gobject.TYPE_STRING,
962
# gobject.TYPE_STRING,
963
# gobject.TYPE_STRING)
964
# self._treeview_merges.set_model(liststore)
965
#
966
# self._treeview_merges.append_column(gtk.TreeViewColumn(_('Date'),
967
# gtk.CellRendererText(), text=0))
968
# self._treeview_merges.append_column(gtk.TreeViewColumn(_('Committer'),
969
# gtk.CellRendererText(), text=1))
970
# self._treeview_merges.append_column(gtk.TreeViewColumn(_('Summary'),
971
# gtk.CellRendererText(), text=2))
972
#
973
# for item in self.pending:
974
# liststore.append([ item['date'],
975
# item['committer'],
976
# item['summary'] ])
977
#
978
#
979
# def _create_diff_view(self):
980
# from diff import DiffView
981
#
982
# self._diff_display = DiffView()
983
# self._diff_display.set_trees(self.wt, self.wt.basis_tree())
984
# self._diff_display.show_diff(None)
985
# self._diff_display.show()
986
# self._hpane.pack2(self._diff_display)
987
#
988
# def _get_specific_files(self):
989
# ret = []
990
# it = self._file_store.get_iter_first()
991
# while it:
992
# if self._file_store.get_value(it, 0):
993
# # get real path from hidden column 3
994
# ret.append(self._file_store.get_value(it, 3))
995
# it = self._file_store.iter_next(it)
996
#
997
# return ret
998
#
999
# def _toggle_commit(self, cell, path, model):
1000
# model[path][0] = not model[path][0]
1001
# return
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0