/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: Jelmer Vernooij
  • Date: 2006-10-08 20:51:52 UTC
  • Revision ID: jelmer@samba.org-20061008205152-1c5306ee8eb43b95
Use Olive's clone dialog in nautilus-bzr; remove the old Clone dialog 
from BzrGtk.

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
10
1
import nautilus
11
2
import bzrlib
12
 
from bzrlib.branch import Branch
13
3
from bzrlib.bzrdir import BzrDir
14
 
from bzrlib.errors import NotBranchError, NoWorkingTree, UnsupportedProtocol
 
4
from bzrlib.errors import NotBranchError
 
5
from bzrlib.workingtree import WorkingTree
15
6
from bzrlib.tree import file_status
16
 
from bzrlib.workingtree import WorkingTree
17
 
from bzrlib.config import GlobalConfig
18
7
 
19
8
from bzrlib.plugin import load_plugins
20
9
load_plugins()
21
10
 
22
 
from bzrlib.plugins.gtk import _i18n, cmd_visualise, cmd_gannotate
 
11
from bzrlib.plugins.gtk import cmd_visualise, cmd_gannotate
23
12
 
24
13
class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
25
14
    def __init__(self):
81
70
        except NotBranchError:
82
71
            return
83
72
 
84
 
        from bzrlib.plugins.gtk.diff import DiffWindow
 
73
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
85
74
        window = DiffWindow()
86
75
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
87
76
        window.show()
99
88
        try:
100
89
            tree, path = WorkingTree.open_containing(file)
101
90
        except NotBranchError:
102
 
            BzrDir.create_standalone_workingtree(file)
 
91
            BzrDir.create_branch_and_repo(file)
103
92
 
104
93
    def remove_cb(self, menu, vfs_file):
105
94
        # We can only cope with local files
129
118
        if vfs_file.get_uri_scheme() != 'file':
130
119
            return
131
120
 
132
 
        from bzrlib.plugins.gtk.branch import BranchDialog
 
121
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
133
122
        
134
123
        dialog = BranchDialog(vfs_file.get_name())
135
 
        response = dialog.run()
136
 
        if response != gtk.RESPONSE_NONE:
137
 
            dialog.hide()
138
 
            dialog.destroy()
 
124
        dialog.display()
139
125
 
140
126
    def commit_cb(self, menu, vfs_file=None):
141
127
        # We can only cope with local files
143
129
            return
144
130
 
145
131
        file = vfs_file.get_uri()
146
 
        tree = None
147
 
        branch = None
148
132
        try:
149
133
            tree, path = WorkingTree.open_containing(file)
150
 
            branch = tree.branch
151
 
        except NotBranchError, e:
152
 
            path = e.path
153
 
            #return
154
 
        except NoWorkingTree, e:
155
 
            path = e.base
156
 
            try:
157
 
                (branch, path) = Branch.open_containing(path)
158
 
            except NotBranchError, e:
159
 
                path = e.path
 
134
        except NotBranchError:
 
135
            return
160
136
 
161
 
        from bzrlib.plugins.gtk.commit import CommitDialog
 
137
        from bzrlib.plugins.gtk.olive.commit import CommitDialog
162
138
        dialog = CommitDialog(tree, path)
163
 
        response = dialog.run()
164
 
        if response != gtk.RESPONSE_NONE:
165
 
            dialog.hide()
166
 
            dialog.destroy()
 
139
        dialog.display()
 
140
        gtk.main()
167
141
 
168
142
    def log_cb(self, menu, vfs_file):
169
143
        # We can only cope with local files
183
157
 
184
158
        return
185
159
 
186
 
    def pull_cb(self, menu, vfs_file):
187
 
        # We can only cope with local files
188
 
        if vfs_file.get_uri_scheme() != 'file':
189
 
            return
190
 
 
191
 
        file = vfs_file.get_uri()
192
 
 
193
 
        # We only want to continue here if we get a NotBranchError
194
 
        try:
195
 
            tree, path = WorkingTree.open_containing(file)
196
 
        except NotBranchError:
197
 
            return
198
 
 
199
 
        from bzrlib.plugins.gtk.pull import PullDialog
200
 
        dialog = PullDialog(tree, path)
201
 
        dialog.display()
202
 
        gtk.main()
203
 
 
204
 
    def merge_cb(self, menu, vfs_file):
205
 
        # We can only cope with local files
206
 
        if vfs_file.get_uri_scheme() != 'file':
207
 
            return
208
 
 
209
 
        file = vfs_file.get_uri()
210
 
 
211
 
        # We only want to continue here if we get a NotBranchError
212
 
        try:
213
 
            tree, path = WorkingTree.open_containing(file)
214
 
        except NotBranchError:
215
 
            return
216
 
 
217
 
        from bzrlib.plugins.gtk.merge import MergeDialog
218
 
        dialog = MergeDialog(tree, path)
219
 
        dialog.display()
220
 
        gtk.main()
221
 
 
222
160
    def get_background_items(self, window, vfs_file):
223
161
        items = []
224
162
        file = vfs_file.get_uri()
225
 
 
226
163
        try:
227
164
            tree, path = WorkingTree.open_containing(file)
228
 
            disabled_flag = self.check_branch_enabled(tree.branch)
229
 
        except UnsupportedProtocol:
230
 
            return
231
165
        except NotBranchError:
232
 
            disabled_flag = self.check_branch_enabled()
233
166
            item = nautilus.MenuItem('BzrNautilus::newtree',
234
 
                                 'Make directory versioned',
 
167
                                 'Create new Bazaar tree',
235
168
                                 'Create new Bazaar tree in this folder')
236
169
            item.connect('activate', self.newtree_cb, vfs_file)
237
170
            items.append(item)
238
171
 
239
172
            item = nautilus.MenuItem('BzrNautilus::clone',
240
 
                                 'Checkout Bazaar branch',
 
173
                                 'Checkout',
241
174
                                 'Checkout Existing Bazaar Branch')
242
175
            item.connect('activate', self.clone_cb, vfs_file)
243
176
            items.append(item)
244
177
 
245
178
            return items
246
 
        except NoWorkingTree:
247
 
            return
248
 
        
249
 
        if disabled_flag == 'False':
250
 
            item = nautilus.MenuItem('BzrNautilus::enable',
251
 
                                     'Enable Bazaar Plugin for this Branch',
252
 
                                     'Enable Bazaar plugin for nautilus')
253
 
            item.connect('activate', self.toggle_integration, 'True', vfs_file)
254
 
            return item,
255
 
        else:
256
 
            item = nautilus.MenuItem('BzrNautilus::disable',
257
 
                                      'Disable Bazaar Plugin for the Branch',
258
 
                                      'Disable Bazaar plugin for nautilus')
259
 
            item.connect('activate', self.toggle_integration, 'False', vfs_file)
260
 
            items.append(item)
261
179
 
262
180
        item = nautilus.MenuItem('BzrNautilus::log',
263
181
                             'Log',
265
183
        item.connect('activate', self.log_cb, vfs_file)
266
184
        items.append(item)
267
185
 
268
 
        item = nautilus.MenuItem('BzrNautilus::pull',
269
 
                             'Pull',
270
 
                             'Pull from another branch')
271
 
        item.connect('activate', self.pull_cb, vfs_file)
272
 
        items.append(item)
273
 
 
274
 
        item = nautilus.MenuItem('BzrNautilus::merge',
275
 
                             'Merge',
276
 
                             'Merge from another branch')
277
 
        item.connect('activate', self.merge_cb, vfs_file)
278
 
        items.append(item)
279
 
 
280
186
        item = nautilus.MenuItem('BzrNautilus::commit',
281
187
                             'Commit',
282
188
                             'Commit Changes')
285
191
 
286
192
        return items
287
193
 
 
194
 
288
195
    def get_file_items(self, window, files):
289
196
        items = []
290
 
        
291
 
        wtfiles = {}
 
197
 
292
198
        for vfs_file in files:
293
199
            # We can only cope with local files
294
200
            if vfs_file.get_uri_scheme() != 'file':
295
 
                continue
 
201
                return
296
202
 
297
203
            file = vfs_file.get_uri()
298
204
            try:
299
205
                tree, path = WorkingTree.open_containing(file)
300
 
                disabled_flag = self.check_branch_enabled(tree.branch)
301
206
            except NotBranchError:
302
 
                disabled_flag = self.check_branch_enabled()
303
207
                if not vfs_file.is_directory():
304
 
                    continue
305
 
 
306
 
                if disabled_flag == 'False':
307
208
                    return
308
 
 
309
209
                item = nautilus.MenuItem('BzrNautilus::newtree',
310
 
                                     'Make directory versioned',
 
210
                                     'Create new Bazaar tree',
311
211
                                     'Create new Bazaar tree in %s' % vfs_file.get_name())
312
212
                item.connect('activate', self.newtree_cb, vfs_file)
313
213
                return item,
314
 
            except NoWorkingTree:
315
 
                continue
316
 
            # Refresh the list of filestatuses in the working tree
317
 
            if path not in wtfiles.keys():
318
 
                tree.lock_read()
319
 
                for rpath, file_class, kind, id, entry in tree.list_files():
320
 
                    wtfiles[rpath] = file_class
321
 
                tree.unlock()
322
 
                wtfiles[u''] = 'V'
323
 
 
324
 
            if wtfiles[path] == '?':
 
214
 
 
215
            file_class = tree.file_class(path)
 
216
 
 
217
            if file_class == '?':
325
218
                item = nautilus.MenuItem('BzrNautilus::add',
326
219
                                     'Add',
327
220
                                     'Add as versioned file')
333
226
                                     'Ignore file for versioning')
334
227
                item.connect('activate', self.ignore_cb, vfs_file)
335
228
                items.append(item)
336
 
            elif wtfiles[path] == 'I':
 
229
            elif file_class == 'I':
337
230
                item = nautilus.MenuItem('BzrNautilus::unignore',
338
231
                                     'Unignore',
339
232
                                     'Unignore file for versioning')
340
233
                item.connect('activate', self.unignore_cb, vfs_file)
341
234
                items.append(item)
342
 
            elif wtfiles[path] == 'V':
 
235
            elif file_class == 'V':
343
236
                item = nautilus.MenuItem('BzrNautilus::log',
344
237
                                 'Log',
345
238
                                 'List changes')
379
272
                               "Version control status"),
380
273
 
381
274
    def update_file_info(self, file):
382
 
 
383
275
        if file.get_uri_scheme() != 'file':
384
276
            return
385
277
        
387
279
            tree, path = WorkingTree.open_containing(file.get_uri())
388
280
        except NotBranchError:
389
281
            return
390
 
        except NoWorkingTree:
391
 
            return   
392
 
 
393
 
        disabled_flag = self.check_branch_enabled(tree.branch)
394
 
        if disabled_flag == 'False':
395
 
            return
396
282
 
397
283
        emblem = None
398
284
        status = None
399
285
 
400
286
        if tree.has_filename(path):
401
 
            emblem = 'bzr-controlled'
 
287
            emblem = 'cvs-controlled'
402
288
            status = 'unchanged'
403
289
            id = tree.path2id(path)
404
290
 
405
291
            delta = tree.changes_from(tree.branch.basis_tree())
406
292
            if delta.touches_file_id(id):
407
 
                emblem = 'bzr-modified'
 
293
                emblem = 'cvs-modified'
408
294
                status = 'modified'
409
295
            for f, _, _ in delta.added:
410
296
                if f == path:
411
 
                    emblem = 'bzr-added'
 
297
                    emblem = 'cvs-added'
412
298
                    status = 'added'
413
299
 
414
300
            for of, f, _, _, _, _ in delta.renamed:
416
302
                    status = 'renamed from %s' % f
417
303
 
418
304
        elif tree.branch.basis_tree().has_filename(path):
419
 
            emblem = 'bzr-removed'
 
305
            emblem = 'cvs-removed'
420
306
            status = 'removed'
421
307
        else:
422
308
            # FIXME: Check for ignored files
425
311
        if emblem is not None:
426
312
            file.add_emblem(emblem)
427
313
        file.add_string_attribute('bzr_status', status)
428
 
 
429
 
    def check_branch_enabled(self, branch=None):
430
 
        # Supports global disable, but there is currently no UI to do this
431
 
        config = GlobalConfig()
432
 
        disabled_flag = config.get_user_option('nautilus_integration')
433
 
        if disabled_flag != 'False':
434
 
            if branch is not None:
435
 
                config = branch.get_config()
436
 
                disabled_flag = config.get_user_option('nautilus_integration')
437
 
        return disabled_flag
438
 
 
439
 
    def toggle_integration(self, menu, action, vfs_file=None):
440
 
        try:
441
 
            tree, path = WorkingTree.open_containing(vfs_file.get_uri())
442
 
        except NotBranchError:
443
 
            return
444
 
        except NoWorkingTree:
445
 
            return
446
 
        branch = tree.branch
447
 
        if branch is None:
448
 
            config = GlobalConfig()
449
 
        else:
450
 
            config = branch.get_config()
451
 
        config.set_user_option('nautilus_integration', action)
452