/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: Mark Lee
  • Date: 2009-07-11 18:39:14 UTC
  • mto: This revision was merged to the branch mainline in revision 661.
  • Revision ID: bzr@lazymalevolence.com-20090711183914-zuii3et5skiv2njo
Re-ignore credits.pickle.

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
 
401
400
        emblem = None
402
401
        status = None
403
402
 
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):
 
403
        if tree.has_filename(path):
413
404
            emblem = 'bzr-controlled'
414
405
            status = 'unchanged'
 
406
            id = tree.path2id(path)
415
407
 
416
408
            delta = tree.changes_from(tree.branch.basis_tree())
417
409
            if delta.touches_file_id(id):