[MERGE] remove legacy 'text_store' attribute

John Arbash Meinel john at arbash-meinel.com
Mon Jul 30 15:55:05 BST 2007


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

Robert Collins wrote:
> We've not used 'text_store' to get at file texts for a long time now.
> 

!approve

Should we be making it truly deprecated with a __getattr__ or __get_attribute__
wrapper?

It seems like a bit of work for something that has been out-of-use for a while.

So I'm fine with just nuking it.

John
=:->

> === modified file 'bzrlib/repository.py'
> --- bzrlib/repository.py        2007-07-26 03:26:31 +0000
> +++ bzrlib/repository.py        2007-07-30 01:40:26 +0000
> @@ -245,7 +245,6 @@
>          self.bzrdir = a_bzrdir
>          self.control_files = control_files
>          self._revision_store = _revision_store
> -        self.text_store = text_store
>          # backwards compatibility
>          self.weave_store = text_store
>          # not right yet - should be more semantically clear ? 
> 
> === modified file 'bzrlib/bzrdir.py'
> --- bzrlib/bzrdir.py    2007-07-25 00:50:15 +0000
> +++ bzrlib/bzrdir.py    2007-07-30 01:39:55 +0000
> @@ -1950,7 +1950,7 @@
>                  ie.revision = previous_ie.revision
>                  return
>          if ie.has_text():
> -            text = self.branch.repository.text_store.get(ie.text_id)
> +            text = self.branch.repository.weave_store.get(ie.text_id)
>              file_lines = text.readlines()
>              assert sha_strings(file_lines) == ie.text_sha1
>              assert sum(map(len, file_lines)) == ie.text_size
> 
> 
> -Rob

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

iD8DBQFGrfvJJdeBCYSNAAMRAoYdAJ9cCuG+ZoLyn9MFTyILQKYhvIsIgwCghwkF
1KqZRusA3xDTwT47gxbSURQ=
=6myj
-----END PGP SIGNATURE-----



More information about the bazaar mailing list