/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 olive/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2007-02-03 13:01:12 UTC
  • Revision ID: jelmer@samba.org-20070203130112-m1stbo29f1ahthzs
Move diff to top-level directory as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/__init__.py
39
39
from errors import show_bzr_error
40
40
from guifiles import GLADEFILENAME
41
41
 
42
 
# import this classes only once
43
 
try:
44
 
    from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
45
 
    from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
46
 
    from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
47
 
    from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
48
 
    from bzrlib.plugins.gtk.commit import CommitDialog
49
 
    from bzrlib.plugins.gtk.push import PushDialog
50
 
except ImportError:
51
 
    # olive+bzr-gtk not installed. try to import from sources
52
 
    path = os.path.dirname(os.path.dirname(__file__))
53
 
    if path not in sys.path:
54
 
        sys.path.append(path)
55
 
    from viz.diffwin import DiffWindow
56
 
    from viz.branchwin import BranchWindow
57
 
    from annotate.gannotate import GAnnotateWindow
58
 
    from annotate.config import GAnnotateConfig
 
42
from bzrlib.plugins.gtk.viz.diff import DiffWindow
 
43
from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
 
44
from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
 
45
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
 
46
from bzrlib.plugins.gtk.commit import CommitDialog
 
47
from bzrlib.plugins.gtk.push import PushDialog
59
48
 
60
49
# History delimiter used in config files
61
50
delimiter = ' '