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 423.1.21
- compare with another revision
- download diff
- download tarball
- view history from revision 423.1.21
- Committer: Szilveszter Farkas (Phanatic)
- Date: 2008-03-03 17:24:22 UTC
- mto: This revision was merged to the branch mainline in revision 435.
- Revision ID: szilveszter.farkas@gmail.com-20080303172422-y1u0gg7kyirrxuun
Installing an olive package is pretty useless. (Fixed: #136432)
- files added:
- olive.glade
- files removed:
- bzr-gtk.applications
- preferences
- files renamed:
- icons/bzr-icon-64.png => bzr-icon-64.png
- bzr-handle-patch => handle-patch
- preferences/__init__.py => preferences.py
- 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
try:
21
from xml.etree.ElementTree import Element, SubElement, tostring
22
except ImportError:
23
from elementtree.ElementTree import Element, SubElement, tostring
24
21
25
22
try:
26
import gtksourceview2
23
import gtksourceview
27
24
have_gtksourceview = True
28
25
except ImportError:
29
26
have_gtksourceview = False
33
30
except ImportError:
34
31
have_gconf = False
35
32
36
from bzrlib import (
37
merge as _mod_merge,
38
osutils,
39
progress,
40
urlutils,
41
workingtree,
42
)
33
from bzrlib import merge as _mod_merge, osutils, progress, workingtree
43
34
from bzrlib.diff import show_diff_trees, internal_diff
44
35
from bzrlib.errors import NoSuchFile
45
36
from bzrlib.patches import parse_patches
46
37
from bzrlib.trace import warning
47
from bzrlib.plugins.gtk import _i18n
48
38
from bzrlib.plugins.gtk.window import Window
49
39
from dialog import error_dialog, info_dialog, warning_dialog
50
40
51
41
52
def fallback_guess_language(slm, content_type):
53
for lang_id in slm.get_language_ids():
54
lang = slm.get_language(lang_id)
55
if "text/x-patch" in lang.get_mime_types():
56
return lang
57
return None
58
59
60
42
class SelectCancelled(Exception):
61
43
62
44
pass
75
57
self.set_shadow_type(gtk.SHADOW_IN)
76
58
77
59
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")
60
self.buffer = gtksourceview.SourceBuffer()
61
slm = gtksourceview.SourceLanguagesManager()
62
gsl = slm.get_language_from_mime_type("text/x-patch")
83
63
if have_gconf:
84
self.apply_gedit_colors(self.buffer)
85
self.apply_colordiff_colors(self.buffer)
64
self.apply_gedit_colors(gsl)
65
self.apply_colordiff_colors(gsl)
86
66
self.buffer.set_language(gsl)
87
self.buffer.set_highlight_syntax(True)
67
self.buffer.set_highlight(True)
88
68
89
self.sourceview = gtksourceview2.View(self.buffer)
69
sourceview = gtksourceview.SourceView(self.buffer)
90
70
else:
91
71
self.buffer = gtk.TextBuffer()
92
self.sourceview = gtk.TextView(self.buffer)
72
sourceview = gtk.TextView(self.buffer)
93
73
94
self.sourceview.set_editable(False)
95
self.sourceview.modify_font(pango.FontDescription("Monospace"))
96
self.add(self.sourceview)
97
self.sourceview.show()
74
sourceview.set_editable(False)
75
sourceview.modify_font(pango.FontDescription("Monospace"))
76
self.add(sourceview)
77
sourceview.show()
98
78
99
79
@staticmethod
100
def apply_gedit_colors(buf):
101
"""Set style to that specified in gedit configuration.
80
def apply_gedit_colors(lang):
81
"""Set style for lang to that specified in gedit configuration.
102
82
103
83
This method needs the gconf module.
104
84
105
:param buf: a gtksourceview2.Buffer object.
85
:param lang: a gtksourceview.SourceLanguage object.
106
86
"""
107
GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
87
GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
88
GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
108
89
109
90
client = gconf.client_get_default()
110
style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
111
if style_scheme_name is not None:
112
style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
113
114
buf.set_style_scheme(style_scheme)
91
client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
92
93
for tag in lang.get_tags():
94
tag_id = tag.get_id()
95
gconf_key = GEDIT_LANG_PATH + '/' + tag_id
96
style_string = client.get_string(gconf_key)
97
98
if style_string is None:
99
continue
100
101
# function to get a bool from a string that's either '0' or '1'
102
string_bool = lambda x: bool(int(x))
103
104
# style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
105
# values are: mask, fg, bg, italic, bold, underline, strike
106
# this packs them into (str_value, attr_name, conv_func) tuples
107
items = zip(style_string.split('/'), ['mask', 'foreground',
108
'background', 'italic', 'bold', 'underline', 'strikethrough' ],
109
[ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
110
string_bool, string_bool, string_bool ]
111
)
112
113
style = gtksourceview.SourceTagStyle()
114
115
# XXX The mask attribute controls whether the present values of
116
# foreground and background color should in fact be used. Ideally
117
# (and that's what gedit does), one could set all three attributes,
118
# and let the TagStyle object figure out which colors to use.
119
# However, in the GtkSourceview python bindings, the mask attribute
120
# is read-only, and it's derived instead from the colors being
121
# set or not. This means that we have to sometimes refrain from
122
# setting fg or bg colors, depending on the value of the mask.
123
# This code could go away if mask were writable.
124
mask = int(items[0][0])
125
if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
126
items[2:3] = []
127
if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
128
items[1:2] = []
129
items[0:1] = [] # skip the mask unconditionally
130
131
for value, attr, func in items:
132
try:
133
value = func(value)
134
except ValueError:
135
warning('gconf key %s contains an invalid value: %s'
136
% gconf_key, value)
137
else:
138
setattr(style, attr, value)
139
140
lang.set_tag_style(tag_id, style)
115
141
116
142
@classmethod
117
def apply_colordiff_colors(klass, buf):
143
def apply_colordiff_colors(klass, lang):
118
144
"""Set style colors for lang using the colordiff configuration file.
119
145
120
146
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
121
147
122
:param buf: a "Diff" gtksourceview2.Buffer object.
148
:param lang: a "Diff" gtksourceview.SourceLanguage object.
123
149
"""
124
scheme_manager = gtksourceview2.StyleSchemeManager()
125
style_scheme = scheme_manager.get_scheme('colordiff')
126
127
# if style scheme not found, we'll generate it from colordiffrc
128
# TODO: reload if colordiffrc has changed.
129
if style_scheme is None:
130
colors = {}
131
132
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
133
f = os.path.expanduser(f)
134
if os.path.exists(f):
135
try:
136
f = file(f)
137
except IOError, e:
138
warning('could not open file %s: %s' % (f, str(e)))
139
else:
140
colors.update(klass.parse_colordiffrc(f))
141
f.close()
142
143
if not colors:
144
# ~/.colordiffrc does not exist
145
return
146
147
mapping = {
148
# map GtkSourceView2 scheme styles to colordiff names
150
colors = {}
151
152
for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
153
f = os.path.expanduser(f)
154
if os.path.exists(f):
155
try:
156
f = file(f)
157
except IOError, e:
158
warning('could not open file %s: %s' % (f, str(e)))
159
else:
160
colors.update(klass.parse_colordiffrc(f))
161
f.close()
162
163
if not colors:
164
# ~/.colordiffrc does not exist
165
return
166
167
mapping = {
168
# map GtkSourceView tags to colordiff names
149
169
# since GSV is richer, accept new names for extra bits,
150
170
# defaulting to old names if they're not present
151
'diff:added-line': ['newtext'],
152
'diff:removed-line': ['oldtext'],
153
'diff:location': ['location', 'diffstuff'],
154
'diff:file': ['file', 'diffstuff'],
155
'diff:special-case': ['specialcase', 'diffstuff'],
156
}
157
158
converted_colors = {}
159
for name, values in mapping.items():
160
color = None
161
for value in values:
162
color = colors.get(value, None)
163
if color is not None:
164
break
165
if color is None:
166
continue
167
converted_colors[name] = color
168
169
# some xml magic to produce needed style scheme description
170
e_style_scheme = Element('style-scheme')
171
e_style_scheme.set('id', 'colordiff')
172
e_style_scheme.set('_name', 'ColorDiff')
173
e_style_scheme.set('version', '1.0')
174
for name, color in converted_colors.items():
175
style = SubElement(e_style_scheme, 'style')
176
style.set('name', name)
177
style.set('foreground', '#%s' % color)
178
179
scheme_xml = tostring(e_style_scheme, 'UTF-8')
180
if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
181
os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
182
file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
183
184
scheme_manager.force_rescan()
185
style_scheme = scheme_manager.get_scheme('colordiff')
186
187
buf.set_style_scheme(style_scheme)
171
'Added@32@line': ['newtext'],
172
'Removed@32@line': ['oldtext'],
173
'Location': ['location', 'diffstuff'],
174
'Diff@32@file': ['file', 'diffstuff'],
175
'Special@32@case': ['specialcase', 'diffstuff'],
176
}
177
178
for tag in lang.get_tags():
179
tag_id = tag.get_id()
180
keys = mapping.get(tag_id, [])
181
color = None
182
183
for key in keys:
184
color = colors.get(key, None)
185
if color is not None:
186
break
187
188
if color is None:
189
continue
190
191
style = gtksourceview.SourceTagStyle()
192
try:
193
style.foreground = gtk.gdk.color_parse(color)
194
except ValueError:
195
warning('not a valid color: %s' % color)
196
else:
197
lang.set_tag_style(tag_id, style)
188
198
189
199
@staticmethod
190
200
def parse_colordiffrc(fileobj):
211
221
# self.parent_tree.lock_read()
212
222
# self.rev_tree.lock_read()
213
223
# try:
214
# self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
224
# self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
215
225
# self.path_to_status = {}
216
226
# self.path_to_diff = {}
217
227
# source_inv = self.parent_tree.inventory
288
298
scrollwin.set_shadow_type(gtk.SHADOW_IN)
289
299
self.pack1(scrollwin)
290
300
scrollwin.show()
291
301
292
302
self.model = gtk.TreeStore(str, str)
293
303
self.treeview = gtk.TreeView(self.model)
294
304
self.treeview.set_headers_visible(False)
311
321
"""
312
322
# The diffs of the selected file: a scrollable source or
313
323
# text view
314
315
def set_diff_text_sections(self, sections):
316
if getattr(self, 'diff_view', None) is None:
317
self.diff_view = DiffFileView()
318
self.pack2(self.diff_view)
324
self.diff_view = DiffFileView()
319
325
self.diff_view.show()
320
for oldname, newname, patch in sections:
326
self.pack2(self.diff_view)
327
self.model.append(None, [ "Complete Diff", "" ])
328
self.diff_view._diffs[None] = ''.join(lines)
329
for patch in parse_patches(lines):
330
oldname = patch.oldname.split('\t')[0]
331
newname = patch.newname.split('\t')[0]
332
self.model.append(None, [oldname, newname])
321
333
self.diff_view._diffs[newname] = str(patch)
322
if newname is None:
323
newname = ''
324
self.model.append(None, [oldname, newname])
325
334
self.diff_view.show_diff(None)
326
335
327
336
def set_diff(self, rev_tree, parent_tree):
330
339
Compares the two trees and populates the window with the
331
340
differences.
332
341
"""
333
if getattr(self, 'diff_view', None) is None:
334
self.diff_view = DiffView()
335
self.pack2(self.diff_view)
342
self.diff_view = DiffView()
343
self.pack2(self.diff_view)
336
344
self.diff_view.show()
337
345
self.diff_view.set_trees(rev_tree, parent_tree)
338
346
self.rev_tree = rev_tree
365
373
self.model.append(titer, [ path, path ])
366
374
367
375
self.treeview.expand_all()
368
self.diff_view.show_diff(None)
369
376
370
377
def set_file(self, file_path):
371
378
"""Select the current file to display"""
388
395
return
389
396
elif specific_files == [ "" ]:
390
397
specific_files = None
391
398
392
399
self.diff_view.show_diff(specific_files)
393
394
def _on_wraplines_toggled(self, widget=None, wrap=False):
395
"""Callback for when the wrap lines checkbutton is toggled"""
396
if wrap or widget.get_active():
397
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
398
else:
399
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
400
400
401
401
402
class DiffWindow(Window):
402
403
"""Diff window.
405
406
differences between two revisions on a branch.
406
407
"""
407
408
408
def __init__(self, parent=None, operations=None):
409
def __init__(self, parent=None):
409
410
Window.__init__(self, parent)
410
411
self.set_border_width(0)
411
412
self.set_title("bzrk diff")
416
417
width = int(monitor.width * 0.66)
417
418
height = int(monitor.height * 0.66)
418
419
self.set_default_size(width, height)
419
self.construct(operations)
420
421
def construct(self, operations):
420
421
self.construct()
422
423
def construct(self):
422
424
"""Construct the window contents."""
423
425
self.vbox = gtk.VBox()
424
426
self.add(self.vbox)
425
427
self.vbox.show()
428
hbox = self._get_button_bar()
429
if hbox is not None:
430
self.vbox.pack_start(hbox, expand=False, fill=True)
426
431
self.diff = DiffWidget()
427
self.vbox.pack_end(self.diff, True, True, 0)
432
self.vbox.add(self.diff)
428
433
self.diff.show_all()
429
# Build after DiffWidget to connect signals
430
menubar = self._get_menu_bar()
431
self.vbox.pack_start(menubar, False, False, 0)
432
hbox = self._get_button_bar(operations)
433
if hbox is not None:
434
self.vbox.pack_start(hbox, False, True, 0)
435
436
437
def _get_menu_bar(self):
438
menubar = gtk.MenuBar()
439
# View menu
440
mb_view = gtk.MenuItem(_i18n("_View"))
441
mb_view_menu = gtk.Menu()
442
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
443
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
444
mb_view_wrapsource.show()
445
mb_view_menu.append(mb_view_wrapsource)
446
mb_view.show()
447
mb_view.set_submenu(mb_view_menu)
448
mb_view.show()
449
menubar.append(mb_view)
450
menubar.show()
451
return menubar
452
453
def _get_button_bar(self, operations):
434
435
def _get_button_bar(self):
454
436
"""Return a button bar to use.
455
437
456
438
:return: None, meaning that no button bar will be used.
457
439
"""
458
if operations is None:
459
return None
440
return None
441
442
def set_diff_text(self, description, lines):
443
"""Set the diff from a text.
444
445
The diff must be in unified diff format, and will be parsed to
446
determine filenames.
447
"""
448
self.diff.set_diff_text(lines)
449
self.set_title(description + " - bzrk diff")
450
451
def set_diff(self, description, rev_tree, parent_tree):
452
"""Set the differences showed by this window.
453
454
Compares the two trees and populates the window with the
455
differences.
456
"""
457
self.diff.set_diff(rev_tree, parent_tree)
458
self.set_title(description + " - bzrk diff")
459
460
def set_file(self, file_path):
461
self.diff.set_file(file_path)
462
463
464
class MergeDirectiveWindow(DiffWindow):
465
466
def __init__(self, directive, parent=None):
467
DiffWindow.__init__(self, parent)
468
self._merge_target = None
469
self.directive = directive
470
471
def _get_button_bar(self):
472
"""The button bar has only the Merge button"""
473
merge_button = gtk.Button('Merge')
474
merge_button.show()
475
merge_button.set_relief(gtk.RELIEF_NONE)
476
merge_button.connect("clicked", self.perform_merge)
477
460
478
hbox = gtk.HButtonBox()
461
479
hbox.set_layout(gtk.BUTTONBOX_START)
462
for title, method in operations:
463
merge_button = gtk.Button(title)
464
merge_button.show()
465
merge_button.set_relief(gtk.RELIEF_NONE)
466
merge_button.connect("clicked", method)
467
hbox.pack_start(merge_button, expand=False, fill=True)
480
hbox.pack_start(merge_button, expand=False, fill=True)
468
481
hbox.show()
469
482
return hbox
470
483
471
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,
475
gtk.STOCK_CANCEL,
476
gtk.RESPONSE_CANCEL,))
477
try:
478
result = d.run()
479
if result != gtk.RESPONSE_OK:
480
raise SelectCancelled()
481
return d.get_current_folder_uri()
482
finally:
483
d.destroy()
484
485
def _merge_successful(self):
486
# No conflicts found.
487
info_dialog(_i18n('Merge successful'),
488
_i18n('All changes applied successfully.'))
489
490
def _conflicts(self):
491
warning_dialog(_i18n('Conflicts encountered'),
492
_i18n('Please resolve the conflicts manually'
493
' before committing.'))
494
495
def _handle_error(self, e):
496
error_dialog('Error', str(e))
497
498
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,
502
gtk.STOCK_CANCEL,
503
gtk.RESPONSE_CANCEL,))
504
d.set_current_name(basename)
505
try:
506
result = d.run()
507
if result != gtk.RESPONSE_OK:
508
raise SelectCancelled()
509
return urlutils.local_path_from_url(d.get_uri())
510
finally:
511
d.destroy()
512
513
def set_diff(self, description, rev_tree, parent_tree):
514
"""Set the differences showed by this window.
515
516
Compares the two trees and populates the window with the
517
differences.
518
"""
519
self.diff.set_diff(rev_tree, parent_tree)
520
self.set_title(description + " - bzrk diff")
521
522
def set_file(self, file_path):
523
self.diff.set_file(file_path)
524
525
526
class DiffController(object):
527
528
def __init__(self, path, patch, window=None):
529
self.path = path
530
self.patch = patch
531
if window is None:
532
window = DiffWindow(operations=self._provide_operations())
533
self.initialize_window(window)
534
self.window = window
535
536
def initialize_window(self, window):
537
window.diff.set_diff_text_sections(self.get_diff_sections())
538
window.set_title(self.path + " - diff")
539
540
def get_diff_sections(self):
541
yield "Complete Diff", None, ''.join(self.patch)
542
for patch in parse_patches(self.patch):
543
oldname = patch.oldname.split('\t')[0]
544
newname = patch.newname.split('\t')[0]
545
yield oldname, newname, str(patch)
546
547
def perform_save(self, window):
548
try:
549
save_path = self.window._get_save_path(osutils.basename(self.path))
484
def perform_merge(self, window):
485
try:
486
tree = self._get_merge_target()
550
487
except SelectCancelled:
551
488
return
552
source = open(self.path, 'rb')
553
try:
554
target = open(save_path, 'wb')
555
try:
556
osutils.pumpfile(source, target)
557
finally:
558
target.close()
559
finally:
560
source.close()
561
562
def _provide_operations(self):
563
return [('Save', self.perform_save)]
564
565
566
class MergeDirectiveController(DiffController):
567
568
def __init__(self, path, directive, window=None):
569
DiffController.__init__(self, path, directive.patch.splitlines(True),
570
window)
571
self.directive = directive
572
self.merge_target = None
573
574
def _provide_operations(self):
575
return [('Merge', self.perform_merge), ('Save', self.perform_save)]
576
577
def perform_merge(self, window):
578
if self.merge_target is None:
579
try:
580
self.merge_target = self.window._get_merge_target()
581
except SelectCancelled:
582
return
583
tree = workingtree.WorkingTree.open(self.merge_target)
584
489
tree.lock_write()
585
490
try:
586
491
try:
591
496
conflict_count = merger.do_merge()
592
497
merger.set_pending()
593
498
if conflict_count == 0:
594
self.window._merge_successful()
499
# No conflicts found.
500
info_dialog(_('Merge successful'),
501
_('All changes applied successfully.'))
595
502
else:
596
self.window._conflicts()
597
503
# There are conflicts to be resolved.
598
self.window.destroy()
504
warning_dialog(_('Conflicts encountered'),
505
_('Please resolve the conflicts manually'
506
' before committing.'))
507
self.destroy()
599
508
except Exception, e:
600
self.window._handle_error(e)
509
error_dialog('Error', str(e))
601
510
finally:
602
511
tree.unlock()
603
512
604
605
def iter_changes_to_status(source, target):
513
def _get_merge_target(self):
514
if self._merge_target is not None:
515
return self._merge_target
516
d = gtk.FileChooserDialog('Merge branch', self,
517
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
518
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
519
gtk.STOCK_CANCEL,
520
gtk.RESPONSE_CANCEL,))
521
try:
522
result = d.run()
523
if result != gtk.RESPONSE_OK:
524
raise SelectCancelled()
525
uri = d.get_current_folder_uri()
526
finally:
527
d.destroy()
528
return workingtree.WorkingTree.open(uri)
529
530
531
def _iter_changes_to_status(source, target):
606
532
"""Determine the differences between trees.
607
533
608
This is a wrapper around iter_changes which just yields more
534
This is a wrapper around _iter_changes which just yields more
609
535
understandable results.
610
536
611
537
:param source: The source tree (basis tree)
618
544
renamed_and_modified = 'renamed and modified'
619
545
modified = 'modified'
620
546
kind_changed = 'kind changed'
621
missing = 'missing'
622
547
623
548
# TODO: Handle metadata changes
624
549
628
553
source.lock_read()
629
554
try:
630
555
for (file_id, paths, changed_content, versioned, parent_ids, names,
631
kinds, executables) in target.iter_changes(source):
556
kinds, executables) in target._iter_changes(source):
632
557
633
558
# Skip the root entry if it isn't very interesting
634
559
if parent_ids == (None, None):
639
564
source_marker = ''
640
565
else:
641
566
source_marker = osutils.kind_marker(kinds[0])
642
643
567
if kinds[1] is None:
644
if kinds[0] is None:
645
# We assume bzr will flag only files in that case,
646
# there may be a bzr bug there as only files seems to
647
# not receive any kind.
648
marker = osutils.kind_marker('file')
649
else:
650
marker = osutils.kind_marker(kinds[0])
568
assert kinds[0] is not None
569
marker = osutils.kind_marker(kinds[0])
651
570
else:
652
571
marker = osutils.kind_marker(kinds[1])
653
572
655
574
if real_path is None:
656
575
real_path = paths[0]
657
576
assert real_path is not None
577
display_path = real_path + marker
658
578
659
579
present_source = versioned[0] and kinds[0] is not None
660
580
present_target = versioned[1] and kinds[1] is not None
661
581
662
if kinds[0] is None and kinds[1] is None:
663
change_type = missing
664
display_path = real_path + marker
665
elif present_source != present_target:
582
if present_source != present_target:
666
583
if present_target:
667
584
change_type = added
668
585
else:
669
586
assert present_source
670
587
change_type = removed
671
display_path = real_path + marker
672
588
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
673
589
# Renamed
674
590
if changed_content or executables[0] != executables[1]:
682
598
change_type = kind_changed
683
599
display_path = (paths[0] + source_marker
684
600
+ ' => ' + paths[1] + marker)
685
elif changed_content or executables[0] != executables[1]:
601
elif changed_content is True or executables[0] != executables[1]:
686
602
change_type = modified
687
display_path = real_path + marker
688
603
else:
689
604
assert False, "How did we get here?"
690
605
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0