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