12
12
# along with this program; if not, write to the Free Software
13
13
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
"""Graphical support for Bazaar using GTK.
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.
30
gsend GTK+ send merge directive.
31
gstatus GTK+ status dialog.
32
gtags Manage branch tags.
33
visualise Graphically visualise this branch.
36
from __future__ import absolute_import
41
if getattr(sys, "frozen", None) is not None: # we run bzr.exe
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.
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'))
15
"""GTK+ frontends to Bazaar commands """
56
from bzrlib.commands import plugin_cmds
58
from bzrlib.plugins.gtk.info import (
59
bzr_plugin_version as version_info,
60
bzr_compatible_versions,
63
if version_info[3] == 'final':
64
version_string = '%d.%d.%d' % version_info[:3]
66
version_string = '%d.%d.%d%s%d' % version_info
67
__version__ = version_string
69
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
19
__version__ = '0.16.0'
20
version_info = tuple(int(n) for n in __version__.split('.'))
23
def check_bzrlib_version(desired):
24
"""Check that bzrlib is compatible.
26
If version is < bzr-gtk version, assume incompatible.
27
If version == bzr-gtk version, assume completely compatible
28
If version == bzr-gtk version + 1, assume compatible, with deprecations
29
Otherwise, assume incompatible.
31
desired_plus = (desired[0], desired[1]+1)
32
bzrlib_version = bzrlib.version_info[:2]
33
if bzrlib_version == desired:
36
from bzrlib.trace import warning
38
# get the message out any way we can
39
from warnings import warn as warning
40
if bzrlib_version < desired:
41
warning('Installed bzr version %s is too old to be used with bzr-gtk'
42
' %s.' % (bzrlib.__version__, __version__))
43
# Not using BzrNewError, because it may not exist.
44
raise Exception, ('Version mismatch', version_info)
46
warning('bzr-gtk is not up to date with installed bzr version %s.'
47
' \nThere should be a newer version available, e.g. %i.%i.'
48
% (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
49
if bzrlib_version != desired_plus:
50
raise Exception, 'Version mismatch'
53
check_bzrlib_version(version_info[:2])
55
from bzrlib.trace import warning
71
56
if __name__ != 'bzrlib.plugins.gtk':
72
from bzrlib.trace import warning
73
57
warning("Not running as bzrlib.plugins.gtk, things may break.")
59
from bzrlib.lazy_import import lazy_import
60
lazy_import(globals(), """
68
from bzrlib.commands import Command, register_command, display_command
69
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
70
from bzrlib.option import Option
78
raise errors.BzrCommandError("PyGTK not installed.")
76
83
def set_ui_factory():
77
from bzrlib.plugins.gtk.ui import GtkUIFactory
85
from ui import GtkUIFactory
79
87
bzrlib.ui.ui_factory = GtkUIFactory()
83
return [os.path.dirname(__file__),
85
"/usr/local/share/bzr-gtk"]
89
for basedir in data_basedirs():
90
path = os.path.join(basedir, *args)
91
if os.path.exists(path):
97
return data_path(os.path.join('icons', *args))
101
"gannotate": ["gblame", "gpraise"],
115
"visualise": ["visualize", "vis", "viz", 'glog'],
119
from bzrlib.plugins import loom
121
pass # Loom plugin doesn't appear to be present
123
commands["gloom"] = []
125
for cmd, aliases in commands.iteritems():
126
plugin_cmds.register_lazy("cmd_%s" % cmd, aliases,
127
"bzrlib.plugins.gtk.commands")
129
def save_commit_messages(*args):
130
from bzrlib.plugins.gtk import commitmsgs
131
commitmsgs.save_commit_messages(*args)
134
from bzrlib.hooks import install_lazy_named_hook
136
from bzrlib.branch import Branch
137
Branch.hooks.install_named_hook('post_uncommit',
138
save_commit_messages,
139
"Saving commit messages for gcommit")
141
install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
142
'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
145
from bzrlib.registry import register_lazy
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')
153
register_lazy("bzrlib.config", "option_registry",
154
'nautilus_integration', 'bzrlib.plugins.gtk.config',
155
'opt_nautilus_integration')
158
def load_tests(basic_tests, module, loader):
90
class cmd_gbranch(Command):
96
pygtk = import_pygtk()
99
except RuntimeError, e:
100
if str(e) == "could not open display":
103
from bzrlib.plugins.gtk.branch import BranchDialog
106
dialog = BranchDialog(os.path.abspath('.'))
109
class cmd_gcheckout(Command):
115
pygtk = import_pygtk()
118
except RuntimeError, e:
119
if str(e) == "could not open display":
122
from bzrlib.plugins.gtk.checkout import CheckoutDialog
125
dialog = CheckoutDialog(os.path.abspath('.'))
129
class cmd_gpush(Command):
133
takes_args = [ "location?" ]
135
def run(self, location="."):
136
(br, path) = branch.Branch.open_containing(location)
138
pygtk = import_pygtk()
141
except RuntimeError, e:
142
if str(e) == "could not open display":
145
from push import PushDialog
148
dialog = PushDialog(br)
152
class cmd_gdiff(Command):
153
"""Show differences in working tree in a GTK+ Window.
155
Otherwise, all changes for the tree are listed.
157
takes_args = ['filename?']
158
takes_options = ['revision']
161
def run(self, revision=None, filename=None):
163
wt = workingtree.WorkingTree.open_containing(".")[0]
167
if revision is not None:
168
if len(revision) == 1:
170
revision_id = revision[0].in_history(branch).rev_id
171
tree2 = branch.repository.revision_tree(revision_id)
172
elif len(revision) == 2:
173
revision_id_0 = revision[0].in_history(branch).rev_id
174
tree2 = branch.repository.revision_tree(revision_id_0)
175
revision_id_1 = revision[1].in_history(branch).rev_id
176
tree1 = branch.repository.revision_tree(revision_id_1)
179
tree2 = tree1.basis_tree()
181
from diff import DiffWindow
183
window = DiffWindow()
184
window.connect("destroy", gtk.main_quit)
185
window.set_diff("Working Tree", tree1, tree2)
186
if filename is not None:
187
tree_filename = wt.relpath(filename)
189
window.set_file(tree_filename)
191
if (tree1.inventory.path2id(tree_filename) is None and
192
tree2.inventory.path2id(tree_filename) is None):
193
raise NotVersionedError(filename)
194
raise BzrCommandError('No changes found for file "%s"' %
203
class cmd_visualise(Command):
204
"""Graphically visualise this branch.
206
Opens a graphical window to allow you to see the history of the branch
207
and relationships between revisions in a visual manner,
209
The default starting point is latest revision on the branch, you can
210
specify a starting point with -r revision.
214
Option('limit', "maximum number of revisions to display",
216
takes_args = [ "location?" ]
217
aliases = [ "visualize", "vis", "viz" ]
219
def run(self, location=".", revision=None, limit=None):
221
(br, path) = branch.Branch.open_containing(location)
223
br.repository.lock_read()
226
revid = br.last_revision()
230
(revno, revid) = revision[0].in_history(br)
232
from viz.branchwin import BranchWindow
236
pp.set_branch(br, revid, limit)
237
pp.connect("destroy", lambda w: gtk.main_quit())
241
br.repository.unlock()
245
class cmd_gannotate(Command):
248
Browse changes to FILENAME line by line in a GTK+ window.
251
takes_args = ["filename", "line?"]
253
Option("all", help="show annotations on all lines"),
254
Option("plain", help="don't highlight annotation lines"),
255
Option("line", type=int, argname="lineno",
256
help="jump to specified line number"),
259
aliases = ["gblame", "gpraise"]
261
def run(self, filename, all=False, plain=False, line='1', revision=None):
262
pygtk = import_pygtk()
266
except RuntimeError, e:
267
if str(e) == "could not open display":
274
raise BzrCommandError('Line argument ("%s") is not a number.' %
277
from annotate.gannotate import GAnnotateWindow
278
from annotate.config import GAnnotateConfig
279
from bzrlib.bzrdir import BzrDir
281
wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
285
tree = br.basis_tree()
287
file_id = tree.path2id(path)
290
raise NotVersionedError(filename)
291
if revision is not None:
292
if len(revision) != 1:
293
raise BzrCommandError("Only 1 revion may be specified.")
294
revision_id = revision[0].in_history(br).rev_id
295
tree = br.repository.revision_tree(revision_id)
297
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
299
window = GAnnotateWindow(all, plain)
300
window.connect("destroy", lambda w: gtk.main_quit())
301
window.set_title(path + " - gannotate")
302
config = GAnnotateConfig(window)
308
window.annotate(tree, br, file_id)
309
window.jump_to_line(line)
317
class cmd_gcommit(Command):
318
"""GTK+ commit dialog
320
Graphical user interface for committing revisions"""
326
def run(self, filename=None):
328
pygtk = import_pygtk()
332
except RuntimeError, e:
333
if str(e) == "could not open display":
337
from commit import CommitDialog
338
from bzrlib.errors import (BzrCommandError,
345
(wt, path) = workingtree.WorkingTree.open_containing(filename)
347
except NotBranchError, e:
349
except NoWorkingTree, e:
352
(br, path) = branch.Branch.open_containing(path)
353
except NotBranchError, e:
356
commit = CommitDialog(wt, path, not br)
360
class cmd_gstatus(Command):
361
"""GTK+ status dialog
363
Graphical user interface for showing status
367
takes_args = ['PATH?']
370
def run(self, path='.'):
372
pygtk = import_pygtk()
376
except RuntimeError, e:
377
if str(e) == "could not open display":
381
from status import StatusDialog
382
(wt, wt_path) = workingtree.WorkingTree.open_containing(path)
383
status = StatusDialog(wt, wt_path)
384
status.connect("destroy", gtk.main_quit)
388
class cmd_gconflicts(Command):
393
(wt, path) = workingtree.WorkingTree.open_containing('.')
395
pygtk = import_pygtk()
398
except RuntimeError, e:
399
if str(e) == "could not open display":
402
from bzrlib.plugins.gtk.conflicts import ConflictsDialog
405
dialog = ConflictsDialog(wt)
409
class cmd_gpreferences(Command):
410
""" GTK+ preferences dialog.
414
pygtk = import_pygtk()
417
except RuntimeError, e:
418
if str(e) == "could not open display":
421
from bzrlib.plugins.gtk.preferences import PreferencesWindow
424
dialog = PreferencesWindow()
429
class cmd_gmissing(Command):
430
""" GTK+ missing revisions dialog.
433
takes_args = ["other_branch?"]
434
def run(self, other_branch=None):
435
pygtk = import_pygtk()
438
except RuntimeError, e:
439
if str(e) == "could not open display":
442
from bzrlib.plugins.gtk.missing import MissingWindow
443
from bzrlib.branch import Branch
445
local_branch = Branch.open_containing(".")[0]
446
if other_branch is None:
447
other_branch = local_branch.get_parent()
449
if other_branch is None:
450
raise errors.BzrCommandError("No peer location known or specified.")
451
remote_branch = Branch.open_containing(other_branch)[0]
453
local_branch.lock_read()
455
remote_branch.lock_read()
457
dialog = MissingWindow(local_branch, remote_branch)
460
remote_branch.unlock()
462
local_branch.unlock()
480
register_command(cmd)
483
gettext.install('olive-gtk')
485
class NoDisplayError(BzrCommandError):
486
"""gtk could not find a proper display"""
489
return "No DISPLAY. Unable to run GTK+ application."
492
from unittest import TestSuite
163
495
default_encoding = sys.getdefaultencoding()
167
import gi.repository.Gtk
170
basic_tests.addTest(loader.loadTestsFromModuleNames(
171
["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
498
result.addTest(tests.test_suite())
173
500
if sys.getdefaultencoding() != default_encoding:
175
502
sys.setdefaultencoding(default_encoding)
added
removed
__init__.py
