~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: John Arbash Meinel
  • Date: 2006-07-13 19:58:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1869.
  • Revision ID: john@arbash-meinel.com-20060713195822-965e2c4422506a75
cleanup pass, allow pycurl connections to be shared between transports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# Copyright (C) 2005, 2006 by Canonical Ltd
2
 
#
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
#
 
12
 
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
160
160
    def _fetch_weave_texts(self, revs):
161
161
        texts_pb = bzrlib.ui.ui_factory.nested_progress_bar()
162
162
        try:
163
 
            # fileids_altered_by_revision_ids requires reading the inventory
164
 
            # weave, we will need to read the inventory weave again when
165
 
            # all this is done, so enable caching for that specific weave
166
 
            inv_w = self.from_repository.get_inventory_weave()
167
 
            inv_w.enable_cache()
168
163
            file_ids = self.from_repository.fileids_altered_by_revision_ids(revs)
169
164
            count = 0
170
165
            num_file_ids = len(file_ids)
177
172
                    self.from_repository.get_transaction())
178
173
                # we fetch all the texts, because texts do
179
174
                # not reference anything, and its cheap enough
180
 
                to_weave.join(from_weave, version_ids=required_versions)
 
175
                to_weave.join(from_weave, version_ids=required_versions) 
181
176
                # we don't need *all* of this data anymore, but we dont know
182
177
                # what we do. This cache clearing will result in a new read 
183
178
                # of the knit data when we do the checkout, but probably we
210
205
                # corrupt.
211
206
                to_weave.join(from_weave, pb=child_pb, msg='merge inventory',
212
207
                              version_ids=revs)
213
 
                from_weave.clear_cache()
214
208
            finally:
215
209
                child_pb.finished()
216
210
        finally: