/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/workingtree.py

  • Committer: Martin Pool
  • Date: 2009-08-26 05:38:16 UTC
  • mfrom: (4634.6.2 2.0)
  • mto: (4634.6.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: mbp@sourcefrog.net-20090826053816-ht6jpktdm77vi6t5
Merge 2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1898
1898
            firstline = xml.split('\n', 1)[0]
1899
1899
            if (not 'revision_id="' in firstline or
1900
1900
                'format="7"' not in firstline):
1901
 
                inv = self.branch.repository.deserialise_inventory(
1902
 
                    new_revision, xml)
 
1901
                inv = self.branch.repository._serializer.read_inventory_from_string(
 
1902
                    xml, new_revision)
1903
1903
                xml = self._create_basis_xml_from_inventory(new_revision, inv)
1904
1904
            self._write_basis_inventory(xml)
1905
1905
        except (errors.NoSuchRevision, errors.RevisionNotPresent):
3035
3035
        return self.get_format_string()
3036
3036
 
3037
3037
 
3038
 
__default_format = WorkingTreeFormat4()
 
3038
__default_format = WorkingTreeFormat6()
3039
3039
WorkingTreeFormat.register_format(__default_format)
3040
 
WorkingTreeFormat.register_format(WorkingTreeFormat6())
3041
3040
WorkingTreeFormat.register_format(WorkingTreeFormat5())
 
3041
WorkingTreeFormat.register_format(WorkingTreeFormat4())
3042
3042
WorkingTreeFormat.register_format(WorkingTreeFormat3())
3043
3043
WorkingTreeFormat.set_default_format(__default_format)
3044
3044
# formats which have no format string are not discoverable