← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2006-01-25 01:43:34 UTC
  • mto: (1534.1.15 integration)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: robertc@robertcollins.net-20060125014334-8dd9ed73c26c5956
Implement final review suggestions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
418
418
        directory but not yet committed.
419
419
        """
420
420
        try:
421
 
            f = self.branch.control_files.controlfile('pending-merges', 'r')
 
421
            f = self.branch.control_files.get_utf8('pending-merges')
422
422
        except NoSuchFile:
423
423
            return []
424
424
        p = []
808
808
    def read_basis_inventory(self, revision_id):
809
809
        """Read the cached basis inventory."""
810
810
        path = self._basis_inventory_name(revision_id)
811
 
        return self.branch.control_files.controlfile(path, 'r').read()
 
811
        return self.branch.control_files.get_utf8(path).read()
812
812
        
813
813
    @needs_read_lock
814
814
    def read_working_inventory(self):
815
815
        """Read the working inventory."""
816
816
        # ElementTree does its own conversion from UTF-8, so open in
817
817
        # binary.
818
 
        f = self.branch.control_files.controlfile('inventory', 'rb')
 
818
        f = self.branch.control_files.get('inventory')
819
819
        return bzrlib.xml5.serializer_v5.read_inventory(f)
820
820
 
821
821
    @needs_write_lock