1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
#!/usr/bin/python
# -*- coding: UTF-8 -*-
"""Difference window.
This module contains the code to manage the diff window which shows
the changes made between two revisions on a branch.
"""
__copyright__ = "Copyright © 2005 Canonical Ltd."
__author__ = "Scott James Remnant <scott@ubuntu.com>"
from cStringIO import StringIO
import gtk
import pango
try:
import gtksourceview
have_gtksourceview = True
except ImportError:
have_gtksourceview = False
from bzrlib.delta import compare_trees
from bzrlib.diff import show_diff_trees
class DiffWindow(gtk.Window):
"""Diff window.
This object represents and manages a single window containing the
differences between two revisions on a branch.
"""
def __init__(self, app=None):
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
self.set_border_width(0)
self.set_title("bzrk diff")
self.app = app
# Use two thirds of the screen by default
screen = self.get_screen()
monitor = screen.get_monitor_geometry(0)
width = int(monitor.width * 0.66)
height = int(monitor.height * 0.66)
self.set_default_size(width, height)
self.construct()
def construct(self):
"""Construct the window contents."""
hbox = gtk.HBox(spacing=6)
hbox.set_border_width(12)
self.add(hbox)
hbox.show()
scrollwin = gtk.ScrolledWindow()
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
scrollwin.set_shadow_type(gtk.SHADOW_IN)
hbox.pack_start(scrollwin, expand=False, fill=True)
scrollwin.show()
self.model = gtk.TreeStore(str, str)
self.treeview = gtk.TreeView(self.model)
self.treeview.set_headers_visible(False)
self.treeview.set_search_column(1)
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
scrollwin.add(self.treeview)
self.treeview.show()
cell = gtk.CellRendererText()
cell.set_property("width-chars", 20)
column = gtk.TreeViewColumn()
column.pack_start(cell, expand=True)
column.add_attribute(cell, "text", 0)
self.treeview.append_column(column)
scrollwin = gtk.ScrolledWindow()
scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scrollwin.set_shadow_type(gtk.SHADOW_IN)
hbox.pack_start(scrollwin, expand=True, fill=True)
scrollwin.show()
if have_gtksourceview:
self.buffer = gtksourceview.SourceBuffer()
slm = gtksourceview.SourceLanguagesManager()
gsl = slm.get_language_from_mime_type("text/x-patch")
self.buffer.set_language(gsl)
self.buffer.set_highlight(True)
sourceview = gtksourceview.SourceView(self.buffer)
else:
self.buffer = gtk.TextBuffer()
sourceview = gtk.TextView(self.buffer)
sourceview.set_editable(False)
sourceview.modify_font(pango.FontDescription("Monospace"))
scrollwin.add(sourceview)
sourceview.show()
def set_diff(self, branch, revid, parentid):
"""Set the differences showed by this window.
Compares the two trees and populates the window with the
differences.
"""
self.rev_tree = branch.repository.revision_tree(revid)
self.parent_tree = branch.repository.revision_tree(parentid)
self.model.clear()
delta = compare_trees(self.parent_tree, self.rev_tree)
self.model.append(None, [ "Complete Diff", "" ])
if len(delta.added):
titer = self.model.append(None, [ "Added", None ])
for path, id, kind in delta.added:
self.model.append(titer, [ path, path ])
if len(delta.removed):
titer = self.model.append(None, [ "Removed", None ])
for path, id, kind in delta.removed:
self.model.append(titer, [ path, path ])
if len(delta.renamed):
titer = self.model.append(None, [ "Renamed", None ])
for oldpath, newpath, id, kind, text_modified, meta_modified \
in delta.renamed:
self.model.append(titer, [ oldpath, oldpath ])
if len(delta.modified):
titer = self.model.append(None, [ "Modified", None ])
for path, id, kind, text_modified, meta_modified in delta.modified:
self.model.append(titer, [ path, path ])
self.treeview.expand_all()
self.set_title(revid + " - " + branch.nick + " - bzrk diff")
def _treeview_cursor_cb(self, *args):
"""Callback for when the treeview cursor changes."""
(path, col) = self.treeview.get_cursor()
specific_files = [ self.model[path][1] ]
if specific_files == [ None ]:
return
elif specific_files == [ "" ]:
specific_files = []
s = StringIO()
show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files)
self.buffer.set_text(s.getvalue())
|