/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-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

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