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
"""GTK+ frontends to Bazaar commands """
17
from bzrlib import errors
18
from bzrlib.commands import Command, register_command, display_command
19
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
20
from bzrlib.commands import Command, register_command
21
from bzrlib.option import Option
22
from bzrlib.branch import Branch
23
from bzrlib.workingtree import WorkingTree
24
from bzrlib.bzrdir import BzrDir
26
__version__ = '0.13.0'
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'))
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)
71
if __name__ != 'bzrlib.plugins.gtk':
72
from bzrlib.trace import warning
73
warning("Not running as bzrlib.plugins.gtk, things may break.")
77
from bzrlib.plugins.gtk.ui import GtkUIFactory
79
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()
33
raise errors.BzrCommandError("PyGTK not installed.")
38
class cmd_gbranch(Command):
44
pygtk = import_pygtk()
47
except RuntimeError, e:
48
if str(e) == "could not open display":
51
from bzrlib.plugins.gtk.olive.branch import BranchDialog
53
window = BranchDialog('.')
56
register_command(cmd_gbranch)
58
class cmd_gdiff(Command):
59
"""Show differences in working tree in a GTK+ Window.
61
Otherwise, all changes for the tree are listed.
63
takes_args = ['filename?']
64
takes_options = ['revision']
67
def run(self, revision=None, filename=None):
68
wt = WorkingTree.open_containing(".")[0]
70
if revision is not None:
71
if len(revision) == 1:
73
revision_id = revision[0].in_history(branch).rev_id
74
tree2 = branch.repository.revision_tree(revision_id)
75
elif len(revision) == 2:
76
revision_id_0 = revision[0].in_history(branch).rev_id
77
tree2 = branch.repository.revision_tree(revision_id_0)
78
revision_id_1 = revision[1].in_history(branch).rev_id
79
tree1 = branch.repository.revision_tree(revision_id_1)
82
tree2 = tree1.basis_tree()
84
from viz.diffwin import DiffWindow
87
window.connect("destroy", lambda w: gtk.main_quit())
88
window.set_diff("Working Tree", tree1, tree2)
89
if filename is not None:
90
tree_filename = wt.relpath(filename)
92
window.set_file(tree_filename)
94
if (tree1.inventory.path2id(tree_filename) is None and
95
tree2.inventory.path2id(tree_filename) is None):
96
raise NotVersionedError(filename)
97
raise BzrCommandError('No changes found for file "%s"' %
103
register_command(cmd_gdiff)
105
class cmd_visualise(Command):
106
"""Graphically visualise this branch.
108
Opens a graphical window to allow you to see the history of the branch
109
and relationships between revisions in a visual manner,
111
The default starting point is latest revision on the branch, you can
112
specify a starting point with -r revision.
116
Option('limit', "maximum number of revisions to display",
118
takes_args = [ "location?" ]
119
aliases = [ "visualize", "vis", "viz" ]
121
def run(self, location=".", revision=None, limit=None):
122
(branch, path) = Branch.open_containing(location)
124
branch.repository.lock_read()
127
revid = branch.last_revision()
131
(revno, revid) = revision[0].in_history(branch)
133
from viz.bzrkapp import BzrkApp
136
app.show(branch, revid, limit)
138
branch.repository.unlock()
143
register_command(cmd_visualise)
145
class cmd_gannotate(Command):
148
Browse changes to FILENAME line by line in a GTK+ window.
151
takes_args = ["filename", "line?"]
153
Option("all", help="show annotations on all lines"),
154
Option("plain", help="don't highlight annotation lines"),
155
Option("line", type=int, argname="lineno",
156
help="jump to specified line number"),
159
aliases = ["gblame", "gpraise"]
161
def run(self, filename, all=False, plain=False, line='1', revision=None):
162
pygtk = import_pygtk()
166
except RuntimeError, e:
167
if str(e) == "could not open display":
173
raise BzrCommandError('Line argument ("%s") is not a number.' %
176
from annotate.gannotate import GAnnotateWindow
177
from annotate.config import GAnnotateConfig
180
(tree, path) = WorkingTree.open_containing(filename)
182
except errors.NoWorkingTree:
183
(branch, path) = Branch.open_containing(filename)
184
tree = branch.basis_tree()
186
file_id = tree.path2id(path)
189
raise NotVersionedError(filename)
190
if revision is not None:
191
if len(revision) != 1:
192
raise BzrCommandError("Only 1 revion may be specified.")
193
revision_id = revision[0].in_history(branch).rev_id
194
tree = branch.repository.revision_tree(revision_id)
196
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
198
window = GAnnotateWindow(all, plain)
199
window.connect("destroy", lambda w: gtk.main_quit())
200
window.set_title(path + " - gannotate")
201
config = GAnnotateConfig(window)
205
window.annotate(tree, branch, file_id)
208
window.jump_to_line(line)
212
register_command(cmd_gannotate)
214
class cmd_gcommit(Command):
215
"""GTK+ commit dialog
217
Graphical user interface for committing revisions"""
222
def run(self, filename=None):
224
pygtk = import_pygtk()
228
except RuntimeError, e:
229
if str(e) == "could not open display":
232
from olive.commit import CommitDialog
233
from bzrlib.commit import Commit
234
from bzrlib.errors import (BzrCommandError,
244
(wt, path) = WorkingTree.open_containing(filename)
246
except NotBranchError, e:
248
except NoWorkingTree, e:
251
(branch, path) = Branch.open_containing(path)
252
except NotBranchError, e:
255
dialog = CommitDialog(wt, path, not branch)
257
dialog.window.connect("destroy", lambda w: gtk.main_quit())
260
register_command(cmd_gcommit)
262
class NoDisplayError(BzrCommandError):
263
"""gtk could not find a proper display"""
266
return "No DISPLAY. gannotate is disabled."
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)
added
removed
__init__.py
