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.commands import Command, register_command, display_command
18
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
19
from bzrlib.commands import Command, register_command
20
from bzrlib.option import Option
21
from bzrlib.branch import Branch
22
from bzrlib.workingtree import WorkingTree
23
from bzrlib.bzrdir import BzrDir
25
__version__ = '0.13.0'
27
class cmd_gbranch(Command):
37
except RuntimeError, e:
38
if str(e) == "could not open display":
41
from bzrlib.plugins.gtk.olive.branch import BranchDialog
43
window = BranchDialog('.')
46
register_command(cmd_gbranch)
48
class cmd_gdiff(Command):
49
"""Show differences in working tree in a GTK+ Window.
51
Otherwise, all changes for the tree are listed.
53
takes_args = ['filename?']
54
takes_options = ['revision']
57
def run(self, revision=None, filename=None):
58
wt = WorkingTree.open_containing(".")[0]
60
if revision is not None:
61
if len(revision) == 1:
63
revision_id = revision[0].in_history(branch).rev_id
64
tree2 = branch.repository.revision_tree(revision_id)
65
elif len(revision) == 2:
66
revision_id_0 = revision[0].in_history(branch).rev_id
67
tree2 = branch.repository.revision_tree(revision_id_0)
68
revision_id_1 = revision[1].in_history(branch).rev_id
69
tree1 = branch.repository.revision_tree(revision_id_1)
72
tree2 = tree1.basis_tree()
74
from viz.diffwin import DiffWindow
77
window.connect("destroy", lambda w: gtk.main_quit())
78
window.set_diff("Working Tree", tree1, tree2)
79
if filename is not None:
80
tree_filename = wt.relpath(filename)
82
window.set_file(tree_filename)
84
if (tree1.inventory.path2id(tree_filename) is None and
85
tree2.inventory.path2id(tree_filename) is None):
86
raise NotVersionedError(filename)
87
raise BzrCommandError('No changes found for file "%s"' %
93
register_command(cmd_gdiff)
95
class cmd_visualise(Command):
96
"""Graphically visualise this branch.
98
Opens a graphical window to allow you to see the history of the branch
99
and relationships between revisions in a visual manner,
101
The default starting point is latest revision on the branch, you can
102
specify a starting point with -r revision.
106
Option('limit', "maximum number of revisions to display",
108
takes_args = [ "location?" ]
109
aliases = [ "visualize", "vis", "viz" ]
111
def run(self, location=".", revision=None, limit=None):
112
(branch, path) = Branch.open_containing(location)
114
branch.repository.lock_read()
117
revid = branch.last_revision()
121
(revno, revid) = revision[0].in_history(branch)
123
from viz.bzrkapp import BzrkApp
126
app.show(branch, revid, limit)
128
branch.repository.unlock()
133
register_command(cmd_visualise)
135
class cmd_gannotate(Command):
138
Browse changes to FILENAME line by line in a GTK+ window.
141
takes_args = ["filename", "line?"]
143
Option("all", help="show annotations on all lines"),
144
Option("plain", help="don't highlight annotation lines"),
145
Option("line", type=int, argname="lineno",
146
help="jump to specified line number"),
149
aliases = ["gblame", "gpraise"]
151
def run(self, filename, all=False, plain=False, line='1', revision=None):
157
except RuntimeError, e:
158
if str(e) == "could not open display":
164
raise BzrCommandError('Line argument ("%s") is not a number.' %
167
from annotate.gannotate import GAnnotateWindow
168
from annotate.config import GAnnotateConfig
170
(wt, path) = WorkingTree.open_containing(filename)
173
file_id = wt.path2id(path)
176
raise NotVersionedError(filename)
177
if revision is not None:
178
if len(revision) != 1:
179
raise BzrCommandError("Only 1 revion may be specified.")
180
revision_id = revision[0].in_history(branch).rev_id
184
window = GAnnotateWindow(all, plain)
185
window.connect("destroy", lambda w: gtk.main_quit())
186
window.set_title(path + " - gannotate")
187
config = GAnnotateConfig(window)
191
window.annotate(branch, file_id, revision_id)
194
window.jump_to_line(line)
198
register_command(cmd_gannotate)
200
class cmd_gcommit(Command):
201
"""GTK+ commit dialog
203
Graphical user interface for committing revisions"""
208
def run(self, filename=None):
215
except RuntimeError, e:
216
if str(e) == "could not open display":
219
from olive.commit import CommitDialog
220
from bzrlib.commit import Commit
221
from bzrlib.errors import (BzrCommandError,
231
(wt, path) = WorkingTree.open_containing(filename)
233
except NotBranchError, e:
235
except NoWorkingTree, e:
238
(branch, path) = Branch.open_containing(path)
239
except NotBranchError, e:
242
dialog = CommitDialog(wt, path, not branch)
244
dialog.window.connect("destroy", lambda w: gtk.main_quit())
247
register_command(cmd_gcommit)
249
class NoDisplayError(BzrCommandError):
250
"""gtk could not find a proper display"""
253
return "No DISPLAY. gannotate is disabled."
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()
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
