[MERGE] remove legacy 'text_store' attribute

Robert Collins robertc at robertcollins.net
Mon Jul 30 02:41:12 BST 2007


We've not used 'text_store' to get at file texts for a long time now.

=== 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
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070730/16f9231c/attachment-0001.pgp 


More information about the bazaar mailing list