1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
|
# -*- coding: utf-8 -*-
#
# QBzr - Qt frontend to Bazaar commands
# Copyright (C) 2006 Lukáš Lalinský <lalinsky@gmail.com>
# Portions Copyright (C) 2006 Jelmer Vernooij <jelmer@samba.org>
# Portions Copyright (C) 2005 Canonical Ltd. (author: Scott James Remnant <scott@ubuntu.com>)
# Portions Copyright (C) 2004-2006 Christopher Lenz <cmlenz@gmx.de>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import errno
import re
import time
import contextlib
from PyQt4 import QtCore, QtGui
from breezy.errors import NoSuchRevision, PathsNotVersionedError
from breezy.mutabletree import MutableTree
# from patiencediff import PatienceSequenceMatcher as SequenceMatcher
from patiencediff import PatienceSequenceMatcher as SequenceMatcher
from breezy.revisiontree import RevisionTree
from breezy.transform import _PreviewTree
from breezy.workingtree import WorkingTree
from breezy.bzr.workingtree_4 import DirStateRevisionTree
from breezy import trace
# from breezy import cleanup
from breezy.plugins.qbrz.lib import cleanup
from breezy.plugins.qbrz.lib.diffview import (
SidebySideDiffView,
SimpleDiffView,
)
from breezy.plugins.qbrz.lib.diff import (
show_diff,
has_ext_diff,
ExtDiffMenu,
DiffItem,
ExtDiffContext,
)
from breezy.plugins.qbrz.lib.i18n import gettext, ngettext, N_
from breezy.plugins.qbrz.lib.util import (
FilterOptions,
QBzrWindow,
ToolBarThrobberWidget,
get_icon,
get_set_encoding,
get_set_tab_width_chars,
get_tab_width_pixels,
content_seems_to_be_binary,
run_in_loading_queue,
runs_in_loading_queue,
show_shortcut_hint,
)
from breezy.plugins.qbrz.lib.widgets.toolbars import FindToolbar
from breezy.plugins.qbrz.lib.uifactory import ui_current_widget
from breezy.plugins.qbrz.lib.trace import reports_exception
from breezy.plugins.qbrz.lib.encoding_selector import EncodingMenuSelector
from breezy.plugins.qbrz.lib.widgets.tab_width_selector import TabWidthMenuSelector
from breezy.plugins.qbrz.lib.widgets.texteditaccessory import setup_guidebar_for_find
def get_title_for_tree(tree, branch, other_branch):
branch_title = ""
if None not in (branch, other_branch) and branch.base != other_branch.base:
branch_title = branch.nick
if isinstance(tree, WorkingTree):
if branch_title:
return gettext("Working Tree for %s") % branch_title
else:
return gettext("Working Tree")
elif isinstance(tree, (RevisionTree, DirStateRevisionTree)):
# revision_id_to_revno is faster, but only works on mainline rev
revid = tree.get_revision_id()
try:
revno = branch.revision_id_to_revno(revid)
except NoSuchRevision:
try:
revno_map = branch.get_revision_id_to_revno_map()
revno_tuple = revno_map[revid] # this can raise KeyError is revision not in the branch
revno = ".".join("%d" % i for i in revno_tuple)
except KeyError:
# this can happens when you try to diff against other branch
# or pending merge
revno = revid
if revno is not None:
if branch_title:
return gettext("Rev %(rev)s for %(branch)s") % {"rev": revno, "branch": branch_title}
else:
return gettext("Rev %s") % revno
else:
if branch_title:
return gettext("Revid: %(revid)s for %(branch)s") % {"revid": revid, "branch": branch_title}
else:
return gettext("Revid: %s") % revid
elif isinstance(tree, _PreviewTree):
return gettext('Merge Preview')
# XXX I don't know what other cases we need to handle
return 'Unknown tree'
class DiffWindow(QBzrWindow):
def __init__(self, arg_provider, parent=None,
complete=False, encoding=None,
filter_options=None, ui_mode=True, allow_refresh=True):
title = [gettext("Diff"), gettext("Loading...")]
QBzrWindow.__init__(self, title, parent, ui_mode=ui_mode)
self.restoreSize("diff", (780, 580))
self.trees = None
self.encoding = encoding
self.arg_provider = arg_provider
self.filter_options = filter_options
if filter_options is None:
self.filter_options = FilterOptions(all_enable=True)
self.complete = complete
self.ignore_whitespace = False
self.delayed_signal_connections = []
self.diffview = SidebySideDiffView(self)
self.sdiffview = SimpleDiffView(self)
self.views = (self.diffview, self.sdiffview)
for view in self.views:
view.set_complete(complete)
self.stack = QtGui.QStackedWidget(self.centralwidget)
self.stack.addWidget(self.diffview)
self.stack.addWidget(self.sdiffview)
vbox = QtGui.QVBoxLayout(self.centralwidget)
vbox.addWidget(self.stack)
# Don't use a custom tab width by default
# Indices are left side, right side and unidiff
# respectively
self.custom_tab_widths = [-1,-1,-1]
for browser in self.diffview.browsers:
browser.installEventFilter(self)
self.create_main_toolbar(allow_refresh)
self.addToolBarBreak()
self.find_toolbar = FindToolbar(self, self.diffview.browsers,
self.show_find)
self.find_toolbar.hide()
self.addToolBar(self.find_toolbar)
setup_guidebar_for_find(self.sdiffview, self.find_toolbar, 1)
for gb in self.diffview.guidebar_panels:
setup_guidebar_for_find(gb, self.find_toolbar, 1)
self.diff_context = ExtDiffContext(self)
def connect_later(self, *args, **kwargs):
"""Schedules a signal to be connected after loading CLI arguments.
Accepts the same arguments as QObject.connect method.
"""
self.delayed_signal_connections.append((args, kwargs))
def process_delayed_connections(self):
for (args, kwargs) in self.delayed_signal_connections:
self.connect(*args, **kwargs)
def create_main_toolbar(self, allow_refresh=True):
toolbar = self.addToolBar(gettext("Diff"))
toolbar.setMovable (False)
toolbar.setToolButtonStyle(QtCore.Qt.ToolButtonTextBesideIcon)
self.show_find = self.create_find_action()
toolbar.addAction(self.show_find)
toolbar.addAction(self.create_toggle_view_mode())
self.view_refresh = self.create_refresh_action(allow_refresh)
if allow_refresh:
toolbar.addAction(self.view_refresh)
if has_ext_diff():
show_ext_diff_menu = self.create_ext_diff_action()
toolbar.addAction(show_ext_diff_menu)
widget = toolbar.widgetForAction(show_ext_diff_menu)
widget.setPopupMode(QtGui.QToolButton.InstantPopup)
widget.setShortcut("Alt+E")
show_shortcut_hint(widget)
show_view_menu = self.create_view_menu()
toolbar.addAction(show_view_menu)
widget = toolbar.widgetForAction(show_view_menu)
widget.setPopupMode(QtGui.QToolButton.InstantPopup)
widget.setShortcut("Alt+V")
show_shortcut_hint(widget)
spacer = QtGui.QWidget()
spacer.setSizePolicy(QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Expanding)
toolbar.addWidget(spacer)
self.throbber = ToolBarThrobberWidget(self)
toolbar.addWidget(self.throbber)
return toolbar
def create_find_action(self):
action = QtGui.QAction(get_icon("edit-find"),
gettext("&Find"), self)
action.setShortcut(QtGui.QKeySequence.Find)
action.setToolTip(gettext("Find on active panel"))
show_shortcut_hint(action)
action.setCheckable(True)
return action
def create_toggle_view_mode(self):
action = QtGui.QAction(get_icon("view-split-left-right"),
gettext("Unidiff"), self)
action.setToolTip(
gettext("Toggle between Side by side and Unidiff view modes"))
action.setShortcut("Ctrl+U")
show_shortcut_hint(action)
action.setCheckable(True)
action.setChecked(False);
self.connect(action,
QtCore.SIGNAL("toggled (bool)"),
self.click_toggle_view_mode)
return action
def create_refresh_action(self, allow_refresh=True):
action = QtGui.QAction(get_icon("view-refresh"),
gettext("&Refresh"), self)
action.setShortcut("Ctrl+R")
show_shortcut_hint(action)
self.connect(action,
QtCore.SIGNAL("triggered (bool)"),
self.click_refresh)
action.setEnabled(allow_refresh)
return action
def create_ext_diff_action(self):
action = QtGui.QAction(get_icon("system-run"),
gettext("&External Diff"), self)
action.setToolTip(
gettext("Launch an external diff application"))
ext_diff_menu = ExtDiffMenu(parent=self, include_builtin = False)
action.setMenu(ext_diff_menu)
self.connect(ext_diff_menu,
QtCore.SIGNAL("triggered(QString)"),
self.ext_diff_triggered)
return action
def create_view_menu(self):
show_view_menu = QtGui.QAction(get_icon("document-properties"), gettext("&View Options"), self)
view_menu = QtGui.QMenu(gettext('View Options'), self)
show_view_menu.setMenu(view_menu)
view_complete = QtGui.QAction(gettext("&Complete"), self)
view_complete.setCheckable(True)
self.connect(view_complete,
QtCore.SIGNAL("toggled (bool)"),
self.click_complete)
view_menu.addAction(view_complete)
self.ignore_whitespace_action = self.create_ignore_ws_action()
view_menu.addAction(self.ignore_whitespace_action)
def on_unidiff_tab_width_changed(tabwidth):
if self.branches:
get_set_tab_width_chars(branch=self.branches[0],tab_width_chars=tabwidth)
self.custom_tab_widths[2] = tabwidth
self.setup_tab_width()
self.tab_width_selector_unidiff = TabWidthMenuSelector(
label_text=gettext("Tab width"),
onChanged=on_unidiff_tab_width_changed)
view_menu.addMenu(self.tab_width_selector_unidiff)
def on_left_tab_width_changed(tabwidth):
if self.branches:
get_set_tab_width_chars(branch=self.branches[0],tab_width_chars=tabwidth)
self.custom_tab_widths[0] = tabwidth
self.setup_tab_width()
self.tab_width_selector_left = TabWidthMenuSelector(
label_text=gettext("Left side tab width"),
onChanged=on_left_tab_width_changed)
view_menu.addMenu(self.tab_width_selector_left)
def on_right_tab_width_changed(tabwidth):
if self.branches:
get_set_tab_width_chars(branch=self.branches[1],tab_width_chars=tabwidth)
self.custom_tab_widths[1] = tabwidth
self.setup_tab_width()
self.tab_width_selector_right = TabWidthMenuSelector(
label_text=gettext("Right side tab width"),
onChanged=on_right_tab_width_changed)
view_menu.addMenu(self.tab_width_selector_right)
if self.stack.currentWidget() == self.diffview:
self.tab_width_selector_unidiff.menuAction().setVisible(False)
else:
self.tab_width_selector_left.menuAction().setVisible(False)
self.tab_width_selector_right.menuAction().setVisible(False)
def on_left_encoding_changed(encoding):
if self.branches:
get_set_encoding(encoding, self.branches[0])
self.click_refresh()
self.encoding_selector_left = EncodingMenuSelector(self.encoding,
gettext("Left side encoding"),
on_left_encoding_changed)
view_menu.addMenu(self.encoding_selector_left)
def on_right_encoding_changed(encoding):
if self.branches:
get_set_encoding(encoding, self.branches[1])
self.click_refresh()
self.encoding_selector_right = EncodingMenuSelector(self.encoding,
gettext("Right side encoding"),
on_right_encoding_changed)
view_menu.addMenu(self.encoding_selector_right)
return show_view_menu
def create_ignore_ws_action(self):
action = QtGui.QAction(gettext("&Ignore whitespace changes"), self)
action.setCheckable(True)
action.setChecked(self.ignore_whitespace);
self.connect_later(action,
QtCore.SIGNAL("toggled (bool)"),
self.click_ignore_whitespace)
return action
def eventFilter(self, object, event):
if event.type() == QtCore.QEvent.FocusIn:
if object in self.diffview.browsers:
self.find_toolbar.set_text_edit(object)
return QBzrWindow.eventFilter(self, object, event)
# Why doesn't this work?
#return super(DiffWindow, self).eventFilter(object, event)
def show(self):
QBzrWindow.show(self)
QtCore.QTimer.singleShot(1, self.initial_load)
@runs_in_loading_queue
@ui_current_widget
@reports_exception()
def initial_load(self):
"""Called to perform the initial load of the form. Enables a
throbber window, then loads the branches etc if they weren't specified
in our constructor.
"""
op = cleanup.OperationWithCleanups(self._initial_load)
self.throbber.show()
op.add_cleanup(self.throbber.hide)
op.run()
def _initial_load(self, op):
# RJL Breezy expects a context handler of some type
exit_stack = contextlib.ExitStack()
args = self.arg_provider.get_diff_window_args(self.processEvents, exit_stack)
# args = self.arg_provider.get_diff_window_args(self.processEvents, op.add_cleanup)
self.trees = (args["old_tree"], args["new_tree"])
self.branches = (args.get("old_branch", None), args.get("new_branch",None))
self.specific_files = args.get("specific_files", None)
self.ignore_whitespace = args.get("ignore_whitespace", False)
self.ignore_whitespace_action.setChecked(self.ignore_whitespace)
self.process_delayed_connections()
self.load_branch_info()
self.setup_tab_width()
self.load_diff()
def load_branch_info(self):
self.set_diff_title()
self.encoding_selector_left.encoding = get_set_encoding(self.encoding, self.branches[0])
self.encoding_selector_right.encoding = get_set_encoding(self.encoding, self.branches[1])
self.processEvents()
def set_diff_title(self):
rev1_title = get_title_for_tree(self.trees[0], self.branches[0], self.branches[1])
rev2_title = get_title_for_tree(self.trees[1], self.branches[1], self.branches[0])
title = [gettext("Diff"), "%s..%s" % (rev1_title, rev2_title)]
if self.specific_files:
nfiles = len(self.specific_files)
if nfiles > 2:
title.append(ngettext("%d file", "%d files", nfiles) % nfiles)
else:
title.append(", ".join(self.specific_files))
else:
if self.filter_options and not self.filter_options.is_all_enable():
title.append(self.filter_options.to_str())
self.set_title_and_icon(title)
self.processEvents()
def setup_tab_width(self):
tabWidths = self.custom_tab_widths
if tabWidths[0] < 0:
tabWidths[0] = get_set_tab_width_chars(branch=self.branches[0])
self.tab_width_selector_left.setTabWidth(tabWidths[0])
if tabWidths[1] < 0:
tabWidths[1] = get_set_tab_width_chars(branch=self.branches[1])
self.tab_width_selector_right.setTabWidth(tabWidths[1])
if tabWidths[2] < 0:
tabWidths[2] = get_set_tab_width_chars(branch=self.branches[0])
self.tab_width_selector_unidiff.setTabWidth(tabWidths[2])
tabWidthsPixels = [get_tab_width_pixels(tab_width_chars=i) for i in tabWidths]
self.diffview.setTabStopWidths(tabWidthsPixels)
self.sdiffview.setTabStopWidth(tabWidthsPixels[2])
def load_diff(self):
self.view_refresh.setEnabled(False)
self.processEvents()
try:
no_changes = True # if there is no changes found we need to inform the user
for di in DiffItem.iter_items(self.trees,
specific_files=self.specific_files,
filter=self.filter_options.check,
lock_trees=True):
lines = di.lines
self.processEvents()
groups = di.groups(self.complete, self.ignore_whitespace)
self.processEvents()
ulines = di.get_unicode_lines(
(self.encoding_selector_left.encoding,
self.encoding_selector_right.encoding))
# If we've got binary, it'll be bytes (probably)...
if di.binary:
data = [b''.join(l) for l in ulines]
else:
data = [''.join(l) for l in ulines]
for view in self.views:
view.append_diff(list(di.paths), di.file_id, di.kind, di.status,
di.dates, di.versioned, di.binary, ulines, groups,
data, di.properties_changed)
self.processEvents()
no_changes = False
except PathsNotVersionedError as e:
QtGui.QMessageBox.critical(self, gettext('Diff'),
gettext('File %s is not versioned.\n'
'Operation aborted.') % e.paths_as_string,
gettext('&Close'))
self.close()
if no_changes:
QtGui.QMessageBox.information(self, gettext('Diff'),
gettext('No changes found.'),
gettext('&OK'))
for t in self.views[0].browsers + (self.views[1],):
t.emit(QtCore.SIGNAL("documentChangeFinished()"))
self.view_refresh.setEnabled(self.can_refresh())
def click_toggle_view_mode(self, checked):
if checked:
view = self.sdiffview
self.find_toolbar.set_text_edits([view.view])
self.tab_width_selector_left.menuAction().setVisible(False)
self.tab_width_selector_right.menuAction().setVisible(False)
self.tab_width_selector_unidiff.menuAction().setVisible(True)
else:
view = self.diffview
self.find_toolbar.set_text_edits(view.browsers)
self.tab_width_selector_left.menuAction().setVisible(True)
self.tab_width_selector_right.menuAction().setVisible(True)
self.tab_width_selector_unidiff.menuAction().setVisible(False)
view.rewind()
index = self.stack.indexOf(view)
self.stack.setCurrentIndex(index)
def click_complete(self, checked ):
self.complete = checked
#Has the side effect of refreshing...
self.diffview.set_complete(checked)
self.sdiffview.set_complete(checked)
self.diffview.clear()
self.sdiffview.clear()
run_in_loading_queue(self.load_diff)
def click_refresh(self):
self.diffview.clear()
self.sdiffview.clear()
run_in_loading_queue(self.load_diff)
def can_refresh(self):
"""Does any of tree is Mutanble/Working tree."""
if self.trees is None: # we might still be loading...
return False
tree1, tree2 = self.trees
if isinstance(tree1, MutableTree) or isinstance(tree2, MutableTree):
return True
return False
def ext_diff_triggered(self, ext_diff):
"""@param ext_diff: path to external diff executable."""
show_diff(self.arg_provider, ext_diff=ext_diff, parent_window=self,
context=self.diff_context)
def click_ignore_whitespace(self, checked ):
self.ignore_whitespace = checked
#Has the side effect of refreshing...
self.diffview.clear()
self.sdiffview.clear()
run_in_loading_queue(self.load_diff)
|