Rev 2662: (robertc) Ancient unused ``Repository.text_store`` attribute has been removed. (Robert Collins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2662
revision-id: pqm at pqm.ubuntu.com-20070731031231-iqrudv126086qgsa
parent: pqm at pqm.ubuntu.com-20070730235409-pfqxlkh2dcs95u70
parent: robertc at robertcollins.net-20070731020734-joiol4rohzm41hp3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-07-31 04:12:31 +0100
message:
  (robertc) Ancient unused ``Repository.text_store`` attribute has been removed. (Robert Collins)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
    ------------------------------------------------------------
    revno: 2661.1.1
    merged: robertc at robertcollins.net-20070731020734-joiol4rohzm41hp3
    parent: pqm at pqm.ubuntu.com-20070730235409-pfqxlkh2dcs95u70
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Tue 2007-07-31 12:07:34 +1000
    message:
      Ancient unused Repository.text_store attribute has been removed. (Robert Collins)
=== modified file 'NEWS'
--- a/NEWS	2007-07-30 17:06:48 +0000
+++ b/NEWS	2007-07-31 02:07:34 +0000
@@ -113,6 +113,9 @@
 
     * KnitIndex.get_parents now returns tuples. (Robert Collins)
 
+    * Ancient unused ``Repository.text_store`` attribute has been removed.
+      (Robert Collins)
+
   INTERNALS:
 
     * merge now uses ``iter_changes`` to calculate changes, which makes room for

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2007-07-15 10:44:12 +0000
+++ b/bzrlib/bzrdir.py	2007-07-31 02:07:34 +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

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-07-25 00:52:21 +0000
+++ b/bzrlib/repository.py	2007-07-31 02:07:34 +0000
@@ -221,7 +221,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/tests/test_upgrade.py'
--- a/bzrlib/tests/test_upgrade.py	2007-03-06 01:15:08 +0000
+++ b/bzrlib/tests/test_upgrade.py	2007-07-31 02:07:34 +0000
@@ -127,7 +127,7 @@
         # 'dir-20051005095101-da1441ea3fa6917a'
         self.assertNotEqual(
             [],
-            repo.text_store.get_weave(
+            repo.weave_store.get_weave(
                 'dir-20051005095101-da1441ea3fa6917a',
                 repo.get_transaction()))