/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: matkor at laptop-hp
  • Date: 2008-08-05 13:56:46 UTC
  • mto: This revision was merged to the branch mainline in revision 601.
  • Revision ID: matkor@laptop-hp-20080805135646-7463836pvyp5dn01
Detection of error opening dbus when python-dbus-0.62 is used.

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
23
 
from bzrlib.plugins.gtk.commands import cmd_gannotate, start_viz_window
 
22
from bzrlib.plugins.gtk import _i18n, cmd_gannotate, start_viz_window
24
23
 
25
24
print "Bazaar nautilus module initialized"
26
25
 
87
86
 
88
87
        from bzrlib.plugins.gtk.diff import DiffWindow
89
88
        window = DiffWindow()
90
 
        window.set_diff(tree.branch._get_nick(local=True), tree, 
91
 
                        tree.branch.basis_tree())
 
89
        window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
92
90
        window.show()
93
91
 
94
92
        return
401
399
        emblem = None
402
400
        status = None
403
401
 
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):
 
402
        if tree.has_filename(path):
413
403
            emblem = 'bzr-controlled'
414
404
            status = 'unchanged'
 
405
            id = tree.path2id(path)
415
406
 
416
407
            delta = tree.changes_from(tree.branch.basis_tree())
417
408
            if delta.touches_file_id(id):