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