/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-09-05 20:46:39 UTC
  • mfrom: (0.5.16 nautilus-bzr)
  • Revision ID: jelmer@samba.org-20060905204639-855b949625e30ba6
Integrate nautilus-bzr.

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
15
 
from bzrlib.tree import file_status
 
4
from bzrlib.errors import NotBranchError
16
5
from bzrlib.workingtree import WorkingTree
17
 
from bzrlib.config import GlobalConfig
18
6
 
19
7
from bzrlib.plugin import load_plugins
20
8
load_plugins()
21
9
 
22
 
from bzrlib.plugins.gtk import _i18n, cmd_visualise, cmd_gannotate
 
10
try:
 
11
    from bzrlib.plugins.gtk import cmd_visualise, cmd_gannotate
 
12
    have_gtkplugin = True
 
13
except ImportError:
 
14
    have_gtkplugin = False
23
15
 
24
 
class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
 
16
class BzrExtension(nautilus.MenuProvider):
25
17
    def __init__(self):
26
18
        pass
27
19
 
81
73
        except NotBranchError:
82
74
            return
83
75
 
84
 
        from bzrlib.plugins.gtk.diff import DiffWindow
 
76
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
85
77
        window = DiffWindow()
86
 
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
 
78
        window.set_diff(tree.branch, tree, tree.branch.revision_tree())
87
79
        window.show()
88
80
 
89
81
        return
99
91
        try:
100
92
            tree, path = WorkingTree.open_containing(file)
101
93
        except NotBranchError:
102
 
            BzrDir.create_standalone_workingtree(file)
 
94
            BzrDir.create_branch_and_repo(file)
103
95
 
104
96
    def remove_cb(self, menu, vfs_file):
105
97
        # We can only cope with local files
129
121
        if vfs_file.get_uri_scheme() != 'file':
130
122
            return
131
123
 
132
 
        from bzrlib.plugins.gtk.branch import BranchDialog
133
 
        
134
 
        dialog = BranchDialog(vfs_file.get_name())
135
 
        response = dialog.run()
136
 
        if response != gtk.RESPONSE_NONE:
137
 
            dialog.hide()
138
 
            dialog.destroy()
 
124
        file = vfs_file.get_uri()
 
125
        try:
 
126
            tree, path = WorkingTree.open_containing(file)
 
127
        except NotBranchError:
 
128
            return
 
129
 
 
130
        from bzrlib.plugins.gtk.clone import CloneDialog
 
131
        dialog = CloneDialog(file)
 
132
        if dialog.run() != gtk.RESPONSE_CANCEL:
 
133
            bzrdir = BzrDir.open(dialog.url)
 
134
            bzrdir.sprout(dialog.dest_path)
139
135
 
140
136
    def commit_cb(self, menu, vfs_file=None):
141
137
        # We can only cope with local files
143
139
            return
144
140
 
145
141
        file = vfs_file.get_uri()
146
 
        tree = None
147
 
        branch = None
148
142
        try:
149
143
            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
 
144
        except NotBranchError:
 
145
            return
160
146
 
161
 
        from bzrlib.plugins.gtk.commit import CommitDialog
162
 
        dialog = CommitDialog(tree, path)
163
 
        response = dialog.run()
164
 
        if response != gtk.RESPONSE_NONE:
165
 
            dialog.hide()
166
 
            dialog.destroy()
 
147
        from bzrlib.plugins.gtk.commit import GCommitDialog
 
148
        dialog = GCommitDialog(tree)
 
149
        dialog.set_title(path + " - Commit")
 
150
        if dialog.run() != gtk.RESPONSE_CANCEL:
 
151
            Commit().commit(working_tree=wt,message=dialog.message,
 
152
                            specific_files=dialog.specific_files)
167
153
 
168
154
    def log_cb(self, menu, vfs_file):
169
155
        # We can only cope with local files
183
169
 
184
170
        return
185
171
 
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
172
    def get_background_items(self, window, vfs_file):
223
 
        items = []
224
173
        file = vfs_file.get_uri()
225
 
 
226
174
        try:
227
175
            tree, path = WorkingTree.open_containing(file)
228
 
            disabled_flag = self.check_branch_enabled(tree.branch)
229
 
        except UnsupportedProtocol:
230
 
            return
231
176
        except NotBranchError:
232
 
            disabled_flag = self.check_branch_enabled()
233
177
            item = nautilus.MenuItem('BzrNautilus::newtree',
234
 
                                 'Make directory versioned',
 
178
                                 'Create new Bazaar tree',
235
179
                                 'Create new Bazaar tree in this folder')
236
180
            item.connect('activate', self.newtree_cb, vfs_file)
237
181
            items.append(item)
238
182
 
239
183
            item = nautilus.MenuItem('BzrNautilus::clone',
240
 
                                 'Checkout Bazaar branch',
 
184
                                 'Checkout',
241
185
                                 'Checkout Existing Bazaar Branch')
242
186
            item.connect('activate', self.clone_cb, vfs_file)
243
187
            items.append(item)
244
188
 
245
189
            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
 
 
262
 
        item = nautilus.MenuItem('BzrNautilus::log',
263
 
                             'Log',
264
 
                             'Show Bazaar history')
265
 
        item.connect('activate', self.log_cb, vfs_file)
266
 
        items.append(item)
267
 
 
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
 
        item = nautilus.MenuItem('BzrNautilus::commit',
281
 
                             'Commit',
282
 
                             'Commit Changes')
283
 
        item.connect('activate', self.commit_cb, vfs_file)
284
 
        items.append(item)
 
190
 
 
191
        items = []
 
192
        if have_gtkplugin:
 
193
            item = nautilus.MenuItem('BzrNautilus::log',
 
194
                                 'Log',
 
195
                                 'Show Bazaar history')
 
196
            item.connect('activate', self.log_cb, vfs_file)
 
197
            items.append(item)
 
198
 
 
199
            item = nautilus.MenuItem('BzrNautilus::commit',
 
200
                                 'Commit',
 
201
                                 'Commit Changes')
 
202
            item.connect('activate', self.commit_cb, vfs_file)
 
203
            items.append(item)
285
204
 
286
205
        return items
287
206
 
 
207
 
288
208
    def get_file_items(self, window, files):
289
209
        items = []
290
 
        
291
 
        wtfiles = {}
 
210
 
292
211
        for vfs_file in files:
293
212
            # We can only cope with local files
294
213
            if vfs_file.get_uri_scheme() != 'file':
295
 
                continue
 
214
                return
296
215
 
297
216
            file = vfs_file.get_uri()
298
217
            try:
299
218
                tree, path = WorkingTree.open_containing(file)
300
 
                disabled_flag = self.check_branch_enabled(tree.branch)
301
219
            except NotBranchError:
302
 
                disabled_flag = self.check_branch_enabled()
303
220
                if not vfs_file.is_directory():
304
 
                    continue
305
 
 
306
 
                if disabled_flag == 'False':
307
221
                    return
308
 
 
309
222
                item = nautilus.MenuItem('BzrNautilus::newtree',
310
 
                                     'Make directory versioned',
 
223
                                     'Create new Bazaar tree',
311
224
                                     'Create new Bazaar tree in %s' % vfs_file.get_name())
312
225
                item.connect('activate', self.newtree_cb, vfs_file)
313
226
                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] == '?':
 
227
 
 
228
            file_class = tree.file_class(path)
 
229
 
 
230
            if file_class == '?':
325
231
                item = nautilus.MenuItem('BzrNautilus::add',
326
232
                                     'Add',
327
233
                                     'Add as versioned file')
333
239
                                     'Ignore file for versioning')
334
240
                item.connect('activate', self.ignore_cb, vfs_file)
335
241
                items.append(item)
336
 
            elif wtfiles[path] == 'I':
 
242
            elif file_class == 'I':
337
243
                item = nautilus.MenuItem('BzrNautilus::unignore',
338
244
                                     'Unignore',
339
245
                                     'Unignore file for versioning')
340
246
                item.connect('activate', self.unignore_cb, vfs_file)
341
247
                items.append(item)
342
 
            elif wtfiles[path] == 'V':
343
 
                item = nautilus.MenuItem('BzrNautilus::log',
344
 
                                 'Log',
345
 
                                 'List changes')
346
 
                item.connect('activate', self.log_cb, vfs_file)
347
 
                items.append(item)
 
248
            elif file_class == 'V':
 
249
                if have_gtkplugin:
 
250
                    item = nautilus.MenuItem('BzrNautilus::log',
 
251
                                     'Log',
 
252
                                     'List changes')
 
253
                    item.connect('activate', self.log_cb, vfs_file)
 
254
                    items.append(item)
348
255
 
349
 
                item = nautilus.MenuItem('BzrNautilus::diff',
350
 
                                 'Diff',
351
 
                                 'Show differences')
352
 
                item.connect('activate', self.diff_cb, vfs_file)
353
 
                items.append(item)
 
256
                    item = nautilus.MenuItem('BzrNautilus::diff',
 
257
                                     'Diff',
 
258
                                     'Show differences')
 
259
                    item.connect('activate', self.diff_cb, vfs_file)
 
260
                    items.append(item)
354
261
 
355
262
                item = nautilus.MenuItem('BzrNautilus::remove',
356
263
                                     'Remove',
358
265
                item.connect('activate', self.remove_cb, vfs_file)
359
266
                items.append(item)
360
267
 
361
 
                item = nautilus.MenuItem('BzrNautilus::annotate',
362
 
                             'Annotate',
363
 
                             'Annotate File Data')
364
 
                item.connect('activate', self.annotate_cb, vfs_file)
365
 
                items.append(item)
366
 
 
367
 
                item = nautilus.MenuItem('BzrNautilus::commit',
368
 
                             'Commit',
369
 
                             'Commit Changes')
370
 
                item.connect('activate', self.commit_cb, vfs_file)
371
 
                items.append(item)
372
 
 
 
268
                if have_gtkplugin:
 
269
                    item = nautilus.MenuItem('BzrNautilus::annotate',
 
270
                                 'Annotate',
 
271
                                 'Annotate File Data')
 
272
                    item.connect('activate', self.annotate_cb, vfs_file)
 
273
                    items.append(item)
 
274
 
 
275
                    item = nautilus.MenuItem('BzrNautilus::commit',
 
276
                                 'Commit',
 
277
                                 'Commit Changes')
 
278
                    item.connect('activate', self.commit_cb, vfs_file)
 
279
                    items.append(item)
 
280
    
373
281
        return items
374
 
 
375
 
    def get_columns(self):
376
 
        return nautilus.Column("BzrNautilus::bzr_status",
377
 
                               "bzr_status",
378
 
                               "Bzr Status",
379
 
                               "Version control status"),
380
 
 
381
 
    def update_file_info(self, file):
382
 
 
383
 
        if file.get_uri_scheme() != 'file':
384
 
            return
385
 
        
386
 
        try:
387
 
            tree, path = WorkingTree.open_containing(file.get_uri())
388
 
        except NotBranchError:
389
 
            return
390
 
        except NoWorkingTree:
391
 
            return   
392
 
 
393
 
        disabled_flag = self.check_branch_enabled(tree.branch)
394
 
        if disabled_flag == 'False':
395
 
            return
396
 
 
397
 
        emblem = None
398
 
        status = None
399
 
 
400
 
        if tree.has_filename(path):
401
 
            emblem = 'bzr-controlled'
402
 
            status = 'unchanged'
403
 
            id = tree.path2id(path)
404
 
 
405
 
            delta = tree.changes_from(tree.branch.basis_tree())
406
 
            if delta.touches_file_id(id):
407
 
                emblem = 'bzr-modified'
408
 
                status = 'modified'
409
 
            for f, _, _ in delta.added:
410
 
                if f == path:
411
 
                    emblem = 'bzr-added'
412
 
                    status = 'added'
413
 
 
414
 
            for of, f, _, _, _, _ in delta.renamed:
415
 
                if f == path:
416
 
                    status = 'renamed from %s' % f
417
 
 
418
 
        elif tree.branch.basis_tree().has_filename(path):
419
 
            emblem = 'bzr-removed'
420
 
            status = 'removed'
421
 
        else:
422
 
            # FIXME: Check for ignored files
423
 
            status = 'unversioned'
424
 
        
425
 
        if emblem is not None:
426
 
            file.add_emblem(emblem)
427
 
        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