/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-01-30 16:05:15 UTC
  • mto: (157.1.2 trunk) (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 138.
  • Revision ID: szilveszter.farkas@gmail.com-20070130160515-1mh5hm2ppdmuq6l1
Added revert functionality to the context menu.

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