45
63
icon = self.render_icon(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON)
46
64
self.set_icon(icon)
66
gtk.accel_map_add_entry("<viz>/Go/Next Revision", gtk.keysyms.Up, gtk.gdk.MOD1_MASK)
67
gtk.accel_map_add_entry("<viz>/Go/Previous Revision", gtk.keysyms.Down, gtk.gdk.MOD1_MASK)
48
69
self.accel_group = gtk.AccelGroup()
49
70
self.add_accel_group(self.accel_group)
72
gtk.Action.set_tool_item_type(gtk.MenuToolButton)
74
self.prev_rev_action = gtk.Action("prev-rev", "_Previous Revision", "Go to the previous revision", gtk.STOCK_GO_DOWN)
75
self.prev_rev_action.set_accel_path("<viz>/Go/Previous Revision")
76
self.prev_rev_action.set_accel_group(self.accel_group)
77
self.prev_rev_action.connect("activate", self._back_clicked_cb)
78
self.prev_rev_action.connect_accelerator()
80
self.next_rev_action = gtk.Action("next-rev", "_Next Revision", "Go to the next revision", gtk.STOCK_GO_UP)
81
self.next_rev_action.set_accel_path("<viz>/Go/Next Revision")
82
self.next_rev_action.set_accel_group(self.accel_group)
83
self.next_rev_action.connect("activate", self._fwd_clicked_cb)
84
self.next_rev_action.connect_accelerator()
88
def set_revision(self, revid):
89
self.treeview.set_revision_id(revid)
53
91
def construct(self):
54
92
"""Construct the window contents."""
55
93
vbox = gtk.VBox(spacing=0)
96
self.paned = gtk.VPaned()
97
self.paned.pack1(self.construct_top(), resize=True, shrink=False)
98
self.paned.pack2(self.construct_bottom(), resize=False, shrink=True)
101
vbox.pack_start(self.construct_menubar(), expand=False, fill=True)
58
102
vbox.pack_start(self.construct_navigation(), expand=False, fill=True)
61
paned.pack1(self.construct_top(), resize=True, shrink=False)
62
paned.pack2(self.construct_bottom(), resize=False, shrink=True)
64
vbox.pack_start(paned, expand=True, fill=True)
65
vbox.set_focus_child(paned)
104
vbox.pack_start(self.paned, expand=True, fill=True)
105
vbox.set_focus_child(self.paned)
109
def construct_menubar(self):
110
menubar = gtk.MenuBar()
112
file_menu = gtk.Menu()
113
file_menuitem = gtk.MenuItem("_File")
114
file_menuitem.set_submenu(file_menu)
116
file_menu_close = gtk.ImageMenuItem(gtk.STOCK_CLOSE, self.accel_group)
117
file_menu_close.connect('activate', lambda x: self.destroy())
119
file_menu_quit = gtk.ImageMenuItem(gtk.STOCK_QUIT, self.accel_group)
120
file_menu_quit.connect('activate', lambda x: gtk.main_quit())
122
if self._parent is not None:
123
file_menu.add(file_menu_close)
124
file_menu.add(file_menu_quit)
126
edit_menu = gtk.Menu()
127
edit_menuitem = gtk.MenuItem("_Edit")
128
edit_menuitem.set_submenu(edit_menu)
130
edit_menu_find = gtk.ImageMenuItem(gtk.STOCK_FIND)
132
edit_menu_branchopts = gtk.MenuItem("Branch Settings")
133
edit_menu_branchopts.connect('activate', lambda x: PreferencesWindow(self.branch.get_config()).show())
135
edit_menu_globopts = gtk.MenuItem("Global Settings")
136
edit_menu_globopts.connect('activate', lambda x: PreferencesWindow().show())
138
edit_menu.add(edit_menu_find)
139
edit_menu.add(edit_menu_branchopts)
140
edit_menu.add(edit_menu_globopts)
142
view_menu = gtk.Menu()
143
view_menuitem = gtk.MenuItem("_View")
144
view_menuitem.set_submenu(view_menu)
146
view_menu_toolbar = gtk.CheckMenuItem("Show Toolbar")
147
view_menu_toolbar.set_active(True)
148
view_menu_toolbar.connect('toggled', self._toolbar_visibility_changed)
150
view_menu_compact = gtk.CheckMenuItem("Show Compact Graph")
151
view_menu_compact.set_active(self.compact_view)
152
view_menu_compact.connect('activate', self._brokenlines_toggled_cb)
154
view_menu.add(view_menu_toolbar)
155
view_menu.add(view_menu_compact)
156
view_menu.add(gtk.SeparatorMenuItem())
158
for (label, name) in [("Revision _Number", "revno"), ("_Date", "date")]:
159
col = gtk.CheckMenuItem("Show " + label + " Column")
160
col.set_active(self.treeview.get_property(name + "-column-visible"))
161
col.connect('toggled', self._col_visibility_changed, name)
165
go_menu.set_accel_group(self.accel_group)
166
go_menuitem = gtk.MenuItem("_Go")
167
go_menuitem.set_submenu(go_menu)
169
go_menu_next = self.next_rev_action.create_menu_item()
170
go_menu_prev = self.prev_rev_action.create_menu_item()
172
self.go_menu_tags = gtk.MenuItem("_Tags")
175
go_menu.add(go_menu_next)
176
go_menu.add(go_menu_prev)
177
go_menu.add(gtk.SeparatorMenuItem())
178
go_menu.add(self.go_menu_tags)
180
revision_menu = gtk.Menu()
181
revision_menuitem = gtk.MenuItem("_Revision")
182
revision_menuitem.set_submenu(revision_menu)
184
revision_menu_diff = gtk.MenuItem("View Changes")
185
revision_menu_diff.connect('activate',
186
lambda w: self.treeview.show_diff())
188
revision_menu_tag = gtk.MenuItem("Tag Revision")
189
revision_menu_tag.connect('activate', self._tag_revision_cb)
191
revision_menu.add(revision_menu_tag)
192
revision_menu.add(revision_menu_diff)
194
branch_menu = gtk.Menu()
195
branch_menuitem = gtk.MenuItem("_Branch")
196
branch_menuitem.set_submenu(branch_menu)
198
branch_menu.add(gtk.MenuItem("Pu_ll Revisions"))
199
branch_menu.add(gtk.MenuItem("Pu_sh Revisions"))
201
help_menu = gtk.Menu()
202
help_menuitem = gtk.MenuItem("_Help")
203
help_menuitem.set_submenu(help_menu)
205
help_about_menuitem = gtk.ImageMenuItem(gtk.STOCK_ABOUT, self.accel_group)
206
help_about_menuitem.connect('activate', self._about_dialog_cb)
208
help_menu.add(help_about_menuitem)
210
menubar.add(file_menuitem)
211
menubar.add(edit_menuitem)
212
menubar.add(view_menuitem)
213
menubar.add(go_menuitem)
214
menubar.add(revision_menuitem)
215
menubar.add(branch_menuitem)
216
menubar.add(help_menuitem)
69
221
def construct_top(self):
70
222
"""Construct the top-half of the window."""
71
scrollwin = gtk.ScrolledWindow()
72
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
73
scrollwin.set_shadow_type(gtk.SHADOW_IN)
76
self.treeview = gtk.TreeView()
77
self.treeview.set_rules_hint(True)
78
self.treeview.set_search_column(4)
79
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
80
self.treeview.connect("row-activated", self._treeview_row_activated_cb)
81
scrollwin.add(self.treeview)
223
# FIXME: Make broken_line_length configurable
225
self.treeview = TreeView(self.branch, self.start, self.maxnum, self.compact_view)
227
self.treeview.connect('revision-selected',
228
self._treeselection_changed_cb)
229
self.treeview.connect('revision-activated',
230
self._tree_revision_activated)
232
self.treeview.connect('tag-added', lambda w, t, r: self._update_tags())
234
for col in ["revno", "date"]:
235
option = self.config.get_user_option(col + '-column-visible')
236
if option is not None:
237
self.treeview.set_property(col + '-column-visible', option == 'True')
82
239
self.treeview.show()
84
cell = CellRendererGraph()
85
column = gtk.TreeViewColumn()
86
column.set_resizable(True)
87
column.pack_start(cell, expand=False)
88
column.add_attribute(cell, "node", 1)
89
column.add_attribute(cell, "in-lines", 2)
90
column.add_attribute(cell, "out-lines", 3)
91
self.treeview.append_column(column)
93
cell = gtk.CellRendererText()
94
cell.set_property("width-chars", 40)
95
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
96
column = gtk.TreeViewColumn("Message")
97
column.set_resizable(True)
98
column.pack_start(cell, expand=True)
99
column.add_attribute(cell, "text", 4)
100
self.treeview.append_column(column)
102
cell = gtk.CellRendererText()
103
cell.set_property("width-chars", 40)
104
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
105
column = gtk.TreeViewColumn("Committer")
106
column.set_resizable(True)
107
column.pack_start(cell, expand=True)
108
column.add_attribute(cell, "text", 5)
109
self.treeview.append_column(column)
111
cell = gtk.CellRendererText()
112
cell.set_property("ellipsize", pango.ELLIPSIZE_END)
113
column = gtk.TreeViewColumn("Date")
114
column.set_resizable(True)
115
column.pack_start(cell, expand=True)
116
column.add_attribute(cell, "text", 6)
117
self.treeview.append_column(column)
241
align = gtk.Alignment(0.0, 0.0, 1.0, 1.0)
242
align.set_padding(5, 0, 0, 0)
243
align.add(self.treeview)
121
248
def construct_navigation(self):
122
249
"""Construct the navigation buttons."""
124
frame.set_shadow_type(gtk.SHADOW_OUT)
127
hbox = gtk.HBox(spacing=12)
131
self.back_button = gtk.Button(stock=gtk.STOCK_GO_BACK)
132
self.back_button.set_relief(gtk.RELIEF_NONE)
133
self.back_button.add_accelerator("clicked", self.accel_group, ord('['),
135
self.back_button.connect("clicked", self._back_clicked_cb)
136
hbox.pack_start(self.back_button, expand=False, fill=True)
137
self.back_button.show()
139
self.fwd_button = gtk.Button(stock=gtk.STOCK_GO_FORWARD)
140
self.fwd_button.set_relief(gtk.RELIEF_NONE)
141
self.fwd_button.add_accelerator("clicked", self.accel_group, ord(']'),
143
self.fwd_button.connect("clicked", self._fwd_clicked_cb)
144
hbox.pack_start(self.fwd_button, expand=False, fill=True)
145
self.fwd_button.show()
250
self.toolbar = gtk.Toolbar()
251
self.toolbar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
253
self.prev_button = self.prev_rev_action.create_tool_item()
254
self.toolbar.insert(self.prev_button, -1)
256
self.next_button = self.next_rev_action.create_tool_item()
257
self.toolbar.insert(self.next_button, -1)
259
self.toolbar.insert(gtk.SeparatorToolItem(), -1)
261
refresh_button = gtk.ToolButton(gtk.STOCK_REFRESH)
262
refresh_button.connect('clicked', self._refresh_clicked)
263
self.toolbar.insert(refresh_button, -1)
265
self.toolbar.show_all()
149
269
def construct_bottom(self):
150
270
"""Construct the bottom half of the window."""
151
scrollwin = gtk.ScrolledWindow()
152
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
153
scrollwin.set_shadow_type(gtk.SHADOW_NONE)
271
from bzrlib.plugins.gtk.revisionview import RevisionView
272
self.revisionview = RevisionView(branch=self.branch)
154
273
(width, height) = self.get_size()
155
scrollwin.set_size_request(width, int(height / 2.5))
158
vbox = gtk.VBox(False, spacing=6)
159
vbox.set_border_width(6)
160
scrollwin.add_with_viewport(vbox)
163
table = gtk.Table(rows=4, columns=2)
164
table.set_row_spacings(6)
165
table.set_col_spacings(6)
166
vbox.pack_start(table, expand=False, fill=True)
169
align = gtk.Alignment(0.0, 0.5)
171
label.set_markup("<b>Revision:</b>")
173
table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
177
align = gtk.Alignment(0.0, 0.5)
178
self.revid_label = gtk.Label()
179
self.revid_label.set_selectable(True)
180
align.add(self.revid_label)
181
table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
182
self.revid_label.show()
185
align = gtk.Alignment(0.0, 0.5)
187
label.set_markup("<b>Committer:</b>")
189
table.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
193
align = gtk.Alignment(0.0, 0.5)
194
self.committer_label = gtk.Label()
195
self.committer_label.set_selectable(True)
196
align.add(self.committer_label)
197
table.attach(align, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
198
self.committer_label.show()
201
align = gtk.Alignment(0.0, 0.5)
203
label.set_markup("<b>Branch nick:</b>")
205
table.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
209
align = gtk.Alignment(0.0, 0.5)
210
self.branchnick_label = gtk.Label()
211
self.branchnick_label.set_selectable(True)
212
align.add(self.branchnick_label)
213
table.attach(align, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
214
self.branchnick_label.show()
217
align = gtk.Alignment(0.0, 0.5)
219
label.set_markup("<b>Timestamp:</b>")
221
table.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
225
align = gtk.Alignment(0.0, 0.5)
226
self.timestamp_label = gtk.Label()
227
self.timestamp_label.set_selectable(True)
228
align.add(self.timestamp_label)
229
table.attach(align, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
230
self.timestamp_label.show()
233
self.parents_table = gtk.Table(rows=1, columns=2)
234
self.parents_table.set_row_spacings(3)
235
self.parents_table.set_col_spacings(6)
236
self.parents_table.show()
237
vbox.pack_start(self.parents_table, expand=False, fill=True)
238
self.parents_widgets = []
241
label.set_markup("<b>Parents:</b>")
242
align = gtk.Alignment(0.0, 0.5)
244
self.parents_table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
248
self.message_buffer = gtk.TextBuffer()
249
textview = gtk.TextView(self.message_buffer)
250
textview.set_editable(False)
251
textview.set_wrap_mode(gtk.WRAP_WORD)
252
textview.modify_font(pango.FontDescription("Monospace"))
253
vbox.pack_start(textview, expand=True, fill=True)
258
def set_branch(self, branch, start, maxnum):
259
"""Set the branch and start position for this window.
261
Creates a new TreeModel and populates it with information about
262
the new branch before updating the window title and model of the
267
# [ revision, node, last_lines, lines, message, committer, timestamp ]
268
self.model = gtk.ListStore(gobject.TYPE_PYOBJECT,
269
gobject.TYPE_PYOBJECT,
270
gobject.TYPE_PYOBJECT,
271
gobject.TYPE_PYOBJECT,
277
(self.revisions, colours, self.children, self.parent_ids,
278
merge_sorted) = distances(branch, start)
279
for (index, (revision, node, lines)) in enumerate(graph(
280
self.revisions, colours, merge_sorted)):
281
# FIXME: at this point we should be able to show the graph order
282
# and lines with no message or commit data - and then incrementally
283
# fill the timestamp, committer etc data as desired.
284
message = revision.message.split("\n")[0]
285
if revision.committer is not None:
286
timestamp = format_date(revision.timestamp, revision.timezone)
289
self.model.append([revision, node, last_lines, lines,
290
message, revision.committer, timestamp])
291
self.index[revision] = index
293
if maxnum is not None and index > maxnum:
296
self.set_title(branch.nick + " - bzrk")
297
self.treeview.set_model(self.model)
299
def _treeview_cursor_cb(self, *args):
300
"""Callback for when the treeview cursor changes."""
301
(path, col) = self.treeview.get_cursor()
302
revision = self.model[path][0]
304
self.back_button.set_sensitive(len(self.parent_ids[revision]) > 0)
305
self.fwd_button.set_sensitive(len(self.children[revision]) > 0)
307
if revision.committer is not None:
309
committer = revision.committer
310
timestamp = format_date(revision.timestamp, revision.timezone)
311
message = revision.message
313
branchnick = revision.properties['branch-nick']
274
self.revisionview.set_size_request(width, int(height / 2.5))
275
self.revisionview.show()
276
self.revisionview.set_show_callback(self._show_clicked_cb)
277
self.revisionview.connect('notify::revision', self._go_clicked_cb)
278
self.treeview.connect('tag-added', lambda w, t, r: self.revisionview.update_tags())
279
return self.revisionview
281
def _tag_selected_cb(self, menuitem, revid):
282
self.treeview.set_revision_id(revid)
284
def _treeselection_changed_cb(self, selection, *args):
285
"""callback for when the treeview changes."""
286
revision = self.treeview.get_revision()
287
parents = self.treeview.get_parents()
288
children = self.treeview.get_children()
290
if revision is not None:
291
prev_menu = gtk.Menu()
293
self.prev_rev_action.set_sensitive(True)
294
for parent_id in parents:
295
parent = self.branch.repository.get_revision(parent_id)
297
str = ' (' + parent.properties['branch-nick'] + ')'
301
item = gtk.MenuItem(parent.message.split("\n")[0] + str)
302
item.connect('activate', self._set_revision_cb, parent_id)
306
self.prev_rev_action.set_sensitive(False)
309
self.prev_button.set_menu(prev_menu)
311
next_menu = gtk.Menu()
312
if len(children) > 0:
313
self.next_rev_action.set_sensitive(True)
314
for child_id in children:
315
child = self.branch.repository.get_revision(child_id)
317
str = ' (' + child.properties['branch-nick'] + ')'
321
item = gtk.MenuItem(child.message.split("\n")[0] + str)
322
item.connect('activate', self._set_revision_cb, child_id)
326
self.next_rev_action.set_sensitive(False)
329
self.next_button.set_menu(next_menu)
331
self.revisionview.set_revision(revision)
332
self.revisionview.set_children(children)
334
def _tree_revision_activated(self, widget, path, col):
335
# TODO: more than one parent
336
"""Callback for when a treeview row gets activated."""
337
revision = self.treeview.get_revision()
338
parents = self.treeview.get_parents()
340
if len(parents) == 0:
323
self.revid_label.set_text(revision.revision_id)
324
self.branchnick_label.set_text(branchnick)
326
self.committer_label.set_text(committer)
327
self.timestamp_label.set_text(timestamp)
328
self.message_buffer.set_text(message)
330
for widget in self.parents_widgets:
331
self.parents_table.remove(widget)
333
self.parents_widgets = []
334
self.parents_table.resize(max(len(self.parent_ids[revision]), 1), 2)
336
for idx, parent_id in enumerate(self.parent_ids[revision]):
337
align = gtk.Alignment(0.0, 0.0)
338
self.parents_widgets.append(align)
339
self.parents_table.attach(align, 1, 2, idx, idx + 1,
340
gtk.EXPAND | gtk.FILL, gtk.FILL)
343
hbox = gtk.HBox(False, spacing=6)
348
image.set_from_stock(
349
gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_SMALL_TOOLBAR)
352
button = gtk.Button()
354
button.connect("clicked", self._go_clicked_cb, parent_id)
355
hbox.pack_start(button, expand=False, fill=True)
359
image.set_from_stock(
360
gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
363
button = gtk.Button()
365
button.set_sensitive(self.app is not None)
366
button.connect("clicked", self._show_clicked_cb,
367
revision.revision_id, parent_id)
368
hbox.pack_start(button, expand=False, fill=True)
371
label = gtk.Label(parent_id)
372
label.set_selectable(True)
373
hbox.pack_start(label, expand=False, fill=True)
343
parent_id = parents[0]
345
self.show_diff(revision.revision_id, parent_id)
346
self.treeview.grab_focus()
377
349
def _back_clicked_cb(self, *args):
378
350
"""Callback for when the back button is clicked."""
379
(path, col) = self.treeview.get_cursor()
380
revision = self.model[path][0]
381
if not len(self.parent_ids[revision]):
384
for parent_id in self.parent_ids[revision]:
385
parent = self.revisions[parent_id]
386
if same_branch(revision, parent):
387
self.treeview.set_cursor(self.index[parent])
390
next = self.revisions[self.parent_ids[revision][0]]
391
self.treeview.set_cursor(self.index[next])
392
self.treeview.grab_focus()
394
353
def _fwd_clicked_cb(self, *args):
395
354
"""Callback for when the forward button is clicked."""
396
(path, col) = self.treeview.get_cursor()
397
revision = self.model[path][0]
398
if not len(self.children[revision]):
401
for child in self.children[revision]:
402
if same_branch(child, revision):
403
self.treeview.set_cursor(self.index[child])
406
prev = list(self.children[revision])[0]
407
self.treeview.set_cursor(self.index[prev])
408
self.treeview.grab_focus()
410
def _go_clicked_cb(self, widget, revid):
355
self.treeview.forward()
357
def _go_clicked_cb(self, w, p):
411
358
"""Callback for when the go button for a parent is clicked."""
412
self.treeview.set_cursor(self.index[self.revisions[revid]])
413
self.treeview.grab_focus()
359
if self.revisionview.get_revision() is not None:
360
self.treeview.set_revision(self.revisionview.get_revision())
415
def _show_clicked_cb(self, widget, revid, parentid):
362
def _show_clicked_cb(self, revid, parentid):
416
363
"""Callback for when the show button for a parent is clicked."""
417
if self.app is not None:
418
self.app.show_diff(self.branch, revid, parentid)
419
self.treeview.grab_focus()
421
def _treeview_row_activated_cb(self, widget, path, col):
422
# TODO: more than one parent
423
"""Callback for when a treeview row gets activated."""
424
revision = self.model[path][0]
425
parent_id = self.parent_ids[revision][0]
426
if self.app is not None:
427
self.app.show_diff(self.branch, revision.revision_id, parent_id)
428
self.treeview.grab_focus()
364
self.show_diff(revid, parentid)
365
self.treeview.grab_focus()
367
def _set_revision_cb(self, w, revision_id):
368
self.treeview.set_revision_id(revision_id)
370
def _brokenlines_toggled_cb(self, button):
371
self.compact_view = button.get_active()
373
if self.compact_view:
378
self.config.set_user_option('viz-compact-view', option)
379
self.treeview.set_property('compact', self.compact_view)
380
self.treeview.refresh()
382
def _tag_revision_cb(self, w):
384
self.treeview.set_sensitive(False)
385
dialog = AddTagDialog(self.branch.repository, self.treeview.get_revision().revision_id, self.branch)
386
response = dialog.run()
387
if response != gtk.RESPONSE_NONE:
390
if response == gtk.RESPONSE_OK:
391
self.treeview.add_tag(dialog.tagname, dialog._revid)
396
self.treeview.set_sensitive(True)
398
def _about_dialog_cb(self, w):
399
from bzrlib.plugins.gtk.about import AboutDialog
403
def _col_visibility_changed(self, col, property):
404
self.config.set_user_option(property + '-column-visible', col.get_active())
405
self.treeview.set_property(property + '-column-visible', col.get_active())
407
def _toolbar_visibility_changed(self, col):
413
def _show_about_cb(self, w):
414
dialog = AboutDialog()
415
dialog.connect('response', lambda d,r: d.destroy())
418
def _refresh_clicked(self, w):
419
self.treeview.refresh()
421
def _update_tags(self):
424
if self.branch.supports_tags():
425
tags = self.branch.tags.get_tag_dict().items()
428
for tag, revid in tags:
429
tag_item = gtk.MenuItem(tag, use_underline=False)
430
tag_item.connect('activate', self._tag_selected_cb, revid)
432
self.go_menu_tags.set_submenu(menu)
434
self.go_menu_tags.set_sensitive(len(tags) != 0)
436
self.go_menu_tags.set_sensitive(False)
438
self.go_menu_tags.show_all()
440
def show_diff(self, revid=None, parentid=None):
441
"""Open a new window to show a diff between the given revisions."""
442
from bzrlib.plugins.gtk.diff import DiffWindow
443
window = DiffWindow(parent=self)
446
parentid = NULL_REVISION
448
rev_tree = self.branch.repository.revision_tree(revid)
449
parent_tree = self.branch.repository.revision_tree(parentid)
451
description = revid + " - " + self.branch.nick
452
window.set_diff(description, rev_tree, parent_tree)