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 793.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 793.1.1
- Committer: Jelmer Vernooij
- Date: 2012-07-09 15:23:26 UTC
- mto: This revision was merged to the branch mainline in revision 794.
- Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
Remove bzr-notify.
- files added:
- avatarproviders.py
- files removed:
- bzr-notify
- olive
- files renamed:
- bazaar-properties.desktop => bazaar-properties.desktop.in
- bzr-handle-patch.desktop => bzr-handle-patch.desktop.in
- files modified:
- AUTHORS
added
removed
diff.py
1
# -*- coding: UTF-8 -*-
2
1
"""Difference window.
3
2
4
3
This module contains the code to manage the diff window which shows
5
4
the changes made between two revisions on a branch.
6
5
"""
7
6
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
__author__ = "Scott James Remnant <scott@ubuntu.com>"
7
__copyright__ = "Copyright 2005 Canonical Ltd."
8
__author__ = "Scott James Remnant <scott@ubuntu.com>"
10
9
11
10
12
11
from cStringIO import StringIO
13
12
14
import pygtk
15
pygtk.require("2.0")
16
import gtk
17
import pango
18
import os
19
import re
20
13
import sys
14
import inspect
21
15
16
from gi.repository import Gtk
17
from gi.repository import Pango
22
18
try:
23
import gtksourceview
19
from gi.repository import GtkSource
24
20
have_gtksourceview = True
25
21
except ImportError:
26
22
have_gtksourceview = False
27
try:
28
import gconf
29
have_gconf = True
30
except ImportError:
31
have_gconf = False
32
23
33
24
from bzrlib import (
25
errors,
34
26
merge as _mod_merge,
35
27
osutils,
36
progress,
37
28
urlutils,
38
29
workingtree,
39
)
40
from bzrlib.diff import show_diff_trees, internal_diff
41
from bzrlib.errors import NoSuchFile
30
)
31
from bzrlib.diff import show_diff_trees
42
32
from bzrlib.patches import parse_patches
43
from bzrlib.trace import warning
44
from bzrlib.plugins.gtk import _i18n
33
from bzrlib.plugins.gtk.dialog import (
34
error_dialog,
35
info_dialog,
36
warning_dialog,
37
)
38
from bzrlib.plugins.gtk.i18n import _i18n
45
39
from bzrlib.plugins.gtk.window import Window
46
from dialog import error_dialog, info_dialog, warning_dialog
40
41
42
def fallback_guess_language(slm, content_type):
43
for lang_id in slm.get_language_ids():
44
lang = slm.get_language(lang_id)
45
if "text/x-patch" in lang.get_mime_types():
46
return lang
47
return None
47
48
48
49
49
50
class SelectCancelled(Exception):
51
52
pass
52
53
53
54
54
class DiffFileView(gtk.ScrolledWindow):
55
class DiffFileView(Gtk.ScrolledWindow):
55
56
"""Window for displaying diffs from a diff file"""
56
57
58
SHOW_WIDGETS = True
59
57
60
def __init__(self):
58
gtk.ScrolledWindow.__init__(self)
61
super(DiffFileView, self).__init__()
59
62
self.construct()
60
63
self._diffs = {}
61
64
62
65
def construct(self):
63
self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
64
self.set_shadow_type(gtk.SHADOW_IN)
66
self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
67
self.set_shadow_type(Gtk.ShadowType.IN)
65
68
66
69
if have_gtksourceview:
67
self.buffer = gtksourceview.SourceBuffer()
68
slm = gtksourceview.SourceLanguagesManager()
69
gsl = slm.get_language_from_mime_type("text/x-patch")
70
if have_gconf:
71
self.apply_gedit_colors(gsl)
72
self.apply_colordiff_colors(gsl)
73
self.buffer.set_language(gsl)
74
self.buffer.set_highlight(True)
75
76
self.sourceview = gtksourceview.SourceView(self.buffer)
70
self.buffer = GtkSource.Buffer()
71
lang_manager = GtkSource.LanguageManager.get_default()
72
language = lang_manager.guess_language(None, "text/x-patch")
73
self.buffer.set_language(language)
74
self.buffer.set_highlight_syntax(True)
75
self.sourceview = GtkSource.View(buffer=self.buffer)
77
76
else:
78
self.buffer = gtk.TextBuffer()
79
self.sourceview = gtk.TextView(self.buffer)
77
self.buffer = Gtk.TextBuffer()
78
self.sourceview = Gtk.TextView(self.buffer)
80
79
81
80
self.sourceview.set_editable(False)
82
self.sourceview.modify_font(pango.FontDescription("Monospace"))
81
self.sourceview.override_font(Pango.FontDescription("Monospace"))
83
82
self.add(self.sourceview)
84
self.sourceview.show()
85
86
@staticmethod
87
def apply_gedit_colors(lang):
88
"""Set style for lang to that specified in gedit configuration.
89
90
This method needs the gconf module.
91
92
:param lang: a gtksourceview.SourceLanguage object.
93
"""
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)
148
149
@classmethod
150
def apply_colordiff_colors(klass, lang):
151
"""Set style colors for lang using the colordiff configuration file.
152
153
Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
154
155
:param lang: a "Diff" gtksourceview.SourceLanguage object.
156
"""
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
176
# since GSV is richer, accept new names for extra bits,
177
# defaulting to old names if they're not present
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)
205
206
@staticmethod
207
def parse_colordiffrc(fileobj):
208
"""Parse fileobj as a colordiff configuration file.
209
210
:return: A dict with the key -> value pairs.
211
"""
212
colors = {}
213
for line in fileobj:
214
if re.match(r'^\s*#', line):
215
continue
216
if '=' not in line:
217
continue
218
key, val = line.split('=', 1)
219
colors[key.strip()] = val.strip()
220
return colors
83
if self.SHOW_WIDGETS:
84
self.sourceview.show()
221
85
222
86
def set_trees(self, rev_tree, parent_tree):
223
87
self.rev_tree = rev_tree
228
92
# self.parent_tree.lock_read()
229
93
# self.rev_tree.lock_read()
230
94
# try:
231
# self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
95
# self.delta = iter_changes_to_status(
96
# self.parent_tree, self.rev_tree)
232
97
# self.path_to_status = {}
233
98
# self.path_to_diff = {}
234
99
# source_inv = self.parent_tree.inventory
235
100
# target_inv = self.rev_tree.inventory
236
101
# for (file_id, real_path, change_type, display_path) in self.delta:
237
# self.path_to_status[real_path] = u'=== %s %s' % (change_type, display_path)
102
# self.path_to_status[real_path] = u'=== %s %s' % (
103
# change_type, display_path)
238
104
# if change_type in ('modified', 'renamed and modified'):
239
105
# source_ie = source_inv[file_id]
240
106
# target_ie = target_inv[file_id]
242
108
# source_ie.diff(internal_diff, *old path, *old_tree,
243
109
# *new_path, target_ie, self.rev_tree,
244
110
# sio)
245
# self.path_to_diff[real_path] =
111
# self.path_to_diff[real_path] =
246
112
#
247
113
# finally:
248
114
# self.rev_tree.unlock()
262
128
"""This is the soft and chewy filling for a DiffWindow."""
263
129
264
130
def __init__(self):
265
DiffFileView.__init__(self)
131
super(DiffView, self).__init__()
266
132
self.rev_tree = None
267
133
self.parent_tree = None
268
134
292
158
self.buffer.set_text(decoded.encode('UTF-8'))
293
159
294
160
295
class DiffWidget(gtk.HPaned):
161
class DiffWidget(Gtk.HPaned):
296
162
"""Diff widget
297
163
298
164
"""
165
166
SHOW_WIDGETS = True
167
299
168
def __init__(self):
300
169
super(DiffWidget, self).__init__()
301
170
302
171
# The file hierarchy: a scrollable treeview
303
scrollwin = gtk.ScrolledWindow()
304
scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
305
scrollwin.set_shadow_type(gtk.SHADOW_IN)
172
scrollwin = Gtk.ScrolledWindow()
173
scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
174
scrollwin.set_shadow_type(Gtk.ShadowType.IN)
306
175
self.pack1(scrollwin)
307
scrollwin.show()
308
309
self.model = gtk.TreeStore(str, str)
310
self.treeview = gtk.TreeView(self.model)
176
if self.SHOW_WIDGETS:
177
scrollwin.show()
178
179
self.model = Gtk.TreeStore(str, str)
180
self.treeview = Gtk.TreeView(model=self.model)
311
181
self.treeview.set_headers_visible(False)
312
182
self.treeview.set_search_column(1)
313
183
self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
314
184
scrollwin.add(self.treeview)
315
self.treeview.show()
185
if self.SHOW_WIDGETS:
186
self.treeview.show()
316
187
317
cell = gtk.CellRendererText()
188
cell = Gtk.CellRendererText()
318
189
cell.set_property("width-chars", 20)
319
column = gtk.TreeViewColumn()
320
column.pack_start(cell, expand=True)
190
column = Gtk.TreeViewColumn()
191
column.pack_start(cell, True)
321
192
column.add_attribute(cell, "text", 0)
322
193
self.treeview.append_column(column)
323
194
333
204
if getattr(self, 'diff_view', None) is None:
334
205
self.diff_view = DiffFileView()
335
206
self.pack2(self.diff_view)
336
self.diff_view.show()
207
if self.SHOW_WIDGETS:
208
self.diff_view.show()
337
209
for oldname, newname, patch in sections:
338
210
self.diff_view._diffs[newname] = str(patch)
339
211
if newname is None:
350
222
if getattr(self, 'diff_view', None) is None:
351
223
self.diff_view = DiffView()
352
224
self.pack2(self.diff_view)
353
self.diff_view.show()
225
if self.SHOW_WIDGETS:
226
self.diff_view.show()
354
227
self.diff_view.set_trees(rev_tree, parent_tree)
355
228
self.rev_tree = rev_tree
356
229
self.parent_tree = parent_tree
358
231
self.model.clear()
359
232
delta = self.rev_tree.changes_from(self.parent_tree)
360
233
361
self.model.append(None, [ "Complete Diff", "" ])
234
self.model.append(None, ["Complete Diff", ""])
362
235
363
236
if len(delta.added):
364
titer = self.model.append(None, [ "Added", None ])
237
titer = self.model.append(None, ["Added", None])
365
238
for path, id, kind in delta.added:
366
self.model.append(titer, [ path, path ])
239
self.model.append(titer, [path, path])
367
240
368
241
if len(delta.removed):
369
titer = self.model.append(None, [ "Removed", None ])
242
titer = self.model.append(None, ["Removed", None])
370
243
for path, id, kind in delta.removed:
371
self.model.append(titer, [ path, path ])
244
self.model.append(titer, [path, path])
372
245
373
246
if len(delta.renamed):
374
titer = self.model.append(None, [ "Renamed", None ])
247
titer = self.model.append(None, ["Renamed", None])
375
248
for oldpath, newpath, id, kind, text_modified, meta_modified \
376
249
in delta.renamed:
377
self.model.append(titer, [ oldpath, newpath ])
250
self.model.append(titer, [oldpath, newpath])
378
251
379
252
if len(delta.modified):
380
titer = self.model.append(None, [ "Modified", None ])
253
titer = self.model.append(None, ["Modified", None])
381
254
for path, id, kind, text_modified, meta_modified in delta.modified:
382
self.model.append(titer, [ path, path ])
255
self.model.append(titer, [path, path])
383
256
384
257
self.treeview.expand_all()
385
258
self.diff_view.show_diff(None)
393
266
tv_path = child.path
394
267
break
395
268
if tv_path is None:
396
raise NoSuchFile(file_path)
397
self.treeview.set_cursor(tv_path)
269
raise errors.NoSuchFile(file_path)
270
self.treeview.set_cursor(tv_path, None, False)
398
271
self.treeview.scroll_to_cell(tv_path)
399
272
400
273
def _treeview_cursor_cb(self, *args):
401
274
"""Callback for when the treeview cursor changes."""
402
275
(path, col) = self.treeview.get_cursor()
403
specific_files = [ self.model[path][1] ]
404
if specific_files == [ None ]:
405
return
406
elif specific_files == [ "" ]:
276
if path is None:
277
return
278
specific_files = [self.model[path][1]]
279
if specific_files == [None]:
280
return
281
elif specific_files == [""]:
407
282
specific_files = None
408
283
409
284
self.diff_view.show_diff(specific_files)
410
285
411
286
def _on_wraplines_toggled(self, widget=None, wrap=False):
412
287
"""Callback for when the wrap lines checkbutton is toggled"""
413
288
if wrap or widget.get_active():
414
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
289
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
415
290
else:
416
self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
291
self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
292
417
293
418
294
class DiffWindow(Window):
419
295
"""Diff window.
422
298
differences between two revisions on a branch.
423
299
"""
424
300
301
SHOW_WIDGETS = True
302
425
303
def __init__(self, parent=None, operations=None):
426
Window.__init__(self, parent)
304
super(DiffWindow, self).__init__(parent=parent)
427
305
self.set_border_width(0)
428
self.set_title("bzrk diff")
306
self.set_title("bzr diff")
429
307
430
308
# Use two thirds of the screen by default
431
309
screen = self.get_screen()
437
315
438
316
def construct(self, operations):
439
317
"""Construct the window contents."""
440
self.vbox = gtk.VBox()
318
self.vbox = Gtk.VBox()
441
319
self.add(self.vbox)
442
self.vbox.show()
320
if self.SHOW_WIDGETS:
321
self.vbox.show()
443
322
self.diff = DiffWidget()
444
323
self.vbox.pack_end(self.diff, True, True, 0)
445
self.diff.show_all()
324
if self.SHOW_WIDGETS:
325
self.diff.show_all()
446
326
# Build after DiffWidget to connect signals
447
327
menubar = self._get_menu_bar()
448
328
self.vbox.pack_start(menubar, False, False, 0)
449
329
hbox = self._get_button_bar(operations)
450
330
if hbox is not None:
451
331
self.vbox.pack_start(hbox, False, True, 0)
452
453
332
454
333
def _get_menu_bar(self):
455
menubar = gtk.MenuBar()
334
menubar = Gtk.MenuBar()
456
335
# View menu
457
mb_view = gtk.MenuItem(_i18n("_View"))
458
mb_view_menu = gtk.Menu()
459
mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
336
mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
337
mb_view_menu = Gtk.Menu()
338
mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
339
_i18n("Wrap _Long Lines"))
460
340
mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
461
mb_view_wrapsource.show()
462
341
mb_view_menu.append(mb_view_wrapsource)
463
mb_view.show()
464
342
mb_view.set_submenu(mb_view_menu)
465
mb_view.show()
466
343
menubar.append(mb_view)
467
menubar.show()
344
if self.SHOW_WIDGETS:
345
menubar.show_all()
468
346
return menubar
469
347
470
348
def _get_button_bar(self, operations):
471
349
"""Return a button bar to use.
472
350
474
352
"""
475
353
if operations is None:
476
354
return None
477
hbox = gtk.HButtonBox()
478
hbox.set_layout(gtk.BUTTONBOX_START)
355
hbox = Gtk.HButtonBox()
356
hbox.set_layout(Gtk.ButtonBoxStyle.START)
479
357
for title, method in operations:
480
merge_button = gtk.Button(title)
481
merge_button.show()
482
merge_button.set_relief(gtk.RELIEF_NONE)
358
merge_button = Gtk.Button(title)
359
if self.SHOW_WIDGETS:
360
merge_button.show()
361
merge_button.set_relief(Gtk.ReliefStyle.NONE)
483
362
merge_button.connect("clicked", method)
484
hbox.pack_start(merge_button, expand=False, fill=True)
485
hbox.show()
363
hbox.pack_start(merge_button, False, True, 0)
364
if self.SHOW_WIDGETS:
365
hbox.show()
486
366
return hbox
487
367
488
368
def _get_merge_target(self):
489
d = gtk.FileChooserDialog('Merge branch', self,
490
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
491
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
492
gtk.STOCK_CANCEL,
493
gtk.RESPONSE_CANCEL,))
369
d = Gtk.FileChooserDialog('Merge branch', self,
370
Gtk.FileChooserAction.SELECT_FOLDER,
371
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
372
Gtk.STOCK_CANCEL,
373
Gtk.ResponseType.CANCEL,))
494
374
try:
495
375
result = d.run()
496
if result != gtk.RESPONSE_OK:
376
if result != Gtk.ResponseType.OK:
497
377
raise SelectCancelled()
498
378
return d.get_current_folder_uri()
499
379
finally:
513
393
error_dialog('Error', str(e))
514
394
515
395
def _get_save_path(self, basename):
516
d = gtk.FileChooserDialog('Save As', self,
517
gtk.FILE_CHOOSER_ACTION_SAVE,
518
buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
519
gtk.STOCK_CANCEL,
520
gtk.RESPONSE_CANCEL,))
396
d = Gtk.FileChooserDialog('Save As', self,
397
Gtk.FileChooserAction.SAVE,
398
buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
399
Gtk.STOCK_CANCEL,
400
Gtk.ResponseType.CANCEL,))
521
401
d.set_current_name(basename)
522
402
try:
523
403
result = d.run()
524
if result != gtk.RESPONSE_OK:
404
if result != Gtk.ResponseType.OK:
525
405
raise SelectCancelled()
526
406
return urlutils.local_path_from_url(d.get_uri())
527
407
finally:
542
422
543
423
class DiffController(object):
544
424
545
def __init__(self, path, patch, window=None):
425
def __init__(self, path, patch, window=None, allow_dirty=False):
546
426
self.path = path
547
427
self.patch = patch
428
self.allow_dirty = allow_dirty
548
429
if window is None:
549
430
window = DiffWindow(operations=self._provide_operations())
550
431
self.initialize_window(window)
556
437
557
438
def get_diff_sections(self):
558
439
yield "Complete Diff", None, ''.join(self.patch)
559
for patch in parse_patches(self.patch):
440
# allow_dirty was added to parse_patches in bzrlib 2.2b1
441
if 'allow_dirty' in inspect.getargspec(parse_patches).args:
442
patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
443
else:
444
patches = parse_patches(self.patch)
445
for patch in patches:
560
446
oldname = patch.oldname.split('\t')[0]
561
447
newname = patch.newname.split('\t')[0]
562
448
yield oldname, newname, str(patch)
583
469
class MergeDirectiveController(DiffController):
584
470
585
471
def __init__(self, path, directive, window=None):
586
DiffController.__init__(self, path, directive.patch.splitlines(True),
587
window)
472
super(MergeDirectiveController, self).__init__(
473
path, directive.patch.splitlines(True), window)
588
474
self.directive = directive
589
475
self.merge_target = None
590
476
601
487
tree.lock_write()
602
488
try:
603
489
try:
604
merger, verified = _mod_merge.Merger.from_mergeable(tree,
605
self.directive, progress.DummyProgress())
606
merger.check_basis(True)
490
if tree.has_changes():
491
raise errors.UncommittedChanges(tree)
492
merger, verified = _mod_merge.Merger.from_mergeable(
493
tree, self.directive, pb=None)
607
494
merger.merge_type = _mod_merge.Merge3Merger
608
495
conflict_count = merger.do_merge()
609
496
merger.set_pending()
635
522
renamed_and_modified = 'renamed and modified'
636
523
modified = 'modified'
637
524
kind_changed = 'kind changed'
525
missing = 'missing'
638
526
639
527
# TODO: Handle metadata changes
640
528
655
543
source_marker = ''
656
544
else:
657
545
source_marker = osutils.kind_marker(kinds[0])
546
658
547
if kinds[1] is None:
659
assert kinds[0] is not None
660
marker = osutils.kind_marker(kinds[0])
548
if kinds[0] is None:
549
# We assume bzr will flag only files in that case,
550
# there may be a bzr bug there as only files seems to
551
# not receive any kind.
552
marker = osutils.kind_marker('file')
553
else:
554
marker = osutils.kind_marker(kinds[0])
661
555
else:
662
556
marker = osutils.kind_marker(kinds[1])
663
557
665
559
if real_path is None:
666
560
real_path = paths[0]
667
561
assert real_path is not None
668
display_path = real_path + marker
669
562
670
563
present_source = versioned[0] and kinds[0] is not None
671
564
present_target = versioned[1] and kinds[1] is not None
672
565
673
if present_source != present_target:
566
if kinds[0] is None and kinds[1] is None:
567
change_type = missing
568
display_path = real_path + marker
569
elif present_source != present_target:
674
570
if present_target:
675
571
change_type = added
676
572
else:
677
573
assert present_source
678
574
change_type = removed
575
display_path = real_path + marker
679
576
elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
680
577
# Renamed
681
578
if changed_content or executables[0] != executables[1]:
689
586
change_type = kind_changed
690
587
display_path = (paths[0] + source_marker
691
588
+ ' => ' + paths[1] + marker)
692
elif changed_content is True or executables[0] != executables[1]:
589
elif changed_content or executables[0] != executables[1]:
693
590
change_type = modified
591
display_path = real_path + marker
694
592
else:
695
593
assert False, "How did we get here?"
696
594
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0