Merge lp:~ian-clatworthy/bzr/eol-none-bug into lp:~bzr/bzr/trunk-old

[Ian Clatworthy]

[Ian Clatworthy (ian-clatworthy)]

This is another fix required to make content filtering and rule handling work. We recently introduced some stricter checking around the value of the eol setting but that broke other uses of rules, e.g. keywords and plugins using them.

A small fix and some tests are provided. I'd like this in 1.16.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ian Clatworthy wrote:
> Ian Clatworthy has proposed merging lp:~ian-clatworthy/bzr/eol-none-bug into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> This is another fix required to make content filtering and rule handling work. We recently introduced some stricter checking around the value of the eol setting but that broke other uses of rules, e.g. keywords and plugins using them.
>
> A small fix and some tests are provided. I'd like this in 1.16.
>

+ prefs = (('eol',None),)
this should be
+ prefs = (('eol', None),)

+ prefs = (('foo',None),('bar', 'v1'))

As should this.

But otherwise

  review approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkovwRQACgkQJdeBCYSNAAPO2wCeJhmXwbZnuu/FCh/R9qnMACit
vq4AoLgK9mNRY63b7atKfZGXC8loDTZ9
=+vHV
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-06-10 09:34:02 +0000
+++ NEWS	2009-06-10 15:35:30 +0000
@@ -84,6 +84,9 @@
 * Fix problem of "directory not empty" when contending for a lock over
   sftp.  (Martin Pool, #340352)
 
+* Fix rule handling so that eol is optional, not mandatory.
+  (Ian Clatworthy, #379370)
+
 * Reconcile can now deal with text revisions that originated in revisions 
   that are ghosts. (Jelmer Vernooij, #336749)
 

=== modified file 'bzrlib/filters/__init__.py'
--- bzrlib/filters/__init__.py	2009-04-20 08:37:32 +0000
+++ bzrlib/filters/__init__.py	2009-06-10 15:35:30 +0000
@@ -247,6 +247,8 @@
         return stack
     stack = []
     for k, v in preferences:
+        if v is None:
+            continue
         try:
             stack_map_lookup = _filter_stacks_registry.get(k)
         except KeyError:

=== modified file 'bzrlib/tests/test_eol_filters.py'
--- bzrlib/tests/test_eol_filters.py	2009-05-07 05:08:46 +0000
+++ bzrlib/tests/test_eol_filters.py	2009-06-10 15:35:30 +0000
@@ -66,3 +66,11 @@
         """
         prefs = (('eol','unknown-value'),)
         self.assertRaises(errors.BzrError, _get_filter_stack_for,  prefs)
+
+    def test_eol_missing_altogether_is_ok(self):
+        """
+        Not having eol in the set of preferences should be ok.
+        """
+        # In this case, 'eol' is looked up with a value of None.
+        prefs = (('eol',None),)
+        self.assertEqual([], _get_filter_stack_for(prefs))

=== modified file 'bzrlib/tests/test_filters.py'
--- bzrlib/tests/test_filters.py	2009-04-08 03:34:31 +0000
+++ bzrlib/tests/test_filters.py	2009-06-10 15:35:30 +0000
@@ -156,6 +156,9 @@
             # Test an unknown value
             prefs = (('foo','v3'),)
             self.assertEqual([], _get_filter_stack_for(prefs))
+            # Test a value of None is skipped
+            prefs = (('foo',None),('bar', 'v1'))
+            self.assertEqual(d_stack, _get_filter_stack_for(prefs))
         finally:
             # Restore the real registry
             filters._reset_registry(original_registry)