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 diff.py
- browse files at revision 793.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 793.1.1
- Committer: Jelmer Vernooij
- Date: 2012-07-09 15:23:26 UTC
- mto: This revision was merged to the branch mainline in revision 794.
- Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.
- files added:
- avatarproviders.py
- branchview
- preferences
- files removed:
- bzr-notify.desktop
- olive
- files renamed:
- bazaar-properties.desktop => bazaar-properties.desktop.in
- viz/graphcell.py => branchview/graphcell.py
- viz/graph.py => branchview/linegraph.py
- bzr-icon-64.png => icons/bzr-icon-64.png
- oliveicon2.png => icons/oliveicon2.png
- preferences.py => preferences/__init__.py
- logview.py => revisionview.py
- files modified:
- .bzrignore
added
removed
diff.py
1
# -*- coding: UTF-8 -*-
2
1
"""Difference window.
3
2
4
3
This module contains the code to manage the diff window which shows
5
4
the changes made between two revisions on a branch.
6
5
"""
7
6
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
__author__ = "Scott James Remnant <scott@ubuntu.com>"
7
__copyright__ = "Copyright 2005 Canonical Ltd."
8
__author__ = "Scott James Remnant <scott@ubuntu.com>"
10
9
11
10
12
11
from cStringIO import StringIO
13
12
14
import gtk
15
import pango
16
import os
17
import re
18
13
import sys
14
import inspect
19
15
16
from gi.repository import Gtk
17
from gi.repository import Pango
20
18
try:
21
import gtksourceview
19
from gi.repository import GtkSource
22
20
have_gtksourceview = True
23
21
except ImportError:
24
22
have_gtksourceview = False
25
try:
26
import gconf
27
have_gconf = True
28
except ImportError:
29
have_gconf = False
30
31
import bzrlib
32
23
24
from bzrlib import (
25
errors,
26
merge as _mod_merge,
27
osutils,
28
urlutils,
29
workingtree,
30
)
33
31
from bzrlib.diff import show_diff_trees
34
from bzrlib.errors import NoSuchFile
35
from bzrlib.trace import warning
36
37
38
class DiffWindow(gtk.Window):
39
"""Diff window.
40
41
This object represents and manages a single window containing the
42
differences between two revisions on a branch.
43
"""
32
from bzrlib.patches import parse_patches
33
from bzrlib.plugins.gtk.dialog import (
34
error_dialog,
35
info_dialog,
36
warning_dialog,
37
)
38
from bzrlib.plugins.gtk.i18n import _i18n
39
from bzrlib.plugins.gtk.window import Window
40
41
42
def fallback_guess_language(slm, content_type):
43
for lang_id in slm.get_language_ids():
44
lang = slm.get_language(lang_id)
45
if "text/x-patch" in lang.get_mime_types():
46
return lang
47
return None
48
49
50
class SelectCancelled(Exception):
51
52
pass
53
54
55
class DiffFileView(Gtk.ScrolledWindow):
56
"""Window for displaying diffs from a diff file"""
57
58
SHOW_WIDGETS = True
44
59
45
60
def __init__(self):
46
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
47
self.set_border_width(0)
48
self.set_title("bzrk diff")
49
50
# Use two thirds of the screen by default
51
screen = self.get_screen()
52
monitor = screen.get_monitor_geometry(0)
53
width = int(monitor.width * 0.66)
54
height = int(monitor.height * 0.66)
55
self.set_default_size(width, height)
56
61
super(DiffFileView, self).__init__()
57
62
self.construct()
63
self._diffs = {}
58
64
59
65
def construct(self):
60
"""Construct the window contents."""
61
# The window consists of a pane containing: the
62
# hierarchical list of files on the left, and the diff
63
# for the currently selected file on the right.
64
pane = gtk.HPaned()
65
self.add(pane)
66
pane.show()
66
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
67
self.set_shadow_type(Gtk.ShadowType.IN)
68
69
if have_gtksourceview:
70
self.buffer = GtkSource.Buffer()
71
lang_manager = GtkSource.LanguageManager.get_default()
72
language = lang_manager.guess_language(None, "text/x-patch")
73
self.buffer.set_language(language)
74
self.buffer.set_highlight_syntax(True)
75
self.sourceview = GtkSource.View(buffer=self.buffer)
76
else:
77
self.buffer = Gtk.TextBuffer()
78
self.sourceview = Gtk.TextView(self.buffer)
79
80
self.sourceview.set_editable(False)
81
self.sourceview.override_font(Pango.FontDescription("Monospace"))
82
self.add(self.sourceview)
83
if self.SHOW_WIDGETS:
84
self.sourceview.show()
85
86
def set_trees(self, rev_tree, parent_tree):
87
self.rev_tree = rev_tree
88
self.parent_tree = parent_tree
89
# self._build_delta()
90
91
# def _build_delta(self):
92
# self.parent_tree.lock_read()
93
# self.rev_tree.lock_read()
94
# try:
95
# self.delta = iter_changes_to_status(
96
# self.parent_tree, self.rev_tree)
97
# self.path_to_status = {}
98
# self.path_to_diff = {}
99
# source_inv = self.parent_tree.inventory
100
# target_inv = self.rev_tree.inventory
101
# for (file_id, real_path, change_type, display_path) in self.delta:
102
# self.path_to_status[real_path] = u'=== %s %s' % (
103
# change_type, display_path)
104
# if change_type in ('modified', 'renamed and modified'):
105
# source_ie = source_inv[file_id]
106
# target_ie = target_inv[file_id]
107
# sio = StringIO()
108
# source_ie.diff(internal_diff, *old path, *old_tree,
109
# *new_path, target_ie, self.rev_tree,
110
# sio)
111
# self.path_to_diff[real_path] =
112
#
113
# finally:
114
# self.rev_tree.unlock()
115
# self.parent_tree.unlock()
116
117
def show_diff(self, specific_files):
118
sections = []
119
if specific_files is None:
120
self.buffer.set_text(self._diffs[None])
121
else:
122
for specific_file in specific_files:
123
sections.append(self._diffs[specific_file])
124
self.buffer.set_text(''.join(sections))
125
126
127
class DiffView(DiffFileView):
128
"""This is the soft and chewy filling for a DiffWindow."""
129
130
def __init__(self):
131
super(DiffView, self).__init__()
132
self.rev_tree = None
133
self.parent_tree = None
134
135
def show_diff(self, specific_files):
136
"""Show the diff for the specified files"""
137
s = StringIO()
138
show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
139
old_label='', new_label='',
140
# path_encoding=sys.getdefaultencoding()
141
# The default is utf-8, but we interpret the file
142
# contents as getdefaultencoding(), so we should
143
# probably try to make the paths in the same encoding.
144
)
145
# str.decode(encoding, 'replace') doesn't do anything. Because if a
146
# character is not valid in 'encoding' there is nothing to replace, the
147
# 'replace' is for 'str.encode()'
148
try:
149
decoded = s.getvalue().decode(sys.getdefaultencoding())
150
except UnicodeDecodeError:
151
try:
152
decoded = s.getvalue().decode('UTF-8')
153
except UnicodeDecodeError:
154
decoded = s.getvalue().decode('iso-8859-1')
155
# This always works, because every byte has a valid
156
# mapping from iso-8859-1 to Unicode
157
# TextBuffer must contain pure UTF-8 data
158
self.buffer.set_text(decoded.encode('UTF-8'))
159
160
161
class DiffWidget(Gtk.HPaned):
162
"""Diff widget
163
164
"""
165
166
SHOW_WIDGETS = True
167
168
def __init__(self):
169
super(DiffWidget, self).__init__()
67
170
68
171
# The file hierarchy: a scrollable treeview
69
scrollwin = gtk.ScrolledWindow()
70
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
71
scrollwin.set_shadow_type(gtk.SHADOW_IN)
72
pane.pack1(scrollwin)
73
scrollwin.show()
172
scrollwin = Gtk.ScrolledWindow()
173
scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
174
scrollwin.set_shadow_type(Gtk.ShadowType.IN)
175
self.pack1(scrollwin)
176
if self.SHOW_WIDGETS:
177
scrollwin.show()
74
178
75
self.model = gtk.TreeStore(str, str)
76
self.treeview = gtk.TreeView(self.model)
179
self.model = Gtk.TreeStore(str, str)
180
self.treeview = Gtk.TreeView(model=self.model)
77
181
self.treeview.set_headers_visible(False)
78
182
self.treeview.set_search_column(1)
79
183
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
80
184
scrollwin.add(self.treeview)
81
self.treeview.show()
185
if self.SHOW_WIDGETS:
186
self.treeview.show()
82
187
83
cell = gtk.CellRendererText()
188
cell = Gtk.CellRendererText()
84
189
cell.set_property("width-chars", 20)
85
column = gtk.TreeViewColumn()
86
column.pack_start(cell, expand=True)
190
column = Gtk.TreeViewColumn()
191
column.pack_start(cell, True)
87
192
column.add_attribute(cell, "text", 0)
88
193
self.treeview.append_column(column)
89
194
195
def set_diff_text(self, lines):
196
"""Set the current diff from a list of lines
197
198
:param lines: The diff to show, in unified diff format
199
"""
90
200
# The diffs of the selected file: a scrollable source or
91
201
# text view
92
scrollwin = gtk.ScrolledWindow()
93
scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
94
scrollwin.set_shadow_type(gtk.SHADOW_IN)
95
pane.pack2(scrollwin)
96
scrollwin.show()
97
98
if have_gtksourceview:
99
self.buffer = gtksourceview.SourceBuffer()
100
slm = gtksourceview.SourceLanguagesManager()
101
gsl = slm.get_language_from_mime_type("text/x-patch")
102
if have_gconf:
103
self.apply_gedit_colors(gsl)
104
self.apply_colordiff_colors(gsl)
105
self.buffer.set_language(gsl)
106
self.buffer.set_highlight(True)
107
108
sourceview = gtksourceview.SourceView(self.buffer)
109
else:
110
self.buffer = gtk.TextBuffer()
111
sourceview = gtk.TextView(self.buffer)
112
113
sourceview.set_editable(False)
114
sourceview.modify_font(pango.FontDescription("Monospace"))
115
scrollwin.add(sourceview)
116
sourceview.show()
117
118
def set_diff(self, description, rev_tree, parent_tree):
202
203
def set_diff_text_sections(self, sections):
204
if getattr(self, 'diff_view', None) is None:
205
self.diff_view = DiffFileView()
206
self.pack2(self.diff_view)
207
if self.SHOW_WIDGETS:
208
self.diff_view.show()
209
for oldname, newname, patch in sections:
210
self.diff_view._diffs[newname] = str(patch)
211
if newname is None:
212
newname = ''
213
self.model.append(None, [oldname, newname])
214
self.diff_view.show_diff(None)
215
216
def set_diff(self, rev_tree, parent_tree):
119
217
"""Set the differences showed by this window.
120
218
121
219
Compares the two trees and populates the window with the
122
220
differences.
123
221
"""
222
if getattr(self, 'diff_view', None) is None:
223
self.diff_view = DiffView()
224
self.pack2(self.diff_view)
225
if self.SHOW_WIDGETS:
226
self.diff_view.show()
227
self.diff_view.set_trees(rev_tree, parent_tree)
124
228
self.rev_tree = rev_tree
125
229
self.parent_tree = parent_tree
126
230
127
231
self.model.clear()
128
232
delta = self.rev_tree.changes_from(self.parent_tree)
129
233
130
self.model.append(None, [ "Complete Diff", "" ])
234
self.model.append(None, ["Complete Diff", ""])
131
235
132
236
if len(delta.added):
133
titer = self.model.append(None, [ "Added", None ])
237
titer = self.model.append(None, ["Added", None])
134
238
for path, id, kind in delta.added:
135
self.model.append(titer, [ path, path ])
239
self.model.append(titer, [path, path])
136
240
137
241
if len(delta.removed):
138
titer = self.model.append(None, [ "Removed", None ])
242
titer = self.model.append(None, ["Removed", None])
139
243
for path, id, kind in delta.removed:
140
self.model.append(titer, [ path, path ])
244
self.model.append(titer, [path, path])
141
245
142
246
if len(delta.renamed):
143
titer = self.model.append(None, [ "Renamed", None ])
247
titer = self.model.append(None, ["Renamed", None])
144
248
for oldpath, newpath, id, kind, text_modified, meta_modified \
145
249
in delta.renamed:
146
self.model.append(titer, [ oldpath, newpath ])
250
self.model.append(titer, [oldpath, newpath])
147
251
148
252
if len(delta.modified):
149
titer = self.model.append(None, [ "Modified", None ])
253
titer = self.model.append(None, ["Modified", None])
150
254
for path, id, kind, text_modified, meta_modified in delta.modified:
151
self.model.append(titer, [ path, path ])
255
self.model.append(titer, [path, path])
152
256
153
257
self.treeview.expand_all()
154
self.set_title(description + " - bzrk diff")
258
self.diff_view.show_diff(None)
155
259
156
260
def set_file(self, file_path):
261
"""Select the current file to display"""
157
262
tv_path = None
158
263
for data in self.model:
159
264
for child in data.iterchildren():
161
266
tv_path = child.path
162
267
break
163
268
if tv_path is None:
164
raise NoSuchFile(file_path)
165
self.treeview.set_cursor(tv_path)
269
raise errors.NoSuchFile(file_path)
270
self.treeview.set_cursor(tv_path, None, False)
166
271
self.treeview.scroll_to_cell(tv_path)
167
272
168
273
def _treeview_cursor_cb(self, *args):
169
274
"""Callback for when the treeview cursor changes."""
170
275
(path, col) = self.treeview.get_cursor()
171
specific_files = [ self.model[path][1] ]
172
if specific_files == [ None ]:
173
return
174
elif specific_files == [ "" ]:
175
specific_files = []
176
177
s = StringIO()
178
show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files)
179
self.buffer.set_text(s.getvalue().decode(sys.getdefaultencoding(), 'replace'))
180
181
@staticmethod
182
def apply_gedit_colors(lang):
183
"""Set style for lang to that specified in gedit configuration.
184
185
This method needs the gconf module.
186
187
:param lang: a gtksourceview.SourceLanguage object.
188
"""
189
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
190
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
191
192
client = gconf.client_get_default()
193
client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
194
195
for tag in lang.get_tags():
196
tag_id = tag.get_id()
197
gconf_key = GEDIT_LANG_PATH + '/' + tag_id
198
style_string = client.get_string(gconf_key)
199
200
if style_string is None:
201
continue
202
203
# function to get a bool from a string that's either '0' or '1'
204
string_bool = lambda x: bool(int(x))
205
206
# style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
207
# values are: mask, fg, bg, italic, bold, underline, strike
208
# this packs them into (str_value, attr_name, conv_func) tuples
209
items = zip(style_string.split('/'), ['mask', 'foreground',
210
'background', 'italic', 'bold', 'underline', 'strikethrough' ],
211
[ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
212
string_bool, string_bool, string_bool ]
213
)
214
215
style = gtksourceview.SourceTagStyle()
216
217
# XXX The mask attribute controls whether the present values of
218
# foreground and background color should in fact be used. Ideally
219
# (and that's what gedit does), one could set all three attributes,
220
# and let the TagStyle object figure out which colors to use.
221
# However, in the GtkSourceview python bindings, the mask attribute
222
# is read-only, and it's derived instead from the colors being
223
# set or not. This means that we have to sometimes refrain from
224
# setting fg or bg colors, depending on the value of the mask.
225
# This code could go away if mask were writable.
226
mask = int(items[0][0])
227
if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
228
items[2:3] = []
229
if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
230
items[1:2] = []
231
items[0:1] = [] # skip the mask unconditionally
232
233
for value, attr, func in items:
234
try:
235
value = func(value)
236
except ValueError:
237
warning('gconf key %s contains an invalid value: %s'
238
% gconf_key, value)
239
else:
240
setattr(style, attr, value)
241
242
lang.set_tag_style(tag_id, style)
243
244
@staticmethod
245
def apply_colordiff_colors(lang):
246
"""Set style colors for lang using the colordiff configuration file.
247
248
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
249
250
:param lang: a "Diff" gtksourceview.SourceLanguage object.
251
"""
252
colors = {}
253
254
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
255
f = os.path.expanduser(f)
256
if os.path.exists(f):
257
try:
258
f = file(f)
259
except IOError, e:
260
warning('could not open file %s: %s' % (f, str(e)))
261
else:
262
colors.update(DiffWindow.parse_colordiffrc(f))
263
f.close()
264
265
if not colors:
266
# ~/.colordiffrc does not exist
267
return
268
269
mapping = {
270
# map GtkSourceView tags to colordiff names
271
# since GSV is richer, accept new names for extra bits,
272
# defaulting to old names if they're not present
273
'Added@32@line': ['newtext'],
274
'Removed@32@line': ['oldtext'],
275
'Location': ['location', 'diffstuff'],
276
'Diff@32@file': ['file', 'diffstuff'],
277
'Special@32@case': ['specialcase', 'diffstuff'],
278
}
279
280
for tag in lang.get_tags():
281
tag_id = tag.get_id()
282
keys = mapping.get(tag_id, [])
283
color = None
284
285
for key in keys:
286
color = colors.get(key, None)
287
if color is not None:
288
break
289
290
if color is None:
291
continue
292
293
style = gtksourceview.SourceTagStyle()
294
try:
295
style.foreground = gtk.gdk.color_parse(color)
296
except ValueError:
297
warning('not a valid color: %s' % color)
298
else:
299
lang.set_tag_style(tag_id, style)
300
301
@staticmethod
302
def parse_colordiffrc(fileobj):
303
"""Parse fileobj as a colordiff configuration file.
304
305
:return: A dict with the key -> value pairs.
306
"""
307
colors = {}
308
for line in fileobj:
309
if re.match(r'^\s*#', line):
310
continue
311
if '=' not in line:
312
continue
313
key, val = line.split('=', 1)
314
colors[key.strip()] = val.strip()
315
return colors
316
276
if path is None:
277
return
278
specific_files = [self.model[path][1]]
279
if specific_files == [None]:
280
return
281
elif specific_files == [""]:
282
specific_files = None
283
284
self.diff_view.show_diff(specific_files)
285
286
def _on_wraplines_toggled(self, widget=None, wrap=False):
287
"""Callback for when the wrap lines checkbutton is toggled"""
288
if wrap or widget.get_active():
289
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
290
else:
291
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
292
293
294
class DiffWindow(Window):
295
"""Diff window.
296
297
This object represents and manages a single window containing the
298
differences between two revisions on a branch.
299
"""
300
301
SHOW_WIDGETS = True
302
303
def __init__(self, parent=None, operations=None):
304
super(DiffWindow, self).__init__(parent=parent)
305
self.set_border_width(0)
306
self.set_title("bzr diff")
307
308
# Use two thirds of the screen by default
309
screen = self.get_screen()
310
monitor = screen.get_monitor_geometry(0)
311
width = int(monitor.width * 0.66)
312
height = int(monitor.height * 0.66)
313
self.set_default_size(width, height)
314
self.construct(operations)
315
316
def construct(self, operations):
317
"""Construct the window contents."""
318
self.vbox = Gtk.VBox()
319
self.add(self.vbox)
320
if self.SHOW_WIDGETS:
321
self.vbox.show()
322
self.diff = DiffWidget()
323
self.vbox.pack_end(self.diff, True, True, 0)
324
if self.SHOW_WIDGETS:
325
self.diff.show_all()
326
# Build after DiffWidget to connect signals
327
menubar = self._get_menu_bar()
328
self.vbox.pack_start(menubar, False, False, 0)
329
hbox = self._get_button_bar(operations)
330
if hbox is not None:
331
self.vbox.pack_start(hbox, False, True, 0)
332
333
def _get_menu_bar(self):
334
menubar = Gtk.MenuBar()
335
# View menu
336
mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
337
mb_view_menu = Gtk.Menu()
338
mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
339
_i18n("Wrap _Long Lines"))
340
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
341
mb_view_menu.append(mb_view_wrapsource)
342
mb_view.set_submenu(mb_view_menu)
343
menubar.append(mb_view)
344
if self.SHOW_WIDGETS:
345
menubar.show_all()
346
return menubar
347
348
def _get_button_bar(self, operations):
349
"""Return a button bar to use.
350
351
:return: None, meaning that no button bar will be used.
352
"""
353
if operations is None:
354
return None
355
hbox = Gtk.HButtonBox()
356
hbox.set_layout(Gtk.ButtonBoxStyle.START)
357
for title, method in operations:
358
merge_button = Gtk.Button(title)
359
if self.SHOW_WIDGETS:
360
merge_button.show()
361
merge_button.set_relief(Gtk.ReliefStyle.NONE)
362
merge_button.connect("clicked", method)
363
hbox.pack_start(merge_button, False, True, 0)
364
if self.SHOW_WIDGETS:
365
hbox.show()
366
return hbox
367
368
def _get_merge_target(self):
369
d = Gtk.FileChooserDialog('Merge branch', self,
370
Gtk.FileChooserAction.SELECT_FOLDER,
371
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
372
Gtk.STOCK_CANCEL,
373
Gtk.ResponseType.CANCEL,))
374
try:
375
result = d.run()
376
if result != Gtk.ResponseType.OK:
377
raise SelectCancelled()
378
return d.get_current_folder_uri()
379
finally:
380
d.destroy()
381
382
def _merge_successful(self):
383
# No conflicts found.
384
info_dialog(_i18n('Merge successful'),
385
_i18n('All changes applied successfully.'))
386
387
def _conflicts(self):
388
warning_dialog(_i18n('Conflicts encountered'),
389
_i18n('Please resolve the conflicts manually'
390
' before committing.'))
391
392
def _handle_error(self, e):
393
error_dialog('Error', str(e))
394
395
def _get_save_path(self, basename):
396
d = Gtk.FileChooserDialog('Save As', self,
397
Gtk.FileChooserAction.SAVE,
398
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
399
Gtk.STOCK_CANCEL,
400
Gtk.ResponseType.CANCEL,))
401
d.set_current_name(basename)
402
try:
403
result = d.run()
404
if result != Gtk.ResponseType.OK:
405
raise SelectCancelled()
406
return urlutils.local_path_from_url(d.get_uri())
407
finally:
408
d.destroy()
409
410
def set_diff(self, description, rev_tree, parent_tree):
411
"""Set the differences showed by this window.
412
413
Compares the two trees and populates the window with the
414
differences.
415
"""
416
self.diff.set_diff(rev_tree, parent_tree)
417
self.set_title(description + " - bzrk diff")
418
419
def set_file(self, file_path):
420
self.diff.set_file(file_path)
421
422
423
class DiffController(object):
424
425
def __init__(self, path, patch, window=None, allow_dirty=False):
426
self.path = path
427
self.patch = patch
428
self.allow_dirty = allow_dirty
429
if window is None:
430
window = DiffWindow(operations=self._provide_operations())
431
self.initialize_window(window)
432
self.window = window
433
434
def initialize_window(self, window):
435
window.diff.set_diff_text_sections(self.get_diff_sections())
436
window.set_title(self.path + " - diff")
437
438
def get_diff_sections(self):
439
yield "Complete Diff", None, ''.join(self.patch)
440
# allow_dirty was added to parse_patches in bzrlib 2.2b1
441
if 'allow_dirty' in inspect.getargspec(parse_patches).args:
442
patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
443
else:
444
patches = parse_patches(self.patch)
445
for patch in patches:
446
oldname = patch.oldname.split('\t')[0]
447
newname = patch.newname.split('\t')[0]
448
yield oldname, newname, str(patch)
449
450
def perform_save(self, window):
451
try:
452
save_path = self.window._get_save_path(osutils.basename(self.path))
453
except SelectCancelled:
454
return
455
source = open(self.path, 'rb')
456
try:
457
target = open(save_path, 'wb')
458
try:
459
osutils.pumpfile(source, target)
460
finally:
461
target.close()
462
finally:
463
source.close()
464
465
def _provide_operations(self):
466
return [('Save', self.perform_save)]
467
468
469
class MergeDirectiveController(DiffController):
470
471
def __init__(self, path, directive, window=None):
472
super(MergeDirectiveController, self).__init__(
473
path, directive.patch.splitlines(True), window)
474
self.directive = directive
475
self.merge_target = None
476
477
def _provide_operations(self):
478
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
479
480
def perform_merge(self, window):
481
if self.merge_target is None:
482
try:
483
self.merge_target = self.window._get_merge_target()
484
except SelectCancelled:
485
return
486
tree = workingtree.WorkingTree.open(self.merge_target)
487
tree.lock_write()
488
try:
489
try:
490
if tree.has_changes():
491
raise errors.UncommittedChanges(tree)
492
merger, verified = _mod_merge.Merger.from_mergeable(
493
tree, self.directive, pb=None)
494
merger.merge_type = _mod_merge.Merge3Merger
495
conflict_count = merger.do_merge()
496
merger.set_pending()
497
if conflict_count == 0:
498
self.window._merge_successful()
499
else:
500
self.window._conflicts()
501
# There are conflicts to be resolved.
502
self.window.destroy()
503
except Exception, e:
504
self.window._handle_error(e)
505
finally:
506
tree.unlock()
507
508
509
def iter_changes_to_status(source, target):
510
"""Determine the differences between trees.
511
512
This is a wrapper around iter_changes which just yields more
513
understandable results.
514
515
:param source: The source tree (basis tree)
516
:param target: The target tree
517
:return: A list of (file_id, real_path, change_type, display_path)
518
"""
519
added = 'added'
520
removed = 'removed'
521
renamed = 'renamed'
522
renamed_and_modified = 'renamed and modified'
523
modified = 'modified'
524
kind_changed = 'kind changed'
525
missing = 'missing'
526
527
# TODO: Handle metadata changes
528
529
status = []
530
target.lock_read()
531
try:
532
source.lock_read()
533
try:
534
for (file_id, paths, changed_content, versioned, parent_ids, names,
535
kinds, executables) in target.iter_changes(source):
536
537
# Skip the root entry if it isn't very interesting
538
if parent_ids == (None, None):
539
continue
540
541
change_type = None
542
if kinds[0] is None:
543
source_marker = ''
544
else:
545
source_marker = osutils.kind_marker(kinds[0])
546
547
if kinds[1] is None:
548
if kinds[0] is None:
549
# We assume bzr will flag only files in that case,
550
# there may be a bzr bug there as only files seems to
551
# not receive any kind.
552
marker = osutils.kind_marker('file')
553
else:
554
marker = osutils.kind_marker(kinds[0])
555
else:
556
marker = osutils.kind_marker(kinds[1])
557
558
real_path = paths[1]
559
if real_path is None:
560
real_path = paths[0]
561
assert real_path is not None
562
563
present_source = versioned[0] and kinds[0] is not None
564
present_target = versioned[1] and kinds[1] is not None
565
566
if kinds[0] is None and kinds[1] is None:
567
change_type = missing
568
display_path = real_path + marker
569
elif present_source != present_target:
570
if present_target:
571
change_type = added
572
else:
573
assert present_source
574
change_type = removed
575
display_path = real_path + marker
576
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
577
# Renamed
578
if changed_content or executables[0] != executables[1]:
579
# and modified
580
change_type = renamed_and_modified
581
else:
582
change_type = renamed
583
display_path = (paths[0] + source_marker
584
+ ' => ' + paths[1] + marker)
585
elif kinds[0] != kinds[1]:
586
change_type = kind_changed
587
display_path = (paths[0] + source_marker
588
+ ' => ' + paths[1] + marker)
589
elif changed_content or executables[0] != executables[1]:
590
change_type = modified
591
display_path = real_path + marker
592
else:
593
assert False, "How did we get here?"
594
595
status.append((file_id, real_path, change_type, display_path))
596
finally:
597
source.unlock()
598
finally:
599
target.unlock()
600
601
return status
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0