/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: 2006-12-13 12:29:59 UTC
  • mto: (66.2.16 bzr-gtk-meld)
  • mto: This revision was merged to the branch mainline in revision 118.
  • Revision ID: jelmer@samba.org-20061213122959-h9yluqyu0ijelmb0
Fix desktop file. Patch from Toshio Kuratomi. Fixes #75278.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
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
14
14
 
15
 
"""Graphical support for Bazaar using GTK.
16
 
 
17
 
This plugin includes:
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
 
ginfo             GTK+ branch info dialog
26
 
gloom             GTK+ loom browse dialog
27
 
gmerge            GTK+ merge dialog
28
 
gmissing          GTK+ missing revisions dialog. 
29
 
gpreferences      GTK+ preferences dialog. 
30
 
gpush             GTK+ push.
31
 
gsend             GTK+ send merge directive.
32
 
gstatus           GTK+ status dialog.
33
 
gtags             Manage branch tags.
34
 
visualise         Graphically visualise this branch. 
35
 
"""
36
 
 
37
 
import os
38
 
import sys
39
 
 
40
 
if getattr(sys, "frozen", None) is not None: # we run bzr.exe
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
 
 
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
 
 
53
 
import bzrlib
54
 
import bzrlib.api
55
 
from bzrlib import (
56
 
    branch,
57
 
    config,
58
 
    errors,
59
 
    )
60
 
from bzrlib.commands import plugin_cmds
61
 
 
62
 
 
63
 
version_info = (0, 99, 0, 'dev', 1)
64
 
 
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
70
 
 
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)
80
 
 
81
 
if __name__ != 'bzrlib.plugins.gtk':
82
 
    from bzrlib.trace import warning
83
 
    warning("Not running as bzrlib.plugins.gtk, things may break.")
84
 
 
85
 
def import_pygtk():
86
 
    try:
 
15
"""GTK+ frontends to Bazaar commands """
 
16
 
 
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
 
24
 
 
25
__version__ = '0.12.0'
 
26
 
 
27
class cmd_gbranch(Command):
 
28
    """GTK+ branching.
 
29
    
 
30
    """
 
31
 
 
32
    def run(self):
87
33
        import pygtk
88
 
    except ImportError:
89
 
        raise errors.BzrCommandError("PyGTK not installed.")
90
 
    pygtk.require('2.0')
91
 
    return pygtk
92
 
 
93
 
 
94
 
def set_ui_factory():
95
 
    import_pygtk()
96
 
    from ui import GtkUIFactory
97
 
    import bzrlib.ui
98
 
    bzrlib.ui.ui_factory = GtkUIFactory()
99
 
 
100
 
 
101
 
def data_basedirs():
102
 
    return [os.path.dirname(__file__),
103
 
             "/usr/share/bzr-gtk", 
104
 
             "/usr/local/share/bzr-gtk"]
105
 
 
106
 
 
107
 
def data_path(*args):
108
 
    for basedir in data_basedirs():
109
 
        path = os.path.join(basedir, *args)
110
 
        if os.path.exists(path):
111
 
            return path
112
 
    return None
113
 
 
114
 
 
115
 
def icon_path(*args):
116
 
    return data_path(os.path.join('icons', *args))
117
 
 
118
 
 
119
 
def open_display():
120
 
    pygtk = import_pygtk()
121
 
    try:
 
34
        pygtk.require("2.0")
 
35
        try:
 
36
            import gtk
 
37
        except RuntimeError, e:
 
38
            if str(e) == "could not open display":
 
39
                raise NoDisplayError
 
40
 
 
41
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
 
42
 
 
43
        window = BranchDialog('.')
 
44
        window.display()
 
45
 
 
46
register_command(cmd_gbranch)
 
47
 
 
48
class cmd_gdiff(Command):
 
49
    """Show differences in working tree in a GTK+ Window.
 
50
    
 
51
    Otherwise, all changes for the tree are listed.
 
52
    """
 
53
    takes_args = ['filename?']
 
54
    takes_options = ['revision']
 
55
 
 
56
    @display_command
 
57
    def run(self, revision=None, filename=None):
 
58
        wt = WorkingTree.open_containing(".")[0]
 
59
        branch = wt.branch
 
60
        if revision is not None:
 
61
            if len(revision) == 1:
 
62
                tree1 = wt
 
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)
 
70
        else:
 
71
            tree1 = wt
 
72
            tree2 = tree1.basis_tree()
 
73
 
 
74
        from viz.diffwin import DiffWindow
122
75
        import gtk
123
 
    except RuntimeError, e:
124
 
        if str(e) == "could not open display":
125
 
            raise NoDisplayError
126
 
    set_ui_factory()
127
 
    return gtk
128
 
 
129
 
 
130
 
commands = {
131
 
    "gannotate": ["gblame", "gpraise"],
132
 
    "gbranch": [],
133
 
    "gcheckout": [],
134
 
    "gcommit": ["gci"],
135
 
    "gconflicts": [],
136
 
    "gdiff": [],
137
 
    "ginit": [],
138
 
    "ginfo": [],
139
 
    "gmerge": [],
140
 
    "gmissing": [],
141
 
    "gpreferences": [],
142
 
    "gpush": [],
143
 
    "gselftest": [],
144
 
    "gsend": [],
145
 
    "gstatus": ["gst"],
146
 
    "gtags": [],
147
 
    "visualise": ["visualize", "vis", "viz", 'glog'],
148
 
    }
149
 
 
150
 
try:
151
 
    from bzrlib.plugins import loom
152
 
except ImportError:
153
 
    pass # Loom plugin doesn't appear to be present
154
 
else:
155
 
    commands["gloom"] = []
156
 
 
157
 
for cmd, aliases in commands.iteritems():
158
 
    plugin_cmds.register_lazy("cmd_%s" % cmd, aliases,
159
 
                              "bzrlib.plugins.gtk.commands")
160
 
 
161
 
def save_commit_messages(*args):
162
 
    from bzrlib.plugins.gtk import commit
163
 
    commit.save_commit_messages(*args)
164
 
 
165
 
branch.Branch.hooks.install_named_hook('post_uncommit',
166
 
                                       save_commit_messages,
167
 
                                       "Saving commit messages for gcommit")
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
 
 
176
 
class NoDisplayError(errors.BzrCommandError):
 
76
        window = 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 = tree1.relpath(filename)
 
81
            try:
 
82
                window.set_file(tree_filename)
 
83
            except NoSuchFile:
 
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"' % 
 
88
                                      filename)
 
89
        window.show()
 
90
 
 
91
        gtk.main()
 
92
 
 
93
register_command(cmd_gdiff)
 
94
 
 
95
class cmd_visualise(Command):
 
96
    """Graphically visualise this branch.
 
97
 
 
98
    Opens a graphical window to allow you to see the history of the branch
 
99
    and relationships between revisions in a visual manner,
 
100
 
 
101
    The default starting point is latest revision on the branch, you can
 
102
    specify a starting point with -r revision.
 
103
    """
 
104
    takes_options = [
 
105
        "revision",
 
106
        Option('limit', "maximum number of revisions to display",
 
107
               int, 'count')]
 
108
    takes_args = [ "location?" ]
 
109
    aliases = [ "visualize", "vis", "viz" ]
 
110
 
 
111
    def run(self, location=".", revision=None, limit=None):
 
112
        (branch, path) = Branch.open_containing(location)
 
113
        branch.lock_read()
 
114
        branch.repository.lock_read()
 
115
        try:
 
116
            if revision is None:
 
117
                revid = branch.last_revision()
 
118
                if revid is None:
 
119
                    return
 
120
            else:
 
121
                (revno, revid) = revision[0].in_history(branch)
 
122
 
 
123
            from viz.bzrkapp import BzrkApp
 
124
                
 
125
            app = BzrkApp()
 
126
            app.show(branch, revid, limit)
 
127
        finally:
 
128
            branch.repository.unlock()
 
129
            branch.unlock()
 
130
        app.main()
 
131
 
 
132
 
 
133
register_command(cmd_visualise)
 
134
 
 
135
class cmd_gannotate(Command):
 
136
    """GTK+ annotate.
 
137
    
 
138
    Browse changes to FILENAME line by line in a GTK+ window.
 
139
    """
 
140
 
 
141
    takes_args = ["filename", "line?"]
 
142
    takes_options = [
 
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"),
 
147
        "revision",
 
148
    ]
 
149
    aliases = ["gblame", "gpraise"]
 
150
    
 
151
    def run(self, filename, all=False, plain=False, line='1', revision=None):
 
152
        import pygtk
 
153
        pygtk.require("2.0")
 
154
 
 
155
        try:
 
156
            import gtk
 
157
        except RuntimeError, e:
 
158
            if str(e) == "could not open display":
 
159
                raise NoDisplayError
 
160
 
 
161
        try:
 
162
            line = int(line)
 
163
        except ValueError:
 
164
            raise BzrCommandError('Line argument ("%s") is not a number.' % 
 
165
                                  line)
 
166
 
 
167
        from annotate.gannotate import GAnnotateWindow
 
168
        from annotate.config import GAnnotateConfig
 
169
 
 
170
        (wt, path) = WorkingTree.open_containing(filename)
 
171
        branch = wt.branch
 
172
 
 
173
        file_id = wt.path2id(path)
 
174
 
 
175
        if file_id is None:
 
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
 
181
        else:
 
182
            revision_id = None
 
183
 
 
184
        window = GAnnotateWindow(all, plain)
 
185
        window.connect("destroy", lambda w: gtk.main_quit())
 
186
        window.set_title(path + " - gannotate")
 
187
        config = GAnnotateConfig(window)
 
188
        window.show()
 
189
        branch.lock_read()
 
190
        try:
 
191
            window.annotate(branch, file_id, revision_id)
 
192
        finally:
 
193
            branch.unlock()
 
194
        window.jump_to_line(line)
 
195
        
 
196
        gtk.main()
 
197
 
 
198
register_command(cmd_gannotate)
 
199
 
 
200
class cmd_gcommit(Command):
 
201
    """GTK+ commit dialog
 
202
 
 
203
    Graphical user interface for committing revisions"""
 
204
    
 
205
    takes_args = []
 
206
    takes_options = []
 
207
 
 
208
    def run(self, filename=None):
 
209
        import os
 
210
        import pygtk
 
211
        pygtk.require("2.0")
 
212
 
 
213
        try:
 
214
            import gtk
 
215
        except RuntimeError, e:
 
216
            if str(e) == "could not open display":
 
217
                raise NoDisplayError
 
218
 
 
219
        from olive.commit import CommitDialog
 
220
        from bzrlib.commit import Commit
 
221
        from bzrlib.errors import (BzrCommandError,
 
222
                                   NotBranchError,
 
223
                                   NoWorkingTree,
 
224
                                   PointlessCommit,
 
225
                                   ConflictsInTree,
 
226
                                   StrictCommitFailed)
 
227
 
 
228
        wt = None
 
229
        branch = None
 
230
        try:
 
231
            (wt, path) = WorkingTree.open_containing(filename)
 
232
            branch = wt.branch
 
233
        except NotBranchError, e:
 
234
            path = e.path
 
235
        except NoWorkingTree, e:
 
236
            path = e.base
 
237
            try:
 
238
                (branch, path) = Branch.open_containing(path)
 
239
            except NotBranchError, e:
 
240
                path = e.path
 
241
 
 
242
        dialog = CommitDialog(wt, path, not branch)
 
243
        if dialog.display():
 
244
            dialog.window.connect("destroy", lambda w: gtk.main_quit())
 
245
            gtk.main()
 
246
 
 
247
register_command(cmd_gcommit)
 
248
 
 
249
class NoDisplayError(BzrCommandError):
177
250
    """gtk could not find a proper display"""
178
251
 
179
252
    def __str__(self):
180
 
        return "No DISPLAY. Unable to run GTK+ application."
181
 
 
182
 
 
183
 
credential_store_registry = getattr(config, "credential_store_registry", None)
184
 
if credential_store_registry is not None:
185
 
    try:
186
 
        credential_store_registry.register_lazy(
187
 
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
188
 
            help="The GNOME Keyring.", fallback=True)
189
 
    except TypeError:
190
 
    # Fallback credentials stores were introduced in Bazaar 1.15
191
 
        credential_store_registry.register_lazy(
192
 
            "gnome-keyring", "bzrlib.plugins.gtk.keyring", "GnomeKeyringCredentialStore",
193
 
            help="The GNOME Keyring.")
194
 
 
195
 
 
196
 
def load_tests(basic_tests, module, loader):
197
 
    testmod_names = [
198
 
        'tests',
199
 
        ]
200
 
    import sys
201
 
    default_encoding = sys.getdefaultencoding()
202
 
    try:
203
 
        result = basic_tests
204
 
        try:
205
 
            import_pygtk()
206
 
        except errors.BzrCommandError:
207
 
            return basic_tests
208
 
        basic_tests.addTest(loader.loadTestsFromModuleNames(
209
 
                ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
210
 
    finally:
211
 
        if sys.getdefaultencoding() != default_encoding:
212
 
            reload(sys)
213
 
            sys.setdefaultencoding(default_encoding)
214
 
    return basic_tests
 
253
        return "No DISPLAY. gannotate is disabled."