← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Martin Pool
  • Date: 2005-09-22 05:18:24 UTC
  • Revision ID: mbp@sourcefrog.net-20050922051824-263a54b20d3c54a4
- store control weaves in .bzr/, not mixed in with file weaves

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
19
19
 
20
20
import bzrlib.errors
21
21
from bzrlib.trace import mutter, note, warning
22
 
from bzrlib.branch import Branch, INVENTORY_FILEID, ANCESTRY_FILEID
 
22
from bzrlib.branch import Branch
23
23
from bzrlib.progress import ProgressBar
24
24
from bzrlib.xml5 import serializer_v5
25
25
from bzrlib.osutils import sha_string, split_lines
87
87
    def __init__(self, to_branch, from_branch, last_revision=None, pb=None):
88
88
        self.to_branch = to_branch
89
89
        self.to_weaves = to_branch.weave_store
 
90
        self.to_control = to_branch.control_weaves
90
91
        self.from_branch = from_branch
91
92
        self.from_weaves = from_branch.weave_store
 
93
        self.from_control = from_branch.control_weaves
92
94
        self.failed_revisions = []
93
95
        self.count_copied = 0
94
96
        self.count_total = 0
182
184
 
183
185
 
184
186
    def _copy_inventory(self, rev_id, inv_xml, parent_ids):
185
 
        self.to_weaves.add_text(INVENTORY_FILEID, rev_id,
 
187
        self.to_control.add_text('inventory', rev_id,
186
188
                                split_lines(inv_xml), parent_ids)
187
189
 
188
190
 
189
191
    def _copy_ancestry(self, rev_id, parent_ids):
190
 
        ancestry_lines = self.from_weaves.get_lines(ANCESTRY_FILEID, rev_id)
191
 
        self.to_weaves.add_text(ANCESTRY_FILEID, rev_id, ancestry_lines,
192
 
                                parent_ids)
 
192
        ancestry_lines = self.from_control.get_lines('ancestry', rev_id)
 
193
        self.to_control.add_text('ancestry', rev_id, ancestry_lines,
 
194
                                 parent_ids)
193
195
 
194
196
        
195
197
    def _copy_new_texts(self, rev_id, inv):