/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: 2010-05-29 23:42:20 UTC
  • mto: This revision was merged to the branch mainline in revision 691.
  • Revision ID: jelmer@samba.org-20100529234220-ilsto1v387x7xhve
Move more olive-specific code into olive/

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus-bzr.py
19
19
from bzrlib.plugin import load_plugins
20
20
load_plugins()
21
21
 
22
 
from bzrlib.plugins.gtk import _i18n, cmd_visualise, cmd_gannotate
 
22
from bzrlib.plugins.gtk import _i18n
 
23
from bzrlib.plugins.gtk.commands import cmd_gannotate, start_viz_window
 
24
 
 
25
print "Bazaar nautilus module initialized"
 
26
 
23
27
 
24
28
class BzrExtension(nautilus.MenuProvider, nautilus.ColumnProvider, nautilus.InfoProvider):
25
29
    def __init__(self):
83
87
 
84
88
        from bzrlib.plugins.gtk.diff import DiffWindow
85
89
        window = DiffWindow()
86
 
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
 
90
        window.set_diff(tree.branch._get_nick(local=True), tree, 
 
91
                        tree.branch.basis_tree())
87
92
        window.show()
88
93
 
89
94
        return
174
179
 
175
180
        # We only want to continue here if we get a NotBranchError
176
181
        try:
177
 
            tree, path = WorkingTree.open_containing(file)
 
182
            branch, path = Branch.open_containing(file)
178
183
        except NotBranchError:
179
184
            return
180
185
 
181
 
        vis = cmd_visualise()
182
 
        vis.run(file)
183
 
 
184
 
        return
 
186
        pp = start_viz_window(branch, [branch.last_revision()])
 
187
        pp.show()
 
188
        gtk.main()
185
189
 
186
190
    def pull_cb(self, menu, vfs_file):
187
191
        # We can only cope with local files
216
220
 
217
221
        from bzrlib.plugins.gtk.merge import MergeDialog
218
222
        dialog = MergeDialog(tree, path)
219
 
        dialog.display()
220
 
        gtk.main()
 
223
        dialog.run()
 
224
        dialog.destroy()
221
225
 
222
226
    def get_background_items(self, window, vfs_file):
223
227
        items = []
237
241
            items.append(item)
238
242
 
239
243
            item = nautilus.MenuItem('BzrNautilus::clone',
240
 
                                 'Checkout Bazaar branch',
 
244
                                 'Checkout Bazaar branch ...',
241
245
                                 'Checkout Existing Bazaar Branch')
242
246
            item.connect('activate', self.clone_cb, vfs_file)
243
247
            items.append(item)
254
258
            return item,
255
259
        else:
256
260
            item = nautilus.MenuItem('BzrNautilus::disable',
257
 
                                      'Disable Bazaar Plugin for the Branch',
 
261
                                      'Disable Bazaar Plugin this Branch',
258
262
                                      'Disable Bazaar plugin for nautilus')
259
263
            item.connect('activate', self.toggle_integration, 'False', vfs_file)
260
264
            items.append(item)
261
265
 
262
266
        item = nautilus.MenuItem('BzrNautilus::log',
263
 
                             'Log',
 
267
                             'History ...',
264
268
                             'Show Bazaar history')
265
269
        item.connect('activate', self.log_cb, vfs_file)
266
270
        items.append(item)
267
271
 
268
272
        item = nautilus.MenuItem('BzrNautilus::pull',
269
 
                             'Pull',
 
273
                             'Pull ...',
270
274
                             'Pull from another branch')
271
275
        item.connect('activate', self.pull_cb, vfs_file)
272
276
        items.append(item)
273
277
 
274
278
        item = nautilus.MenuItem('BzrNautilus::merge',
275
 
                             'Merge',
 
279
                             'Merge ...',
276
280
                             'Merge from another branch')
277
281
        item.connect('activate', self.merge_cb, vfs_file)
278
282
        items.append(item)
279
283
 
280
284
        item = nautilus.MenuItem('BzrNautilus::commit',
281
 
                             'Commit',
 
285
                             'Commit ...',
282
286
                             'Commit Changes')
283
287
        item.connect('activate', self.commit_cb, vfs_file)
284
288
        items.append(item)
341
345
                items.append(item)
342
346
            elif wtfiles[path] == 'V':
343
347
                item = nautilus.MenuItem('BzrNautilus::log',
344
 
                                 'Log',
 
348
                                 'History ...',
345
349
                                 'List changes')
346
350
                item.connect('activate', self.log_cb, vfs_file)
347
351
                items.append(item)
348
352
 
349
353
                item = nautilus.MenuItem('BzrNautilus::diff',
350
 
                                 'Diff',
 
354
                                 'View Changes ...',
351
355
                                 'Show differences')
352
356
                item.connect('activate', self.diff_cb, vfs_file)
353
357
                items.append(item)
359
363
                items.append(item)
360
364
 
361
365
                item = nautilus.MenuItem('BzrNautilus::annotate',
362
 
                             'Annotate',
 
366
                             'Annotate ...',
363
367
                             'Annotate File Data')
364
368
                item.connect('activate', self.annotate_cb, vfs_file)
365
369
                items.append(item)
366
370
 
367
371
                item = nautilus.MenuItem('BzrNautilus::commit',
368
 
                             'Commit',
 
372
                             'Commit ...',
369
373
                             'Commit Changes')
370
374
                item.connect('activate', self.commit_cb, vfs_file)
371
375
                items.append(item)
397
401
        emblem = None
398
402
        status = None
399
403
 
400
 
        if tree.has_filename(path):
 
404
        id = tree.path2id(path)
 
405
        if id == None:
 
406
            if tree.is_ignored(path):
 
407
                status = 'ignored'
 
408
                emblem = 'bzr-ignored'
 
409
            else:
 
410
                status = 'unversioned'
 
411
                        
 
412
        elif tree.has_filename(path):
401
413
            emblem = 'bzr-controlled'
402
414
            status = 'unchanged'
403
 
            id = tree.path2id(path)
404
415
 
405
416
            delta = tree.changes_from(tree.branch.basis_tree())
406
417
            if delta.touches_file_id(id):