Rev 191: Avoid using working.inventory, instead use working.iter_entries_by_dir() in http://bazaar.launchpad.net/%7Ejameinel/bzr-gtk/small-fixes

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ejameinel/bzr-gtk/small-fixes

------------------------------------------------------------
revno: 191
revision-id: john at arbash-meinel.com-20070419213553-67gevxr2324qpd3v
parent: john at arbash-meinel.com-20070419213038-80g223n0050jmphn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: gtk
timestamp: Thu 2007-04-19 16:35:53 -0500
message:
  Avoid using working.inventory, instead use working.iter_entries_by_dir()
modified:
  olive/info_helper.py           info_helper.py-20060925015732-u1iq8jia3u2pbomr-1
-------------- next part --------------
=== modified file 'olive/info_helper.py'
--- a/olive/info_helper.py	2006-12-20 02:06:04 +0000
+++ b/olive/info_helper.py	2007-04-19 21:35:53 +0000
@@ -163,8 +163,7 @@
     ret = {}
     branch = working.branch
     basis = working.basis_tree()
-    work_inv = working.inventory
-    
+
     if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
         delta = compare_trees(basis, working, want_unchanged=True)
     else:
@@ -192,8 +191,7 @@
     
     ret = {}
     basis = working.basis_tree()
-    work_inv = working.inventory
-    
+
     if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
         delta = compare_trees(basis, working, want_unchanged=True)
     else:
@@ -215,8 +213,8 @@
     ret['ignored'] = ignore_cnt
 
     dir_cnt = 0
-    for file_id in work_inv:
-        if work_inv.get_file_kind(file_id) == 'directory':
+    for path, ie in working.iter_entries_by_dir():
+        if ie.kind == 'directory':
             dir_cnt += 1
     ret['subdirs'] = dir_cnt