Rev 4737: fix _getitems to actually return the objects requested when there is no cache. in http://bazaar.launchpad.net/~jameinel/bzr/2.1-chk-memory
John Arbash Meinel
john at arbash-meinel.com
Thu Oct 8 22:59:31 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.1-chk-memory
------------------------------------------------------------
revno: 4737
revision-id: john at arbash-meinel.com-20091008215909-d1ukaxat5o9mdl69
parent: john at arbash-meinel.com-20091008214343-bff832zjcytjf1q9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-chk-memory
timestamp: Thu 2009-10-08 16:59:09 -0500
message:
fix _getitems to actually return the objects requested when there is no cache.
-------------- next part --------------
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2009-10-08 21:43:43 +0000
+++ b/bzrlib/inventory.py 2009-10-08 21:59:09 +0000
@@ -974,8 +974,6 @@
if isinstance(relpath, basestring):
relpath = osutils.splitpath(relpath)
- # mutter("lookup path %r" % relpath)
-
try:
parent = self.root
except errors.NoSuchId:
@@ -2044,6 +2042,7 @@
if self._fileid_to_entry_cache is None:
# We know that nothing will be in the cache anyway
self._fileid_to_entry_cache = {}
+ remaining = file_ids
else:
for file_id in file_ids:
entry = self._fileid_to_entry_cache.get(file_id, None)
More information about the bazaar-commits
mailing list