/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: John Arbash Meinel
  • Date: 2006-09-12 21:19:54 UTC
  • mto: This revision was merged to the branch mainline in revision 2071.
  • Revision ID: john@arbash-meinel.com-20060912211954-3d8074cfb66e1139
Find a few places that weren't importing their dependencies.
Demandload a few more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
35
35
    lockable_files,
36
36
    lockdir,
37
37
    urlutils,
 
38
    xml4,
 
39
    xml5,
38
40
    )
39
41
from bzrlib.osutils import (
40
42
    safe_unicode,
48
50
from bzrlib.transactions import WriteTransaction
49
51
from bzrlib.transport import get_transport
50
52
from bzrlib.weave import Weave
51
 
from bzrlib.xml4 import serializer_v4
52
 
import bzrlib.xml5
53
53
""")
54
54
 
55
55
from bzrlib.trace import mutter
1482
1482
        self.bzrdir.transport.delete_tree('text-store')
1483
1483
 
1484
1484
    def _convert_working_inv(self):
1485
 
        inv = serializer_v4.read_inventory(self.branch.control_files.get('inventory'))
1486
 
        new_inv_xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
 
1485
        inv = xml4.serializer_v4.read_inventory(
 
1486
                    self.branch.control_files.get('inventory'))
 
1487
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1487
1488
        # FIXME inventory is a working tree change.
1488
1489
        self.branch.control_files.put('inventory', StringIO(new_inv_xml))
1489
1490
 
1547
1548
    def _load_old_inventory(self, rev_id):
1548
1549
        assert rev_id not in self.converted_revs
1549
1550
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
1550
 
        inv = serializer_v4.read_inventory_from_string(old_inv_xml)
 
1551
        inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
1551
1552
        rev = self.revisions[rev_id]
1552
1553
        if rev.inventory_sha1:
1553
1554
            assert rev.inventory_sha1 == sha_string(old_inv_xml), \
1557
1558
    def _load_updated_inventory(self, rev_id):
1558
1559
        assert rev_id in self.converted_revs
1559
1560
        inv_xml = self.inv_weave.get_text(rev_id)
1560
 
        inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(inv_xml)
 
1561
        inv = xml5.serializer_v5.read_inventory_from_string(inv_xml)
1561
1562
        return inv
1562
1563
 
1563
1564
    def _convert_one_rev(self, rev_id):
1579
1580
                assert getattr(ie, 'revision', None) is not None, \
1580
1581
                    'no revision on {%s} in {%s}' % \
1581
1582
                    (file_id, rev.revision_id)
1582
 
        new_inv_xml = bzrlib.xml5.serializer_v5.write_inventory_to_string(inv)
 
1583
        new_inv_xml = xml5.serializer_v5.write_inventory_to_string(inv)
1583
1584
        new_inv_sha1 = sha_string(new_inv_xml)
1584
1585
        self.inv_weave.add_lines(rev.revision_id, 
1585
1586
                                 present_parents,