11
11
from cStringIO import StringIO
13
from gi.repository import Gtk
14
from gi.repository import Pango
21
20
from xml.etree.ElementTree import Element, SubElement, tostring
22
21
except ImportError:
23
22
from elementtree.ElementTree import Element, SubElement, tostring
25
from gi.repository import GtkSource
27
26
have_gtksourceview = True
28
27
except ImportError:
29
28
have_gtksourceview = False
30
from gi.repository import GConf
33
32
except ImportError:
36
35
from bzrlib import (
37
37
merge as _mod_merge,
43
from bzrlib.diff import show_diff_trees, internal_diff
44
from bzrlib.errors import NoSuchFile
42
from bzrlib.diff import show_diff_trees
45
43
from bzrlib.patches import parse_patches
46
44
from bzrlib.trace import warning
47
from bzrlib.plugins.gtk import _i18n
45
from bzrlib.plugins.gtk.dialog import (
50
from bzrlib.plugins.gtk.i18n import _i18n
48
51
from bzrlib.plugins.gtk.window import Window
49
from dialog import error_dialog, info_dialog, warning_dialog
52
54
def fallback_guess_language(slm, content_type):
65
class DiffFileView(gtk.ScrolledWindow):
67
class DiffFileView(Gtk.ScrolledWindow):
66
68
"""Window for displaying diffs from a diff file"""
68
70
def __init__(self):
69
gtk.ScrolledWindow.__init__(self)
71
Gtk.ScrolledWindow.__init__(self)
73
75
def construct(self):
74
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
75
self.set_shadow_type(gtk.SHADOW_IN)
76
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
77
self.set_shadow_type(Gtk.ShadowType.IN)
77
79
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")
80
self.buffer = GtkSource.Buffer()
81
lang_manager = GtkSource.LanguageManager.get_default()
82
language = lang_manager.guess_language(None, "text/x-patch")
84
84
self.apply_gedit_colors(self.buffer)
85
85
self.apply_colordiff_colors(self.buffer)
86
self.buffer.set_language(gsl)
86
self.buffer.set_language(language)
87
87
self.buffer.set_highlight_syntax(True)
89
self.sourceview = gtksourceview2.View(self.buffer)
89
self.sourceview = GtkSource.View(buffer=self.buffer)
91
self.buffer = gtk.TextBuffer()
92
self.sourceview = gtk.TextView(self.buffer)
91
self.buffer = Gtk.TextBuffer()
92
self.sourceview = Gtk.TextView(self.buffer)
94
94
self.sourceview.set_editable(False)
95
self.sourceview.modify_font(pango.FontDescription("Monospace"))
95
self.sourceview.modify_font(Pango.FontDescription("Monospace"))
96
96
self.add(self.sourceview)
97
97
self.sourceview.show()
103
103
This method needs the gconf module.
105
:param buf: a gtksourceview2.Buffer object.
105
:param buf: a GtkSource.Buffer object.
107
107
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
108
GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
109
client = gconf.client_get_default()
110
client = GConf.Client.get_default()
110
111
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
111
112
if style_scheme_name is not None:
112
style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
114
buf.set_style_scheme(style_scheme)
113
style_scheme_mgr = GtkSource.StyleSchemeManager()
114
style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
116
style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
118
if style_scheme is not None:
119
buf.set_style_scheme(style_scheme)
117
122
def apply_colordiff_colors(klass, buf):
120
125
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
122
:param buf: a "Diff" gtksourceview2.Buffer object.
127
:param buf: a "Diff" GtkSource.Buffer object.
124
scheme_manager = gtksourceview2.StyleSchemeManager()
129
scheme_manager = GtkSource.StyleSchemeManager()
125
130
style_scheme = scheme_manager.get_scheme('colordiff')
127
132
# if style scheme not found, we'll generate it from colordiffrc
283
288
super(DiffWidget, self).__init__()
285
290
# The file hierarchy: a scrollable treeview
286
scrollwin = gtk.ScrolledWindow()
287
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
288
scrollwin.set_shadow_type(gtk.SHADOW_IN)
291
scrollwin = Gtk.ScrolledWindow()
292
scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
293
scrollwin.set_shadow_type(Gtk.ShadowType.IN)
289
294
self.pack1(scrollwin)
292
self.model = gtk.TreeStore(str, str)
293
self.treeview = gtk.TreeView(self.model)
297
self.model = Gtk.TreeStore(str, str)
298
self.treeview = Gtk.TreeView(model=self.model)
294
299
self.treeview.set_headers_visible(False)
295
300
self.treeview.set_search_column(1)
296
301
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
297
302
scrollwin.add(self.treeview)
298
303
self.treeview.show()
300
cell = gtk.CellRendererText()
305
cell = Gtk.CellRendererText()
301
306
cell.set_property("width-chars", 20)
302
column = gtk.TreeViewColumn()
303
column.pack_start(cell, expand=True)
307
column = Gtk.TreeViewColumn()
308
column.pack_start(cell, True)
304
309
column.add_attribute(cell, "text", 0)
305
310
self.treeview.append_column(column)
376
381
tv_path = child.path
378
383
if tv_path is None:
379
raise NoSuchFile(file_path)
380
self.treeview.set_cursor(tv_path)
384
raise errors.NoSuchFile(file_path)
385
self.treeview.set_cursor(tv_path, None, False)
381
386
self.treeview.scroll_to_cell(tv_path)
383
388
def _treeview_cursor_cb(self, *args):
394
399
def _on_wraplines_toggled(self, widget=None, wrap=False):
395
400
"""Callback for when the wrap lines checkbutton is toggled"""
396
401
if wrap or widget.get_active():
397
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
402
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
399
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
404
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
401
406
class DiffWindow(Window):
437
442
def _get_menu_bar(self):
438
menubar = gtk.MenuBar()
443
menubar = Gtk.MenuBar()
440
mb_view = gtk.MenuItem(_i18n("_View"))
441
mb_view_menu = gtk.Menu()
442
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
445
mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
446
mb_view_menu = Gtk.Menu()
447
mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
448
_i18n("Wrap _Long Lines"))
443
449
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
444
450
mb_view_wrapsource.show()
445
451
mb_view_menu.append(mb_view_wrapsource)
458
464
if operations is None:
460
hbox = gtk.HButtonBox()
461
hbox.set_layout(gtk.BUTTONBOX_START)
466
hbox = Gtk.HButtonBox()
467
hbox.set_layout(Gtk.ButtonBoxStyle.START)
462
468
for title, method in operations:
463
merge_button = gtk.Button(title)
469
merge_button = Gtk.Button(title)
464
470
merge_button.show()
465
merge_button.set_relief(gtk.RELIEF_NONE)
471
merge_button.set_relief(Gtk.ReliefStyle.NONE)
466
472
merge_button.connect("clicked", method)
467
473
hbox.pack_start(merge_button, expand=False, fill=True)
471
477
def _get_merge_target(self):
472
d = gtk.FileChooserDialog('Merge branch', self,
473
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
474
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
476
gtk.RESPONSE_CANCEL,))
478
d = Gtk.FileChooserDialog('Merge branch', self,
479
Gtk.FileChooserAction.SELECT_FOLDER,
480
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
482
Gtk.ResponseType.CANCEL,))
479
if result != gtk.RESPONSE_OK:
485
if result != Gtk.ResponseType.OK:
480
486
raise SelectCancelled()
481
487
return d.get_current_folder_uri()
496
502
error_dialog('Error', str(e))
498
504
def _get_save_path(self, basename):
499
d = gtk.FileChooserDialog('Save As', self,
500
gtk.FILE_CHOOSER_ACTION_SAVE,
501
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
503
gtk.RESPONSE_CANCEL,))
505
d = Gtk.FileChooserDialog('Save As', self,
506
Gtk.FileChooserAction.SAVE,
507
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
509
Gtk.ResponseType.CANCEL,))
504
510
d.set_current_name(basename)
507
if result != gtk.RESPONSE_OK:
513
if result != Gtk.ResponseType.OK:
508
514
raise SelectCancelled()
509
515
return urlutils.local_path_from_url(d.get_uri())
526
532
class DiffController(object):
528
def __init__(self, path, patch, window=None):
534
def __init__(self, path, patch, window=None, allow_dirty=False):
530
536
self.patch = patch
537
self.allow_dirty = allow_dirty
531
538
if window is None:
532
539
window = DiffWindow(operations=self._provide_operations())
533
540
self.initialize_window(window)
540
547
def get_diff_sections(self):
541
548
yield "Complete Diff", None, ''.join(self.patch)
542
for patch in parse_patches(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)
553
patches = parse_patches(self.patch)
554
for patch in patches:
543
555
oldname = patch.oldname.split('\t')[0]
544
556
newname = patch.newname.split('\t')[0]
545
557
yield oldname, newname, str(patch)
584
596
tree.lock_write()
587
merger, verified = _mod_merge.Merger.from_mergeable(tree,
588
self.directive, progress.DummyProgress())
589
merger.check_basis(True)
599
if tree.has_changes():
600
raise errors.UncommittedChanges(tree)
601
merger, verified = _mod_merge.Merger.from_mergeable(
602
tree, self.directive, pb=None)
590
603
merger.merge_type = _mod_merge.Merge3Merger
591
604
conflict_count = merger.do_merge()
592
605
merger.set_pending()
added
removed
diff.py
