[MERGE] cleanup of fetch.py

[Robert Collins]

This cleans up a few things in fetch.py that are bit-rotten:
 - unused variables are removed
 - the overly general control_files interface is removed in place of
using get_inventory_weave.
 - a empty 4-space indent is turned into a empty line.

=== modified file 'bzrlib/fetch.py'
--- bzrlib/fetch.py     2007-08-16 05:50:11 +0000
+++ bzrlib/fetch.py     2007-08-22 07:50:19 +0000
@@ -121,9 +121,7 @@
         requested revisions, finally clearing the progress bar.
         """
         self.to_weaves = self.to_repository.weave_store
-        self.to_control = self.to_repository.control_weaves
         self.from_weaves = self.from_repository.weave_store
-        self.from_control = self.from_repository.control_weaves
         self.count_total = 0
         self.file_ids_names = {}
         pp = ProgressPhase('Fetch phase', 4, self.pb)
@@ -221,9 +219,7 @@
 
     def _fetch_inventory_weave(self, revs, pb):
         pb.update("fetch inventory", 0, 2)
-        to_weave = self.to_control.get_weave('inventory',
-                self.to_repository.get_transaction())
-
+        to_weave = self.to_repository.get_inventory_weave()
         child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
         try:
             # just merge, this is optimisable and its means we don't
@@ -249,7 +245,7 @@
         after fetching weave texts.
         """
         pass
-        
+
 
 class GenericRepoFetcher(RepoFetcher):
     """This is a generic repo to repo fetcher.


-- 
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/20070822/da7b9973/attachment.pgp