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

[Wouter van Heyst]

[lp:~larstiq/bzr-svn/filter_stacks_registry]

4190. By Wouter van Heyst on 2012-04-04

replace deprecated lazy_register_filter_stack_map() with filter_stacks_registry.register_lazy()

[Wouter van Heyst (larstiq)]

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.

[Jelmer Vernooij (jelmer)]

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.

review: Needs Fixing

[Wouter van Heyst (larstiq)]

Ah, yes. Let me fix that.

[lp:~larstiq/bzr-svn/filter_stacks_registry]

4191. By Wouter van Heyst on 2012-04-04

retain compatibility with bzr 2.5 re: lazy_register_filter_stack_map

[Wouter van Heyst (larstiq)]

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

[Jelmer Vernooij (jelmer)]

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.

review: Approve (code)

[Wouter van Heyst (larstiq)]

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

=== modified file '__init__.py'
--- __init__.py	2012-03-29 13:14:13 +0000
+++ __init__.py	2012-04-04 14:21:22 +0000
@@ -77,9 +77,6 @@
     NoSuchFile,
     UnsupportedFormatError,
     )
-from bzrlib.filters import (
-    lazy_register_filter_stack_map,
-    )
 from bzrlib.repository import (
     format_registry as repository_format_registry,
     network_format_registry as repository_network_format_registry,
@@ -387,8 +384,16 @@
                           'bzrlib.plugins.svn.commands')
 
 
-lazy_register_filter_stack_map("svn-keywords",
-        "bzrlib.plugins.svn.keywords", "create_svn_keywords_filter")
+try:
+    # bzrlib.filters.filter_stacks_registry as introduced in 2.6
+    from bzrlib.filters import filter_stacks_registry
+    filter_stacks_registry.register_lazy("svn-keywords",
+            "bzrlib.plugins.svn.keywords", "create_svn_keywords_filter")
+except ImportError:
+    # fall back to lazy_register_filter_stack_map on older bzr
+    from bzrlib.filters import lazy_register_filter_stack_map
+    lazy_register_filter_stack_map("svn-keywords",
+            "bzrlib.plugins.svn.keywords", "create_svn_keywords_filter")
 
 
 def info_svn_repository(repository, stats, outf):