/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
14
14
 
15
15
"""GTK+ frontends to Bazaar commands """
16
16
 
17
 
import bzrlib
18
 
 
19
 
__version__ = '0.17.0'
20
 
version_info = tuple(int(n) for n in __version__.split('.'))
21
 
 
22
 
 
23
 
def check_bzrlib_version(desired):
24
 
    """Check that bzrlib is compatible.
25
 
 
26
 
    If version is < bzr-gtk version, assume incompatible.
27
 
    If version == bzr-gtk version, assume completely compatible
28
 
    If version == bzr-gtk version + 1, assume compatible, with deprecations
29
 
    Otherwise, assume incompatible.
30
 
    """
31
 
    desired_plus = (desired[0], desired[1]+1)
32
 
    bzrlib_version = bzrlib.version_info[:2]
33
 
    if bzrlib_version == desired:
34
 
        return
35
 
    try:
36
 
        from bzrlib.trace import warning
37
 
    except ImportError:
38
 
        # get the message out any way we can
39
 
        from warnings import warn as warning
40
 
    if bzrlib_version < desired:
41
 
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
42
 
                ' %s.' % (bzrlib.__version__, __version__))
43
 
        raise BzrError('Version mismatch: %r' % version_info)
44
 
    else:
45
 
        warning('bzr-gtk is not up to date with installed bzr version %s.'
46
 
                ' \nThere should be a newer version available, e.g. %i.%i.' 
47
 
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
48
 
        if bzrlib_version != desired_plus:
49
 
            raise Exception, 'Version mismatch'
50
 
 
51
 
 
52
 
check_bzrlib_version(version_info[:2])
53
 
 
54
 
from bzrlib.trace import warning
55
 
if __name__ != 'bzrlib.plugins.gtk':
56
 
    warning("Not running as bzrlib.plugins.gtk, things may break.")
57
 
 
58
 
from bzrlib.lazy_import import lazy_import
59
 
lazy_import(globals(), """
60
 
from bzrlib import (
61
 
    branch,
62
 
    errors,
63
 
    workingtree,
64
 
    )
65
 
""")
66
 
 
67
17
from bzrlib.commands import Command, register_command, display_command
68
18
from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
 
19
from bzrlib.commands import Command, register_command
69
20
from bzrlib.option import Option
70
 
 
71
 
import os.path
72
 
 
73
 
def import_pygtk():
74
 
    try:
75
 
        import pygtk
76
 
    except ImportError:
77
 
        raise errors.BzrCommandError("PyGTK not installed.")
78
 
    pygtk.require('2.0')
79
 
    return pygtk
80
 
 
81
 
 
82
 
def set_ui_factory():
83
 
    import_pygtk()
84
 
    from ui import GtkUIFactory
85
 
    import bzrlib.ui
86
 
    bzrlib.ui.ui_factory = GtkUIFactory()
87
 
 
88
 
 
89
 
class GTKCommand(Command):
90
 
    """Abstract class providing GTK specific run commands."""
91
 
 
92
 
    def open_display(self):
93
 
        pygtk = import_pygtk()
94
 
        try:
95
 
            import gtk
96
 
        except RuntimeError, e:
97
 
            if str(e) == "could not open display":
98
 
                raise NoDisplayError
99
 
        set_ui_factory()
100
 
        return gtk
101
 
 
102
 
    def run(self):
103
 
        self.open_display()
104
 
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
105
 
        dialog.run()
106
 
 
107
 
 
108
 
class cmd_gbranch(GTKCommand):
 
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):
109
28
    """GTK+ branching.
110
29
    
111
30
    """
112
31
 
113
 
    def get_gtk_dialog(self, path):
114
 
        from bzrlib.plugins.gtk.branch import BranchDialog
115
 
        return BranchDialog(path)
116
 
 
117
 
 
118
 
class cmd_gcheckout(GTKCommand):
119
 
    """ GTK+ checkout.
120
 
    
121
 
    """
122
 
    
123
 
    def get_gtk_dialog(self, path):
124
 
        from bzrlib.plugins.gtk.checkout import CheckoutDialog
125
 
        return CheckoutDialog(path)
126
 
 
127
 
 
128
 
 
129
 
class cmd_gpush(GTKCommand):
130
 
    """ GTK+ push.
131
 
    
132
 
    """
133
 
    takes_args = [ "location?" ]
134
 
 
135
 
    def run(self, location="."):
136
 
        (br, path) = branch.Branch.open_containing(location)
137
 
        self.open_display()
138
 
        from push import PushDialog
139
 
        dialog = PushDialog(br)
140
 
        dialog.run()
141
 
 
142
 
 
143
 
 
144
 
class cmd_gdiff(GTKCommand):
 
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):
145
51
    """Show differences in working tree in a GTK+ Window.
146
52
    
147
53
    Otherwise, all changes for the tree are listed.
151
57
 
152
58
    @display_command
153
59
    def run(self, revision=None, filename=None):
154
 
        set_ui_factory()
155
 
        wt = workingtree.WorkingTree.open_containing(".")[0]
156
 
        wt.lock_read()
157
 
        try:
158
 
            branch = wt.branch
159
 
            if revision is not None:
160
 
                if len(revision) == 1:
161
 
                    tree1 = wt
162
 
                    revision_id = revision[0].in_history(branch).rev_id
163
 
                    tree2 = branch.repository.revision_tree(revision_id)
164
 
                elif len(revision) == 2:
165
 
                    revision_id_0 = revision[0].in_history(branch).rev_id
166
 
                    tree2 = branch.repository.revision_tree(revision_id_0)
167
 
                    revision_id_1 = revision[1].in_history(branch).rev_id
168
 
                    tree1 = branch.repository.revision_tree(revision_id_1)
169
 
            else:
 
60
        wt = WorkingTree.open_containing(".")[0]
 
61
        branch = wt.branch
 
62
        if revision is not None:
 
63
            if len(revision) == 1:
170
64
                tree1 = wt
171
 
                tree2 = tree1.basis_tree()
172
 
 
173
 
            from diff import DiffWindow
174
 
            import gtk
175
 
            window = DiffWindow()
176
 
            window.connect("destroy", gtk.main_quit)
177
 
            window.set_diff("Working Tree", tree1, tree2)
178
 
            if filename is not None:
179
 
                tree_filename = wt.relpath(filename)
180
 
                try:
181
 
                    window.set_file(tree_filename)
182
 
                except NoSuchFile:
183
 
                    if (tree1.path2id(tree_filename) is None and 
184
 
                        tree2.path2id(tree_filename) is None):
185
 
                        raise NotVersionedError(filename)
186
 
                    raise BzrCommandError('No changes found for file "%s"' % 
187
 
                                          filename)
188
 
            window.show()
189
 
 
190
 
            gtk.main()
191
 
        finally:
192
 
            wt.unlock()
193
 
 
 
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)
194
96
 
195
97
class cmd_visualise(Command):
196
98
    """Graphically visualise this branch.
209
111
    aliases = [ "visualize", "vis", "viz" ]
210
112
 
211
113
    def run(self, location=".", revision=None, limit=None):
212
 
        set_ui_factory()
213
 
        (br, path) = branch.Branch.open_containing(location)
214
 
        br.lock_read()
215
 
        br.repository.lock_read()
 
114
        (branch, path) = Branch.open_containing(location)
 
115
        branch.lock_read()
 
116
        branch.repository.lock_read()
216
117
        try:
217
118
            if revision is None:
218
 
                revid = br.last_revision()
 
119
                revid = branch.last_revision()
219
120
                if revid is None:
220
121
                    return
221
122
            else:
222
 
                (revno, revid) = revision[0].in_history(br)
 
123
                (revno, revid) = revision[0].in_history(branch)
223
124
 
224
 
            from viz.branchwin import BranchWindow
225
 
            import gtk
 
125
            from viz.bzrkapp import BzrkApp
226
126
                
227
 
            pp = BranchWindow()
228
 
            pp.set_branch(br, revid, limit)
229
 
            pp.connect("destroy", lambda w: gtk.main_quit())
230
 
            pp.show()
231
 
            gtk.main()
 
127
            app = BzrkApp()
 
128
            app.show(branch, revid, limit)
232
129
        finally:
233
 
            br.repository.unlock()
234
 
            br.unlock()
235
 
 
236
 
 
237
 
class cmd_gannotate(GTKCommand):
 
130
            branch.repository.unlock()
 
131
            branch.unlock()
 
132
        app.main()
 
133
 
 
134
 
 
135
register_command(cmd_visualise)
 
136
 
 
137
class cmd_gannotate(Command):
238
138
    """GTK+ annotate.
239
139
    
240
140
    Browse changes to FILENAME line by line in a GTK+ window.
245
145
        Option("all", help="show annotations on all lines"),
246
146
        Option("plain", help="don't highlight annotation lines"),
247
147
        Option("line", type=int, argname="lineno",
248
 
               help="jump to specified line number"),
249
 
        "revision",
 
148
               help="jump to specified line number")
250
149
    ]
251
150
    aliases = ["gblame", "gpraise"]
252
151
    
253
 
    def run(self, filename, all=False, plain=False, line='1', revision=None):
254
 
        gtk = self.open_display()
 
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
255
161
 
256
162
        try:
257
163
            line = int(line)
261
167
 
262
168
        from annotate.gannotate import GAnnotateWindow
263
169
        from annotate.config import GAnnotateConfig
264
 
        from bzrlib.bzrdir import BzrDir
265
 
 
266
 
        wt, br, path = BzrDir.open_containing_tree_or_branch(filename)
267
 
        if wt is not None:
268
 
            tree = wt
269
 
        else:
270
 
            tree = br.basis_tree()
271
 
 
272
 
        file_id = tree.path2id(path)
 
170
 
 
171
        (wt, path) = WorkingTree.open_containing(filename)
 
172
        branch = wt.branch
 
173
 
 
174
        file_id = wt.path2id(path)
273
175
 
274
176
        if file_id is None:
275
177
            raise NotVersionedError(filename)
276
 
        if revision is not None:
277
 
            if len(revision) != 1:
278
 
                raise BzrCommandError("Only 1 revion may be specified.")
279
 
            revision_id = revision[0].in_history(br).rev_id
280
 
            tree = br.repository.revision_tree(revision_id)
281
 
        else:
282
 
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
283
178
 
284
179
        window = GAnnotateWindow(all, plain)
285
180
        window.connect("destroy", lambda w: gtk.main_quit())
286
181
        window.set_title(path + " - gannotate")
287
182
        config = GAnnotateConfig(window)
288
183
        window.show()
289
 
        br.lock_read()
290
 
        if wt is not None:
291
 
            wt.lock_read()
 
184
        branch.lock_read()
292
185
        try:
293
 
            window.annotate(tree, br, file_id)
294
 
            window.jump_to_line(line)
295
 
            gtk.main()
 
186
            window.annotate(branch, file_id)
296
187
        finally:
297
 
            br.unlock()
298
 
            if wt is not None:
299
 
                wt.unlock()
300
 
 
301
 
 
302
 
 
303
 
class cmd_gcommit(GTKCommand):
 
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):
304
196
    """GTK+ commit dialog
305
197
 
306
198
    Graphical user interface for committing revisions"""
307
199
    
308
 
    aliases = [ "gci" ]
309
200
    takes_args = []
310
201
    takes_options = []
311
202
 
312
203
    def run(self, filename=None):
313
 
        import os
314
 
        self.open_display()
315
 
        from commit import CommitDialog
316
 
        from bzrlib.errors import (BzrCommandError,
317
 
                                   NotBranchError,
318
 
                                   NoWorkingTree)
319
 
 
320
 
        wt = None
321
 
        br = None
322
 
        try:
323
 
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
324
 
            br = wt.branch
325
 
        except NoWorkingTree, e:
326
 
            path = e.base
327
 
            (br, path) = branch.Branch.open_containing(path)
328
 
 
329
 
        commit = CommitDialog(wt, path, not br)
330
 
        commit.run()
331
 
 
332
 
 
333
 
 
334
 
class cmd_gstatus(GTKCommand):
335
 
    """GTK+ status dialog
336
 
 
337
 
    Graphical user interface for showing status 
338
 
    information."""
339
 
    
340
 
    aliases = [ "gst" ]
341
 
    takes_args = ['PATH?']
342
 
    takes_options = []
343
 
 
344
 
    def run(self, path='.'):
345
 
        import os
346
 
        gtk = self.open_display()
347
 
        from status import StatusDialog
348
 
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
349
 
        status = StatusDialog(wt, wt_path)
350
 
        status.connect("destroy", gtk.main_quit)
351
 
        status.run()
352
 
 
353
 
 
354
 
 
355
 
class cmd_gconflicts(GTKCommand):
356
 
    """ GTK+ push.
357
 
    
358
 
    """
359
 
    def run(self):
360
 
        (wt, path) = workingtree.WorkingTree.open_containing('.')
361
 
        self.open_display()
362
 
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
363
 
        dialog = ConflictsDialog(wt)
364
 
        dialog.run()
365
 
 
366
 
 
367
 
 
368
 
class cmd_gpreferences(GTKCommand):
369
 
    """ GTK+ preferences dialog.
370
 
 
371
 
    """
372
 
    def run(self):
373
 
        self.open_display()
374
 
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
375
 
        dialog = PreferencesWindow()
376
 
        dialog.run()
377
 
 
378
 
 
379
 
 
380
 
class cmd_gmissing(Command):
381
 
    """ GTK+ missing revisions dialog.
382
 
 
383
 
    """
384
 
    takes_args = ["other_branch?"]
385
 
    def run(self, other_branch=None):
386
 
        pygtk = import_pygtk()
 
204
        import pygtk
 
205
        pygtk.require("2.0")
 
206
 
387
207
        try:
388
208
            import gtk
389
209
        except RuntimeError, e:
390
210
            if str(e) == "could not open display":
391
211
                raise NoDisplayError
392
212
 
393
 
        from bzrlib.plugins.gtk.missing import MissingWindow
394
 
        from bzrlib.branch import Branch
395
 
 
396
 
        local_branch = Branch.open_containing(".")[0]
397
 
        if other_branch is None:
398
 
            other_branch = local_branch.get_parent()
399
 
            
400
 
            if other_branch is None:
401
 
                raise errors.BzrCommandError("No peer location known or specified.")
402
 
        remote_branch = Branch.open_containing(other_branch)[0]
403
 
        set_ui_factory()
404
 
        local_branch.lock_read()
405
 
        try:
406
 
            remote_branch.lock_read()
407
 
            try:
408
 
                dialog = MissingWindow(local_branch, remote_branch)
409
 
                dialog.run()
410
 
            finally:
411
 
                remote_branch.unlock()
412
 
        finally:
413
 
            local_branch.unlock()
414
 
 
415
 
 
416
 
class cmd_ginit(GTKCommand):
417
 
    def run(self):
418
 
        self.open_display()
419
 
        from initialize import InitDialog
420
 
        dialog = InitDialog(os.path.abspath(os.path.curdir))
421
 
        dialog.run()
422
 
 
423
 
 
424
 
class cmd_gtags(GTKCommand):
425
 
    def run(self):
426
 
        br = branch.Branch.open_containing('.')[0]
427
 
        
428
 
        gtk = self.open_display()
429
 
        from tags import TagsWindow
430
 
        window = TagsWindow(br)
431
 
        window.show()
432
 
        gtk.main()
433
 
 
434
 
 
435
 
commands = [
436
 
    cmd_gmissing, 
437
 
    cmd_gpreferences, 
438
 
    cmd_gconflicts, 
439
 
    cmd_gstatus,
440
 
    cmd_gcommit, 
441
 
    cmd_gannotate, 
442
 
    cmd_visualise, 
443
 
    cmd_gdiff,
444
 
    cmd_gpush, 
445
 
    cmd_gcheckout, 
446
 
    cmd_gbranch,
447
 
    cmd_ginit,
448
 
    cmd_gtags
449
 
    ]
450
 
 
451
 
for cmd in commands:
452
 
    register_command(cmd)
453
 
 
454
 
 
455
 
class cmd_commit_notify(GTKCommand):
456
 
    """Run the bzr commit notifier.
457
 
 
458
 
    This is a background program which will pop up a notification on the users
459
 
    screen when a commit occurs.
460
 
    """
461
 
 
462
 
    def run(self):
463
 
        gtk = self.open_display()
464
 
        import cgi
465
 
        import dbus
466
 
        import dbus.service
467
 
        import pynotify
468
 
        from bzrlib.bzrdir import BzrDir
469
 
        from bzrlib import errors
470
 
        from bzrlib.osutils import format_date
471
 
        from bzrlib.transport import get_transport
472
 
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
473
 
            import dbus.glib
474
 
        from bzrlib.plugins.dbus import activity
475
 
        bus = dbus.SessionBus()
476
 
        # get the object so we can subscribe to callbacks from it.
477
 
        broadcast_service = bus.get_object(
478
 
            activity.Broadcast.DBUS_NAME,
479
 
            activity.Broadcast.DBUS_PATH)
480
 
        def catch_branch(revision_id, urls):
481
 
            # TODO: show all the urls, or perhaps choose the 'best'.
482
 
            url = urls[0]
483
 
            try:
484
 
                if isinstance(revision_id, unicode):
485
 
                    revision_id = revision_id.encode('utf8')
486
 
                transport = get_transport(url)
487
 
                a_dir = BzrDir.open_from_transport(transport)
488
 
                branch = a_dir.open_branch()
489
 
                revno = branch.revision_id_to_revno(revision_id)
490
 
                revision = branch.repository.get_revision(revision_id)
491
 
                summary = 'New revision %d in %s' % (revno, url)
492
 
                body  = 'Committer: %s\n' % revision.committer
493
 
                body += 'Date: %s\n' % format_date(revision.timestamp,
494
 
                    revision.timezone)
495
 
                body += '\n'
496
 
                body += revision.message
497
 
                body = cgi.escape(body)
498
 
                nw = pynotify.Notification(summary, body)
499
 
                nw.set_timeout(5000)
500
 
                nw.show()
501
 
            except Exception, e:
502
 
                print e
503
 
                raise
504
 
        broadcast_service.connect_to_signal("Revision", catch_branch,
505
 
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
506
 
        pynotify.init("bzr commit-notify")
507
 
        gtk.main()
508
 
 
509
 
register_command(cmd_commit_notify)
510
 
 
511
 
 
512
 
import gettext
513
 
gettext.install('olive-gtk')
514
 
 
 
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)
515
233
 
516
234
class NoDisplayError(BzrCommandError):
517
235
    """gtk could not find a proper display"""
518
236
 
519
237
    def __str__(self):
520
 
        return "No DISPLAY. Unable to run GTK+ application."
521
 
 
522
 
 
523
 
def test_suite():
524
 
    from unittest import TestSuite
525
 
    import tests
526
 
    import sys
527
 
    default_encoding = sys.getdefaultencoding()
528
 
    try:
529
 
        result = TestSuite()
530
 
        result.addTest(tests.test_suite())
531
 
    finally:
532
 
        if sys.getdefaultencoding() != default_encoding:
533
 
            reload(sys)
534
 
            sys.setdefaultencoding(default_encoding)
535
 
    return result
 
238
        return "No DISPLAY. gannotate is disabled."