/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: Vincent Ladeuil
  • Date: 2009-06-15 14:02:08 UTC
  • mto: This revision was merged to the branch mainline in revision 649.
  • Revision ID: v.ladeuil+lp@free.fr-20090615140208-k5zg9c0vttrr9se8
Integrater Jelmer patch and implement a more robust solution.

* ui.py:
(GtkUIFactory._progress_all_finished): *Don't* uninstall the
widget.

* branchview/treeview.py:
(TreeView.__init__): Unconditionally install the progress widget
that will remain active until someone else install one or the
TreeView is destroyed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
visualise         Graphically visualise this branch. 
35
35
"""
36
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
37
import bzrlib
54
38
import bzrlib.api
55
39
from bzrlib import (
59
43
    )
60
44
from bzrlib.commands import plugin_cmds
61
45
 
 
46
import os.path
62
47
 
63
 
version_info = (0, 99, 0, 'dev', 1)
 
48
version_info = (0, 96, 0, 'dev', 1)
64
49
 
65
50
if version_info[3] == 'final':
66
51
    version_string = '%d.%d.%d' % version_info[:3]
70
55
 
71
56
COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0),
72
57
                           (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
 
                           ]
 
58
                           (1, 15, 0),]
78
59
 
79
60
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
80
61
 
144
125
    "gsend": [],
145
126
    "gstatus": ["gst"],
146
127
    "gtags": [],
147
 
    "visualise": ["visualize", "vis", "viz", 'glog'],
 
128
    "visualise": ["visualize", "vis", "viz"],
148
129
    }
149
130
 
150
131
try: