bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
49
by Jelmer Vernooij
Merge in Dan Loda's gannotate plugin and put it in annotate/ |
1 |
# This program is free software; you can redistribute it and/or modify
|
2 |
# it under the terms of the GNU General Public License as published by
|
|
3 |
# the Free Software Foundation; either version 2 of the License, or
|
|
4 |
# (at your option) any later version.
|
|
5 |
||
6 |
# This program is distributed in the hope that it will be useful,
|
|
7 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
8 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
9 |
# GNU General Public License for more details.
|
|
10 |
||
11 |
# You should have received a copy of the GNU General Public License
|
|
12 |
# along with this program; if not, write to the Free Software
|
|
13 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
14 |
||
208.2.1
by Robert Collins
Better module docstring. |
15 |
"""Graphical support for Bazaar using GTK.
|
16 |
||
17 |
This plugin includes:
|
|
18 |
gannotate GTK+ annotate.
|
|
19 |
gbranch GTK+ branching.
|
|
20 |
gcheckout GTK+ checkout.
|
|
323
by Jelmer Vernooij
Add gsend command. |
21 |
gcommit GTK+ commit dialog.
|
242.1.2
by Adeodato Simó
Fix gconflicts docstring. |
22 |
gconflicts GTK+ conflicts.
|
208.2.1
by Robert Collins
Better module docstring. |
23 |
gdiff Show differences in working tree in a GTK+ Window.
|
24 |
ginit Initialise a new branch.
|
|
592.4.1
by Jasper Groenewegen
Add ginfo command to bzr, shows info dialog |
25 |
ginfo GTK+ branch info dialog
|
580.1.1
by Jelmer Vernooij
Add gloom command. |
26 |
gloom GTK+ loom browse dialog
|
571.1.1
by Jasper Groenewegen
Add gmerge command and change MergeDialog to set parent as default if available |
27 |
gmerge GTK+ merge dialog
|
208.2.1
by Robert Collins
Better module docstring. |
28 |
gmissing GTK+ missing revisions dialog.
|
29 |
gpreferences GTK+ preferences dialog.
|
|
323
by Jelmer Vernooij
Add gsend command. |
30 |
gpush GTK+ push.
|
31 |
gsend GTK+ send merge directive.
|
|
32 |
gstatus GTK+ status dialog.
|
|
208.2.1
by Robert Collins
Better module docstring. |
33 |
gtags Manage branch tags.
|
34 |
visualise Graphically visualise this branch.
|
|
35 |
"""
|
|
73
by Jelmer Vernooij
Release 0.9, list myself as maintainer. |
36 |
|
670.1.1
by Vincent Ladeuil
Patch as proposed on https://bugs.edge.launchpad.net/bzr/+bug/388790 |
37 |
import os |
38 |
import sys |
|
39 |
||
40 |
if getattr(sys, "frozen", None) is not None: # we run bzr.exe |
|
670.1.2
by Vincent Ladeuil
Clarify intent and more cleanup from review feedback. |
41 |
|
42 |
# FIXME: Unless a better packaging solution is found, the following
|
|
43 |
# provides a workaround for https://bugs.launchpad.net/bzr/+bug/388790 Also
|
|
44 |
# see https://code.edge.launchpad.net/~vila/bzr-gtk/388790-windows-setup
|
|
45 |
# for more details about while it's needed.
|
|
46 |
||
670.1.1
by Vincent Ladeuil
Patch as proposed on https://bugs.edge.launchpad.net/bzr/+bug/388790 |
47 |
# NOTE: _lib must be ahead of bzrlib or sax.saxutils (in olive) fails
|
48 |
here = os.path.dirname(__file__) |
|
49 |
sys.path.insert(0, os.path.join(here, '_lib')) |
|
50 |
sys.path.append(os.path.join(here, '_lib/gtk-2.0')) |
|
51 |
||
52 |
||
137
by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron). |
53 |
import bzrlib |
625.1.1
by Jelmer Vernooij
Use bzrlib.api.require_any_version() rather than doing our own version checking. |
54 |
import bzrlib.api |
635.1.1
by Jelmer Vernooij
Support gnome keyring. |
55 |
from bzrlib import ( |
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
56 |
branch, |
635.1.1
by Jelmer Vernooij
Support gnome keyring. |
57 |
config, |
58 |
errors, |
|
59 |
)
|
|
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
60 |
from bzrlib.commands import plugin_cmds |
61 |
||
137
by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron). |
62 |
|
665
by Vincent Ladeuil
Open 0.97.0 for development. |
63 |
version_info = (0, 98, 0, 'dev', 1) |
137
by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron). |
64 |
|
287
by Jelmer Vernooij
Use standard version tuple. |
65 |
if version_info[3] == 'final': |
66 |
version_string = '%d.%d.%d' % version_info[:3] |
|
67 |
else: |
|
68 |
version_string = '%d.%d.%d%s%d' % version_info |
|
69 |
__version__ = version_string |
|
137
by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron). |
70 |
|
625.1.1
by Jelmer Vernooij
Use bzrlib.api.require_any_version() rather than doing our own version checking. |
71 |
COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0), |
628.1.2
by Vincent Ladeuil
Upgrade COMPATIBLE_BZR_VERSIONS. |
72 |
(1, 10, 0), (1, 11, 0), (1, 12, 0), (1, 13, 0), |
650
by Vincent Ladeuil
Trivial fix. |
73 |
(1, 15, 0), |
659
by Vincent Ladeuil
Fix bzr compatibility for early adopters. |
74 |
(1, 17, 0), |
666
by Vincent Ladeuil
Catch-up with bzr.dev. |
75 |
(2, 1, 0), |
659
by Vincent Ladeuil
Fix bzr compatibility for early adopters. |
76 |
]
|
625.1.1
by Jelmer Vernooij
Use bzrlib.api.require_any_version() rather than doing our own version checking. |
77 |
|
78 |
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS) |
|
137
by Jelmer Vernooij
Warn about incompatible versions (taken from bzrtools, thanks Aaron). |
79 |
|
146
by Jelmer Vernooij
Move more code to top-level directory. |
80 |
if __name__ != 'bzrlib.plugins.gtk': |
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
81 |
from bzrlib.trace import warning |
146
by Jelmer Vernooij
Move more code to top-level directory. |
82 |
warning("Not running as bzrlib.plugins.gtk, things may break.") |
83 |
||
66.2.20
by Aaron Bentley
Nicer error when PyGTK not installed |
84 |
def import_pygtk(): |
85 |
try: |
|
86 |
import pygtk |
|
87 |
except ImportError: |
|
88 |
raise errors.BzrCommandError("PyGTK not installed.") |
|
89 |
pygtk.require('2.0') |
|
90 |
return pygtk |
|
91 |
||
92 |
||
133
by Jelmer Vernooij
Actually use the ui factory. |
93 |
def set_ui_factory(): |
177
by Jelmer Vernooij
Register commands all at once. |
94 |
import_pygtk() |
142
by Jelmer Vernooij
Move some files to the top-level directory, add first test. |
95 |
from ui import GtkUIFactory |
133
by Jelmer Vernooij
Actually use the ui factory. |
96 |
import bzrlib.ui |
97 |
bzrlib.ui.ui_factory = GtkUIFactory() |
|
98 |
||
99 |
||
531.6.1
by Jelmer Vernooij
Try harder to find license and credits files. |
100 |
def data_basedirs(): |
101 |
return [os.path.dirname(__file__), |
|
399.1.19
by Jelmer Vernooij
Add utility function for finding icon paths. |
102 |
"/usr/share/bzr-gtk", |
103 |
"/usr/local/share/bzr-gtk"] |
|
531.6.1
by Jelmer Vernooij
Try harder to find license and credits files. |
104 |
|
105 |
||
106 |
def data_path(*args): |
|
107 |
for basedir in data_basedirs(): |
|
108 |
path = os.path.join(basedir, *args) |
|
399.1.19
by Jelmer Vernooij
Add utility function for finding icon paths. |
109 |
if os.path.exists(path): |
110 |
return path |
|
111 |
return None |
|
112 |
||
113 |
||
531.6.1
by Jelmer Vernooij
Try harder to find license and credits files. |
114 |
def icon_path(*args): |
115 |
return data_path(os.path.join('icons', *args)) |
|
116 |
||
117 |
||
505.1.1
by Jelmer Vernooij
Make handle-patch not dependend on the users name being abentley and install it. |
118 |
def open_display(): |
119 |
pygtk = import_pygtk() |
|
120 |
try: |
|
121 |
import gtk |
|
122 |
except RuntimeError, e: |
|
123 |
if str(e) == "could not open display": |
|
124 |
raise NoDisplayError |
|
125 |
set_ui_factory() |
|
126 |
return gtk |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
127 |
|
505.1.1
by Jelmer Vernooij
Make handle-patch not dependend on the users name being abentley and install it. |
128 |
|
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
129 |
commands = { |
130 |
"gannotate": ["gblame", "gpraise"], |
|
131 |
"gbranch": [], |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
132 |
"gcheckout": [], |
133 |
"gcommit": ["gci"], |
|
134 |
"gconflicts": [], |
|
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
135 |
"gdiff": [], |
136 |
"ginit": [], |
|
137 |
"ginfo": [], |
|
138 |
"gmerge": [], |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
139 |
"gmissing": [], |
140 |
"gpreferences": [], |
|
141 |
"gpush": [], |
|
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
142 |
"gselftest": [], |
143 |
"gsend": [], |
|
144 |
"gstatus": ["gst"], |
|
145 |
"gtags": [], |
|
146 |
"visualise": ["visualize", "vis", "viz"], |
|
147 |
}
|
|
177
by Jelmer Vernooij
Register commands all at once. |
148 |
|
580.1.5
by Jelmer Vernooij
Try to import rather than use getattr to avoid problems wrt the order in which plugins are loaded. |
149 |
try: |
150 |
from bzrlib.plugins import loom |
|
151 |
except ImportError: |
|
152 |
pass # Loom plugin doesn't appear to be present |
|
153 |
else: |
|
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
154 |
commands["gloom"] = [] |
155 |
||
156 |
for cmd, aliases in commands.iteritems(): |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
157 |
plugin_cmds.register_lazy("cmd_%s" % cmd, aliases, |
158 |
"bzrlib.plugins.gtk.commands") |
|
249
by Aaron Bentley
Add gselftest command |
159 |
|
635.2.12
by Vincent Ladeuil
Implement commit message saving without modifying bzrlib. |
160 |
def save_commit_messages(*args): |
161 |
from bzrlib.plugins.gtk import commit |
|
162 |
commit.save_commit_messages(*args) |
|
163 |
||
164 |
branch.Branch.hooks.install_named_hook('post_uncommit', |
|
165 |
save_commit_messages, |
|
166 |
"Saving commit messages for gcommit") |
|
249
by Aaron Bentley
Add gselftest command |
167 |
|
152
by Jelmer Vernooij
Cleanup some more code. |
168 |
import gettext |
169 |
gettext.install('olive-gtk') |
|
170 |
||
475.1.2
by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n(). |
171 |
# Let's create a specialized alias to protect '_' from being erased by other
|
172 |
# uses of '_' as an anonymous variable (think pdb for one).
|
|
173 |
_i18n = gettext.gettext |
|
173.1.2
by Robert Collins
Minor refactoring of __init__ to have less duplication. |
174 |
|
625.2.1
by Jelmer Vernooij
Move commands to a separate module and register them lazily. |
175 |
class NoDisplayError(errors.BzrCommandError): |
55.1.2
by Jelmer Vernooij
Move commands to top-level __init__ |
176 |
"""gtk could not find a proper display""" |
177 |
||
178 |
def __str__(self): |
|
133
by Jelmer Vernooij
Actually use the ui factory. |
179 |
return "No DISPLAY. Unable to run GTK+ application." |
180 |
||
173.1.2
by Robert Collins
Minor refactoring of __init__ to have less duplication. |
181 |
|
635.1.1
by Jelmer Vernooij
Support gnome keyring. |
182 |
credential_store_registry = getattr(config, "credential_store_registry", None) |
183 |
if credential_store_registry is not None: |
|
184 |
try: |
|
185 |
credential_store_registry.register_lazy( |
|
186 |
"gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore", |
|
187 |
help="The GNOME Keyring.", fallback=True) |
|
188 |
except TypeError: |
|
189 |
# Fallback credentials stores were introduced in Bazaar 1.15
|
|
190 |
credential_store_registry.register_lazy( |
|
191 |
"gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore", |
|
192 |
help="The GNOME Keyring.") |
|
193 |
||
194 |
||
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
195 |
def load_tests(basic_tests, module, loader): |
196 |
testmod_names = [ |
|
197 |
'tests', |
|
198 |
]
|
|
163
by Aaron Bentley
Prevent test suite from causing default-encoding changes |
199 |
import sys |
200 |
default_encoding = sys.getdefaultencoding() |
|
201 |
try: |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
202 |
result = basic_tests |
330.6.4
by Aaron Bentley
Allow test suite to run without pygtk |
203 |
try: |
204 |
import_pygtk() |
|
205 |
except errors.BzrCommandError: |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
206 |
return basic_tests |
207 |
basic_tests.addTest(loader.loadTestsFromModuleNames( |
|
208 |
["%s.%s" % (__name__, tmn) for tmn in testmod_names])) |
|
163
by Aaron Bentley
Prevent test suite from causing default-encoding changes |
209 |
finally: |
170.1.2
by Aaron Bentley
Test suite only fixes encoding if it's changed. Fixes test_selftest bug. |
210 |
if sys.getdefaultencoding() != default_encoding: |
211 |
reload(sys) |
|
212 |
sys.setdefaultencoding(default_encoding) |
|
632
by Vincent Ladeuil
Upgrade to the new loading tests API. |
213 |
return basic_tests |