← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2006-03-02 10:51:24 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060302105124-675e0bed0d749b43
get knit repositories really using knits for text storage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
161
161
            to_weave = self.to_weaves.get_weave_or_empty(file_id,
162
162
                self.to_repository.get_transaction())
163
163
 
164
 
            if to_weave.numversions() > 0:
 
164
            if to_weave.num_versions() > 0:
165
165
                # destination has contents, must merge
166
166
                from_weave = self.from_weaves.get_weave(file_id,
167
167
                    self.from_repository.get_transaction())
177
177
        to_weave = self.to_control.get_weave('inventory',
178
178
                self.to_repository.get_transaction())
179
179
 
180
 
        if to_weave.numversions() > 0:
 
180
        if to_weave.num_versions() > 0:
181
181
            # destination has contents, must merge
182
182
            self.pb.update("inventory fetch", 1, 2)
183
183
            from_weave = self.from_repository.get_inventory_weave()