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
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
|
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
#
# Some parts of the code:
# Copyright (C) 2005 by Canonical Ltd.
# Author: Scott James Remnant <scott@ubuntu.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import sys
from cStringIO import StringIO
try:
import pygtk
pygtk.require("2.0")
except:
pass
try:
import gtk
import gtk.glade
import gobject
import pango
except:
sys.exit(1)
try:
import gtksourceview
have_gtksourceview = True
except ImportError:
have_gtksourceview = False
import bzrlib
if bzrlib.version_info < (0, 9):
# function deprecated after 0.9
from bzrlib.delta import compare_trees
from bzrlib.diff import show_diff_trees
import bzrlib.errors as errors
from bzrlib.workingtree import WorkingTree
class OliveDiff:
""" Display Diff window and perform the needed actions. """
def __init__(self, gladefile, comm, dialog):
""" Initialize the Diff window. """
self.gladefile = gladefile
self.glade = gtk.glade.XML(self.gladefile, 'window_diff', 'olive-gtk')
# Communication object
self.comm = comm
# Dialog object
self.dialog = dialog
# Get some important widgets
self.window = self.glade.get_widget('window_diff')
self.treeview = self.glade.get_widget('treeview_diff_files')
# Check if current location is a branch
try:
(self.wt, path) = WorkingTree.open_containing(self.comm.get_path())
branch = self.wt.branch
except errors.NotBranchError:
self.notbranch = True
return
except:
raise
file_id = self.wt.path2id(path)
self.notbranch = False
if file_id is None:
self.notbranch = True
return
# Set the old working tree
self.old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
# Dictionary for signal_autoconnect
dic = { "on_button_diff_close_clicked": self.close,
"on_treeview_diff_files_cursor_changed": self.cursor_changed }
# Connect the signals to the handlers
self.glade.signal_autoconnect(dic)
# Create the file list
self._create_file_view()
# Generate initial diff
self._init_diff()
def display(self):
""" Display the Diff window. """
if self.notbranch:
self.dialog.error_dialog(_('Directory is not a branch'),
_('You can perform this action only in a branch.'))
self.close()
else:
self.window.show_all()
def _create_file_view(self):
""" Create the list of files. """
self.model = gtk.TreeStore(str, str)
self.treeview.set_model(self.model)
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)
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_diff = self.glade.get_widget('scrolledwindow_diff_diff')
scrollwin_diff.add(sourceview)
def _init_diff(self):
""" Generate initial diff. """
self.model.clear()
if bzrlib.version_info < (0, 9):
delta = compare_trees(self.old_tree, self.wt)
else:
delta = self.wt.changes_from(self.old_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, newpath ])
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()
def cursor_changed(self, *args):
""" Callback 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.old_tree, self.wt, s, specific_files)
self.buffer.set_text(s.getvalue())
def close(self, widget=None):
self.window.destroy()
|