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