Merge lp://qastaging/~larstiq/bzr-svn/filter_stacks_registry into lp://qastaging/bzr-svn

When pulling into branches bzr-svn would spit out a warning:

  /home/larstiq/.bazaar/plugins/dev/svn/__init__.py:391: DeprecationWarning: bzrlib.filters.lazy_register_filter_stack_map was deprecated in version 2.6.0. "bzrlib.plugins.svn.keywords", "create_svn_keywords_filter")

This commit gets rid of the warning by using the, hopefully, intended replacement.

Hi Wouter,

Thanks for the fix. We should still look for the old name too, as bzr-svn supports bzr 2.5 and bzr 2.6 (only 2.6 deprecates lazy_register_filter_stack_map). 2.5 doesn't have the new registry.

Ah, yes. Let me fix that.

I moved the import down to where it is used fall back on lazy_register_filter_stack_map when it fails.

Thanks, seems good to land. You should be able to do that yourself.

It might be nice to move the register call into an else: clause, though I guess it's not likely that will raise an ImportError anyway.

On Wed, Apr 04, 2012 at 14:42:31 -0000, Jelmer Vernooij wrote:
> Review: Approve code
>
> Thanks, seems good to land. You should be able to do that yourself.
>
> It might be nice to move the register call into an else: clause, though I guess it's not likely that will raise an ImportError anyway.

Yeah, given the remote possibility of raising an ImportError there I
prefer the clarity of keeping the two lines together. Merging and
landing.

Wouter