/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 nautilus-bzr.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 12:43:48 UTC
  • mto: (126.1.38 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315124348-0nx0zb7fv4pa8xk6
Fix the indentation error in the TortoiseBZR test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus-bzr.py
 
1
# Trivial Bazaar plugin for Nautilus
 
2
#
 
3
# Copyright (C) 2006 Jeff Bailey
 
4
# Copyright (C) 2006 Wouter van Heyst
 
5
# Copyright (C) 2006 Jelmer Vernooij
 
6
#
 
7
# Published under the GNU GPL
 
8
 
1
9
import nautilus
2
10
import bzrlib
3
11
from bzrlib.bzrdir import BzrDir
70
78
        except NotBranchError:
71
79
            return
72
80
 
73
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
81
        from bzrlib.plugins.gtk.viz.diff import DiffWindow
74
82
        window = DiffWindow()
75
83
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
76
84
        window.show()
118
126
        if vfs_file.get_uri_scheme() != 'file':
119
127
            return
120
128
 
121
 
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
 
129
        from bzrlib.plugins.gtk.branch import BranchDialog
122
130
        
123
131
        dialog = BranchDialog(vfs_file.get_name())
124
132
        dialog.display()
134
142
        except NotBranchError:
135
143
            return
136
144
 
137
 
        from bzrlib.plugins.gtk.olive.commit import CommitDialog
 
145
        from bzrlib.plugins.gtk.commit import CommitDialog
138
146
        dialog = CommitDialog(tree, path)
139
147
        dialog.display()
140
148
        gtk.main()
170
178
        except NotBranchError:
171
179
            return
172
180
 
173
 
        from bzrlib.plugins.gtk.olive.pull import PullDialog
 
181
        from bzrlib.plugins.gtk.pull import PullDialog
174
182
        dialog = PullDialog(tree, path)
175
183
        dialog.display()
176
184
        gtk.main()
188
196
        except NotBranchError:
189
197
            return
190
198
 
191
 
        from bzrlib.plugins.gtk.olive.merge import MergeDialog
 
199
        from bzrlib.plugins.gtk.merge import MergeDialog
192
200
        dialog = MergeDialog(tree, path)
193
201
        dialog.display()
194
202
        gtk.main()