Merge lp:~gz/bzr-git/trivial_lru_cache_add into lp:bzr-git

[Martin Packman]

The deprecation of the add method of bzrlib.lru_cache classes has landed on bzr.dev. This branch just changes the spelling in bzr-git to use plain __setitem__ syntax instead. See also the bzr merge proposal:

<https://code.launchpad.net/~gz/bzr/lru_cache_refactor/+merge/79439>

[Jelmer Vernooij (jelmer)]

On Thu, 2011-10-27 at 20:16 +0000, Martin Packman wrote:
> Martin Packman has proposed merging lp:~gz/bzr-git/trivial_lru_cache_add into lp:bzr-git.
>
> Requested reviews:
> bzr-git developers (bzr-git)
>
> For more details, see:
> https://code.launchpad.net/~gz/bzr-git/trivial_lru_cache_add/+merge/80616
>
> The deprecation of the add method of bzrlib.lru_cache classes has landed on bzr.dev. This branch just changes the spelling in bzr-git to use plain __setitem__ syntax instead. See also the bzr merge proposal:
I'm trying to remember, was __setitem__ also available in older versions
of bzr?

Cheers,

Jelmer

[Martin Packman (gz)]

> I'm trying to remember, was __setitem__ also available in older versions
> of bzr?

Yup, it was part of the initial implementation of the module in r2996.

[Jelmer Vernooij (jelmer)]

On Fri, 2011-10-28 at 08:17 +0000, Martin Packman wrote:
> > I'm trying to remember, was __setitem__ also available in older versions
> > of bzr?
>
> Yup, it was part of the initial implementation of the module in r2996.
Great, thanks for confirming.

Merged!

Cheers,

Jelmer

=== modified file 'object_store.py'
--- object_store.py	2011-09-12 23:37:55 +0000
+++ object_store.py	2011-10-27 20:15:28 +0000
@@ -112,7 +112,7 @@
         return list(self.iter_revision_trees(revids))
 
     def add(self, tree):
-        self._cache.add(tree.get_revision_id(), tree)
+        self._cache[tree.get_revision_id()] = tree
 
 
 def _find_missing_bzr_revids(graph, want, have):