/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

Merged an approved request (single clicking bookmark).

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-2008 Jelmer Vernooij <jelmer@samba.org>
 
6
#
 
7
# Published under the GNU GPL
 
8
 
 
9
import gtk
1
10
import nautilus
2
11
import bzrlib
 
12
from bzrlib.branch import Branch
3
13
from bzrlib.bzrdir import BzrDir
4
 
from bzrlib.errors import NotBranchError
 
14
from bzrlib.errors import NotBranchError, NoWorkingTree, UnsupportedProtocol
 
15
from bzrlib.tree import file_status
5
16
from bzrlib.workingtree import WorkingTree
6
 
from bzrlib.tree import file_status
7
17
 
8
18
from bzrlib.plugin import load_plugins
9
19
load_plugins()
70
80
        except NotBranchError:
71
81
            return
72
82
 
73
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
83
        from bzrlib.plugins.gtk.diff import DiffWindow
74
84
        window = DiffWindow()
75
85
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
76
86
        window.show()
88
98
        try:
89
99
            tree, path = WorkingTree.open_containing(file)
90
100
        except NotBranchError:
91
 
            BzrDir.create_branch_and_repo(file)
 
101
            BzrDir.create_standalone_workingtree(file)
92
102
 
93
103
    def remove_cb(self, menu, vfs_file):
94
104
        # We can only cope with local files
118
128
        if vfs_file.get_uri_scheme() != 'file':
119
129
            return
120
130
 
121
 
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
 
131
        from bzrlib.plugins.gtk.branch import BranchDialog
122
132
        
123
133
        dialog = BranchDialog(vfs_file.get_name())
124
 
        dialog.display()
 
134
        response = dialog.run()
 
135
        if response != gtk.RESPONSE_NONE:
 
136
            dialog.hide()
 
137
            dialog.destroy()
125
138
 
126
139
    def commit_cb(self, menu, vfs_file=None):
127
140
        # We can only cope with local files
129
142
            return
130
143
 
131
144
        file = vfs_file.get_uri()
 
145
        tree = None
 
146
        branch = None
132
147
        try:
133
148
            tree, path = WorkingTree.open_containing(file)
134
 
        except NotBranchError:
135
 
            return
 
149
            branch = tree.branch
 
150
        except NotBranchError, e:
 
151
            path = e.path
 
152
            #return
 
153
        except NoWorkingTree, e:
 
154
            path = e.base
 
155
            try:
 
156
                (branch, path) = Branch.open_containing(path)
 
157
            except NotBranchError, e:
 
158
                path = e.path
136
159
 
137
 
        from bzrlib.plugins.gtk.olive.commit import CommitDialog
 
160
        from bzrlib.plugins.gtk.commit import CommitDialog
138
161
        dialog = CommitDialog(tree, path)
139
 
        dialog.display()
140
 
        gtk.main()
 
162
        response = dialog.run()
 
163
        if response != gtk.RESPONSE_NONE:
 
164
            dialog.hide()
 
165
            dialog.destroy()
141
166
 
142
167
    def log_cb(self, menu, vfs_file):
143
168
        # We can only cope with local files
157
182
 
158
183
        return
159
184
 
 
185
    def pull_cb(self, menu, vfs_file):
 
186
        # We can only cope with local files
 
187
        if vfs_file.get_uri_scheme() != 'file':
 
188
            return
 
189
 
 
190
        file = vfs_file.get_uri()
 
191
 
 
192
        # We only want to continue here if we get a NotBranchError
 
193
        try:
 
194
            tree, path = WorkingTree.open_containing(file)
 
195
        except NotBranchError:
 
196
            return
 
197
 
 
198
        from bzrlib.plugins.gtk.pull import PullDialog
 
199
        dialog = PullDialog(tree, path)
 
200
        dialog.display()
 
201
        gtk.main()
 
202
 
 
203
    def merge_cb(self, menu, vfs_file):
 
204
        # We can only cope with local files
 
205
        if vfs_file.get_uri_scheme() != 'file':
 
206
            return
 
207
 
 
208
        file = vfs_file.get_uri()
 
209
 
 
210
        # We only want to continue here if we get a NotBranchError
 
211
        try:
 
212
            tree, path = WorkingTree.open_containing(file)
 
213
        except NotBranchError:
 
214
            return
 
215
 
 
216
        from bzrlib.plugins.gtk.merge import MergeDialog
 
217
        dialog = MergeDialog(tree, path)
 
218
        dialog.display()
 
219
        gtk.main()
 
220
 
160
221
    def get_background_items(self, window, vfs_file):
161
222
        items = []
162
223
        file = vfs_file.get_uri()
163
224
        try:
164
225
            tree, path = WorkingTree.open_containing(file)
 
226
        except UnsupportedProtocol:
 
227
            return
165
228
        except NotBranchError:
166
229
            item = nautilus.MenuItem('BzrNautilus::newtree',
167
230
                                 'Make directory versioned',
176
239
            items.append(item)
177
240
 
178
241
            return items
 
242
        except NoWorkingTree:
 
243
            return
179
244
 
180
245
        item = nautilus.MenuItem('BzrNautilus::log',
181
246
                             'Log',
183
248
        item.connect('activate', self.log_cb, vfs_file)
184
249
        items.append(item)
185
250
 
 
251
        item = nautilus.MenuItem('BzrNautilus::pull',
 
252
                             'Pull',
 
253
                             'Pull from another branch')
 
254
        item.connect('activate', self.pull_cb, vfs_file)
 
255
        items.append(item)
 
256
 
 
257
        item = nautilus.MenuItem('BzrNautilus::merge',
 
258
                             'Merge',
 
259
                             'Merge from another branch')
 
260
        item.connect('activate', self.merge_cb, vfs_file)
 
261
        items.append(item)
 
262
 
186
263
        item = nautilus.MenuItem('BzrNautilus::commit',
187
264
                             'Commit',
188
265
                             'Commit Changes')
191
268
 
192
269
        return items
193
270
 
194
 
 
195
271
    def get_file_items(self, window, files):
196
272
        items = []
197
273
 
 
274
        wtfiles = {}
198
275
        for vfs_file in files:
199
276
            # We can only cope with local files
200
277
            if vfs_file.get_uri_scheme() != 'file':
201
 
                return
 
278
                continue
202
279
 
203
280
            file = vfs_file.get_uri()
204
281
            try:
205
282
                tree, path = WorkingTree.open_containing(file)
206
283
            except NotBranchError:
207
284
                if not vfs_file.is_directory():
208
 
                    return
 
285
                    continue
209
286
                item = nautilus.MenuItem('BzrNautilus::newtree',
210
287
                                     'Make directory versioned',
211
288
                                     'Create new Bazaar tree in %s' % vfs_file.get_name())
212
289
                item.connect('activate', self.newtree_cb, vfs_file)
213
290
                return item,
214
 
 
215
 
            file_class = tree.file_class(path)
216
 
 
217
 
            if file_class == '?':
 
291
            except NoWorkingTree:
 
292
                continue
 
293
            # Refresh the list of filestatuses in the working tree
 
294
            if path not in wtfiles.keys():
 
295
                tree.lock_read()
 
296
                for rpath, file_class, kind, id, entry in tree.list_files():
 
297
                    wtfiles[rpath] = file_class
 
298
                tree.unlock()
 
299
                wtfiles[u''] = 'V'
 
300
 
 
301
            if wtfiles[path] == '?':
218
302
                item = nautilus.MenuItem('BzrNautilus::add',
219
303
                                     'Add',
220
304
                                     'Add as versioned file')
226
310
                                     'Ignore file for versioning')
227
311
                item.connect('activate', self.ignore_cb, vfs_file)
228
312
                items.append(item)
229
 
            elif file_class == 'I':
 
313
            elif wtfiles[path] == 'I':
230
314
                item = nautilus.MenuItem('BzrNautilus::unignore',
231
315
                                     'Unignore',
232
316
                                     'Unignore file for versioning')
233
317
                item.connect('activate', self.unignore_cb, vfs_file)
234
318
                items.append(item)
235
 
            elif file_class == 'V':
 
319
            elif wtfiles[path] == 'V':
236
320
                item = nautilus.MenuItem('BzrNautilus::log',
237
321
                                 'Log',
238
322
                                 'List changes')
279
363
            tree, path = WorkingTree.open_containing(file.get_uri())
280
364
        except NotBranchError:
281
365
            return
 
366
        except NoWorkingTree:
 
367
            return
282
368
 
283
369
        emblem = None
284
370
        status = None
285
371
 
286
372
        if tree.has_filename(path):
287
 
            emblem = 'cvs-controlled'
 
373
            emblem = 'bzr-controlled'
288
374
            status = 'unchanged'
289
375
            id = tree.path2id(path)
290
376
 
291
377
            delta = tree.changes_from(tree.branch.basis_tree())
292
378
            if delta.touches_file_id(id):
293
 
                emblem = 'cvs-modified'
 
379
                emblem = 'bzr-modified'
294
380
                status = 'modified'
295
381
            for f, _, _ in delta.added:
296
382
                if f == path:
297
 
                    emblem = 'cvs-added'
 
383
                    emblem = 'bzr-added'
298
384
                    status = 'added'
299
385
 
300
386
            for of, f, _, _, _, _ in delta.renamed:
302
388
                    status = 'renamed from %s' % f
303
389
 
304
390
        elif tree.branch.basis_tree().has_filename(path):
305
 
            emblem = 'cvs-removed'
 
391
            emblem = 'bzr-removed'
306
392
            status = 'removed'
307
393
        else:
308
394
            # FIXME: Check for ignored files
309
395
            status = 'unversioned'
 
396
            emblem = 'bzr-unversioned'
310
397
        
311
398
        if emblem is not None:
312
399
            file.add_emblem(emblem)