/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Jelmer Vernooij
  • Date: 2010-06-04 12:25:04 UTC
  • mfrom: (689.1.1 return-creds)
  • Revision ID: jelmer@samba.org-20100604122504-xe291u8la5uur0ij
Merge credentials fix from John.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
22
22
gconflicts        GTK+ conflicts. 
23
23
gdiff             Show differences in working tree in a GTK+ Window. 
24
24
ginit             Initialise a new branch.
 
25
ginfo             GTK+ branch info dialog
25
26
gloom             GTK+ loom browse dialog
26
27
gmerge            GTK+ merge dialog
27
28
gmissing          GTK+ missing revisions dialog. 
58
59
    )
59
60
from bzrlib.commands import plugin_cmds
60
61
 
61
 
from info import (
62
 
    bzr_plugin_version as version_info,
63
 
    bzr_compatible_versions,
64
 
    )
 
62
 
 
63
version_info = (0, 99, 0, 'dev', 1)
65
64
 
66
65
if version_info[3] == 'final':
67
66
    version_string = '%d.%d.%d' % version_info[:3]
69
68
    version_string = '%d.%d.%d%s%d' % version_info
70
69
__version__ = version_string
71
70
 
72
 
bzrlib.api.require_any_api(bzrlib, bzr_compatible_versions)
 
71
COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0),
 
72
                           (1, 10, 0), (1, 11, 0), (1, 12, 0), (1, 13, 0),
 
73
                           (1, 15, 0),
 
74
                           (1, 17, 0),
 
75
                           (2, 1, 0),
 
76
                           (2, 2, 0),
 
77
                           ]
 
78
 
 
79
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
73
80
 
74
81
if __name__ != 'bzrlib.plugins.gtk':
75
82
    from bzrlib.trace import warning
128
135
    "gconflicts": [],
129
136
    "gdiff": [],
130
137
    "ginit": [],
 
138
    "ginfo": [],
131
139
    "gmerge": [],
132
140
    "gmissing": [],
133
141
    "gpreferences": [],
158
166
                                       save_commit_messages,
159
167
                                       "Saving commit messages for gcommit")
160
168
 
 
169
import gettext
 
170
gettext.install('olive-gtk')
 
171
 
 
172
# Let's create a specialized alias to protect '_' from being erased by other
 
173
# uses of '_' as an anonymous variable (think pdb for one).
 
174
_i18n = gettext.gettext
 
175
 
161
176
class NoDisplayError(errors.BzrCommandError):
162
177
    """gtk could not find a proper display"""
163
178
 
197
212
            reload(sys)
198
213
            sys.setdefaultencoding(default_encoding)
199
214
    return basic_tests
200
 
 
201
 
 
202
 
def _i18n(text):
203
 
    # Stub until we support proper i18n
204
 
    return text