/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: Lucas Shrewsbury
  • Date: 2009-08-24 05:45:14 UTC
  • mto: This revision was merged to the branch mainline in revision 663.
  • Revision ID: rollbak@gmail.com-20090824054514-x5cteatkygzhw1ls
Fix #294632 by adding ignored emblem and correct status.
Fix #417966 by setting not emblem and correcting status.

* nautilus-bzr.py:
(BzrExtension.update_file_info): added check for ignored and unversioned files.

* setup.py: 
(data_files): added ignored emblem image.

Show diffs side-by-side

added added

removed removed

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