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