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 __init__.py
- browse files at revision 399.1.19
- compare with another revision
- download diff
- download tarball
- view history from revision 399.1.19
- Committer: Jelmer Vernooij
- Date: 2008-03-30 15:58:52 UTC
- mto: (450.1.11 trunk)
- mto: This revision was merged to the branch mainline in revision 458.
- Revision ID: jelmer@samba.org-20080330155852-0btngt3srvde5pj9
Add utility function for finding icon paths.
- files added:
- bzr-notify.desktop
- olive
- files removed:
- avatarproviders.py
- preferences
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- bzr-handle-patch => handle-patch
- preferences/__init__.py => preferences.py
- files modified:
- .bzrignore
added
removed
__init__.py
15
15
"""Graphical support for Bazaar using GTK.
16
16
17
17
This plugin includes:
18
gannotate GTK+ annotate.
19
gbranch GTK+ branching.
20
gcheckout GTK+ checkout.
18
commit-notify Start the graphical notifier of commits.
19
gannotate GTK+ annotate.
20
gbranch GTK+ branching.
21
gcheckout GTK+ checkout.
21
22
gcommit GTK+ commit dialog.
22
gconflicts GTK+ conflicts.
23
gdiff Show differences in working tree in a GTK+ Window.
23
gconflicts GTK+ conflicts.
24
gdiff Show differences in working tree in a GTK+ Window.
25
ghandle-patch Display and optionally merge a merge directive or patch.
24
26
ginit Initialise a new branch.
25
gloom GTK+ loom browse dialog
26
gmerge GTK+ merge dialog
27
gmissing GTK+ missing revisions dialog.
28
gpreferences GTK+ preferences dialog.
27
gmissing GTK+ missing revisions dialog.
28
gpreferences GTK+ preferences dialog.
29
29
gpush GTK+ push.
30
30
gsend GTK+ send merge directive.
31
31
gstatus GTK+ status dialog.
32
32
gtags Manage branch tags.
33
visualise Graphically visualise this branch.
33
visualise Graphically visualise this branch.
34
34
"""
35
35
36
from __future__ import absolute_import
37
38
import os
39
36
import sys
40
37
41
if getattr(sys, "frozen", None) is not None: # we run bzr.exe
42
43
# FIXME: Unless a better packaging solution is found, the following
44
# provides a workaround for https://bugs.launchpad.net/bzr/+bug/388790 Also
45
# see https://code.edge.launchpad.net/~vila/bzr-gtk/388790-windows-setup
46
# for more details about while it's needed.
47
48
# NOTE: _lib must be ahead of bzrlib or sax.saxutils (in olive) fails
49
here = os.path.dirname(__file__)
50
sys.path.insert(0, os.path.join(here, '_lib'))
51
sys.path.append(os.path.join(here, '_lib/gtk-2.0'))
52
53
54
38
import bzrlib
55
import bzrlib.api
56
from bzrlib.commands import plugin_cmds
57
39
58
from bzrlib.plugins.gtk.info import (
59
bzr_plugin_version as version_info,
60
bzr_compatible_versions,
61
)
40
version_info = (0, 94, 0, 'dev', 0)
62
41
63
42
if version_info[3] == 'final':
64
43
version_string = '%d.%d.%d' % version_info[:3]
66
45
version_string = '%d.%d.%d%s%d' % version_info
67
46
__version__ = version_string
68
47
69
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
70
48
required_bzrlib = (1, 3)
49
50
def check_bzrlib_version(desired):
51
"""Check that bzrlib is compatible.
52
53
If version is < bzr-gtk version, assume incompatible.
54
"""
55
bzrlib_version = bzrlib.version_info[:2]
56
try:
57
from bzrlib.trace import warning
58
except ImportError:
59
# get the message out any way we can
60
from warnings import warn as warning
61
if bzrlib_version < desired:
62
from bzrlib.errors import BzrError
63
warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
64
' %s.' % (bzrlib.__version__, __version__))
65
raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
66
67
68
if version_info[2] == "final":
69
check_bzrlib_version(required_bzrlib)
70
71
from bzrlib.trace import warning
71
72
if __name__ != 'bzrlib.plugins.gtk':
72
from bzrlib.trace import warning
73
73
warning("Not running as bzrlib.plugins.gtk, things may break.")
74
74
75
from bzrlib.lazy_import import lazy_import
76
lazy_import(globals(), """
77
from bzrlib import (
78
branch,
79
builtins,
80
errors,
81
merge_directive,
82
workingtree,
83
)
84
""")
85
86
from bzrlib.commands import Command, register_command, display_command
87
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
88
from bzrlib.option import Option
89
90
import os.path
91
92
def import_pygtk():
93
try:
94
import pygtk
95
except ImportError:
96
raise errors.BzrCommandError("PyGTK not installed.")
97
pygtk.require('2.0')
98
return pygtk
99
75
100
76
101
def set_ui_factory():
77
from bzrlib.plugins.gtk.ui import GtkUIFactory
102
import_pygtk()
103
from ui import GtkUIFactory
78
104
import bzrlib.ui
79
105
bzrlib.ui.ui_factory = GtkUIFactory()
80
106
81
107
82
def data_basedirs():
83
return [os.path.dirname(__file__),
108
def data_path():
109
return os.path.dirname(__file__)
110
111
112
def icon_path(*args):
113
basedirs = [os.path.join(data_path()),
84
114
"/usr/share/bzr-gtk",
85
115
"/usr/local/share/bzr-gtk"]
86
87
88
def data_path(*args):
89
for basedir in data_basedirs():
90
path = os.path.join(basedir, *args)
116
for basedir in basedirs:
117
path = os.path.join(basedir, 'icons', *args)
91
118
if os.path.exists(path):
92
119
return path
93
120
return None
94
121
95
122
96
def icon_path(*args):
97
return data_path(os.path.join('icons', *args))
98
99
100
commands = {
101
"gannotate": ["gblame", "gpraise"],
102
"gbranch": [],
103
"gcheckout": [],
104
"gcommit": ["gci"],
105
"gconflicts": [],
106
"gdiff": [],
107
"ginit": [],
108
"gmerge": [],
109
"gmissing": [],
110
"gpreferences": [],
111
"gpush": [],
112
"gsend": [],
113
"gstatus": ["gst"],
114
"gtags": [],
115
"visualise": ["visualize", "vis", "viz", 'glog'],
116
}
117
118
try:
119
from bzrlib.plugins import loom
120
except ImportError:
121
pass # Loom plugin doesn't appear to be present
122
else:
123
commands["gloom"] = []
124
125
for cmd, aliases in commands.iteritems():
126
plugin_cmds.register_lazy("cmd_%s" % cmd, aliases,
127
"bzrlib.plugins.gtk.commands")
128
129
def save_commit_messages(*args):
130
from bzrlib.plugins.gtk import commitmsgs
131
commitmsgs.save_commit_messages(*args)
132
133
try:
134
from bzrlib.hooks import install_lazy_named_hook
135
except ImportError:
136
from bzrlib.branch import Branch
137
Branch.hooks.install_named_hook('post_uncommit',
138
save_commit_messages,
139
"Saving commit messages for gcommit")
140
else:
141
install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
142
'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
143
144
try:
145
from bzrlib.registry import register_lazy
146
except ImportError:
147
from bzrlib import config
148
option_registry = getattr(config, "option_registry", None)
149
if option_registry is not None:
150
config.option_registry.register_lazy('nautilus_integration',
151
'bzrlib.plugins.gtk.config', 'opt_nautilus_integration')
152
else:
153
register_lazy("bzrlib.config", "option_registry",
154
'nautilus_integration', 'bzrlib.plugins.gtk.config',
155
'opt_nautilus_integration')
156
157
158
def load_tests(basic_tests, module, loader):
159
testmod_names = [
160
'tests',
161
]
123
class GTKCommand(Command):
124
"""Abstract class providing GTK specific run commands."""
125
126
def open_display(self):
127
pygtk = import_pygtk()
128
try:
129
import gtk
130
except RuntimeError, e:
131
if str(e) == "could not open display":
132
raise NoDisplayError
133
set_ui_factory()
134
return gtk
135
136
def run(self):
137
self.open_display()
138
dialog = self.get_gtk_dialog(os.path.abspath('.'))
139
dialog.run()
140
141
142
class cmd_gbranch(GTKCommand):
143
"""GTK+ branching.
144
145
"""
146
147
def get_gtk_dialog(self, path):
148
from bzrlib.plugins.gtk.branch import BranchDialog
149
return BranchDialog(path)
150
151
152
class cmd_gcheckout(GTKCommand):
153
""" GTK+ checkout.
154
155
"""
156
157
def get_gtk_dialog(self, path):
158
from bzrlib.plugins.gtk.checkout import CheckoutDialog
159
return CheckoutDialog(path)
160
161
162
163
class cmd_gpush(GTKCommand):
164
""" GTK+ push.
165
166
"""
167
takes_args = [ "location?" ]
168
169
def run(self, location="."):
170
(br, path) = branch.Branch.open_containing(location)
171
self.open_display()
172
from push import PushDialog
173
dialog = PushDialog(br.repository, br.last_revision(), br)
174
dialog.run()
175
176
177
178
class cmd_gdiff(GTKCommand):
179
"""Show differences in working tree in a GTK+ Window.
180
181
Otherwise, all changes for the tree are listed.
182
"""
183
takes_args = ['filename?']
184
takes_options = ['revision']
185
186
@display_command
187
def run(self, revision=None, filename=None):
188
set_ui_factory()
189
wt = workingtree.WorkingTree.open_containing(".")[0]
190
wt.lock_read()
191
try:
192
branch = wt.branch
193
if revision is not None:
194
if len(revision) == 1:
195
tree1 = wt
196
revision_id = revision[0].in_history(branch).rev_id
197
tree2 = branch.repository.revision_tree(revision_id)
198
elif len(revision) == 2:
199
revision_id_0 = revision[0].in_history(branch).rev_id
200
tree2 = branch.repository.revision_tree(revision_id_0)
201
revision_id_1 = revision[1].in_history(branch).rev_id
202
tree1 = branch.repository.revision_tree(revision_id_1)
203
else:
204
tree1 = wt
205
tree2 = tree1.basis_tree()
206
207
from diff import DiffWindow
208
import gtk
209
window = DiffWindow()
210
window.connect("destroy", gtk.main_quit)
211
window.set_diff("Working Tree", tree1, tree2)
212
if filename is not None:
213
tree_filename = wt.relpath(filename)
214
try:
215
window.set_file(tree_filename)
216
except NoSuchFile:
217
if (tree1.path2id(tree_filename) is None and
218
tree2.path2id(tree_filename) is None):
219
raise NotVersionedError(filename)
220
raise BzrCommandError('No changes found for file "%s"' %
221
filename)
222
window.show()
223
224
gtk.main()
225
finally:
226
wt.unlock()
227
228
229
def start_viz_window(branch, revisions, limit=None):
230
"""Start viz on branch with revision revision.
231
232
:return: The viz window object.
233
"""
234
from viz import BranchWindow
235
return BranchWindow(branch, revisions, limit)
236
237
238
class cmd_visualise(Command):
239
"""Graphically visualise this branch.
240
241
Opens a graphical window to allow you to see the history of the branch
242
and relationships between revisions in a visual manner,
243
244
The default starting point is latest revision on the branch, you can
245
specify a starting point with -r revision.
246
"""
247
takes_options = [
248
"revision",
249
Option('limit', "Maximum number of revisions to display.",
250
int, 'count')]
251
takes_args = [ "locations*" ]
252
aliases = [ "visualize", "vis", "viz" ]
253
254
def run(self, locations_list, revision=None, limit=None):
255
set_ui_factory()
256
if locations_list is None:
257
locations_list = ["."]
258
revids = []
259
for location in locations_list:
260
(br, path) = branch.Branch.open_containing(location)
261
if revision is None:
262
revids.append(br.last_revision())
263
else:
264
(revno, revid) = revision[0].in_history(br)
265
revids.append(revid)
266
import gtk
267
pp = start_viz_window(br, revids, limit)
268
pp.connect("destroy", lambda w: gtk.main_quit())
269
pp.show()
270
gtk.main()
271
272
273
class cmd_gannotate(GTKCommand):
274
"""GTK+ annotate.
275
276
Browse changes to FILENAME line by line in a GTK+ window.
277
"""
278
279
takes_args = ["filename", "line?"]
280
takes_options = [
281
Option("all", help="Show annotations on all lines."),
282
Option("plain", help="Don't highlight annotation lines."),
283
Option("line", type=int, argname="lineno",
284
help="Jump to specified line number."),
285
"revision",
286
]
287
aliases = ["gblame", "gpraise"]
288
289
def run(self, filename, all=False, plain=False, line='1', revision=None):
290
gtk = self.open_display()
291
292
try:
293
line = int(line)
294
except ValueError:
295
raise BzrCommandError('Line argument ("%s") is not a number.' %
296
line)
297
298
from annotate.gannotate import GAnnotateWindow
299
from annotate.config import GAnnotateConfig
300
from bzrlib.bzrdir import BzrDir
301
302
wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
303
if wt is not None:
304
tree = wt
305
else:
306
tree = br.basis_tree()
307
308
file_id = tree.path2id(path)
309
310
if file_id is None:
311
raise NotVersionedError(filename)
312
if revision is not None:
313
if len(revision) != 1:
314
raise BzrCommandError("Only 1 revion may be specified.")
315
revision_id = revision[0].in_history(br).rev_id
316
tree = br.repository.revision_tree(revision_id)
317
else:
318
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
319
320
window = GAnnotateWindow(all, plain)
321
window.connect("destroy", lambda w: gtk.main_quit())
322
config = GAnnotateConfig(window)
323
window.show()
324
br.lock_read()
325
if wt is not None:
326
wt.lock_read()
327
try:
328
window.annotate(tree, br, file_id)
329
window.jump_to_line(line)
330
gtk.main()
331
finally:
332
br.unlock()
333
if wt is not None:
334
wt.unlock()
335
336
337
338
class cmd_gcommit(GTKCommand):
339
"""GTK+ commit dialog
340
341
Graphical user interface for committing revisions"""
342
343
aliases = [ "gci" ]
344
takes_args = []
345
takes_options = []
346
347
def run(self, filename=None):
348
import os
349
self.open_display()
350
from commit import CommitDialog
351
from bzrlib.errors import (BzrCommandError,
352
NotBranchError,
353
NoWorkingTree)
354
355
wt = None
356
br = None
357
try:
358
(wt, path) = workingtree.WorkingTree.open_containing(filename)
359
br = wt.branch
360
except NoWorkingTree, e:
361
from dialog import error_dialog
362
error_dialog(_('Directory does not have a working tree'),
363
_('Operation aborted.'))
364
return 1 # should this be retval=3?
365
366
# It is a good habit to keep things locked for the duration, but it
367
# could cause difficulties if someone wants to do things in another
368
# window... We could lock_read() until we actually go to commit
369
# changes... Just a thought.
370
wt.lock_write()
371
try:
372
dlg = CommitDialog(wt)
373
return dlg.run()
374
finally:
375
wt.unlock()
376
377
378
class cmd_gstatus(GTKCommand):
379
"""GTK+ status dialog
380
381
Graphical user interface for showing status
382
information."""
383
384
aliases = [ "gst" ]
385
takes_args = ['PATH?']
386
takes_options = []
387
388
def run(self, path='.'):
389
import os
390
gtk = self.open_display()
391
from status import StatusDialog
392
(wt, wt_path) = workingtree.WorkingTree.open_containing(path)
393
status = StatusDialog(wt, wt_path)
394
status.connect("destroy", gtk.main_quit)
395
status.run()
396
397
398
class cmd_gsend(GTKCommand):
399
"""GTK+ send merge directive.
400
401
"""
402
def run(self):
403
(br, path) = branch.Branch.open_containing(".")
404
gtk = self.open_display()
405
from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
406
from StringIO import StringIO
407
dialog = SendMergeDirectiveDialog(br)
408
if dialog.run() == gtk.RESPONSE_OK:
409
outf = StringIO()
410
outf.writelines(dialog.get_merge_directive().to_lines())
411
mail_client = br.get_config().get_mail_client()
412
mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]",
413
outf.getvalue())
414
415
416
417
418
class cmd_gconflicts(GTKCommand):
419
"""GTK+ conflicts.
420
421
Select files from the list of conflicts and run an external utility to
422
resolve them.
423
"""
424
def run(self):
425
(wt, path) = workingtree.WorkingTree.open_containing('.')
426
self.open_display()
427
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
428
dialog = ConflictsDialog(wt)
429
dialog.run()
430
431
432
class cmd_gpreferences(GTKCommand):
433
""" GTK+ preferences dialog.
434
435
"""
436
def run(self):
437
self.open_display()
438
from bzrlib.plugins.gtk.preferences import PreferencesWindow
439
dialog = PreferencesWindow()
440
dialog.run()
441
442
443
class cmd_gmissing(Command):
444
""" GTK+ missing revisions dialog.
445
446
"""
447
takes_args = ["other_branch?"]
448
def run(self, other_branch=None):
449
pygtk = import_pygtk()
450
try:
451
import gtk
452
except RuntimeError, e:
453
if str(e) == "could not open display":
454
raise NoDisplayError
455
456
from bzrlib.plugins.gtk.missing import MissingWindow
457
from bzrlib.branch import Branch
458
459
local_branch = Branch.open_containing(".")[0]
460
if other_branch is None:
461
other_branch = local_branch.get_parent()
462
463
if other_branch is None:
464
raise errors.BzrCommandError("No peer location known or specified.")
465
remote_branch = Branch.open_containing(other_branch)[0]
466
set_ui_factory()
467
local_branch.lock_read()
468
try:
469
remote_branch.lock_read()
470
try:
471
dialog = MissingWindow(local_branch, remote_branch)
472
dialog.run()
473
finally:
474
remote_branch.unlock()
475
finally:
476
local_branch.unlock()
477
478
479
class cmd_ginit(GTKCommand):
480
def run(self):
481
self.open_display()
482
from initialize import InitDialog
483
dialog = InitDialog(os.path.abspath(os.path.curdir))
484
dialog.run()
485
486
487
class cmd_gtags(GTKCommand):
488
def run(self):
489
br = branch.Branch.open_containing('.')[0]
490
491
gtk = self.open_display()
492
from tags import TagsWindow
493
window = TagsWindow(br)
494
window.show()
495
gtk.main()
496
497
498
commands = [
499
cmd_gannotate,
500
cmd_gbranch,
501
cmd_gcheckout,
502
cmd_gcommit,
503
cmd_gconflicts,
504
cmd_gdiff,
505
cmd_ginit,
506
cmd_gmissing,
507
cmd_gpreferences,
508
cmd_gpush,
509
cmd_gsend,
510
cmd_gstatus,
511
cmd_gtags,
512
cmd_visualise
513
]
514
515
for cmd in commands:
516
register_command(cmd)
517
518
519
class cmd_commit_notify(GTKCommand):
520
"""Run the bzr commit notifier.
521
522
This is a background program which will pop up a notification on the users
523
screen when a commit occurs.
524
"""
525
526
def run(self):
527
from notify import NotifyPopupMenu
528
gtk = self.open_display()
529
menu = NotifyPopupMenu()
530
icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
531
icon.connect('popup-menu', menu.display)
532
533
import cgi
534
import dbus
535
import dbus.service
536
import pynotify
537
from bzrlib.bzrdir import BzrDir
538
from bzrlib import errors
539
from bzrlib.osutils import format_date
540
from bzrlib.transport import get_transport
541
if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
542
import dbus.glib
543
from bzrlib.plugins.dbus import activity
544
bus = dbus.SessionBus()
545
# get the object so we can subscribe to callbacks from it.
546
broadcast_service = bus.get_object(
547
activity.Broadcast.DBUS_NAME,
548
activity.Broadcast.DBUS_PATH)
549
550
def catch_branch(revision_id, urls):
551
# TODO: show all the urls, or perhaps choose the 'best'.
552
url = urls[0]
553
try:
554
if isinstance(revision_id, unicode):
555
revision_id = revision_id.encode('utf8')
556
transport = get_transport(url)
557
a_dir = BzrDir.open_from_transport(transport)
558
branch = a_dir.open_branch()
559
revno = branch.revision_id_to_revno(revision_id)
560
revision = branch.repository.get_revision(revision_id)
561
summary = 'New revision %d in %s' % (revno, url)
562
body = 'Committer: %s\n' % revision.committer
563
body += 'Date: %s\n' % format_date(revision.timestamp,
564
revision.timezone)
565
body += '\n'
566
body += revision.message
567
body = cgi.escape(body)
568
nw = pynotify.Notification(summary, body)
569
def start_viz(notification=None, action=None, data=None):
570
"""Start the viz program."""
571
pp = start_viz_window(branch, revision_id)
572
pp.show()
573
def start_branch(notification=None, action=None, data=None):
574
"""Start a Branch dialog"""
575
from bzrlib.plugins.gtk.branch import BranchDialog
576
bd = BranchDialog(remote_path=url)
577
bd.run()
578
nw.add_action("inspect", "Inspect", start_viz, None)
579
nw.add_action("branch", "Branch", start_branch, None)
580
nw.set_timeout(5000)
581
nw.show()
582
except Exception, e:
583
print e
584
raise
585
broadcast_service.connect_to_signal("Revision", catch_branch,
586
dbus_interface=activity.Broadcast.DBUS_INTERFACE)
587
pynotify.init("bzr commit-notify")
588
gtk.main()
589
590
register_command(cmd_commit_notify)
591
592
593
class cmd_gselftest(GTKCommand):
594
"""Version of selftest that displays a notification at the end"""
595
596
takes_args = builtins.cmd_selftest.takes_args
597
takes_options = builtins.cmd_selftest.takes_options
598
_see_also = ['selftest']
599
600
def run(self, *args, **kwargs):
601
import cgi
602
import sys
603
default_encoding = sys.getdefaultencoding()
604
# prevent gtk from blowing up later
605
gtk = import_pygtk()
606
# prevent gtk from messing with default encoding
607
import pynotify
608
if sys.getdefaultencoding() != default_encoding:
609
reload(sys)
610
sys.setdefaultencoding(default_encoding)
611
result = builtins.cmd_selftest().run(*args, **kwargs)
612
if result == 0:
613
summary = 'Success'
614
body = 'Selftest succeeded in "%s"' % os.getcwd()
615
if result == 1:
616
summary = 'Failure'
617
body = 'Selftest failed in "%s"' % os.getcwd()
618
pynotify.init("bzr gselftest")
619
note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
620
note.set_timeout(pynotify.EXPIRES_NEVER)
621
note.show()
622
623
624
register_command(cmd_gselftest)
625
626
627
class cmd_test_gtk(GTKCommand):
628
"""Version of selftest that just runs the gtk test suite."""
629
630
takes_options = ['verbose',
631
Option('one', short_name='1',
632
help='Stop when one test fails.'),
633
Option('benchmark', help='Run the benchmarks.'),
634
Option('lsprof-timed',
635
help='Generate lsprof output for benchmarked'
636
' sections of code.'),
637
Option('list-only',
638
help='List the tests instead of running them.'),
639
Option('randomize', type=str, argname="SEED",
640
help='Randomize the order of tests using the given'
641
' seed or "now" for the current time.'),
642
]
643
takes_args = ['testspecs*']
644
645
def run(self, verbose=None, one=False, benchmark=None,
646
lsprof_timed=None, list_only=False, randomize=None,
647
testspecs_list=None):
648
from bzrlib import __path__ as bzrlib_path
649
from bzrlib.tests import selftest
650
651
print '%10s: %s' % ('bzrlib', bzrlib_path[0])
652
if benchmark:
653
print 'No benchmarks yet'
654
return 3
655
656
test_suite_factory = bench_suite
657
if verbose is None:
658
verbose = True
659
# TODO: should possibly lock the history file...
660
benchfile = open(".perf_history", "at", buffering=1)
661
else:
662
test_suite_factory = test_suite
663
if verbose is None:
664
verbose = False
665
benchfile = None
666
667
if testspecs_list is not None:
668
pattern = '|'.join(testspecs_list)
669
else:
670
pattern = ".*"
671
672
try:
673
result = selftest(verbose=verbose,
674
pattern=pattern,
675
stop_on_failure=one,
676
test_suite_factory=test_suite_factory,
677
lsprof_timed=lsprof_timed,
678
bench_history=benchfile,
679
list_only=list_only,
680
random_seed=randomize,
681
)
682
finally:
683
if benchfile is not None:
684
benchfile.close()
685
686
register_command(cmd_test_gtk)
687
688
689
class cmd_ghandle_patch(GTKCommand):
690
"""Display a patch or merge directive, possibly merging.
691
692
This is a helper, meant to be launched from other programs like browsers
693
or email clients. Since these programs often do not allow parameters to
694
be provided, a "handle-patch" script is included.
695
"""
696
697
takes_args = ['path']
698
699
def run(self, path):
700
try:
701
from bzrlib.plugins.gtk.diff import (DiffWindow,
702
MergeDirectiveWindow)
703
lines = open(path, 'rb').readlines()
704
lines = [l.replace('\r\n', '\n') for l in lines]
705
try:
706
directive = merge_directive.MergeDirective.from_lines(lines)
707
except errors.NotAMergeDirective:
708
window = DiffWindow()
709
window.set_diff_text(path, lines)
710
else:
711
window = MergeDirectiveWindow(directive, path)
712
window.set_diff_text(path, directive.patch.splitlines(True))
713
window.show()
714
gtk = self.open_display()
715
window.connect("destroy", gtk.main_quit)
716
except Exception, e:
717
from dialog import error_dialog
718
error_dialog('Error', str(e))
719
raise
720
gtk.main()
721
722
723
register_command(cmd_ghandle_patch)
724
725
726
import gettext
727
gettext.install('olive-gtk')
728
729
730
class NoDisplayError(BzrCommandError):
731
"""gtk could not find a proper display"""
732
733
def __str__(self):
734
return "No DISPLAY. Unable to run GTK+ application."
735
736
737
def test_suite():
738
from unittest import TestSuite
739
import tests
162
740
import sys
163
741
default_encoding = sys.getdefaultencoding()
164
742
try:
165
result = basic_tests
743
result = TestSuite()
166
744
try:
167
import gi.repository.Gtk
168
except ImportError:
169
return basic_tests
170
basic_tests.addTest(loader.loadTestsFromModuleNames(
171
["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
745
import_pygtk()
746
except errors.BzrCommandError:
747
return result
748
result.addTest(tests.test_suite())
172
749
finally:
173
750
if sys.getdefaultencoding() != default_encoding:
174
751
reload(sys)
175
752
sys.setdefaultencoding(default_encoding)
176
return basic_tests
177
753
return result
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0