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 """
59
from bzrlib.commands import plugin_cmds
61
from bzrlib.plugins.gtk.info import (
62
bzr_plugin_version as version_info,
63
bzr_compatible_versions,
66
if version_info[3] == 'final':
67
version_string = '%d.%d.%d' % version_info[:3]
69
version_string = '%d.%d.%d%s%d' % version_info
70
__version__ = version_string
72
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
74
if __name__ != 'bzrlib.plugins.gtk':
75
from bzrlib.trace import warning
76
warning("Not running as bzrlib.plugins.gtk, things may break.")
19
__version__ = '0.15.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 import errors
56
from bzrlib.commands import Command, register_command, display_command
57
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
58
from bzrlib.commands import Command, register_command
59
from bzrlib.option import Option
60
from bzrlib.branch import Branch
61
from bzrlib.workingtree import WorkingTree
62
from bzrlib.bzrdir import BzrDir
70
raise errors.BzrCommandError("PyGTK not installed.")
79
75
def set_ui_factory():
80
from bzrlib.plugins.gtk.ui import GtkUIFactory
76
pygtk = import_pygtk()
77
from olive.ui import GtkUIFactory
82
79
bzrlib.ui.ui_factory = GtkUIFactory()
86
return [os.path.dirname(__file__),
88
"/usr/local/share/bzr-gtk"]
92
for basedir in data_basedirs():
93
path = os.path.join(basedir, *args)
94
if os.path.exists(path):
100
return data_path(os.path.join('icons', *args))
104
"gannotate": ["gblame", "gpraise"],
118
"visualise": ["visualize", "vis", "viz", 'glog'],
122
from bzrlib.plugins import loom
124
pass # Loom plugin doesn't appear to be present
126
commands["gloom"] = []
128
for cmd, aliases in commands.iteritems():
129
plugin_cmds.register_lazy("cmd_%s" % cmd, aliases,
130
"bzrlib.plugins.gtk.commands")
132
def save_commit_messages(*args):
133
from bzrlib.plugins.gtk import commitmsgs
134
commitmsgs.save_commit_messages(*args)
137
from bzrlib.hooks import install_lazy_named_hook
139
from bzrlib.branch import Branch
140
Branch.hooks.install_named_hook('post_uncommit',
141
save_commit_messages,
142
"Saving commit messages for gcommit")
144
install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
145
'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
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
def load_tests(basic_tests, module, loader):
158
default_encoding = sys.getdefaultencoding()
162
import gi.repository.Gtk
165
basic_tests.addTest(loader.loadTestsFromModuleNames(
166
["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
168
if sys.getdefaultencoding() != default_encoding:
170
sys.setdefaultencoding(default_encoding)
82
class cmd_gbranch(Command):
88
pygtk = import_pygtk()
91
except RuntimeError, e:
92
if str(e) == "could not open display":
95
from bzrlib.plugins.gtk.olive.branch import BranchDialog
98
dialog = BranchDialog(os.path.abspath('.'))
99
dialog.window.connect("destroy", lambda w: gtk.main_quit())
104
register_command(cmd_gbranch)
106
class cmd_gdiff(Command):
107
"""Show differences in working tree in a GTK+ Window.
109
Otherwise, all changes for the tree are listed.
111
takes_args = ['filename?']
112
takes_options = ['revision']
115
def run(self, revision=None, filename=None):
117
wt = WorkingTree.open_containing(".")[0]
119
if revision is not None:
120
if len(revision) == 1:
122
revision_id = revision[0].in_history(branch).rev_id
123
tree2 = branch.repository.revision_tree(revision_id)
124
elif len(revision) == 2:
125
revision_id_0 = revision[0].in_history(branch).rev_id
126
tree2 = branch.repository.revision_tree(revision_id_0)
127
revision_id_1 = revision[1].in_history(branch).rev_id
128
tree1 = branch.repository.revision_tree(revision_id_1)
131
tree2 = tree1.basis_tree()
133
from viz.diffwin import DiffWindow
135
window = DiffWindow()
136
window.connect("destroy", lambda w: gtk.main_quit())
137
window.set_diff("Working Tree", tree1, tree2)
138
if filename is not None:
139
tree_filename = wt.relpath(filename)
141
window.set_file(tree_filename)
143
if (tree1.inventory.path2id(tree_filename) is None and
144
tree2.inventory.path2id(tree_filename) is None):
145
raise NotVersionedError(filename)
146
raise BzrCommandError('No changes found for file "%s"' %
152
register_command(cmd_gdiff)
154
class cmd_visualise(Command):
155
"""Graphically visualise this branch.
157
Opens a graphical window to allow you to see the history of the branch
158
and relationships between revisions in a visual manner,
160
The default starting point is latest revision on the branch, you can
161
specify a starting point with -r revision.
165
Option('limit', "maximum number of revisions to display",
167
takes_args = [ "location?" ]
168
aliases = [ "visualize", "vis", "viz" ]
170
def run(self, location=".", revision=None, limit=None):
172
(branch, path) = Branch.open_containing(location)
174
branch.repository.lock_read()
177
revid = branch.last_revision()
181
(revno, revid) = revision[0].in_history(branch)
183
from viz.bzrkapp import BzrkApp
186
app.show(branch, revid, limit)
188
branch.repository.unlock()
193
register_command(cmd_visualise)
195
class cmd_gannotate(Command):
198
Browse changes to FILENAME line by line in a GTK+ window.
201
takes_args = ["filename", "line?"]
203
Option("all", help="show annotations on all lines"),
204
Option("plain", help="don't highlight annotation lines"),
205
Option("line", type=int, argname="lineno",
206
help="jump to specified line number"),
209
aliases = ["gblame", "gpraise"]
211
def run(self, filename, all=False, plain=False, line='1', revision=None):
212
pygtk = import_pygtk()
216
except RuntimeError, e:
217
if str(e) == "could not open display":
224
raise BzrCommandError('Line argument ("%s") is not a number.' %
227
from annotate.gannotate import GAnnotateWindow
228
from annotate.config import GAnnotateConfig
231
(tree, path) = WorkingTree.open_containing(filename)
233
except errors.NoWorkingTree:
234
(branch, path) = Branch.open_containing(filename)
235
tree = branch.basis_tree()
237
file_id = tree.path2id(path)
240
raise NotVersionedError(filename)
241
if revision is not None:
242
if len(revision) != 1:
243
raise BzrCommandError("Only 1 revion may be specified.")
244
revision_id = revision[0].in_history(branch).rev_id
245
tree = branch.repository.revision_tree(revision_id)
247
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
249
window = GAnnotateWindow(all, plain)
250
window.connect("destroy", lambda w: gtk.main_quit())
251
window.set_title(path + " - gannotate")
252
config = GAnnotateConfig(window)
256
window.annotate(tree, branch, file_id)
259
window.jump_to_line(line)
263
register_command(cmd_gannotate)
265
class cmd_gcommit(Command):
266
"""GTK+ commit dialog
268
Graphical user interface for committing revisions"""
273
def run(self, filename=None):
275
pygtk = import_pygtk()
279
except RuntimeError, e:
280
if str(e) == "could not open display":
284
from olive.commit import CommitDialog
285
from bzrlib.commit import Commit
286
from bzrlib.errors import (BzrCommandError,
296
(wt, path) = WorkingTree.open_containing(filename)
298
except NotBranchError, e:
300
except NoWorkingTree, e:
303
(branch, path) = Branch.open_containing(path)
304
except NotBranchError, e:
308
commit = CommitDialog(wt, path, not branch)
311
register_command(cmd_gcommit)
313
class NoDisplayError(BzrCommandError):
314
"""gtk could not find a proper display"""
317
return "No DISPLAY. Unable to run GTK+ application."
320
from unittest import TestSuite
323
result.addTest(tests.test_suite())
added
removed
__init__.py
