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