15
17
"""Graphical support for Bazaar using GTK.
17
19
This plugin includes:
20
commit-notify Start the graphical notifier of commits.
18
21
gannotate GTK+ annotate.
19
22
gbranch GTK+ branching.
20
23
gcheckout GTK+ checkout.
21
gcommit GTK+ commit dialog.
22
gconflicts GTK+ conflicts.
24
gcommit GTK+ commit dialog
23
26
gdiff Show differences in working tree in a GTK+ Window.
24
27
ginit Initialise a new branch.
25
gmerge GTK+ merge dialog
26
28
gmissing GTK+ missing revisions dialog.
27
29
gpreferences GTK+ preferences dialog.
29
gsend GTK+ send merge directive.
30
gstatus GTK+ status dialog.
31
gstatus GTK+ status dialog
31
32
gtags Manage branch tags.
32
33
visualise Graphically visualise this branch.
39
version_info = (0, 95, 0, 'dev', 1)
41
if version_info[3] == 'final':
42
version_string = '%d.%d.%d' % version_info[:3]
44
version_string = '%d.%d.%d%s%d' % version_info
45
__version__ = version_string
47
required_bzrlib = (1, 3)
38
__version__ = '0.18.0'
39
version_info = tuple(int(n) for n in __version__.split('.'))
49
42
def check_bzrlib_version(desired):
50
43
"""Check that bzrlib is compatible.
52
45
If version is < bzr-gtk version, assume incompatible.
46
If version == bzr-gtk version, assume completely compatible
47
If version == bzr-gtk version + 1, assume compatible, with deprecations
48
Otherwise, assume incompatible.
50
desired_plus = (desired[0], desired[1]+1)
54
51
bzrlib_version = bzrlib.version_info[:2]
52
if bzrlib_version == desired or (bzrlib_version == desired_plus and
53
bzrlib.version_info[3] == 'dev'):
56
56
from bzrlib.trace import warning
57
57
except ImportError:
252
239
Option('limit', "Maximum number of revisions to display.",
254
takes_args = [ "locations*" ]
241
takes_args = [ "location?" ]
255
242
aliases = [ "visualize", "vis", "viz" ]
257
def run(self, locations_list, revision=None, limit=None):
244
def run(self, location=".", revision=None, limit=None):
259
if locations_list is None:
260
locations_list = ["."]
262
for location in locations_list:
263
(br, path) = branch.Branch.open_containing(location)
246
(br, path) = branch.Branch.open_containing(location)
264
249
if revision is None:
265
revids.append(br.last_revision())
250
revid = br.last_revision()
267
revids.append(revision[0].as_revision_id(br))
269
pp = start_viz_window(br, revids, limit)
270
pp.connect("destroy", lambda w: gtk.main_quit())
254
(revno, revid) = revision[0].in_history(br)
257
pp = start_viz_window(br, revid, limit)
258
pp.connect("destroy", lambda w: gtk.main_quit())
275
265
class cmd_gannotate(GTKCommand):
386
368
aliases = [ "gst" ]
387
369
takes_args = ['PATH?']
388
takes_options = ['revision']
390
def run(self, path='.', revision=None):
372
def run(self, path='.'):
374
gtk = self.open_display()
393
375
from status import StatusDialog
394
376
(wt, wt_path) = workingtree.WorkingTree.open_containing(path)
396
if revision is not None:
398
revision_id = revision[0].as_revision_id(wt.branch)
400
from bzrlib.errors import BzrError
401
raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
405
status = StatusDialog(wt, wt_path, revision_id)
377
status = StatusDialog(wt, wt_path)
406
378
status.connect("destroy", gtk.main_quit)
410
class cmd_gsend(GTKCommand):
411
"""GTK+ send merge directive.
415
(br, path) = branch.Branch.open_containing(".")
417
from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
418
from StringIO import StringIO
419
dialog = SendMergeDirectiveDialog(br)
420
if dialog.run() == gtk.RESPONSE_OK:
422
outf.writelines(dialog.get_merge_directive().to_lines())
423
mail_client = br.get_config().get_mail_client()
424
mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]",
430
383
class cmd_gconflicts(GTKCommand):
433
Select files from the list of conflicts and run an external utility to
437
388
(wt, path) = workingtree.WorkingTree.open_containing('.')
439
390
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
391
dialog = ConflictsDialog(wt)
444
396
class cmd_gpreferences(GTKCommand):
445
397
""" GTK+ preferences dialog.
450
402
from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
403
dialog = PreferencesWindow()
455
class cmd_gmerge(Command):
456
""" GTK+ merge dialog
459
takes_args = ["merge_from_path?"]
460
def run(self, merge_from_path=None):
461
from bzrlib import workingtree
462
from bzrlib.plugins.gtk.dialog import error_dialog
463
from bzrlib.plugins.gtk.merge import MergeDialog
465
(wt, path) = workingtree.WorkingTree.open_containing('.')
466
old_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
467
delta = wt.changes_from(old_tree)
468
if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
469
error_dialog(_i18n('There are local changes in the branch'),
470
_i18n('Please commit or revert the changes before merging.'))
472
parent_branch_path = wt.branch.get_parent()
473
merge = MergeDialog(wt, path, parent_branch_path)
474
response = merge.run()
478
408
class cmd_gmissing(Command):
479
409
""" GTK+ missing revisions dialog.
551
479
for cmd in commands:
552
480
register_command(cmd)
555
class cmd_gselftest(GTKCommand):
556
"""Version of selftest that displays a notification at the end"""
558
takes_args = builtins.cmd_selftest.takes_args
559
takes_options = builtins.cmd_selftest.takes_options
560
_see_also = ['selftest']
562
def run(self, *args, **kwargs):
483
class cmd_commit_notify(GTKCommand):
484
"""Run the bzr commit notifier.
486
This is a background program which will pop up a notification on the users
487
screen when a commit occurs.
491
from notify import NotifyPopupMenu
492
gtk = self.open_display()
493
menu = NotifyPopupMenu()
494
icon = gtk.status_icon_new_from_file("bzr-icon-64.png")
495
icon.connect('popup-menu', menu.display)
565
default_encoding = sys.getdefaultencoding()
566
# prevent gtk from blowing up later
568
# prevent gtk from messing with default encoding
570
if sys.getdefaultencoding() != default_encoding:
572
sys.setdefaultencoding(default_encoding)
573
result = builtins.cmd_selftest().run(*args, **kwargs)
576
body = 'Selftest succeeded in "%s"' % os.getcwd()
579
body = 'Selftest failed in "%s"' % os.getcwd()
580
pynotify.init("bzr gselftest")
581
note = pynotify.Notification(cgi.escape(summary), cgi.escape(body))
582
note.set_timeout(pynotify.EXPIRES_NEVER)
586
register_command(cmd_gselftest)
589
class cmd_test_gtk(GTKCommand):
590
"""Version of selftest that just runs the gtk test suite."""
592
takes_options = ['verbose',
593
Option('one', short_name='1',
594
help='Stop when one test fails.'),
595
Option('benchmark', help='Run the benchmarks.'),
596
Option('lsprof-timed',
597
help='Generate lsprof output for benchmarked'
598
' sections of code.'),
600
help='List the tests instead of running them.'),
601
Option('randomize', type=str, argname="SEED",
602
help='Randomize the order of tests using the given'
603
' seed or "now" for the current time.'),
605
takes_args = ['testspecs*']
607
def run(self, verbose=None, one=False, benchmark=None,
608
lsprof_timed=None, list_only=False, randomize=None,
609
testspecs_list=None):
610
from bzrlib import __path__ as bzrlib_path
611
from bzrlib.tests import selftest
613
print '%10s: %s' % ('bzrlib', bzrlib_path[0])
615
print 'No benchmarks yet'
618
test_suite_factory = bench_suite
621
# TODO: should possibly lock the history file...
622
benchfile = open(".perf_history", "at", buffering=1)
624
test_suite_factory = test_suite
629
if testspecs_list is not None:
630
pattern = '|'.join(testspecs_list)
635
result = selftest(verbose=verbose,
638
test_suite_factory=test_suite_factory,
639
lsprof_timed=lsprof_timed,
640
bench_history=benchfile,
642
random_seed=randomize,
645
if benchfile is not None:
648
register_command(cmd_test_gtk)
501
from bzrlib.bzrdir import BzrDir
502
from bzrlib import errors
503
from bzrlib.osutils import format_date
504
from bzrlib.transport import get_transport
505
if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
507
from bzrlib.plugins.dbus import activity
508
bus = dbus.SessionBus()
509
# get the object so we can subscribe to callbacks from it.
510
broadcast_service = bus.get_object(
511
activity.Broadcast.DBUS_NAME,
512
activity.Broadcast.DBUS_PATH)
514
def catch_branch(revision_id, urls):
515
# TODO: show all the urls, or perhaps choose the 'best'.
518
if isinstance(revision_id, unicode):
519
revision_id = revision_id.encode('utf8')
520
transport = get_transport(url)
521
a_dir = BzrDir.open_from_transport(transport)
522
branch = a_dir.open_branch()
523
revno = branch.revision_id_to_revno(revision_id)
524
revision = branch.repository.get_revision(revision_id)
525
summary = 'New revision %d in %s' % (revno, url)
526
body = 'Committer: %s\n' % revision.committer
527
body += 'Date: %s\n' % format_date(revision.timestamp,
530
body += revision.message
531
body = cgi.escape(body)
532
nw = pynotify.Notification(summary, body)
533
def start_viz(notification=None, action=None, data=None):
534
"""Start the viz program."""
535
pp = start_viz_window(branch, revision_id)
537
def start_branch(notification=None, action=None, data=None):
538
"""Start a Branch dialog"""
539
from bzrlib.plugins.gtk.branch import BranchDialog
540
bd = BranchDialog(remote_path=url)
542
nw.add_action("inspect", "Inspect", start_viz, None)
543
nw.add_action("branch", "Branch", start_branch, None)
549
broadcast_service.connect_to_signal("Revision", catch_branch,
550
dbus_interface=activity.Broadcast.DBUS_INTERFACE)
551
pynotify.init("bzr commit-notify")
554
register_command(cmd_commit_notify)
653
558
gettext.install('olive-gtk')
655
# Let's create a specialized alias to protect '_' from being erased by other
656
# uses of '_' as an anonymous variable (think pdb for one).
657
_i18n = gettext.gettext
659
561
class NoDisplayError(BzrCommandError):
660
562
"""gtk could not find a proper display"""