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 553.1.2
- compare with another revision
- download diff
- download tarball
- view history from revision 553.1.2
- Committer: Jelmer Vernooij
- Date: 2008-07-18 20:12:54 UTC
- mto: This revision was merged to the branch mainline in revision 555.
- Revision ID: jelmer@samba.org-20080718201254-phkice8vdvr2svvm
Fix license path finding.
- files added:
- bzr-notify
- olive
- files removed:
- avatarproviders.py
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- bzr-handle-patch.desktop.in => bzr-handle-patch.desktop
- files modified:
- AUTHORS
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
gannotate GTK+ annotate.
19
gbranch GTK+ branching.
20
gcheckout GTK+ checkout.
21
21
gcommit GTK+ commit dialog.
22
gconflicts GTK+ conflicts.
23
gdiff Show differences in working tree in a GTK+ Window.
22
gconflicts GTK+ conflicts.
23
gdiff Show differences in working tree in a GTK+ Window.
24
24
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.
25
gmissing GTK+ missing revisions dialog.
26
gpreferences GTK+ preferences dialog.
29
27
gpush GTK+ push.
30
28
gsend GTK+ send merge directive.
31
29
gstatus GTK+ status dialog.
32
30
gtags Manage branch tags.
33
visualise Graphically visualise this branch.
31
visualise Graphically visualise this branch.
34
32
"""
35
33
36
from __future__ import absolute_import
37
38
import os
39
34
import sys
40
35
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
36
import bzrlib
55
import bzrlib.api
56
from bzrlib.commands import plugin_cmds
57
37
58
from bzrlib.plugins.gtk.info import (
59
bzr_plugin_version as version_info,
60
bzr_compatible_versions,
61
)
38
version_info = (0, 95, 0, 'dev', 1)
62
39
63
40
if version_info[3] == 'final':
64
41
version_string = '%d.%d.%d' % version_info[:3]
66
43
version_string = '%d.%d.%d%s%d' % version_info
67
44
__version__ = version_string
68
45
69
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
70
46
required_bzrlib = (1, 3)
47
48
def check_bzrlib_version(desired):
49
"""Check that bzrlib is compatible.
50
51
If version is < bzr-gtk version, assume incompatible.
52
"""
53
bzrlib_version = bzrlib.version_info[:2]
54
try:
55
from bzrlib.trace import warning
56
except ImportError:
57
# get the message out any way we can
58
from warnings import warn as warning
59
if bzrlib_version < desired:
60
from bzrlib.errors import BzrError
61
warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
62
' %s.' % (bzrlib.__version__, __version__))
63
raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
64
65
66
if version_info[2] == "final":
67
check_bzrlib_version(required_bzrlib)
68
69
from bzrlib.trace import warning
71
70
if __name__ != 'bzrlib.plugins.gtk':
72
from bzrlib.trace import warning
73
71
warning("Not running as bzrlib.plugins.gtk, things may break.")
74
72
73
from bzrlib.lazy_import import lazy_import
74
lazy_import(globals(), """
75
from bzrlib import (
76
branch,
77
builtins,
78
errors,
79
merge_directive,
80
workingtree,
81
)
82
""")
83
84
from bzrlib.commands import Command, register_command, display_command
85
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
86
from bzrlib.option import Option
87
88
import os.path
89
90
def import_pygtk():
91
try:
92
import pygtk
93
except ImportError:
94
raise errors.BzrCommandError("PyGTK not installed.")
95
pygtk.require('2.0')
96
return pygtk
97
75
98
76
99
def set_ui_factory():
77
from bzrlib.plugins.gtk.ui import GtkUIFactory
100
import_pygtk()
101
from ui import GtkUIFactory
78
102
import bzrlib.ui
79
103
bzrlib.ui.ui_factory = GtkUIFactory()
80
104
97
121
return data_path(os.path.join('icons', *args))
98
122
99
123
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
]
124
def open_display():
125
pygtk = import_pygtk()
126
try:
127
import gtk
128
except RuntimeError, e:
129
if str(e) == "could not open display":
130
raise NoDisplayError
131
set_ui_factory()
132
return gtk
133
134
135
class GTKCommand(Command):
136
"""Abstract class providing GTK specific run commands."""
137
138
def run(self):
139
open_display()
140
dialog = self.get_gtk_dialog(os.path.abspath('.'))
141
dialog.run()
142
143
144
class cmd_gbranch(GTKCommand):
145
"""GTK+ branching.
146
147
"""
148
149
def get_gtk_dialog(self, path):
150
from bzrlib.plugins.gtk.branch import BranchDialog
151
return BranchDialog(path)
152
153
154
class cmd_gcheckout(GTKCommand):
155
""" GTK+ checkout.
156
157
"""
158
159
def get_gtk_dialog(self, path):
160
from bzrlib.plugins.gtk.checkout import CheckoutDialog
161
return CheckoutDialog(path)
162
163
164
165
class cmd_gpush(GTKCommand):
166
""" GTK+ push.
167
168
"""
169
takes_args = [ "location?" ]
170
171
def run(self, location="."):
172
(br, path) = branch.Branch.open_containing(location)
173
open_display()
174
from push import PushDialog
175
dialog = PushDialog(br.repository, br.last_revision(), br)
176
dialog.run()
177
178
179
180
class cmd_gdiff(GTKCommand):
181
"""Show differences in working tree in a GTK+ Window.
182
183
Otherwise, all changes for the tree are listed.
184
"""
185
takes_args = ['filename?']
186
takes_options = ['revision']
187
188
@display_command
189
def run(self, revision=None, filename=None):
190
set_ui_factory()
191
wt = workingtree.WorkingTree.open_containing(".")[0]
192
wt.lock_read()
193
try:
194
branch = wt.branch
195
if revision is not None:
196
if len(revision) == 1:
197
tree1 = wt
198
revision_id = revision[0].as_revision_id(tree1.branch)
199
tree2 = branch.repository.revision_tree(revision_id)
200
elif len(revision) == 2:
201
revision_id_0 = revision[0].as_revision_id(branch)
202
tree2 = branch.repository.revision_tree(revision_id_0)
203
revision_id_1 = revision[1].as_revision_id(branch)
204
tree1 = branch.repository.revision_tree(revision_id_1)
205
else:
206
tree1 = wt
207
tree2 = tree1.basis_tree()
208
209
from diff import DiffWindow
210
import gtk
211
window = DiffWindow()
212
window.connect("destroy", gtk.main_quit)
213
window.set_diff("Working Tree", tree1, tree2)
214
if filename is not None:
215
tree_filename = wt.relpath(filename)
216
try:
217
window.set_file(tree_filename)
218
except NoSuchFile:
219
if (tree1.path2id(tree_filename) is None and
220
tree2.path2id(tree_filename) is None):
221
raise NotVersionedError(filename)
222
raise BzrCommandError('No changes found for file "%s"' %
223
filename)
224
window.show()
225
226
gtk.main()
227
finally:
228
wt.unlock()
229
230
231
def start_viz_window(branch, revisions, limit=None):
232
"""Start viz on branch with revision revision.
233
234
:return: The viz window object.
235
"""
236
from viz import BranchWindow
237
return BranchWindow(branch, revisions, limit)
238
239
240
class cmd_visualise(Command):
241
"""Graphically visualise this branch.
242
243
Opens a graphical window to allow you to see the history of the branch
244
and relationships between revisions in a visual manner,
245
246
The default starting point is latest revision on the branch, you can
247
specify a starting point with -r revision.
248
"""
249
takes_options = [
250
"revision",
251
Option('limit', "Maximum number of revisions to display.",
252
int, 'count')]
253
takes_args = [ "locations*" ]
254
aliases = [ "visualize", "vis", "viz" ]
255
256
def run(self, locations_list, revision=None, limit=None):
257
set_ui_factory()
258
if locations_list is None:
259
locations_list = ["."]
260
revids = []
261
for location in locations_list:
262
(br, path) = branch.Branch.open_containing(location)
263
if revision is None:
264
revids.append(br.last_revision())
265
else:
266
revids.append(revision[0].as_revision_id(br))
267
import gtk
268
pp = start_viz_window(br, revids, limit)
269
pp.connect("destroy", lambda w: gtk.main_quit())
270
pp.show()
271
gtk.main()
272
273
274
class cmd_gannotate(GTKCommand):
275
"""GTK+ annotate.
276
277
Browse changes to FILENAME line by line in a GTK+ window.
278
"""
279
280
takes_args = ["filename", "line?"]
281
takes_options = [
282
Option("all", help="Show annotations on all lines."),
283
Option("plain", help="Don't highlight annotation lines."),
284
Option("line", type=int, argname="lineno",
285
help="Jump to specified line number."),
286
"revision",
287
]
288
aliases = ["gblame", "gpraise"]
289
290
def run(self, filename, all=False, plain=False, line='1', revision=None):
291
gtk = open_display()
292
293
try:
294
line = int(line)
295
except ValueError:
296
raise BzrCommandError('Line argument ("%s") is not a number.' %
297
line)
298
299
from annotate.gannotate import GAnnotateWindow
300
from annotate.config import GAnnotateConfig
301
from bzrlib.bzrdir import BzrDir
302
303
wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
304
if wt is not None:
305
tree = wt
306
else:
307
tree = br.basis_tree()
308
309
file_id = tree.path2id(path)
310
311
if file_id is None:
312
raise NotVersionedError(filename)
313
if revision is not None:
314
if len(revision) != 1:
315
raise BzrCommandError("Only 1 revion may be specified.")
316
revision_id = revision[0].as_revision_id(br)
317
tree = br.repository.revision_tree(revision_id)
318
else:
319
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
320
321
window = GAnnotateWindow(all, plain, branch=br)
322
window.connect("destroy", lambda w: gtk.main_quit())
323
config = GAnnotateConfig(window)
324
window.show()
325
br.lock_read()
326
if wt is not None:
327
wt.lock_read()
328
try:
329
window.annotate(tree, br, file_id)
330
window.jump_to_line(line)
331
gtk.main()
332
finally:
333
br.unlock()
334
if wt is not None:
335
wt.unlock()
336
337
338
339
class cmd_gcommit(GTKCommand):
340
"""GTK+ commit dialog
341
342
Graphical user interface for committing revisions"""
343
344
aliases = [ "gci" ]
345
takes_args = []
346
takes_options = []
347
348
def run(self, filename=None):
349
import os
350
open_display()
351
from commit import CommitDialog
352
from bzrlib.errors import (BzrCommandError,
353
NotBranchError,
354
NoWorkingTree)
355
356
wt = None
357
br = None
358
try:
359
(wt, path) = workingtree.WorkingTree.open_containing(filename)
360
br = wt.branch
361
except NoWorkingTree, e:
362
from dialog import error_dialog
363
error_dialog(_i18n('Directory does not have a working tree'),
364
_i18n('Operation aborted.'))
365
return 1 # should this be retval=3?
366
367
# It is a good habit to keep things locked for the duration, but it
368
# could cause difficulties if someone wants to do things in another
369
# window... We could lock_read() until we actually go to commit
370
# changes... Just a thought.
371
wt.lock_write()
372
try:
373
dlg = CommitDialog(wt)
374
return dlg.run()
375
finally:
376
wt.unlock()
377
378
379
class cmd_gstatus(GTKCommand):
380
"""GTK+ status dialog
381
382
Graphical user interface for showing status
383
information."""
384
385
aliases = [ "gst" ]
386
takes_args = ['PATH?']
387
takes_options = ['revision']
388
389
def run(self, path='.', revision=None):
390
import os
391
gtk = open_display()
392
from status import StatusDialog
393
(wt, wt_path) = workingtree.WorkingTree.open_containing(path)
394
395
if revision is not None:
396
try:
397
revision_id = revision[0].as_revision_id(wt.branch)
398
except:
399
from bzrlib.errors import BzrError
400
raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
401
else:
402
revision_id = None
403
404
status = StatusDialog(wt, wt_path, revision_id)
405
status.connect("destroy", gtk.main_quit)
406
status.run()
407
408
409
class cmd_gsend(GTKCommand):
410
"""GTK+ send merge directive.
411
412
"""
413
def run(self):
414
(br, path) = branch.Branch.open_containing(".")
415
gtk = open_display()
416
from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
417
from StringIO import StringIO
418
dialog = SendMergeDirectiveDialog(br)
419
if dialog.run() == gtk.RESPONSE_OK:
420
outf = StringIO()
421
outf.writelines(dialog.get_merge_directive().to_lines())
422
mail_client = br.get_config().get_mail_client()
423
mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]",
424
outf.getvalue())
425
426
427
428
429
class cmd_gconflicts(GTKCommand):
430
"""GTK+ conflicts.
431
432
Select files from the list of conflicts and run an external utility to
433
resolve them.
434
"""
435
def run(self):
436
(wt, path) = workingtree.WorkingTree.open_containing('.')
437
open_display()
438
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
439
dialog = ConflictsDialog(wt)
440
dialog.run()
441
442
443
class cmd_gpreferences(GTKCommand):
444
""" GTK+ preferences dialog.
445
446
"""
447
def run(self):
448
open_display()
449
from bzrlib.plugins.gtk.preferences import PreferencesWindow
450
dialog = PreferencesWindow()
451
dialog.run()
452
453
454
class cmd_gmissing(Command):
455
""" GTK+ missing revisions dialog.
456
457
"""
458
takes_args = ["other_branch?"]
459
def run(self, other_branch=None):
460
pygtk = import_pygtk()
461
try:
462
import gtk
463
except RuntimeError, e:
464
if str(e) == "could not open display":
465
raise NoDisplayError
466
467
from bzrlib.plugins.gtk.missing import MissingWindow
468
from bzrlib.branch import Branch
469
470
local_branch = Branch.open_containing(".")[0]
471
if other_branch is None:
472
other_branch = local_branch.get_parent()
473
474
if other_branch is None:
475
raise errors.BzrCommandError("No peer location known or specified.")
476
remote_branch = Branch.open_containing(other_branch)[0]
477
set_ui_factory()
478
local_branch.lock_read()
479
try:
480
remote_branch.lock_read()
481
try:
482
dialog = MissingWindow(local_branch, remote_branch)
483
dialog.run()
484
finally:
485
remote_branch.unlock()
486
finally:
487
local_branch.unlock()
488
489
490
class cmd_ginit(GTKCommand):
491
def run(self):
492
open_display()
493
from initialize import InitDialog
494
dialog = InitDialog(os.path.abspath(os.path.curdir))
495
dialog.run()
496
497
498
class cmd_gtags(GTKCommand):
499
def run(self):
500
br = branch.Branch.open_containing('.')[0]
501
502
gtk = open_display()
503
from tags import TagsWindow
504
window = TagsWindow(br)
505
window.show()
506
gtk.main()
507
508
509
commands = [
510
cmd_gannotate,
511
cmd_gbranch,
512
cmd_gcheckout,
513
cmd_gcommit,
514
cmd_gconflicts,
515
cmd_gdiff,
516
cmd_ginit,
517
cmd_gmissing,
518
cmd_gpreferences,
519
cmd_gpush,
520
cmd_gsend,
521
cmd_gstatus,
522
cmd_gtags,
523
cmd_visualise
524
]
525
526
for cmd in commands:
527
register_command(cmd)
528
529
530
class cmd_gselftest(GTKCommand):
531
"""Version of selftest that displays a notification at the end"""
532
533
takes_args = builtins.cmd_selftest.takes_args
534
takes_options = builtins.cmd_selftest.takes_options
535
_see_also = ['selftest']
536
537
def run(self, *args, **kwargs):
538
import cgi
539
import sys
540
default_encoding = sys.getdefaultencoding()
541
# prevent gtk from blowing up later
542
gtk = import_pygtk()
543
# prevent gtk from messing with default encoding
544
import pynotify
545
if sys.getdefaultencoding() != default_encoding:
546
reload(sys)
547
sys.setdefaultencoding(default_encoding)
548
result = builtins.cmd_selftest().run(*args, **kwargs)
549
if result == 0:
550
summary = 'Success'
551
body = 'Selftest succeeded in "%s"' % os.getcwd()
552
if result == 1:
553
summary = 'Failure'
554
body = 'Selftest failed in "%s"' % os.getcwd()
555
pynotify.init("bzr gselftest")
556
note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
557
note.set_timeout(pynotify.EXPIRES_NEVER)
558
note.show()
559
560
561
register_command(cmd_gselftest)
562
563
564
class cmd_test_gtk(GTKCommand):
565
"""Version of selftest that just runs the gtk test suite."""
566
567
takes_options = ['verbose',
568
Option('one', short_name='1',
569
help='Stop when one test fails.'),
570
Option('benchmark', help='Run the benchmarks.'),
571
Option('lsprof-timed',
572
help='Generate lsprof output for benchmarked'
573
' sections of code.'),
574
Option('list-only',
575
help='List the tests instead of running them.'),
576
Option('randomize', type=str, argname="SEED",
577
help='Randomize the order of tests using the given'
578
' seed or "now" for the current time.'),
579
]
580
takes_args = ['testspecs*']
581
582
def run(self, verbose=None, one=False, benchmark=None,
583
lsprof_timed=None, list_only=False, randomize=None,
584
testspecs_list=None):
585
from bzrlib import __path__ as bzrlib_path
586
from bzrlib.tests import selftest
587
588
print '%10s: %s' % ('bzrlib', bzrlib_path[0])
589
if benchmark:
590
print 'No benchmarks yet'
591
return 3
592
593
test_suite_factory = bench_suite
594
if verbose is None:
595
verbose = True
596
# TODO: should possibly lock the history file...
597
benchfile = open(".perf_history", "at", buffering=1)
598
else:
599
test_suite_factory = test_suite
600
if verbose is None:
601
verbose = False
602
benchfile = None
603
604
if testspecs_list is not None:
605
pattern = '|'.join(testspecs_list)
606
else:
607
pattern = ".*"
608
609
try:
610
result = selftest(verbose=verbose,
611
pattern=pattern,
612
stop_on_failure=one,
613
test_suite_factory=test_suite_factory,
614
lsprof_timed=lsprof_timed,
615
bench_history=benchfile,
616
list_only=list_only,
617
random_seed=randomize,
618
)
619
finally:
620
if benchfile is not None:
621
benchfile.close()
622
623
register_command(cmd_test_gtk)
624
625
626
627
import gettext
628
gettext.install('olive-gtk')
629
630
# Let's create a specialized alias to protect '_' from being erased by other
631
# uses of '_' as an anonymous variable (think pdb for one).
632
_i18n = gettext.gettext
633
634
class NoDisplayError(BzrCommandError):
635
"""gtk could not find a proper display"""
636
637
def __str__(self):
638
return "No DISPLAY. Unable to run GTK+ application."
639
640
641
def test_suite():
642
from unittest import TestSuite
643
import tests
162
644
import sys
163
645
default_encoding = sys.getdefaultencoding()
164
646
try:
165
result = basic_tests
647
result = TestSuite()
166
648
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]))
649
import_pygtk()
650
except errors.BzrCommandError:
651
return result
652
result.addTest(tests.test_suite())
172
653
finally:
173
654
if sys.getdefaultencoding() != default_encoding:
174
655
reload(sys)
175
656
sys.setdefaultencoding(default_encoding)
176
return basic_tests
177
657
return result
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0