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 473.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 473.1.1
- Committer: Andrew Bennetts
- Date: 2008-04-29 08:17:01 UTC
- mto: This revision was merged to the branch mainline in revision 476.
- Revision ID: andrew@puzzling.org-20080429081701-2pu9uteic8o88nre
Simple hack to fix gannotate.
- files added:
- olive.glade
- files removed:
- bzr-notify
- files renamed:
- 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
17
18
import os
18
19
import re
19
20
import sys
20
from xml.etree.ElementTree import Element, SubElement, tostring
21
21
22
22
try:
23
import gtksourceview2
23
import gtksourceview
24
24
have_gtksourceview = True
25
25
except ImportError:
26
26
have_gtksourceview = False
41
41
from bzrlib.errors import NoSuchFile
42
42
from bzrlib.patches import parse_patches
43
43
from bzrlib.trace import warning
44
from bzrlib.plugins.gtk import _i18n
45
44
from bzrlib.plugins.gtk.window import Window
46
45
from dialog import error_dialog, info_dialog, warning_dialog
47
46
64
63
self.set_shadow_type(gtk.SHADOW_IN)
65
64
66
65
if have_gtksourceview:
67
self.buffer = gtksourceview2.Buffer()
68
slm = gtksourceview2.LanguageManager()
69
gsl = slm.guess_language(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")
70
69
if have_gconf:
71
self.apply_gedit_colors(self.buffer)
72
self.apply_colordiff_colors(self.buffer)
70
self.apply_gedit_colors(gsl)
71
self.apply_colordiff_colors(gsl)
73
72
self.buffer.set_language(gsl)
74
self.buffer.set_highlight_syntax(True)
73
self.buffer.set_highlight(True)
75
74
76
self.sourceview = gtksourceview2.View(self.buffer)
75
sourceview = gtksourceview.SourceView(self.buffer)
77
76
else:
78
77
self.buffer = gtk.TextBuffer()
79
self.sourceview = gtk.TextView(self.buffer)
78
sourceview = gtk.TextView(self.buffer)
80
79
81
self.sourceview.set_editable(False)
82
self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
self.add(self.sourceview)
84
self.sourceview.show()
80
sourceview.set_editable(False)
81
sourceview.modify_font(pango.FontDescription("Monospace"))
82
self.add(sourceview)
83
sourceview.show()
85
84
86
85
@staticmethod
87
def apply_gedit_colors(buf):
88
"""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.
89
88
90
89
This method needs the gconf module.
91
90
92
:param buf: a gtksourceview2.Buffer object.
91
:param lang: a gtksourceview.SourceLanguage object.
93
92
"""
94
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
93
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
94
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
95
95
96
96
client = gconf.client_get_default()
97
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
98
if style_scheme_name is not None:
99
style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
100
101
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)
102
147
103
148
@classmethod
104
def apply_colordiff_colors(klass, buf):
149
def apply_colordiff_colors(klass, lang):
105
150
"""Set style colors for lang using the colordiff configuration file.
106
151
107
152
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
108
153
109
:param buf: a "Diff" gtksourceview2.Buffer object.
154
:param lang: a "Diff" gtksourceview.SourceLanguage object.
110
155
"""
111
scheme_manager = gtksourceview2.StyleSchemeManager()
112
style_scheme = scheme_manager.get_scheme('colordiff')
113
114
# if style scheme not found, we'll generate it from colordiffrc
115
# TODO: reload if colordiffrc has changed.
116
if style_scheme is None:
117
colors = {}
118
119
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
120
f = os.path.expanduser(f)
121
if os.path.exists(f):
122
try:
123
f = file(f)
124
except IOError, e:
125
warning('could not open file %s: %s' % (f, str(e)))
126
else:
127
colors.update(klass.parse_colordiffrc(f))
128
f.close()
129
130
if not colors:
131
# ~/.colordiffrc does not exist
132
return
133
134
mapping = {
135
# 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
136
175
# since GSV is richer, accept new names for extra bits,
137
176
# defaulting to old names if they're not present
138
'diff:added-line': ['newtext'],
139
'diff:removed-line': ['oldtext'],
140
'diff:location': ['location', 'diffstuff'],
141
'diff:file': ['file', 'diffstuff'],
142
'diff:special-case': ['specialcase', 'diffstuff'],
143
}
144
145
converted_colors = {}
146
for name, values in mapping.items():
147
color = None
148
for value in values:
149
color = colors.get(value, None)
150
if color is not None:
151
break
152
if color is None:
153
continue
154
converted_colors[name] = color
155
156
# some xml magic to produce needed style scheme description
157
e_style_scheme = Element('style-scheme')
158
e_style_scheme.set('id', 'colordiff')
159
e_style_scheme.set('_name', 'ColorDiff')
160
e_style_scheme.set('version', '1.0')
161
for name, color in converted_colors.items():
162
style = SubElement(e_style_scheme, 'style')
163
style.set('name', name)
164
style.set('foreground', '#%s' % color)
165
166
scheme_xml = tostring(e_style_scheme, 'UTF-8')
167
if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
168
os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
169
file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
170
171
scheme_manager.force_rescan()
172
style_scheme = scheme_manager.get_scheme('colordiff')
173
174
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)
175
204
176
205
@staticmethod
177
206
def parse_colordiffrc(fileobj):
275
304
scrollwin.set_shadow_type(gtk.SHADOW_IN)
276
305
self.pack1(scrollwin)
277
306
scrollwin.show()
278
307
279
308
self.model = gtk.TreeStore(str, str)
280
309
self.treeview = gtk.TreeView(self.model)
281
310
self.treeview.set_headers_visible(False)
298
327
"""
299
328
# The diffs of the selected file: a scrollable source or
300
329
# text view
301
302
def set_diff_text_sections(self, sections):
303
if getattr(self, 'diff_view', None) is None:
304
self.diff_view = DiffFileView()
305
self.pack2(self.diff_view)
330
self.diff_view = DiffFileView()
306
331
self.diff_view.show()
307
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])
308
339
self.diff_view._diffs[newname] = str(patch)
309
if newname is None:
310
newname = ''
311
self.model.append(None, [oldname, newname])
312
340
self.diff_view.show_diff(None)
313
341
314
342
def set_diff(self, rev_tree, parent_tree):
317
345
Compares the two trees and populates the window with the
318
346
differences.
319
347
"""
320
if getattr(self, 'diff_view', None) is None:
321
self.diff_view = DiffView()
322
self.pack2(self.diff_view)
348
self.diff_view = DiffView()
349
self.pack2(self.diff_view)
323
350
self.diff_view.show()
324
351
self.diff_view.set_trees(rev_tree, parent_tree)
325
352
self.rev_tree = rev_tree
352
379
self.model.append(titer, [ path, path ])
353
380
354
381
self.treeview.expand_all()
355
self.diff_view.show_diff(None)
356
382
357
383
def set_file(self, file_path):
358
384
"""Select the current file to display"""
375
401
return
376
402
elif specific_files == [ "" ]:
377
403
specific_files = None
378
404
379
405
self.diff_view.show_diff(specific_files)
380
381
def _on_wraplines_toggled(self, widget=None, wrap=False):
382
"""Callback for when the wrap lines checkbutton is toggled"""
383
if wrap or widget.get_active():
384
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
385
else:
386
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
406
387
407
388
408
class DiffWindow(Window):
389
409
"""Diff window.
392
412
differences between two revisions on a branch.
393
413
"""
394
414
395
def __init__(self, parent=None, operations=None):
415
def __init__(self, parent=None):
396
416
Window.__init__(self, parent)
397
417
self.set_border_width(0)
398
418
self.set_title("bzrk diff")
403
423
width = int(monitor.width * 0.66)
404
424
height = int(monitor.height * 0.66)
405
425
self.set_default_size(width, height)
406
self.construct(operations)
407
408
def construct(self, operations):
426
427
self.construct()
428
429
def construct(self):
409
430
"""Construct the window contents."""
410
431
self.vbox = gtk.VBox()
411
432
self.add(self.vbox)
412
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)
413
437
self.diff = DiffWidget()
414
self.vbox.pack_end(self.diff, True, True, 0)
438
self.vbox.add(self.diff)
415
439
self.diff.show_all()
416
# Build after DiffWidget to connect signals
417
menubar = self._get_menu_bar()
418
self.vbox.pack_start(menubar, False, False, 0)
419
hbox = self._get_button_bar(operations)
420
if hbox is not None:
421
self.vbox.pack_start(hbox, False, True, 0)
422
423
424
def _get_menu_bar(self):
425
menubar = gtk.MenuBar()
426
# View menu
427
mb_view = gtk.MenuItem(_i18n("_View"))
428
mb_view_menu = gtk.Menu()
429
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
430
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
431
mb_view_wrapsource.show()
432
mb_view_menu.append(mb_view_wrapsource)
433
mb_view.show()
434
mb_view.set_submenu(mb_view_menu)
435
mb_view.show()
436
menubar.append(mb_view)
437
menubar.show()
438
return menubar
439
440
def _get_button_bar(self, operations):
440
441
def _get_button_bar(self):
441
442
"""Return a button bar to use.
442
443
443
444
:return: None, meaning that no button bar will be used.
444
445
"""
445
if operations is None:
446
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
447
490
hbox = gtk.HButtonBox()
448
491
hbox.set_layout(gtk.BUTTONBOX_START)
449
for title, method in operations:
450
merge_button = gtk.Button(title)
451
merge_button.show()
452
merge_button.set_relief(gtk.RELIEF_NONE)
453
merge_button.connect("clicked", method)
454
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)
455
494
hbox.show()
456
495
return hbox
457
496
458
def _get_merge_target(self):
459
d = gtk.FileChooserDialog('Merge branch', self,
460
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
461
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
462
gtk.STOCK_CANCEL,
463
gtk.RESPONSE_CANCEL,))
464
try:
465
result = d.run()
466
if result != gtk.RESPONSE_OK:
467
raise SelectCancelled()
468
return d.get_current_folder_uri()
469
finally:
470
d.destroy()
471
472
def _merge_successful(self):
473
# No conflicts found.
474
info_dialog(_i18n('Merge successful'),
475
_i18n('All changes applied successfully.'))
476
477
def _conflicts(self):
478
warning_dialog(_i18n('Conflicts encountered'),
479
_i18n('Please resolve the conflicts manually'
480
' before committing.'))
481
482
def _handle_error(self, e):
483
error_dialog('Error', str(e))
484
485
def _get_save_path(self, basename):
486
d = gtk.FileChooserDialog('Save As', self,
487
gtk.FILE_CHOOSER_ACTION_SAVE,
488
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
489
gtk.STOCK_CANCEL,
490
gtk.RESPONSE_CANCEL,))
491
d.set_current_name(basename)
492
try:
493
result = d.run()
494
if result != gtk.RESPONSE_OK:
495
raise SelectCancelled()
496
return urlutils.local_path_from_url(d.get_uri())
497
finally:
498
d.destroy()
499
500
def set_diff(self, description, rev_tree, parent_tree):
501
"""Set the differences showed by this window.
502
503
Compares the two trees and populates the window with the
504
differences.
505
"""
506
self.diff.set_diff(rev_tree, parent_tree)
507
self.set_title(description + " - bzrk diff")
508
509
def set_file(self, file_path):
510
self.diff.set_file(file_path)
511
512
513
class DiffController(object):
514
515
def __init__(self, path, patch, window=None):
516
self.path = path
517
self.patch = patch
518
if window is None:
519
window = DiffWindow(operations=self._provide_operations())
520
self.initialize_window(window)
521
self.window = window
522
523
def initialize_window(self, window):
524
window.diff.set_diff_text_sections(self.get_diff_sections())
525
window.set_title(self.path + " - diff")
526
527
def get_diff_sections(self):
528
yield "Complete Diff", None, ''.join(self.patch)
529
for patch in parse_patches(self.patch):
530
oldname = patch.oldname.split('\t')[0]
531
newname = patch.newname.split('\t')[0]
532
yield oldname, newname, str(patch)
533
534
def perform_save(self, window):
535
try:
536
save_path = self.window._get_save_path(osutils.basename(self.path))
537
except SelectCancelled:
538
return
539
source = open(self.path, 'rb')
540
try:
541
target = open(save_path, 'wb')
542
try:
543
osutils.pumpfile(source, target)
544
finally:
545
target.close()
546
finally:
547
source.close()
548
549
def _provide_operations(self):
550
return [('Save', self.perform_save)]
551
552
553
class MergeDirectiveController(DiffController):
554
555
def __init__(self, path, directive, window=None):
556
DiffController.__init__(self, path, directive.patch.splitlines(True),
557
window)
558
self.directive = directive
559
self.merge_target = None
560
561
def _provide_operations(self):
562
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
563
564
497
def perform_merge(self, window):
565
if self.merge_target is None:
566
try:
567
self.merge_target = self.window._get_merge_target()
568
except SelectCancelled:
569
return
570
tree = workingtree.WorkingTree.open(self.merge_target)
498
try:
499
tree = self._get_merge_target()
500
except SelectCancelled:
501
return
571
502
tree.lock_write()
572
503
try:
573
504
try:
578
509
conflict_count = merger.do_merge()
579
510
merger.set_pending()
580
511
if conflict_count == 0:
581
self.window._merge_successful()
512
# No conflicts found.
513
info_dialog(_('Merge successful'),
514
_('All changes applied successfully.'))
582
515
else:
583
self.window._conflicts()
584
516
# There are conflicts to be resolved.
585
self.window.destroy()
517
warning_dialog(_('Conflicts encountered'),
518
_('Please resolve the conflicts manually'
519
' before committing.'))
520
self.destroy()
586
521
except Exception, e:
587
self.window._handle_error(e)
522
error_dialog('Error', str(e))
588
523
finally:
589
524
tree.unlock()
590
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
591
570
592
571
def iter_changes_to_status(source, target):
593
572
"""Determine the differences between trees.
605
584
renamed_and_modified = 'renamed and modified'
606
585
modified = 'modified'
607
586
kind_changed = 'kind changed'
608
missing = 'missing'
609
587
610
588
# TODO: Handle metadata changes
611
589
626
604
source_marker = ''
627
605
else:
628
606
source_marker = osutils.kind_marker(kinds[0])
629
630
607
if kinds[1] is None:
631
if kinds[0] is None:
632
# We assume bzr will flag only files in that case,
633
# there may be a bzr bug there as only files seems to
634
# not receive any kind.
635
marker = osutils.kind_marker('file')
636
else:
637
marker = osutils.kind_marker(kinds[0])
608
assert kinds[0] is not None
609
marker = osutils.kind_marker(kinds[0])
638
610
else:
639
611
marker = osutils.kind_marker(kinds[1])
640
612
642
614
if real_path is None:
643
615
real_path = paths[0]
644
616
assert real_path is not None
617
display_path = real_path + marker
645
618
646
619
present_source = versioned[0] and kinds[0] is not None
647
620
present_target = versioned[1] and kinds[1] is not None
648
621
649
if kinds[0] is None and kinds[1] is None:
650
change_type = missing
651
display_path = real_path + marker
652
elif present_source != present_target:
622
if present_source != present_target:
653
623
if present_target:
654
624
change_type = added
655
625
else:
656
626
assert present_source
657
627
change_type = removed
658
display_path = real_path + marker
659
628
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
660
629
# Renamed
661
630
if changed_content or executables[0] != executables[1]:
669
638
change_type = kind_changed
670
639
display_path = (paths[0] + source_marker
671
640
+ ' => ' + paths[1] + marker)
672
elif changed_content or executables[0] != executables[1]:
641
elif changed_content is True or executables[0] != executables[1]:
673
642
change_type = modified
674
display_path = real_path + marker
675
643
else:
676
644
assert False, "How did we get here?"
677
645
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0