/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-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

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
from bzrlib.plugins.gtk import cmd_visualise, cmd_gannotate
23
11
 
24
 
class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
 
12
class BzrExtension(nautilus.MenuProvider):
25
13
    def __init__(self):
26
14
        pass
27
15
 
81
69
        except NotBranchError:
82
70
            return
83
71
 
84
 
        from bzrlib.plugins.gtk.diff import DiffWindow
 
72
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
85
73
        window = DiffWindow()
86
 
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
 
74
        window.set_diff(tree.branch, tree, tree.branch.revision_tree())
87
75
        window.show()
88
76
 
89
77
        return
99
87
        try:
100
88
            tree, path = WorkingTree.open_containing(file)
101
89
        except NotBranchError:
102
 
            BzrDir.create_standalone_workingtree(file)
 
90
            BzrDir.create_branch_and_repo(file)
103
91
 
104
92
    def remove_cb(self, menu, vfs_file):
105
93
        # We can only cope with local files
129
117
        if vfs_file.get_uri_scheme() != 'file':
130
118
            return
131
119
 
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()
 
120
        file = vfs_file.get_uri()
 
121
        try:
 
122
            tree, path = WorkingTree.open_containing(file)
 
123
        except NotBranchError:
 
124
            return
 
125
 
 
126
        from bzrlib.plugins.gtk.clone import CloneDialog
 
127
        dialog = CloneDialog(file)
 
128
        if dialog.run() != gtk.RESPONSE_CANCEL:
 
129
            bzrdir = BzrDir.open(dialog.url)
 
130
            bzrdir.sprout(dialog.dest_path)
139
131
 
140
132
    def commit_cb(self, menu, vfs_file=None):
141
133
        # We can only cope with local files
143
135
            return
144
136
 
145
137
        file = vfs_file.get_uri()
146
 
        tree = None
147
 
        branch = None
148
138
        try:
149
139
            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
 
140
        except NotBranchError:
 
141
            return
160
142
 
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()
 
143
        from bzrlib.plugins.gtk.commit import GCommitDialog
 
144
        dialog = GCommitDialog(tree)
 
145
        dialog.set_title(path + " - Commit")
 
146
        if dialog.run() != gtk.RESPONSE_CANCEL:
 
147
            Commit().commit(working_tree=wt,message=dialog.message,
 
148
                            specific_files=dialog.specific_files)
167
149
 
168
150
    def log_cb(self, menu, vfs_file):
169
151
        # We can only cope with local files
183
165
 
184
166
        return
185
167
 
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
168
    def get_background_items(self, window, vfs_file):
223
 
        items = []
224
169
        file = vfs_file.get_uri()
225
 
 
226
170
        try:
227
171
            tree, path = WorkingTree.open_containing(file)
228
 
            disabled_flag = self.check_branch_enabled(tree.branch)
229
 
        except UnsupportedProtocol:
230
 
            return
231
172
        except NotBranchError:
232
 
            disabled_flag = self.check_branch_enabled()
233
173
            item = nautilus.MenuItem('BzrNautilus::newtree',
234
 
                                 'Make directory versioned',
 
174
                                 'Create new Bazaar tree',
235
175
                                 'Create new Bazaar tree in this folder')
236
176
            item.connect('activate', self.newtree_cb, vfs_file)
237
177
            items.append(item)
238
178
 
239
179
            item = nautilus.MenuItem('BzrNautilus::clone',
240
 
                                 'Checkout Bazaar branch',
 
180
                                 'Checkout',
241
181
                                 'Checkout Existing Bazaar Branch')
242
182
            item.connect('activate', self.clone_cb, vfs_file)
243
183
            items.append(item)
244
184
 
245
185
            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
186
 
 
187
        items = []
262
188
        item = nautilus.MenuItem('BzrNautilus::log',
263
189
                             'Log',
264
190
                             'Show Bazaar history')
265
191
        item.connect('activate', self.log_cb, vfs_file)
266
192
        items.append(item)
267
193
 
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
194
        item = nautilus.MenuItem('BzrNautilus::commit',
281
195
                             'Commit',
282
196
                             'Commit Changes')
285
199
 
286
200
        return items
287
201
 
 
202
 
288
203
    def get_file_items(self, window, files):
289
204
        items = []
290
 
        
291
 
        wtfiles = {}
 
205
 
292
206
        for vfs_file in files:
293
207
            # We can only cope with local files
294
208
            if vfs_file.get_uri_scheme() != 'file':
295
 
                continue
 
209
                return
296
210
 
297
211
            file = vfs_file.get_uri()
298
212
            try:
299
213
                tree, path = WorkingTree.open_containing(file)
300
 
                disabled_flag = self.check_branch_enabled(tree.branch)
301
214
            except NotBranchError:
302
 
                disabled_flag = self.check_branch_enabled()
303
215
                if not vfs_file.is_directory():
304
 
                    continue
305
 
 
306
 
                if disabled_flag == 'False':
307
216
                    return
308
 
 
309
217
                item = nautilus.MenuItem('BzrNautilus::newtree',
310
 
                                     'Make directory versioned',
 
218
                                     'Create new Bazaar tree',
311
219
                                     'Create new Bazaar tree in %s' % vfs_file.get_name())
312
220
                item.connect('activate', self.newtree_cb, vfs_file)
313
221
                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] == '?':
 
222
 
 
223
            file_class = tree.file_class(path)
 
224
 
 
225
            if file_class == '?':
325
226
                item = nautilus.MenuItem('BzrNautilus::add',
326
227
                                     'Add',
327
228
                                     'Add as versioned file')
333
234
                                     'Ignore file for versioning')
334
235
                item.connect('activate', self.ignore_cb, vfs_file)
335
236
                items.append(item)
336
 
            elif wtfiles[path] == 'I':
 
237
            elif file_class == 'I':
337
238
                item = nautilus.MenuItem('BzrNautilus::unignore',
338
239
                                     'Unignore',
339
240
                                     'Unignore file for versioning')
340
241
                item.connect('activate', self.unignore_cb, vfs_file)
341
242
                items.append(item)
342
 
            elif wtfiles[path] == 'V':
 
243
            elif file_class == 'V':
343
244
                item = nautilus.MenuItem('BzrNautilus::log',
344
245
                                 'Log',
345
246
                                 'List changes')
371
272
                items.append(item)
372
273
 
373
274
        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