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 248
- compare with another revision
- download diff
- download tarball
- view history from revision 248
- Committer: Jelmer Vernooij
- Date: 2007-07-23 14:38:44 UTC
- mfrom: (235.1.8 gtk)
- Revision ID: jelmer@samba.org-20070723143844-0ff13ktjb3pf0jt3
Merge fixes for #127392 and #127381)
- files added:
- bzr-notify.desktop
- olive
- files removed:
- avatarproviders.py
- branchview
- preferences
- files renamed:
- bazaar-properties.desktop.in => bazaar-properties.desktop
- icons/bzr-icon-64.png => bzr-icon-64.png
- revisionview.py => logview.py
- icons/oliveicon2.png => oliveicon2.png
- preferences/__init__.py => preferences.py
- branchview/linegraph.py => viz/graph.py
- branchview/graphcell.py => viz/graphcell.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.
21
gcommit GTK+ commit dialog.
22
gconflicts GTK+ conflicts.
23
gdiff Show differences in working tree in a GTK+ Window.
18
commit-notify Start the graphical notifier of commits.
19
gannotate GTK+ annotate.
20
gbranch GTK+ branching.
21
gcheckout GTK+ checkout.
22
gcommit GTK+ commit dialog
23
gconflicts GTK+ push.
24
gdiff Show differences in working tree in a GTK+ Window.
24
25
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.
29
gpush GTK+ push.
30
gsend GTK+ send merge directive.
31
gstatus GTK+ status dialog.
26
gmissing GTK+ missing revisions dialog.
27
gpreferences GTK+ preferences dialog.
28
gpush GTK+ push.
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
import sys
40
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
34
import bzrlib
55
import bzrlib.api
56
from bzrlib.commands import plugin_cmds
57
58
from bzrlib.plugins.gtk.info import (
59
bzr_plugin_version as version_info,
60
bzr_compatible_versions,
61
)
62
63
if version_info[3] == 'final':
64
version_string = '%d.%d.%d' % version_info[:3]
65
else:
66
version_string = '%d.%d.%d%s%d' % version_info
67
__version__ = version_string
68
69
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
70
35
36
__version__ = '0.19.0'
37
version_info = tuple(int(n) for n in __version__.split('.'))
38
39
40
def check_bzrlib_version(desired):
41
"""Check that bzrlib is compatible.
42
43
If version is < bzr-gtk version, assume incompatible.
44
If version == bzr-gtk version, assume completely compatible
45
If version == bzr-gtk version + 1, assume compatible, with deprecations
46
Otherwise, assume incompatible.
47
"""
48
desired_plus = (desired[0], desired[1]+1)
49
bzrlib_version = bzrlib.version_info[:2]
50
if bzrlib_version == desired or (bzrlib_version == desired_plus and
51
bzrlib.version_info[3] == 'dev'):
52
return
53
try:
54
from bzrlib.trace import warning
55
except ImportError:
56
# get the message out any way we can
57
from warnings import warn as warning
58
if bzrlib_version < desired:
59
from bzrlib.errors import BzrError
60
warning('Installed bzr version %s is too old to be used with bzr-gtk'
61
' %s.' % (bzrlib.__version__, __version__))
62
raise BzrError('Version mismatch: %r' % version_info)
63
else:
64
warning('bzr-gtk is not up to date with installed bzr version %s.'
65
' \nThere should be a newer version available, e.g. %i.%i.'
66
% (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
67
68
69
check_bzrlib_version(version_info[:2])
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
errors,
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
81
105
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
]
106
def data_path():
107
return os.path.dirname(__file__)
108
109
110
class GTKCommand(Command):
111
"""Abstract class providing GTK specific run commands."""
112
113
def open_display(self):
114
pygtk = import_pygtk()
115
try:
116
import gtk
117
except RuntimeError, e:
118
if str(e) == "could not open display":
119
raise NoDisplayError
120
set_ui_factory()
121
return gtk
122
123
def run(self):
124
self.open_display()
125
dialog = self.get_gtk_dialog(os.path.abspath('.'))
126
dialog.run()
127
128
129
class cmd_gbranch(GTKCommand):
130
"""GTK+ branching.
131
132
"""
133
134
def get_gtk_dialog(self, path):
135
from bzrlib.plugins.gtk.branch import BranchDialog
136
return BranchDialog(path)
137
138
139
class cmd_gcheckout(GTKCommand):
140
""" GTK+ checkout.
141
142
"""
143
144
def get_gtk_dialog(self, path):
145
from bzrlib.plugins.gtk.checkout import CheckoutDialog
146
return CheckoutDialog(path)
147
148
149
150
class cmd_gpush(GTKCommand):
151
""" GTK+ push.
152
153
"""
154
takes_args = [ "location?" ]
155
156
def run(self, location="."):
157
(br, path) = branch.Branch.open_containing(location)
158
self.open_display()
159
from push import PushDialog
160
dialog = PushDialog(br.repository, br.last_revision(), br)
161
dialog.run()
162
163
164
165
class cmd_gdiff(GTKCommand):
166
"""Show differences in working tree in a GTK+ Window.
167
168
Otherwise, all changes for the tree are listed.
169
"""
170
takes_args = ['filename?']
171
takes_options = ['revision']
172
173
@display_command
174
def run(self, revision=None, filename=None):
175
set_ui_factory()
176
wt = workingtree.WorkingTree.open_containing(".")[0]
177
wt.lock_read()
178
try:
179
branch = wt.branch
180
if revision is not None:
181
if len(revision) == 1:
182
tree1 = wt
183
revision_id = revision[0].in_history(branch).rev_id
184
tree2 = branch.repository.revision_tree(revision_id)
185
elif len(revision) == 2:
186
revision_id_0 = revision[0].in_history(branch).rev_id
187
tree2 = branch.repository.revision_tree(revision_id_0)
188
revision_id_1 = revision[1].in_history(branch).rev_id
189
tree1 = branch.repository.revision_tree(revision_id_1)
190
else:
191
tree1 = wt
192
tree2 = tree1.basis_tree()
193
194
from diff import DiffWindow
195
import gtk
196
window = DiffWindow()
197
window.connect("destroy", gtk.main_quit)
198
window.set_diff("Working Tree", tree1, tree2)
199
if filename is not None:
200
tree_filename = wt.relpath(filename)
201
try:
202
window.set_file(tree_filename)
203
except NoSuchFile:
204
if (tree1.path2id(tree_filename) is None and
205
tree2.path2id(tree_filename) is None):
206
raise NotVersionedError(filename)
207
raise BzrCommandError('No changes found for file "%s"' %
208
filename)
209
window.show()
210
211
gtk.main()
212
finally:
213
wt.unlock()
214
215
216
def start_viz_window(branch, revision, limit=None):
217
"""Start viz on branch with revision revision.
218
219
:return: The viz window object.
220
"""
221
from viz.branchwin import BranchWindow
222
branch.lock_read()
223
pp = BranchWindow()
224
pp.set_branch(branch, revision, limit)
225
# cleanup locks when the window is closed
226
pp.connect("destroy", lambda w: branch.unlock())
227
return pp
228
229
230
class cmd_visualise(Command):
231
"""Graphically visualise this branch.
232
233
Opens a graphical window to allow you to see the history of the branch
234
and relationships between revisions in a visual manner,
235
236
The default starting point is latest revision on the branch, you can
237
specify a starting point with -r revision.
238
"""
239
takes_options = [
240
"revision",
241
Option('limit', "Maximum number of revisions to display.",
242
int, 'count')]
243
takes_args = [ "location?" ]
244
aliases = [ "visualize", "vis", "viz" ]
245
246
def run(self, location=".", revision=None, limit=None):
247
set_ui_factory()
248
(br, path) = branch.Branch.open_containing(location)
249
br.lock_read()
250
try:
251
if revision is None:
252
revid = br.last_revision()
253
if revid is None:
254
return
255
else:
256
(revno, revid) = revision[0].in_history(br)
257
258
import gtk
259
pp = start_viz_window(br, revid, limit)
260
pp.connect("destroy", lambda w: gtk.main_quit())
261
pp.show()
262
gtk.main()
263
finally:
264
br.unlock()
265
266
267
class cmd_gannotate(GTKCommand):
268
"""GTK+ annotate.
269
270
Browse changes to FILENAME line by line in a GTK+ window.
271
"""
272
273
takes_args = ["filename", "line?"]
274
takes_options = [
275
Option("all", help="Show annotations on all lines."),
276
Option("plain", help="Don't highlight annotation lines."),
277
Option("line", type=int, argname="lineno",
278
help="Jump to specified line number."),
279
"revision",
280
]
281
aliases = ["gblame", "gpraise"]
282
283
def run(self, filename, all=False, plain=False, line='1', revision=None):
284
gtk = self.open_display()
285
286
try:
287
line = int(line)
288
except ValueError:
289
raise BzrCommandError('Line argument ("%s") is not a number.' %
290
line)
291
292
from annotate.gannotate import GAnnotateWindow
293
from annotate.config import GAnnotateConfig
294
from bzrlib.bzrdir import BzrDir
295
296
wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
297
if wt is not None:
298
tree = wt
299
else:
300
tree = br.basis_tree()
301
302
file_id = tree.path2id(path)
303
304
if file_id is None:
305
raise NotVersionedError(filename)
306
if revision is not None:
307
if len(revision) != 1:
308
raise BzrCommandError("Only 1 revion may be specified.")
309
revision_id = revision[0].in_history(br).rev_id
310
tree = br.repository.revision_tree(revision_id)
311
else:
312
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
313
314
window = GAnnotateWindow(all, plain)
315
window.connect("destroy", lambda w: gtk.main_quit())
316
window.set_title(path + " - gannotate")
317
config = GAnnotateConfig(window)
318
window.show()
319
br.lock_read()
320
if wt is not None:
321
wt.lock_read()
322
try:
323
window.annotate(tree, br, file_id)
324
window.jump_to_line(line)
325
gtk.main()
326
finally:
327
br.unlock()
328
if wt is not None:
329
wt.unlock()
330
331
332
333
class cmd_gcommit(GTKCommand):
334
"""GTK+ commit dialog
335
336
Graphical user interface for committing revisions"""
337
338
aliases = [ "gci" ]
339
takes_args = []
340
takes_options = []
341
342
def run(self, filename=None):
343
import os
344
self.open_display()
345
from commit import CommitDialog
346
from bzrlib.errors import (BzrCommandError,
347
NotBranchError,
348
NoWorkingTree)
349
350
wt = None
351
br = None
352
try:
353
(wt, path) = workingtree.WorkingTree.open_containing(filename)
354
br = wt.branch
355
except NoWorkingTree, e:
356
path = e.base
357
(br, path) = branch.Branch.open_containing(path)
358
359
commit = CommitDialog(wt, path, not br)
360
commit.run()
361
362
363
364
class cmd_gstatus(GTKCommand):
365
"""GTK+ status dialog
366
367
Graphical user interface for showing status
368
information."""
369
370
aliases = [ "gst" ]
371
takes_args = ['PATH?']
372
takes_options = []
373
374
def run(self, path='.'):
375
import os
376
gtk = self.open_display()
377
from status import StatusDialog
378
(wt, wt_path) = workingtree.WorkingTree.open_containing(path)
379
status = StatusDialog(wt, wt_path)
380
status.connect("destroy", gtk.main_quit)
381
status.run()
382
383
384
385
class cmd_gconflicts(GTKCommand):
386
""" GTK+ push.
387
388
"""
389
def run(self):
390
(wt, path) = workingtree.WorkingTree.open_containing('.')
391
self.open_display()
392
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
393
dialog = ConflictsDialog(wt)
394
dialog.run()
395
396
397
398
class cmd_gpreferences(GTKCommand):
399
""" GTK+ preferences dialog.
400
401
"""
402
def run(self):
403
self.open_display()
404
from bzrlib.plugins.gtk.preferences import PreferencesWindow
405
dialog = PreferencesWindow()
406
dialog.run()
407
408
409
410
class cmd_gmissing(Command):
411
""" GTK+ missing revisions dialog.
412
413
"""
414
takes_args = ["other_branch?"]
415
def run(self, other_branch=None):
416
pygtk = import_pygtk()
417
try:
418
import gtk
419
except RuntimeError, e:
420
if str(e) == "could not open display":
421
raise NoDisplayError
422
423
from bzrlib.plugins.gtk.missing import MissingWindow
424
from bzrlib.branch import Branch
425
426
local_branch = Branch.open_containing(".")[0]
427
if other_branch is None:
428
other_branch = local_branch.get_parent()
429
430
if other_branch is None:
431
raise errors.BzrCommandError("No peer location known or specified.")
432
remote_branch = Branch.open_containing(other_branch)[0]
433
set_ui_factory()
434
local_branch.lock_read()
435
try:
436
remote_branch.lock_read()
437
try:
438
dialog = MissingWindow(local_branch, remote_branch)
439
dialog.run()
440
finally:
441
remote_branch.unlock()
442
finally:
443
local_branch.unlock()
444
445
446
class cmd_ginit(GTKCommand):
447
def run(self):
448
self.open_display()
449
from initialize import InitDialog
450
dialog = InitDialog(os.path.abspath(os.path.curdir))
451
dialog.run()
452
453
454
class cmd_gtags(GTKCommand):
455
def run(self):
456
br = branch.Branch.open_containing('.')[0]
457
458
gtk = self.open_display()
459
from tags import TagsWindow
460
window = TagsWindow(br)
461
window.show()
462
gtk.main()
463
464
465
commands = [
466
cmd_gmissing,
467
cmd_gpreferences,
468
cmd_gconflicts,
469
cmd_gstatus,
470
cmd_gcommit,
471
cmd_gannotate,
472
cmd_visualise,
473
cmd_gdiff,
474
cmd_gpush,
475
cmd_gcheckout,
476
cmd_gbranch,
477
cmd_ginit,
478
cmd_gtags
479
]
480
481
for cmd in commands:
482
register_command(cmd)
483
484
485
class cmd_commit_notify(GTKCommand):
486
"""Run the bzr commit notifier.
487
488
This is a background program which will pop up a notification on the users
489
screen when a commit occurs.
490
"""
491
492
def run(self):
493
from notify import NotifyPopupMenu
494
gtk = self.open_display()
495
menu = NotifyPopupMenu()
496
icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
497
icon.connect('popup-menu', menu.display)
498
499
import cgi
500
import dbus
501
import dbus.service
502
import pynotify
503
from bzrlib.bzrdir import BzrDir
504
from bzrlib import errors
505
from bzrlib.osutils import format_date
506
from bzrlib.transport import get_transport
507
if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
508
import dbus.glib
509
from bzrlib.plugins.dbus import activity
510
bus = dbus.SessionBus()
511
# get the object so we can subscribe to callbacks from it.
512
broadcast_service = bus.get_object(
513
activity.Broadcast.DBUS_NAME,
514
activity.Broadcast.DBUS_PATH)
515
516
def catch_branch(revision_id, urls):
517
# TODO: show all the urls, or perhaps choose the 'best'.
518
url = urls[0]
519
try:
520
if isinstance(revision_id, unicode):
521
revision_id = revision_id.encode('utf8')
522
transport = get_transport(url)
523
a_dir = BzrDir.open_from_transport(transport)
524
branch = a_dir.open_branch()
525
revno = branch.revision_id_to_revno(revision_id)
526
revision = branch.repository.get_revision(revision_id)
527
summary = 'New revision %d in %s' % (revno, url)
528
body = 'Committer: %s\n' % revision.committer
529
body += 'Date: %s\n' % format_date(revision.timestamp,
530
revision.timezone)
531
body += '\n'
532
body += revision.message
533
body = cgi.escape(body)
534
nw = pynotify.Notification(summary, body)
535
def start_viz(notification=None, action=None, data=None):
536
"""Start the viz program."""
537
pp = start_viz_window(branch, revision_id)
538
pp.show()
539
def start_branch(notification=None, action=None, data=None):
540
"""Start a Branch dialog"""
541
from bzrlib.plugins.gtk.branch import BranchDialog
542
bd = BranchDialog(remote_path=url)
543
bd.run()
544
nw.add_action("inspect", "Inspect", start_viz, None)
545
nw.add_action("branch", "Branch", start_branch, None)
546
nw.set_timeout(5000)
547
nw.show()
548
except Exception, e:
549
print e
550
raise
551
broadcast_service.connect_to_signal("Revision", catch_branch,
552
dbus_interface=activity.Broadcast.DBUS_INTERFACE)
553
pynotify.init("bzr commit-notify")
554
gtk.main()
555
556
register_command(cmd_commit_notify)
557
558
559
import gettext
560
gettext.install('olive-gtk')
561
562
563
class NoDisplayError(BzrCommandError):
564
"""gtk could not find a proper display"""
565
566
def __str__(self):
567
return "No DISPLAY. Unable to run GTK+ application."
568
569
570
def test_suite():
571
from unittest import TestSuite
572
import tests
162
573
import sys
163
574
default_encoding = sys.getdefaultencoding()
164
575
try:
165
result = basic_tests
166
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]))
576
result = TestSuite()
577
result.addTest(tests.test_suite())
172
578
finally:
173
579
if sys.getdefaultencoding() != default_encoding:
174
580
reload(sys)
175
581
sys.setdefaultencoding(default_encoding)
176
return basic_tests
177
582
return result
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0