[Pkg-bazaar-commits] ./bzr-gtk/unstable r123: Ignored files are no more shown as unknown (Fixed: #67926).

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 123
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Mon 2006-12-18 11:06:32 +0100
message:
  Ignored files are no more shown as unknown (Fixed: #67926).
modified:
  olive/__init__.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2006-12-18 09:35:14 +0000
+++ b/olive/__init__.py	2006-12-18 10:06:32 +0000
@@ -595,6 +595,9 @@
                 for rpath, id, kind in delta.unchanged:
                     if rpath == filename:
                         status = 'unchanged'
+                for rpath, file_class, kind, id, entry in self.wt.list_files():
+                    if rpath == filename and file_class == 'I':
+                        status = 'ignored'
             
             #try:
             #    status = fileops.status(path + os.sep + item)
@@ -611,6 +614,8 @@
                 st = _('modified')
             elif status == 'unchanged':
                 st = _('unchanged')
+            elif status == 'ignored':
+                st = _('ignored')
             else:
                 st = _('unknown')
             liststore.append([gtk.STOCK_FILE, item, st])
@@ -761,7 +766,7 @@
             tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
         
             delta = tree1.changes_from(tree2, want_unchanged=True)
-
+            
         # Add'em to the ListStore
         for item in dirs:
             liststore.append([gtk.STOCK_DIRECTORY, item, ''])
@@ -785,6 +790,9 @@
                 for rpath, id, kind in delta.unchanged:
                     if rpath == filename:
                         status = 'unchanged'
+                for rpath, file_class, kind, id, entry in self.wt.list_files():
+                    if rpath == filename and file_class == 'I':
+                        status = 'ignored'
             
             #try:
             #    status = fileops.status(path + os.sep + item)
@@ -801,6 +809,8 @@
                 st = _('modified')
             elif status == 'unchanged':
                 st = _('unchanged')
+            elif status == 'ignored':
+                st = _('ignored')
             else:
                 st = _('unknown')
             liststore.append([gtk.STOCK_FILE, item, st])