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 449.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 449.1.2
- Committer: Jelmer Vernooij
- Date: 2008-03-14 02:19:21 UTC
- mto: (452.2.3 trunk)
- mto: This revision was merged to the branch mainline in revision 453.
- Revision ID: jelmer@samba.org-20080314021921-2dgptk62dhp7pd91
Honor child_submit_to in the submit_branch if no email address was specified.
Consistent with the changes in bzr.dev.
Consistent with the changes in bzr.dev.
- files added:
- cmenu.ui
- olive
- files removed:
- bzr-gtk.applications
- preferences
- files renamed:
- 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
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
9
__author__ = "Scott James Remnant <scott@ubuntu.com>"
9
10
10
11
17
18
import os
18
19
import re
19
20
import sys
20
import inspect
21
try:
22
from xml.etree.ElementTree import Element, SubElement, tostring
23
except ImportError:
24
from elementtree.ElementTree import Element, SubElement, tostring
25
21
26
22
try:
27
import gtksourceview2
23
import gtksourceview
28
24
have_gtksourceview = True
29
25
except ImportError:
30
26
have_gtksourceview = False
35
31
have_gconf = False
36
32
37
33
from bzrlib import (
38
errors,
39
34
merge as _mod_merge,
40
35
osutils,
36
progress,
41
37
urlutils,
42
38
workingtree,
43
39
)
44
40
from bzrlib.diff import show_diff_trees, internal_diff
41
from bzrlib.errors import NoSuchFile
45
42
from bzrlib.patches import parse_patches
46
43
from bzrlib.trace import warning
47
from bzrlib.plugins.gtk import _i18n
48
44
from bzrlib.plugins.gtk.window import Window
49
45
from dialog import error_dialog, info_dialog, warning_dialog
50
46
51
47
52
def fallback_guess_language(slm, content_type):
53
for lang_id in slm.get_language_ids():
54
lang = slm.get_language(lang_id)
55
if "text/x-patch" in lang.get_mime_types():
56
return lang
57
return None
58
59
60
48
class SelectCancelled(Exception):
61
49
62
50
pass
75
63
self.set_shadow_type(gtk.SHADOW_IN)
76
64
77
65
if have_gtksourceview:
78
self.buffer = gtksourceview2.Buffer()
79
slm = gtksourceview2.LanguageManager()
80
guess_language = getattr(gtksourceview2.LanguageManager,
81
"guess_language", fallback_guess_language)
82
gsl = guess_language(slm, content_type="text/x-patch")
66
self.buffer = gtksourceview.SourceBuffer()
67
slm = gtksourceview.SourceLanguagesManager()
68
gsl = slm.get_language_from_mime_type("text/x-patch")
83
69
if have_gconf:
84
self.apply_gedit_colors(self.buffer)
85
self.apply_colordiff_colors(self.buffer)
70
self.apply_gedit_colors(gsl)
71
self.apply_colordiff_colors(gsl)
86
72
self.buffer.set_language(gsl)
87
self.buffer.set_highlight_syntax(True)
73
self.buffer.set_highlight(True)
88
74
89
self.sourceview = gtksourceview2.View(self.buffer)
75
sourceview = gtksourceview.SourceView(self.buffer)
90
76
else:
91
77
self.buffer = gtk.TextBuffer()
92
self.sourceview = gtk.TextView(self.buffer)
78
sourceview = gtk.TextView(self.buffer)
93
79
94
self.sourceview.set_editable(False)
95
self.sourceview.modify_font(pango.FontDescription("Monospace"))
96
self.add(self.sourceview)
97
self.sourceview.show()
80
sourceview.set_editable(False)
81
sourceview.modify_font(pango.FontDescription("Monospace"))
82
self.add(sourceview)
83
sourceview.show()
98
84
99
85
@staticmethod
100
def apply_gedit_colors(buf):
101
"""Set style to that specified in gedit configuration.
86
def apply_gedit_colors(lang):
87
"""Set style for lang to that specified in gedit configuration.
102
88
103
89
This method needs the gconf module.
104
90
105
:param buf: a gtksourceview2.Buffer object.
91
:param lang: a gtksourceview.SourceLanguage object.
106
92
"""
107
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
108
GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
93
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
94
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
109
95
110
96
client = gconf.client_get_default()
111
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
112
if style_scheme_name is not None:
113
style_scheme_mgr = gtksourceview2.StyleSchemeManager()
114
style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
115
116
style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
117
118
if style_scheme is not None:
119
buf.set_style_scheme(style_scheme)
97
client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
98
99
for tag in lang.get_tags():
100
tag_id = tag.get_id()
101
gconf_key = GEDIT_LANG_PATH + '/' + tag_id
102
style_string = client.get_string(gconf_key)
103
104
if style_string is None:
105
continue
106
107
# function to get a bool from a string that's either '0' or '1'
108
string_bool = lambda x: bool(int(x))
109
110
# style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
111
# values are: mask, fg, bg, italic, bold, underline, strike
112
# this packs them into (str_value, attr_name, conv_func) tuples
113
items = zip(style_string.split('/'), ['mask', 'foreground',
114
'background', 'italic', 'bold', 'underline', 'strikethrough' ],
115
[ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
116
string_bool, string_bool, string_bool ]
117
)
118
119
style = gtksourceview.SourceTagStyle()
120
121
# XXX The mask attribute controls whether the present values of
122
# foreground and background color should in fact be used. Ideally
123
# (and that's what gedit does), one could set all three attributes,
124
# and let the TagStyle object figure out which colors to use.
125
# However, in the GtkSourceview python bindings, the mask attribute
126
# is read-only, and it's derived instead from the colors being
127
# set or not. This means that we have to sometimes refrain from
128
# setting fg or bg colors, depending on the value of the mask.
129
# This code could go away if mask were writable.
130
mask = int(items[0][0])
131
if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
132
items[2:3] = []
133
if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
134
items[1:2] = []
135
items[0:1] = [] # skip the mask unconditionally
136
137
for value, attr, func in items:
138
try:
139
value = func(value)
140
except ValueError:
141
warning('gconf key %s contains an invalid value: %s'
142
% gconf_key, value)
143
else:
144
setattr(style, attr, value)
145
146
lang.set_tag_style(tag_id, style)
120
147
121
148
@classmethod
122
def apply_colordiff_colors(klass, buf):
149
def apply_colordiff_colors(klass, lang):
123
150
"""Set style colors for lang using the colordiff configuration file.
124
151
125
152
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
126
153
127
:param buf: a "Diff" gtksourceview2.Buffer object.
154
:param lang: a "Diff" gtksourceview.SourceLanguage object.
128
155
"""
129
scheme_manager = gtksourceview2.StyleSchemeManager()
130
style_scheme = scheme_manager.get_scheme('colordiff')
131
132
# if style scheme not found, we'll generate it from colordiffrc
133
# TODO: reload if colordiffrc has changed.
134
if style_scheme is None:
135
colors = {}
136
137
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
138
f = os.path.expanduser(f)
139
if os.path.exists(f):
140
try:
141
f = file(f)
142
except IOError, e:
143
warning('could not open file %s: %s' % (f, str(e)))
144
else:
145
colors.update(klass.parse_colordiffrc(f))
146
f.close()
147
148
if not colors:
149
# ~/.colordiffrc does not exist
150
return
151
152
mapping = {
153
# map GtkSourceView2 scheme styles to colordiff names
156
colors = {}
157
158
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
159
f = os.path.expanduser(f)
160
if os.path.exists(f):
161
try:
162
f = file(f)
163
except IOError, e:
164
warning('could not open file %s: %s' % (f, str(e)))
165
else:
166
colors.update(klass.parse_colordiffrc(f))
167
f.close()
168
169
if not colors:
170
# ~/.colordiffrc does not exist
171
return
172
173
mapping = {
174
# map GtkSourceView tags to colordiff names
154
175
# since GSV is richer, accept new names for extra bits,
155
176
# defaulting to old names if they're not present
156
'diff:added-line': ['newtext'],
157
'diff:removed-line': ['oldtext'],
158
'diff:location': ['location', 'diffstuff'],
159
'diff:file': ['file', 'diffstuff'],
160
'diff:special-case': ['specialcase', 'diffstuff'],
161
}
162
163
converted_colors = {}
164
for name, values in mapping.items():
165
color = None
166
for value in values:
167
color = colors.get(value, None)
168
if color is not None:
169
break
170
if color is None:
171
continue
172
converted_colors[name] = color
173
174
# some xml magic to produce needed style scheme description
175
e_style_scheme = Element('style-scheme')
176
e_style_scheme.set('id', 'colordiff')
177
e_style_scheme.set('_name', 'ColorDiff')
178
e_style_scheme.set('version', '1.0')
179
for name, color in converted_colors.items():
180
style = SubElement(e_style_scheme, 'style')
181
style.set('name', name)
182
style.set('foreground', '#%s' % color)
183
184
scheme_xml = tostring(e_style_scheme, 'UTF-8')
185
if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
186
os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
187
file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
188
189
scheme_manager.force_rescan()
190
style_scheme = scheme_manager.get_scheme('colordiff')
191
192
buf.set_style_scheme(style_scheme)
177
'Added@32@line': ['newtext'],
178
'Removed@32@line': ['oldtext'],
179
'Location': ['location', 'diffstuff'],
180
'Diff@32@file': ['file', 'diffstuff'],
181
'Special@32@case': ['specialcase', 'diffstuff'],
182
}
183
184
for tag in lang.get_tags():
185
tag_id = tag.get_id()
186
keys = mapping.get(tag_id, [])
187
color = None
188
189
for key in keys:
190
color = colors.get(key, None)
191
if color is not None:
192
break
193
194
if color is None:
195
continue
196
197
style = gtksourceview.SourceTagStyle()
198
try:
199
style.foreground = gtk.gdk.color_parse(color)
200
except ValueError:
201
warning('not a valid color: %s' % color)
202
else:
203
lang.set_tag_style(tag_id, style)
193
204
194
205
@staticmethod
195
206
def parse_colordiffrc(fileobj):
216
227
# self.parent_tree.lock_read()
217
228
# self.rev_tree.lock_read()
218
229
# try:
219
# self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
230
# self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
220
231
# self.path_to_status = {}
221
232
# self.path_to_diff = {}
222
233
# source_inv = self.parent_tree.inventory
293
304
scrollwin.set_shadow_type(gtk.SHADOW_IN)
294
305
self.pack1(scrollwin)
295
306
scrollwin.show()
296
307
297
308
self.model = gtk.TreeStore(str, str)
298
309
self.treeview = gtk.TreeView(self.model)
299
310
self.treeview.set_headers_visible(False)
316
327
"""
317
328
# The diffs of the selected file: a scrollable source or
318
329
# text view
319
320
def set_diff_text_sections(self, sections):
321
if getattr(self, 'diff_view', None) is None:
322
self.diff_view = DiffFileView()
323
self.pack2(self.diff_view)
330
self.diff_view = DiffFileView()
324
331
self.diff_view.show()
325
for oldname, newname, patch in sections:
332
self.pack2(self.diff_view)
333
self.model.append(None, [ "Complete Diff", "" ])
334
self.diff_view._diffs[None] = ''.join(lines)
335
for patch in parse_patches(lines):
336
oldname = patch.oldname.split('\t')[0]
337
newname = patch.newname.split('\t')[0]
338
self.model.append(None, [oldname, newname])
326
339
self.diff_view._diffs[newname] = str(patch)
327
if newname is None:
328
newname = ''
329
self.model.append(None, [oldname, newname])
330
340
self.diff_view.show_diff(None)
331
341
332
342
def set_diff(self, rev_tree, parent_tree):
335
345
Compares the two trees and populates the window with the
336
346
differences.
337
347
"""
338
if getattr(self, 'diff_view', None) is None:
339
self.diff_view = DiffView()
340
self.pack2(self.diff_view)
348
self.diff_view = DiffView()
349
self.pack2(self.diff_view)
341
350
self.diff_view.show()
342
351
self.diff_view.set_trees(rev_tree, parent_tree)
343
352
self.rev_tree = rev_tree
370
379
self.model.append(titer, [ path, path ])
371
380
372
381
self.treeview.expand_all()
373
self.diff_view.show_diff(None)
374
382
375
383
def set_file(self, file_path):
376
384
"""Select the current file to display"""
381
389
tv_path = child.path
382
390
break
383
391
if tv_path is None:
384
raise errors.NoSuchFile(file_path)
392
raise NoSuchFile(file_path)
385
393
self.treeview.set_cursor(tv_path)
386
394
self.treeview.scroll_to_cell(tv_path)
387
395
393
401
return
394
402
elif specific_files == [ "" ]:
395
403
specific_files = None
396
404
397
405
self.diff_view.show_diff(specific_files)
398
399
def _on_wraplines_toggled(self, widget=None, wrap=False):
400
"""Callback for when the wrap lines checkbutton is toggled"""
401
if wrap or widget.get_active():
402
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
403
else:
404
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
406
405
407
406
408
class DiffWindow(Window):
407
409
"""Diff window.
410
412
differences between two revisions on a branch.
411
413
"""
412
414
413
def __init__(self, parent=None, operations=None):
415
def __init__(self, parent=None):
414
416
Window.__init__(self, parent)
415
417
self.set_border_width(0)
416
418
self.set_title("bzrk diff")
421
423
width = int(monitor.width * 0.66)
422
424
height = int(monitor.height * 0.66)
423
425
self.set_default_size(width, height)
424
self.construct(operations)
425
426
def construct(self, operations):
426
427
self.construct()
428
429
def construct(self):
427
430
"""Construct the window contents."""
428
431
self.vbox = gtk.VBox()
429
432
self.add(self.vbox)
430
433
self.vbox.show()
434
hbox = self._get_button_bar()
435
if hbox is not None:
436
self.vbox.pack_start(hbox, expand=False, fill=True)
431
437
self.diff = DiffWidget()
432
self.vbox.pack_end(self.diff, True, True, 0)
438
self.vbox.add(self.diff)
433
439
self.diff.show_all()
434
# Build after DiffWidget to connect signals
435
menubar = self._get_menu_bar()
436
self.vbox.pack_start(menubar, False, False, 0)
437
hbox = self._get_button_bar(operations)
438
if hbox is not None:
439
self.vbox.pack_start(hbox, False, True, 0)
440
441
442
def _get_menu_bar(self):
443
menubar = gtk.MenuBar()
444
# View menu
445
mb_view = gtk.MenuItem(_i18n("_View"))
446
mb_view_menu = gtk.Menu()
447
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
448
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
449
mb_view_wrapsource.show()
450
mb_view_menu.append(mb_view_wrapsource)
451
mb_view.show()
452
mb_view.set_submenu(mb_view_menu)
453
mb_view.show()
454
menubar.append(mb_view)
455
menubar.show()
456
return menubar
457
458
def _get_button_bar(self, operations):
440
441
def _get_button_bar(self):
459
442
"""Return a button bar to use.
460
443
461
444
:return: None, meaning that no button bar will be used.
462
445
"""
463
if operations is None:
464
return None
446
return None
447
448
def set_diff_text(self, description, lines):
449
"""Set the diff from a text.
450
451
The diff must be in unified diff format, and will be parsed to
452
determine filenames.
453
"""
454
self.diff.set_diff_text(lines)
455
self.set_title(description + " - bzrk diff")
456
457
def set_diff(self, description, rev_tree, parent_tree):
458
"""Set the differences showed by this window.
459
460
Compares the two trees and populates the window with the
461
differences.
462
"""
463
self.diff.set_diff(rev_tree, parent_tree)
464
self.set_title(description + " - bzrk diff")
465
466
def set_file(self, file_path):
467
self.diff.set_file(file_path)
468
469
470
class MergeDirectiveWindow(DiffWindow):
471
472
def __init__(self, directive, path):
473
DiffWindow.__init__(self, None)
474
self._merge_target = None
475
self.directive = directive
476
self.path = path
477
478
def _get_button_bar(self):
479
"""The button bar has only the Merge button"""
480
merge_button = gtk.Button('Merge')
481
merge_button.show()
482
merge_button.set_relief(gtk.RELIEF_NONE)
483
merge_button.connect("clicked", self.perform_merge)
484
485
save_button = gtk.Button('Save')
486
save_button.show()
487
save_button.set_relief(gtk.RELIEF_NONE)
488
save_button.connect("clicked", self.perform_save)
489
465
490
hbox = gtk.HButtonBox()
466
491
hbox.set_layout(gtk.BUTTONBOX_START)
467
for title, method in operations:
468
merge_button = gtk.Button(title)
469
merge_button.show()
470
merge_button.set_relief(gtk.RELIEF_NONE)
471
merge_button.connect("clicked", method)
472
hbox.pack_start(merge_button, expand=False, fill=True)
492
hbox.pack_start(merge_button, expand=False, fill=True)
493
hbox.pack_start(save_button, expand=False, fill=True)
473
494
hbox.show()
474
495
return hbox
475
496
476
def _get_merge_target(self):
477
d = gtk.FileChooserDialog('Merge branch', self,
478
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
479
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
480
gtk.STOCK_CANCEL,
481
gtk.RESPONSE_CANCEL,))
482
try:
483
result = d.run()
484
if result != gtk.RESPONSE_OK:
485
raise SelectCancelled()
486
return d.get_current_folder_uri()
487
finally:
488
d.destroy()
489
490
def _merge_successful(self):
491
# No conflicts found.
492
info_dialog(_i18n('Merge successful'),
493
_i18n('All changes applied successfully.'))
494
495
def _conflicts(self):
496
warning_dialog(_i18n('Conflicts encountered'),
497
_i18n('Please resolve the conflicts manually'
498
' before committing.'))
499
500
def _handle_error(self, e):
501
error_dialog('Error', str(e))
502
503
def _get_save_path(self, basename):
504
d = gtk.FileChooserDialog('Save As', self,
505
gtk.FILE_CHOOSER_ACTION_SAVE,
506
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
507
gtk.STOCK_CANCEL,
508
gtk.RESPONSE_CANCEL,))
509
d.set_current_name(basename)
510
try:
511
result = d.run()
512
if result != gtk.RESPONSE_OK:
513
raise SelectCancelled()
514
return urlutils.local_path_from_url(d.get_uri())
515
finally:
516
d.destroy()
517
518
def set_diff(self, description, rev_tree, parent_tree):
519
"""Set the differences showed by this window.
520
521
Compares the two trees and populates the window with the
522
differences.
523
"""
524
self.diff.set_diff(rev_tree, parent_tree)
525
self.set_title(description + " - bzrk diff")
526
527
def set_file(self, file_path):
528
self.diff.set_file(file_path)
529
530
531
class DiffController(object):
532
533
def __init__(self, path, patch, window=None, allow_dirty=False):
534
self.path = path
535
self.patch = patch
536
self.allow_dirty = allow_dirty
537
if window is None:
538
window = DiffWindow(operations=self._provide_operations())
539
self.initialize_window(window)
540
self.window = window
541
542
def initialize_window(self, window):
543
window.diff.set_diff_text_sections(self.get_diff_sections())
544
window.set_title(self.path + " - diff")
545
546
def get_diff_sections(self):
547
yield "Complete Diff", None, ''.join(self.patch)
548
# allow_dirty was added to parse_patches in bzrlib 2.2b1
549
if 'allow_dirty' in inspect.getargspec(parse_patches).args:
550
patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
551
else:
552
patches = parse_patches(self.patch)
553
for patch in patches:
554
oldname = patch.oldname.split('\t')[0]
555
newname = patch.newname.split('\t')[0]
556
yield oldname, newname, str(patch)
557
558
def perform_save(self, window):
559
try:
560
save_path = self.window._get_save_path(osutils.basename(self.path))
561
except SelectCancelled:
562
return
563
source = open(self.path, 'rb')
564
try:
565
target = open(save_path, 'wb')
566
try:
567
osutils.pumpfile(source, target)
568
finally:
569
target.close()
570
finally:
571
source.close()
572
573
def _provide_operations(self):
574
return [('Save', self.perform_save)]
575
576
577
class MergeDirectiveController(DiffController):
578
579
def __init__(self, path, directive, window=None):
580
DiffController.__init__(self, path, directive.patch.splitlines(True),
581
window)
582
self.directive = directive
583
self.merge_target = None
584
585
def _provide_operations(self):
586
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
587
588
497
def perform_merge(self, window):
589
if self.merge_target is None:
590
try:
591
self.merge_target = self.window._get_merge_target()
592
except SelectCancelled:
593
return
594
tree = workingtree.WorkingTree.open(self.merge_target)
498
try:
499
tree = self._get_merge_target()
500
except SelectCancelled:
501
return
595
502
tree.lock_write()
596
503
try:
597
504
try:
598
if tree.has_changes():
599
raise errors.UncommittedChanges(tree)
600
merger, verified = _mod_merge.Merger.from_mergeable(
601
tree, self.directive, pb=None)
505
merger, verified = _mod_merge.Merger.from_mergeable(tree,
506
self.directive, progress.DummyProgress())
507
merger.check_basis(True)
602
508
merger.merge_type = _mod_merge.Merge3Merger
603
509
conflict_count = merger.do_merge()
604
510
merger.set_pending()
605
511
if conflict_count == 0:
606
self.window._merge_successful()
512
# No conflicts found.
513
info_dialog(_('Merge successful'),
514
_('All changes applied successfully.'))
607
515
else:
608
self.window._conflicts()
609
516
# There are conflicts to be resolved.
610
self.window.destroy()
517
warning_dialog(_('Conflicts encountered'),
518
_('Please resolve the conflicts manually'
519
' before committing.'))
520
self.destroy()
611
521
except Exception, e:
612
self.window._handle_error(e)
522
error_dialog('Error', str(e))
613
523
finally:
614
524
tree.unlock()
615
525
616
617
def iter_changes_to_status(source, target):
526
def _get_merge_target(self):
527
if self._merge_target is not None:
528
return self._merge_target
529
d = gtk.FileChooserDialog('Merge branch', self,
530
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
531
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
532
gtk.STOCK_CANCEL,
533
gtk.RESPONSE_CANCEL,))
534
try:
535
result = d.run()
536
if result != gtk.RESPONSE_OK:
537
raise SelectCancelled()
538
uri = d.get_current_folder_uri()
539
finally:
540
d.destroy()
541
return workingtree.WorkingTree.open(uri)
542
543
def perform_save(self, window):
544
d = gtk.FileChooserDialog('Save As', self,
545
gtk.FILE_CHOOSER_ACTION_SAVE,
546
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
547
gtk.STOCK_CANCEL,
548
gtk.RESPONSE_CANCEL,))
549
d.set_current_name(osutils.basename(self.path))
550
try:
551
try:
552
result = d.run()
553
if result != gtk.RESPONSE_OK:
554
raise SelectCancelled()
555
uri = d.get_uri()
556
finally:
557
d.destroy()
558
except SelectCancelled:
559
return
560
source = open(self.path, 'rb')
561
try:
562
target = open(urlutils.local_path_from_url(uri), 'wb')
563
try:
564
target.write(source.read())
565
finally:
566
target.close()
567
finally:
568
source.close()
569
570
571
def _iter_changes_to_status(source, target):
618
572
"""Determine the differences between trees.
619
573
620
This is a wrapper around iter_changes which just yields more
574
This is a wrapper around _iter_changes which just yields more
621
575
understandable results.
622
576
623
577
:param source: The source tree (basis tree)
630
584
renamed_and_modified = 'renamed and modified'
631
585
modified = 'modified'
632
586
kind_changed = 'kind changed'
633
missing = 'missing'
634
587
635
588
# TODO: Handle metadata changes
636
589
640
593
source.lock_read()
641
594
try:
642
595
for (file_id, paths, changed_content, versioned, parent_ids, names,
643
kinds, executables) in target.iter_changes(source):
596
kinds, executables) in target._iter_changes(source):
644
597
645
598
# Skip the root entry if it isn't very interesting
646
599
if parent_ids == (None, None):
651
604
source_marker = ''
652
605
else:
653
606
source_marker = osutils.kind_marker(kinds[0])
654
655
607
if kinds[1] is None:
656
if kinds[0] is None:
657
# We assume bzr will flag only files in that case,
658
# there may be a bzr bug there as only files seems to
659
# not receive any kind.
660
marker = osutils.kind_marker('file')
661
else:
662
marker = osutils.kind_marker(kinds[0])
608
assert kinds[0] is not None
609
marker = osutils.kind_marker(kinds[0])
663
610
else:
664
611
marker = osutils.kind_marker(kinds[1])
665
612
667
614
if real_path is None:
668
615
real_path = paths[0]
669
616
assert real_path is not None
617
display_path = real_path + marker
670
618
671
619
present_source = versioned[0] and kinds[0] is not None
672
620
present_target = versioned[1] and kinds[1] is not None
673
621
674
if kinds[0] is None and kinds[1] is None:
675
change_type = missing
676
display_path = real_path + marker
677
elif present_source != present_target:
622
if present_source != present_target:
678
623
if present_target:
679
624
change_type = added
680
625
else:
681
626
assert present_source
682
627
change_type = removed
683
display_path = real_path + marker
684
628
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
685
629
# Renamed
686
630
if changed_content or executables[0] != executables[1]:
694
638
change_type = kind_changed
695
639
display_path = (paths[0] + source_marker
696
640
+ ' => ' + paths[1] + marker)
697
elif changed_content or executables[0] != executables[1]:
641
elif changed_content is True or executables[0] != executables[1]:
698
642
change_type = modified
699
display_path = real_path + marker
700
643
else:
701
644
assert False, "How did we get here?"
702
645
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0