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 450.3.1
- compare with another revision
- download diff
- download tarball
- view history from revision 450.3.1
- Committer: Jelmer Vernooij
- Date: 2008-03-28 19:26:53 UTC
- mto: (450.1.13 trunk)
- mto: This revision was merged to the branch mainline in revision 458.
- Revision ID: jelmer@samba.org-20080328192653-trzptkwahx1tulz9
Add module for preferences code.
- files added:
- cmenu.ui
- olive
- files removed:
- avatarproviders.py
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- icons/bzr-icon-64.png => bzr-icon-64.png
- bzr-notify.desktop.in => bzr-notify.desktop
- bzr-handle-patch => handle-patch
- 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
11
12
from cStringIO import StringIO
12
13
13
from gi.repository import Gtk
14
from gi.repository import Pango
14
import pygtk
15
pygtk.require("2.0")
16
import gtk
17
import pango
15
18
import os
16
19
import re
17
20
import sys
18
import inspect
19
try:
20
from xml.etree.ElementTree import Element, SubElement, tostring
21
except ImportError:
22
from elementtree.ElementTree import Element, SubElement, tostring
23
21
24
22
try:
25
from gi.repository import GtkSource
23
import gtksourceview
26
24
have_gtksourceview = True
27
25
except ImportError:
28
26
have_gtksourceview = False
29
27
try:
30
from gi.repository import GConf
28
import gconf
31
29
have_gconf = True
32
30
except ImportError:
33
31
have_gconf = False
34
32
35
33
from bzrlib import (
36
errors,
37
34
merge as _mod_merge,
38
35
osutils,
36
progress,
39
37
urlutils,
40
38
workingtree,
41
39
)
42
from bzrlib.diff import show_diff_trees
40
from bzrlib.diff import show_diff_trees, internal_diff
41
from bzrlib.errors import NoSuchFile
43
42
from bzrlib.patches import parse_patches
44
43
from bzrlib.trace import warning
45
from bzrlib.plugins.gtk.dialog import (
46
error_dialog,
47
info_dialog,
48
warning_dialog,
49
)
50
from bzrlib.plugins.gtk.i18n import _i18n
51
44
from bzrlib.plugins.gtk.window import Window
52
53
54
def fallback_guess_language(slm, content_type):
55
for lang_id in slm.get_language_ids():
56
lang = slm.get_language(lang_id)
57
if "text/x-patch" in lang.get_mime_types():
58
return lang
59
return None
45
from dialog import error_dialog, info_dialog, warning_dialog
60
46
61
47
62
48
class SelectCancelled(Exception):
64
50
pass
65
51
66
52
67
class DiffFileView(Gtk.ScrolledWindow):
53
class DiffFileView(gtk.ScrolledWindow):
68
54
"""Window for displaying diffs from a diff file"""
69
55
70
56
def __init__(self):
71
Gtk.ScrolledWindow.__init__(self)
57
gtk.ScrolledWindow.__init__(self)
72
58
self.construct()
73
59
self._diffs = {}
74
60
75
61
def construct(self):
76
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
77
self.set_shadow_type(Gtk.ShadowType.IN)
62
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
63
self.set_shadow_type(gtk.SHADOW_IN)
78
64
79
65
if have_gtksourceview:
80
self.buffer = GtkSource.Buffer()
81
lang_manager = GtkSource.LanguageManager.get_default()
82
language = lang_manager.guess_language(None, "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)
86
self.buffer.set_language(language)
87
self.buffer.set_highlight_syntax(True)
70
self.apply_gedit_colors(gsl)
71
self.apply_colordiff_colors(gsl)
72
self.buffer.set_language(gsl)
73
self.buffer.set_highlight(True)
88
74
89
self.sourceview = GtkSource.View(buffer=self.buffer)
75
sourceview = gtksourceview.SourceView(self.buffer)
90
76
else:
91
self.buffer = Gtk.TextBuffer()
92
self.sourceview = Gtk.TextView(self.buffer)
77
self.buffer = gtk.TextBuffer()
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 GtkSource.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')
109
110
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 = GtkSource.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)
93
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
94
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
95
96
client = gconf.client_get_default()
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" GtkSource.Buffer object.
154
:param lang: a "Diff" gtksourceview.SourceLanguage object.
128
155
"""
129
scheme_manager = GtkSource.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):
280
291
self.buffer.set_text(decoded.encode('UTF-8'))
281
292
282
293
283
class DiffWidget(Gtk.HPaned):
294
class DiffWidget(gtk.HPaned):
284
295
"""Diff widget
285
296
286
297
"""
288
299
super(DiffWidget, self).__init__()
289
300
290
301
# The file hierarchy: a scrollable treeview
291
scrollwin = Gtk.ScrolledWindow()
292
scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
293
scrollwin.set_shadow_type(Gtk.ShadowType.IN)
302
scrollwin = gtk.ScrolledWindow()
303
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
304
scrollwin.set_shadow_type(gtk.SHADOW_IN)
294
305
self.pack1(scrollwin)
295
306
scrollwin.show()
296
297
self.model = Gtk.TreeStore(str, str)
298
self.treeview = Gtk.TreeView(model=self.model)
307
308
self.model = gtk.TreeStore(str, str)
309
self.treeview = gtk.TreeView(self.model)
299
310
self.treeview.set_headers_visible(False)
300
311
self.treeview.set_search_column(1)
301
312
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
302
313
scrollwin.add(self.treeview)
303
314
self.treeview.show()
304
315
305
cell = Gtk.CellRendererText()
316
cell = gtk.CellRendererText()
306
317
cell.set_property("width-chars", 20)
307
column = Gtk.TreeViewColumn()
308
column.pack_start(cell, True)
318
column = gtk.TreeViewColumn()
319
column.pack_start(cell, expand=True)
309
320
column.add_attribute(cell, "text", 0)
310
321
self.treeview.append_column(column)
311
322
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.WrapMode.WORD)
403
else:
404
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.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
self.vbox = Gtk.VBox()
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(label=_i18n("_View"))
446
mb_view_menu = Gtk.Menu()
447
mb_view_wrapsource = Gtk.CheckMenuItem(
448
label=_i18n("Wrap _Long Lines"))
449
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
450
mb_view_wrapsource.show()
451
mb_view_menu.append(mb_view_wrapsource)
452
mb_view.show()
453
mb_view.set_submenu(mb_view_menu)
454
mb_view.show()
455
menubar.append(mb_view)
456
menubar.show()
457
return menubar
458
459
def _get_button_bar(self, operations):
440
441
def _get_button_bar(self):
460
442
"""Return a button bar to use.
461
443
462
444
:return: None, meaning that no button bar will be used.
463
445
"""
464
if operations is None:
465
return None
466
hbox = Gtk.HButtonBox()
467
hbox.set_layout(Gtk.ButtonBoxStyle.START)
468
for title, method in operations:
469
merge_button = Gtk.Button(title)
470
merge_button.show()
471
merge_button.set_relief(Gtk.ReliefStyle.NONE)
472
merge_button.connect("clicked", method)
473
hbox.pack_start(merge_button, expand=False, fill=True)
474
hbox.show()
475
return hbox
476
477
def _get_merge_target(self):
478
d = Gtk.FileChooserDialog('Merge branch', self,
479
Gtk.FileChooserAction.SELECT_FOLDER,
480
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
481
Gtk.STOCK_CANCEL,
482
Gtk.ResponseType.CANCEL,))
483
try:
484
result = d.run()
485
if result != Gtk.ResponseType.OK:
486
raise SelectCancelled()
487
return d.get_current_folder_uri()
488
finally:
489
d.destroy()
490
491
def _merge_successful(self):
492
# No conflicts found.
493
info_dialog(_i18n('Merge successful'),
494
_i18n('All changes applied successfully.'))
495
496
def _conflicts(self):
497
warning_dialog(_i18n('Conflicts encountered'),
498
_i18n('Please resolve the conflicts manually'
499
' before committing.'))
500
501
def _handle_error(self, e):
502
error_dialog('Error', str(e))
503
504
def _get_save_path(self, basename):
505
d = Gtk.FileChooserDialog('Save As', self,
506
Gtk.FileChooserAction.SAVE,
507
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
508
Gtk.STOCK_CANCEL,
509
Gtk.ResponseType.CANCEL,))
510
d.set_current_name(basename)
511
try:
512
result = d.run()
513
if result != Gtk.ResponseType.OK:
514
raise SelectCancelled()
515
return urlutils.local_path_from_url(d.get_uri())
516
finally:
517
d.destroy()
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")
518
456
519
457
def set_diff(self, description, rev_tree, parent_tree):
520
458
"""Set the differences showed by this window.
529
467
self.diff.set_file(file_path)
530
468
531
469
532
class DiffController(object):
470
class MergeDirectiveWindow(DiffWindow):
533
471
534
def __init__(self, path, patch, window=None, allow_dirty=False):
472
def __init__(self, directive, path):
473
DiffWindow.__init__(self, None)
474
self._merge_target = None
475
self.directive = directive
535
476
self.path = path
536
self.patch = patch
537
self.allow_dirty = allow_dirty
538
if window is None:
539
window = DiffWindow(operations=self._provide_operations())
540
self.initialize_window(window)
541
self.window = window
542
543
def initialize_window(self, window):
544
window.diff.set_diff_text_sections(self.get_diff_sections())
545
window.set_title(self.path + " - diff")
546
547
def get_diff_sections(self):
548
yield "Complete Diff", None, ''.join(self.patch)
549
# allow_dirty was added to parse_patches in bzrlib 2.2b1
550
if 'allow_dirty' in inspect.getargspec(parse_patches).args:
551
patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
552
else:
553
patches = parse_patches(self.patch)
554
for patch in patches:
555
oldname = patch.oldname.split('\t')[0]
556
newname = patch.newname.split('\t')[0]
557
yield oldname, newname, str(patch)
558
559
def perform_save(self, window):
560
try:
561
save_path = self.window._get_save_path(osutils.basename(self.path))
562
except SelectCancelled:
563
return
564
source = open(self.path, 'rb')
565
try:
566
target = open(save_path, 'wb')
567
try:
568
osutils.pumpfile(source, target)
569
finally:
570
target.close()
571
finally:
572
source.close()
573
574
def _provide_operations(self):
575
return [('Save', self.perform_save)]
576
577
578
class MergeDirectiveController(DiffController):
579
580
def __init__(self, path, directive, window=None):
581
DiffController.__init__(self, path, directive.patch.splitlines(True),
582
window)
583
self.directive = directive
584
self.merge_target = None
585
586
def _provide_operations(self):
587
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
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
490
hbox = gtk.HButtonBox()
491
hbox.set_layout(gtk.BUTTONBOX_START)
492
hbox.pack_start(merge_button, expand=False, fill=True)
493
hbox.pack_start(save_button, expand=False, fill=True)
494
hbox.show()
495
return hbox
588
496
589
497
def perform_merge(self, window):
590
if self.merge_target is None:
591
try:
592
self.merge_target = self.window._get_merge_target()
593
except SelectCancelled:
594
return
595
tree = workingtree.WorkingTree.open(self.merge_target)
498
try:
499
tree = self._get_merge_target()
500
except SelectCancelled:
501
return
596
502
tree.lock_write()
597
503
try:
598
504
try:
599
if tree.has_changes():
600
raise errors.UncommittedChanges(tree)
601
merger, verified = _mod_merge.Merger.from_mergeable(
602
tree, self.directive, pb=None)
505
merger, verified = _mod_merge.Merger.from_mergeable(tree,
506
self.directive, progress.DummyProgress())
507
merger.check_basis(True)
603
508
merger.merge_type = _mod_merge.Merge3Merger
604
509
conflict_count = merger.do_merge()
605
510
merger.set_pending()
606
511
if conflict_count == 0:
607
self.window._merge_successful()
512
# No conflicts found.
513
info_dialog(_('Merge successful'),
514
_('All changes applied successfully.'))
608
515
else:
609
self.window._conflicts()
610
516
# There are conflicts to be resolved.
611
self.window.destroy()
517
warning_dialog(_('Conflicts encountered'),
518
_('Please resolve the conflicts manually'
519
' before committing.'))
520
self.destroy()
612
521
except Exception, e:
613
self.window._handle_error(e)
522
error_dialog('Error', str(e))
614
523
finally:
615
524
tree.unlock()
616
525
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
617
570
618
571
def iter_changes_to_status(source, target):
619
572
"""Determine the differences between trees.
631
584
renamed_and_modified = 'renamed and modified'
632
585
modified = 'modified'
633
586
kind_changed = 'kind changed'
634
missing = 'missing'
635
587
636
588
# TODO: Handle metadata changes
637
589
652
604
source_marker = ''
653
605
else:
654
606
source_marker = osutils.kind_marker(kinds[0])
655
656
607
if kinds[1] is None:
657
if kinds[0] is None:
658
# We assume bzr will flag only files in that case,
659
# there may be a bzr bug there as only files seems to
660
# not receive any kind.
661
marker = osutils.kind_marker('file')
662
else:
663
marker = osutils.kind_marker(kinds[0])
608
assert kinds[0] is not None
609
marker = osutils.kind_marker(kinds[0])
664
610
else:
665
611
marker = osutils.kind_marker(kinds[1])
666
612
668
614
if real_path is None:
669
615
real_path = paths[0]
670
616
assert real_path is not None
617
display_path = real_path + marker
671
618
672
619
present_source = versioned[0] and kinds[0] is not None
673
620
present_target = versioned[1] and kinds[1] is not None
674
621
675
if kinds[0] is None and kinds[1] is None:
676
change_type = missing
677
display_path = real_path + marker
678
elif present_source != present_target:
622
if present_source != present_target:
679
623
if present_target:
680
624
change_type = added
681
625
else:
682
626
assert present_source
683
627
change_type = removed
684
display_path = real_path + marker
685
628
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
686
629
# Renamed
687
630
if changed_content or executables[0] != executables[1]:
695
638
change_type = kind_changed
696
639
display_path = (paths[0] + source_marker
697
640
+ ' => ' + paths[1] + marker)
698
elif changed_content or executables[0] != executables[1]:
641
elif changed_content is True or executables[0] != executables[1]:
699
642
change_type = modified
700
display_path = real_path + marker
701
643
else:
702
644
assert False, "How did we get here?"
703
645
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0