Merge lp:~vila/bzr/dead-code into lp:bzr

[Vincent Ladeuil]

Remove dead code bzrlib.filters.ContentFilterContext.config(): wasn't tested nor used.

This removes the config stuff in filters.ContentFilterContext (this was
untested (hence broken) never used and handle the case where a tree exists
without a branch which cannot be achieved in bzrlib).

[John A Meinel (jameinel)]

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

On 8/2/2012 1:31 PM, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr/dead-code into
> lp:bzr.
>
> Requested reviews: bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr/dead-code/+merge/117874
>
> This removes the config stuff in filters.ContentFilterContext (this
> was untested (hence broken) never used and handle the case where a
> tree exists without a branch which cannot be achieved in bzrlib).
>

 merge: approve

Based on your cover letter.

John
=:->

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

iEYEARECAAYFAlAad5YACgkQJdeBCYSNAAOKawCcCiwdOLQA1a4HCLU4bVrlYxGL
S4IAn0E/gcJWZvgalsgSf0F+t7NVDONO
=D3lV
-----END PGP SIGNATURE-----

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/filters/__init__.py'
--- bzrlib/filters/__init__.py	2012-03-29 14:54:16 +0000
+++ bzrlib/filters/__init__.py	2012-08-02 11:35:22 +0000
@@ -90,7 +90,6 @@
         # Cached values
         self._revision_id = None
         self._revision = None
-        self._config = None
 
     def relpath(self):
         """Relative path of file to tree-root."""
@@ -131,16 +130,6 @@
                 self._revision = repo.get_revision(rev_id)
         return self._revision
 
-    def config(self):
-        """The Config object to search for configuration settings."""
-        if self._config is None:
-            branch = getattr(self._tree, 'branch', None)
-            if branch is not None:
-                self._config = branch.get_config()
-            else:
-                self._config = config.GlobalConfig()
-        return self._config
-
 
 def filtered_input_file(f, filters):
     """Get an input file that converts external to internal content.