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 511.5.6
- compare with another revision
- download diff
- download tarball
- view history from revision 511.5.6
- Committer: Jelmer Vernooij
- Date: 2008-06-29 18:12:29 UTC
- mto: This revision was merged to the branch mainline in revision 519.
- Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.
- files added:
- cmenu.ui
- olive
- files removed:
- avatarproviders.py
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- bzr-handle-patch.desktop.in => bzr-handle-patch.desktop
- bzr-notify.desktop.in => bzr-notify.desktop
- 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
44
from bzrlib.plugins.gtk import _i18n
51
45
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
46
from dialog import error_dialog, info_dialog, warning_dialog
60
47
61
48
62
49
class SelectCancelled(Exception):
64
51
pass
65
52
66
53
67
class DiffFileView(Gtk.ScrolledWindow):
54
class DiffFileView(gtk.ScrolledWindow):
68
55
"""Window for displaying diffs from a diff file"""
69
56
70
57
def __init__(self):
71
GObject.GObject.__init__(self)
58
gtk.ScrolledWindow.__init__(self)
72
59
self.construct()
73
60
self._diffs = {}
74
61
75
62
def construct(self):
76
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
77
self.set_shadow_type(Gtk.ShadowType.IN)
63
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
64
self.set_shadow_type(gtk.SHADOW_IN)
78
65
79
66
if have_gtksourceview:
80
self.buffer = GtkSource.Buffer()
81
slm = GtkSource.LanguageManager()
82
guess_language = getattr(GtkSource.LanguageManager,
83
"guess_language", fallback_guess_language)
84
gsl = guess_language(slm, content_type="text/x-patch")
67
self.buffer = gtksourceview.SourceBuffer()
68
slm = gtksourceview.SourceLanguagesManager()
69
gsl = slm.get_language_from_mime_type("text/x-patch")
85
70
if have_gconf:
86
self.apply_gedit_colors(self.buffer)
87
self.apply_colordiff_colors(self.buffer)
71
self.apply_gedit_colors(gsl)
72
self.apply_colordiff_colors(gsl)
88
73
self.buffer.set_language(gsl)
89
self.buffer.set_highlight_syntax(True)
74
self.buffer.set_highlight(True)
90
75
91
self.sourceview = GtkSource.View(self.buffer)
76
sourceview = gtksourceview.SourceView(self.buffer)
92
77
else:
93
self.buffer = Gtk.TextBuffer()
94
self.sourceview = Gtk.TextView(self.buffer)
78
self.buffer = gtk.TextBuffer()
79
sourceview = gtk.TextView(self.buffer)
95
80
96
self.sourceview.set_editable(False)
97
self.sourceview.modify_font(Pango.FontDescription("Monospace"))
98
self.add(self.sourceview)
99
self.sourceview.show()
81
sourceview.set_editable(False)
82
sourceview.modify_font(pango.FontDescription("Monospace"))
83
self.add(sourceview)
84
sourceview.show()
100
85
101
86
@staticmethod
102
def apply_gedit_colors(buf):
103
"""Set style to that specified in gedit configuration.
87
def apply_gedit_colors(lang):
88
"""Set style for lang to that specified in gedit configuration.
104
89
105
90
This method needs the gconf module.
106
91
107
:param buf: a GtkSource.Buffer object.
92
:param lang: a gtksourceview.SourceLanguage object.
108
93
"""
109
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
110
GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
111
112
client = GConf.Client.get_default()
113
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
114
if style_scheme_name is not None:
115
style_scheme_mgr = GtkSource.StyleSchemeManager()
116
style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
117
118
style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
119
120
if style_scheme is not None:
121
buf.set_style_scheme(style_scheme)
94
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
95
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
96
97
client = gconf.client_get_default()
98
client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
99
100
for tag in lang.get_tags():
101
tag_id = tag.get_id()
102
gconf_key = GEDIT_LANG_PATH + '/' + tag_id
103
style_string = client.get_string(gconf_key)
104
105
if style_string is None:
106
continue
107
108
# function to get a bool from a string that's either '0' or '1'
109
string_bool = lambda x: bool(int(x))
110
111
# style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
112
# values are: mask, fg, bg, italic, bold, underline, strike
113
# this packs them into (str_value, attr_name, conv_func) tuples
114
items = zip(style_string.split('/'), ['mask', 'foreground',
115
'background', 'italic', 'bold', 'underline', 'strikethrough' ],
116
[ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
117
string_bool, string_bool, string_bool ]
118
)
119
120
style = gtksourceview.SourceTagStyle()
121
122
# XXX The mask attribute controls whether the present values of
123
# foreground and background color should in fact be used. Ideally
124
# (and that's what gedit does), one could set all three attributes,
125
# and let the TagStyle object figure out which colors to use.
126
# However, in the GtkSourceview python bindings, the mask attribute
127
# is read-only, and it's derived instead from the colors being
128
# set or not. This means that we have to sometimes refrain from
129
# setting fg or bg colors, depending on the value of the mask.
130
# This code could go away if mask were writable.
131
mask = int(items[0][0])
132
if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
133
items[2:3] = []
134
if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
135
items[1:2] = []
136
items[0:1] = [] # skip the mask unconditionally
137
138
for value, attr, func in items:
139
try:
140
value = func(value)
141
except ValueError:
142
warning('gconf key %s contains an invalid value: %s'
143
% gconf_key, value)
144
else:
145
setattr(style, attr, value)
146
147
lang.set_tag_style(tag_id, style)
122
148
123
149
@classmethod
124
def apply_colordiff_colors(klass, buf):
150
def apply_colordiff_colors(klass, lang):
125
151
"""Set style colors for lang using the colordiff configuration file.
126
152
127
153
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
128
154
129
:param buf: a "Diff" GtkSource.Buffer object.
155
:param lang: a "Diff" gtksourceview.SourceLanguage object.
130
156
"""
131
scheme_manager = GtkSource.StyleSchemeManager()
132
style_scheme = scheme_manager.get_scheme('colordiff')
133
134
# if style scheme not found, we'll generate it from colordiffrc
135
# TODO: reload if colordiffrc has changed.
136
if style_scheme is None:
137
colors = {}
138
139
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
140
f = os.path.expanduser(f)
141
if os.path.exists(f):
142
try:
143
f = file(f)
144
except IOError, e:
145
warning('could not open file %s: %s' % (f, str(e)))
146
else:
147
colors.update(klass.parse_colordiffrc(f))
148
f.close()
149
150
if not colors:
151
# ~/.colordiffrc does not exist
152
return
153
154
mapping = {
155
# map GtkSourceView2 scheme styles to colordiff names
157
colors = {}
158
159
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
160
f = os.path.expanduser(f)
161
if os.path.exists(f):
162
try:
163
f = file(f)
164
except IOError, e:
165
warning('could not open file %s: %s' % (f, str(e)))
166
else:
167
colors.update(klass.parse_colordiffrc(f))
168
f.close()
169
170
if not colors:
171
# ~/.colordiffrc does not exist
172
return
173
174
mapping = {
175
# map GtkSourceView tags to colordiff names
156
176
# since GSV is richer, accept new names for extra bits,
157
177
# defaulting to old names if they're not present
158
'diff:added-line': ['newtext'],
159
'diff:removed-line': ['oldtext'],
160
'diff:location': ['location', 'diffstuff'],
161
'diff:file': ['file', 'diffstuff'],
162
'diff:special-case': ['specialcase', 'diffstuff'],
163
}
164
165
converted_colors = {}
166
for name, values in mapping.items():
167
color = None
168
for value in values:
169
color = colors.get(value, None)
170
if color is not None:
171
break
172
if color is None:
173
continue
174
converted_colors[name] = color
175
176
# some xml magic to produce needed style scheme description
177
e_style_scheme = Element('style-scheme')
178
e_style_scheme.set('id', 'colordiff')
179
e_style_scheme.set('_name', 'ColorDiff')
180
e_style_scheme.set('version', '1.0')
181
for name, color in converted_colors.items():
182
style = SubElement(e_style_scheme, 'style')
183
style.set('name', name)
184
style.set('foreground', '#%s' % color)
185
186
scheme_xml = tostring(e_style_scheme, 'UTF-8')
187
if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
188
os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
189
file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
190
191
scheme_manager.force_rescan()
192
style_scheme = scheme_manager.get_scheme('colordiff')
193
194
buf.set_style_scheme(style_scheme)
178
'Added@32@line': ['newtext'],
179
'Removed@32@line': ['oldtext'],
180
'Location': ['location', 'diffstuff'],
181
'Diff@32@file': ['file', 'diffstuff'],
182
'Special@32@case': ['specialcase', 'diffstuff'],
183
}
184
185
for tag in lang.get_tags():
186
tag_id = tag.get_id()
187
keys = mapping.get(tag_id, [])
188
color = None
189
190
for key in keys:
191
color = colors.get(key, None)
192
if color is not None:
193
break
194
195
if color is None:
196
continue
197
198
style = gtksourceview.SourceTagStyle()
199
try:
200
style.foreground = gtk.gdk.color_parse(color)
201
except ValueError:
202
warning('not a valid color: %s' % color)
203
else:
204
lang.set_tag_style(tag_id, style)
195
205
196
206
@staticmethod
197
207
def parse_colordiffrc(fileobj):
282
292
self.buffer.set_text(decoded.encode('UTF-8'))
283
293
284
294
285
class DiffWidget(Gtk.HPaned):
295
class DiffWidget(gtk.HPaned):
286
296
"""Diff widget
287
297
288
298
"""
290
300
super(DiffWidget, self).__init__()
291
301
292
302
# The file hierarchy: a scrollable treeview
293
scrollwin = Gtk.ScrolledWindow()
294
scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
295
scrollwin.set_shadow_type(Gtk.ShadowType.IN)
303
scrollwin = gtk.ScrolledWindow()
304
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
305
scrollwin.set_shadow_type(gtk.SHADOW_IN)
296
306
self.pack1(scrollwin)
297
307
scrollwin.show()
298
299
self.model = Gtk.TreeStore(str, str)
300
self.treeview = Gtk.TreeView(self.model)
308
309
self.model = gtk.TreeStore(str, str)
310
self.treeview = gtk.TreeView(self.model)
301
311
self.treeview.set_headers_visible(False)
302
312
self.treeview.set_search_column(1)
303
313
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
304
314
scrollwin.add(self.treeview)
305
315
self.treeview.show()
306
316
307
cell = Gtk.CellRendererText()
317
cell = gtk.CellRendererText()
308
318
cell.set_property("width-chars", 20)
309
column = Gtk.TreeViewColumn()
310
column.pack_start(cell, True, True, 0)
319
column = gtk.TreeViewColumn()
320
column.pack_start(cell, expand=True)
311
321
column.add_attribute(cell, "text", 0)
312
322
self.treeview.append_column(column)
313
323
320
330
# text view
321
331
322
332
def set_diff_text_sections(self, sections):
323
if getattr(self, 'diff_view', None) is None:
324
self.diff_view = DiffFileView()
325
self.pack2(self.diff_view)
333
self.diff_view = DiffFileView()
326
334
self.diff_view.show()
335
self.pack2(self.diff_view)
327
336
for oldname, newname, patch in sections:
328
337
self.diff_view._diffs[newname] = str(patch)
329
338
if newname is None:
337
346
Compares the two trees and populates the window with the
338
347
differences.
339
348
"""
340
if getattr(self, 'diff_view', None) is None:
341
self.diff_view = DiffView()
342
self.pack2(self.diff_view)
349
self.diff_view = DiffView()
350
self.pack2(self.diff_view)
343
351
self.diff_view.show()
344
352
self.diff_view.set_trees(rev_tree, parent_tree)
345
353
self.rev_tree = rev_tree
372
380
self.model.append(titer, [ path, path ])
373
381
374
382
self.treeview.expand_all()
375
self.diff_view.show_diff(None)
376
383
377
384
def set_file(self, file_path):
378
385
"""Select the current file to display"""
383
390
tv_path = child.path
384
391
break
385
392
if tv_path is None:
386
raise errors.NoSuchFile(file_path)
393
raise NoSuchFile(file_path)
387
394
self.treeview.set_cursor(tv_path)
388
395
self.treeview.scroll_to_cell(tv_path)
389
396
395
402
return
396
403
elif specific_files == [ "" ]:
397
404
specific_files = None
398
405
399
406
self.diff_view.show_diff(specific_files)
400
401
def _on_wraplines_toggled(self, widget=None, wrap=False):
402
"""Callback for when the wrap lines checkbutton is toggled"""
403
if wrap or widget.get_active():
404
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
405
else:
406
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
407
407
408
408
409
class DiffWindow(Window):
409
410
"""Diff window.
427
428
428
429
def construct(self, operations):
429
430
"""Construct the window contents."""
430
self.vbox = Gtk.VBox()
431
self.vbox = gtk.VBox()
431
432
self.add(self.vbox)
432
433
self.vbox.show()
434
hbox = self._get_button_bar(operations)
435
if hbox is not None:
436
self.vbox.pack_start(hbox, expand=False, fill=True)
433
437
self.diff = DiffWidget()
434
self.vbox.pack_end(self.diff, True, True, 0)
438
self.vbox.add(self.diff)
435
439
self.diff.show_all()
436
# Build after DiffWidget to connect signals
437
menubar = self._get_menu_bar()
438
self.vbox.pack_start(menubar, False, False, 0)
439
hbox = self._get_button_bar(operations)
440
if hbox is not None:
441
self.vbox.pack_start(hbox, False, True, 0)
442
443
444
def _get_menu_bar(self):
445
menubar = Gtk.MenuBar()
446
# View menu
447
mb_view = Gtk.MenuItem(_i18n("_View"))
448
mb_view_menu = Gtk.Menu()
449
mb_view_wrapsource = Gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
450
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
451
mb_view_wrapsource.show()
452
mb_view_menu.append(mb_view_wrapsource)
453
mb_view.show()
454
mb_view.set_submenu(mb_view_menu)
455
mb_view.show()
456
menubar.append(mb_view)
457
menubar.show()
458
return menubar
459
440
460
441
def _get_button_bar(self, operations):
461
442
"""Return a button bar to use.
462
443
464
445
"""
465
446
if operations is None:
466
447
return None
467
hbox = Gtk.HButtonBox()
468
hbox.set_layout(Gtk.ButtonBoxStyle.START)
448
hbox = gtk.HButtonBox()
449
hbox.set_layout(gtk.BUTTONBOX_START)
469
450
for title, method in operations:
470
merge_button = Gtk.Button(title)
451
merge_button = gtk.Button(title)
471
452
merge_button.show()
472
merge_button.set_relief(Gtk.ReliefStyle.NONE)
453
merge_button.set_relief(gtk.RELIEF_NONE)
473
454
merge_button.connect("clicked", method)
474
455
hbox.pack_start(merge_button, expand=False, fill=True)
475
456
hbox.show()
476
457
return hbox
477
458
478
459
def _get_merge_target(self):
479
d = Gtk.FileChooserDialog('Merge branch', self,
480
Gtk.FileChooserAction.SELECT_FOLDER,
481
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
482
Gtk.STOCK_CANCEL,
483
Gtk.ResponseType.CANCEL,))
460
d = gtk.FileChooserDialog('Merge branch', self,
461
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
462
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
463
gtk.STOCK_CANCEL,
464
gtk.RESPONSE_CANCEL,))
484
465
try:
485
466
result = d.run()
486
if result != Gtk.ResponseType.OK:
467
if result != gtk.RESPONSE_OK:
487
468
raise SelectCancelled()
488
469
return d.get_current_folder_uri()
489
470
finally:
503
484
error_dialog('Error', str(e))
504
485
505
486
def _get_save_path(self, basename):
506
d = Gtk.FileChooserDialog('Save As', self,
507
Gtk.FileChooserAction.SAVE,
508
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
509
Gtk.STOCK_CANCEL,
510
Gtk.ResponseType.CANCEL,))
487
d = gtk.FileChooserDialog('Save As', self,
488
gtk.FILE_CHOOSER_ACTION_SAVE,
489
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
490
gtk.STOCK_CANCEL,
491
gtk.RESPONSE_CANCEL,))
511
492
d.set_current_name(basename)
512
493
try:
513
494
result = d.run()
514
if result != Gtk.ResponseType.OK:
495
if result != gtk.RESPONSE_OK:
515
496
raise SelectCancelled()
516
497
return urlutils.local_path_from_url(d.get_uri())
517
498
finally:
532
513
533
514
class DiffController(object):
534
515
535
def __init__(self, path, patch, window=None, allow_dirty=False):
516
def __init__(self, path, patch, window=None):
536
517
self.path = path
537
518
self.patch = patch
538
self.allow_dirty = allow_dirty
539
519
if window is None:
540
520
window = DiffWindow(operations=self._provide_operations())
541
521
self.initialize_window(window)
547
527
548
528
def get_diff_sections(self):
549
529
yield "Complete Diff", None, ''.join(self.patch)
550
# allow_dirty was added to parse_patches in bzrlib 2.2b1
551
if 'allow_dirty' in inspect.getargspec(parse_patches).args:
552
patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
553
else:
554
patches = parse_patches(self.patch)
555
for patch in patches:
530
for patch in parse_patches(self.patch):
556
531
oldname = patch.oldname.split('\t')[0]
557
532
newname = patch.newname.split('\t')[0]
558
533
yield oldname, newname, str(patch)
597
572
tree.lock_write()
598
573
try:
599
574
try:
600
if tree.has_changes():
601
raise errors.UncommittedChanges(tree)
602
merger, verified = _mod_merge.Merger.from_mergeable(
603
tree, self.directive, pb=None)
575
merger, verified = _mod_merge.Merger.from_mergeable(tree,
576
self.directive, progress.DummyProgress())
577
merger.check_basis(True)
604
578
merger.merge_type = _mod_merge.Merge3Merger
605
579
conflict_count = merger.do_merge()
606
580
merger.set_pending()
632
606
renamed_and_modified = 'renamed and modified'
633
607
modified = 'modified'
634
608
kind_changed = 'kind changed'
635
missing = 'missing'
636
609
637
610
# TODO: Handle metadata changes
638
611
653
626
source_marker = ''
654
627
else:
655
628
source_marker = osutils.kind_marker(kinds[0])
656
657
629
if kinds[1] is None:
658
if kinds[0] is None:
659
# We assume bzr will flag only files in that case,
660
# there may be a bzr bug there as only files seems to
661
# not receive any kind.
662
marker = osutils.kind_marker('file')
663
else:
664
marker = osutils.kind_marker(kinds[0])
630
assert kinds[0] is not None
631
marker = osutils.kind_marker(kinds[0])
665
632
else:
666
633
marker = osutils.kind_marker(kinds[1])
667
634
669
636
if real_path is None:
670
637
real_path = paths[0]
671
638
assert real_path is not None
639
display_path = real_path + marker
672
640
673
641
present_source = versioned[0] and kinds[0] is not None
674
642
present_target = versioned[1] and kinds[1] is not None
675
643
676
if kinds[0] is None and kinds[1] is None:
677
change_type = missing
678
display_path = real_path + marker
679
elif present_source != present_target:
644
if present_source != present_target:
680
645
if present_target:
681
646
change_type = added
682
647
else:
683
648
assert present_source
684
649
change_type = removed
685
display_path = real_path + marker
686
650
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
687
651
# Renamed
688
652
if changed_content or executables[0] != executables[1]:
696
660
change_type = kind_changed
697
661
display_path = (paths[0] + source_marker
698
662
+ ' => ' + paths[1] + marker)
699
elif changed_content or executables[0] != executables[1]:
663
elif changed_content is True or executables[0] != executables[1]:
700
664
change_type = modified
701
display_path = real_path + marker
702
665
else:
703
666
assert False, "How did we get here?"
704
667
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0