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