/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

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus-bzr.py
70
70
        except NotBranchError:
71
71
            return
72
72
 
73
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
73
        from bzrlib.plugins.gtk.viz.diff import DiffWindow
74
74
        window = DiffWindow()
75
75
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
76
76
        window.show()
118
118
        if vfs_file.get_uri_scheme() != 'file':
119
119
            return
120
120
 
121
 
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
 
121
        from bzrlib.plugins.gtk.branch import BranchDialog
122
122
        
123
123
        dialog = BranchDialog(vfs_file.get_name())
124
124
        dialog.display()
134
134
        except NotBranchError:
135
135
            return
136
136
 
137
 
        from bzrlib.plugins.gtk.olive.commit import CommitDialog
 
137
        from bzrlib.plugins.gtk.commit import CommitDialog
138
138
        dialog = CommitDialog(tree, path)
139
139
        dialog.display()
140
140
        gtk.main()
170
170
        except NotBranchError:
171
171
            return
172
172
 
173
 
        from bzrlib.plugins.gtk.olive.pull import PullDialog
 
173
        from bzrlib.plugins.gtk.pull import PullDialog
174
174
        dialog = PullDialog(tree, path)
175
175
        dialog.display()
176
176
        gtk.main()
188
188
        except NotBranchError:
189
189
            return
190
190
 
191
 
        from bzrlib.plugins.gtk.olive.merge import MergeDialog
 
191
        from bzrlib.plugins.gtk.merge import MergeDialog
192
192
        dialog = MergeDialog(tree, path)
193
193
        dialog.display()
194
194
        gtk.main()