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.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.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 import errors
60
from bzrlib.commands import Command, register_command, display_command
61
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
62
from bzrlib.commands import Command, register_command
63
from bzrlib.option import Option
64
from bzrlib.branch import Branch
65
from bzrlib.workingtree import WorkingTree
66
from bzrlib.bzrdir import BzrDir
74
raise errors.BzrCommandError("PyGTK not installed.")
76
79
def set_ui_factory():
77
from bzrlib.plugins.gtk.ui import GtkUIFactory
80
pygtk = import_pygtk()
81
from ui import GtkUIFactory
79
83
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):
163
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]))
173
if sys.getdefaultencoding() != default_encoding:
175
sys.setdefaultencoding(default_encoding)
86
class cmd_gbranch(Command):
92
pygtk = import_pygtk()
95
except RuntimeError, e:
96
if str(e) == "could not open display":
99
from bzrlib.plugins.gtk.branch import BranchDialog
102
dialog = BranchDialog(os.path.abspath('.'))
105
register_command(cmd_gbranch)
107
class cmd_gcheckout(Command):
113
pygtk = import_pygtk()
116
except RuntimeError, e:
117
if str(e) == "could not open display":
120
from bzrlib.plugins.gtk.checkout import CheckoutDialog
123
dialog = CheckoutDialog(os.path.abspath('.'))
126
register_command(cmd_gcheckout)
128
class cmd_gpush(Command):
132
takes_args = [ "location?" ]
134
def run(self, location="."):
135
(branch, path) = Branch.open_containing(location)
137
pygtk = import_pygtk()
140
except RuntimeError, e:
141
if str(e) == "could not open display":
144
from push import PushDialog
147
dialog = PushDialog(branch)
150
register_command(cmd_gpush)
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.open_containing(".")[0]
165
if revision is not None:
166
if len(revision) == 1:
168
revision_id = revision[0].in_history(branch).rev_id
169
tree2 = branch.repository.revision_tree(revision_id)
170
elif len(revision) == 2:
171
revision_id_0 = revision[0].in_history(branch).rev_id
172
tree2 = branch.repository.revision_tree(revision_id_0)
173
revision_id_1 = revision[1].in_history(branch).rev_id
174
tree1 = branch.repository.revision_tree(revision_id_1)
177
tree2 = tree1.basis_tree()
179
from diff import DiffWindow
181
window = DiffWindow()
182
window.connect("destroy", gtk.main_quit)
183
window.set_diff("Working Tree", tree1, tree2)
184
if filename is not None:
185
tree_filename = wt.relpath(filename)
187
window.set_file(tree_filename)
189
if (tree1.inventory.path2id(tree_filename) is None and
190
tree2.inventory.path2id(tree_filename) is None):
191
raise NotVersionedError(filename)
192
raise BzrCommandError('No changes found for file "%s"' %
198
register_command(cmd_gdiff)
200
class cmd_visualise(Command):
201
"""Graphically visualise this branch.
203
Opens a graphical window to allow you to see the history of the branch
204
and relationships between revisions in a visual manner,
206
The default starting point is latest revision on the branch, you can
207
specify a starting point with -r revision.
211
Option('limit', "maximum number of revisions to display",
213
takes_args = [ "location?" ]
214
aliases = [ "visualize", "vis", "viz" ]
216
def run(self, location=".", revision=None, limit=None):
218
(branch, path) = Branch.open_containing(location)
220
branch.repository.lock_read()
223
revid = branch.last_revision()
227
(revno, revid) = revision[0].in_history(branch)
229
from viz.branchwin import BranchWindow
233
pp.set_branch(branch, revid, limit)
234
pp.connect("destroy", lambda w: gtk.main_quit())
238
branch.repository.unlock()
242
register_command(cmd_visualise)
244
class cmd_gannotate(Command):
247
Browse changes to FILENAME line by line in a GTK+ window.
250
takes_args = ["filename", "line?"]
252
Option("all", help="show annotations on all lines"),
253
Option("plain", help="don't highlight annotation lines"),
254
Option("line", type=int, argname="lineno",
255
help="jump to specified line number"),
258
aliases = ["gblame", "gpraise"]
260
def run(self, filename, all=False, plain=False, line='1', revision=None):
261
pygtk = import_pygtk()
265
except RuntimeError, e:
266
if str(e) == "could not open display":
273
raise BzrCommandError('Line argument ("%s") is not a number.' %
276
from annotate.gannotate import GAnnotateWindow
277
from annotate.config import GAnnotateConfig
280
(tree, path) = WorkingTree.open_containing(filename)
282
except errors.NoWorkingTree:
283
(branch, path) = Branch.open_containing(filename)
284
tree = branch.basis_tree()
286
file_id = tree.path2id(path)
289
raise NotVersionedError(filename)
290
if revision is not None:
291
if len(revision) != 1:
292
raise BzrCommandError("Only 1 revion may be specified.")
293
revision_id = revision[0].in_history(branch).rev_id
294
tree = branch.repository.revision_tree(revision_id)
296
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
298
window = GAnnotateWindow(all, plain)
299
window.connect("destroy", lambda w: gtk.main_quit())
300
window.set_title(path + " - gannotate")
301
config = GAnnotateConfig(window)
305
window.annotate(tree, branch, file_id)
308
window.jump_to_line(line)
312
register_command(cmd_gannotate)
314
class cmd_gcommit(Command):
315
"""GTK+ commit dialog
317
Graphical user interface for committing revisions"""
323
def run(self, filename=None):
325
pygtk = import_pygtk()
329
except RuntimeError, e:
330
if str(e) == "could not open display":
334
from commit import CommitDialog
335
from bzrlib.commit import Commit
336
from bzrlib.errors import (BzrCommandError,
346
(wt, path) = WorkingTree.open_containing(filename)
348
except NotBranchError, e:
350
except NoWorkingTree, e:
353
(branch, path) = Branch.open_containing(path)
354
except NotBranchError, e:
358
commit = CommitDialog(wt, path, not branch)
361
register_command(cmd_gcommit)
364
gettext.install('olive-gtk')
366
class NoDisplayError(BzrCommandError):
367
"""gtk could not find a proper display"""
370
return "No DISPLAY. Unable to run GTK+ application."
373
from unittest import TestSuite
376
result.addTest(tests.test_suite())
added
removed
__init__.py
