← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Remove more cases of getting transport via control_files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
486
486
        else:
487
487
            parents = [last_rev]
488
488
        try:
489
 
            merges_file = self._control_files._transport.get('pending-merges')
 
489
            merges_file = self._transport.get('pending-merges')
490
490
        except errors.NoSuchFile:
491
491
            pass
492
492
        else:
870
870
        still in the working inventory and have that text hash.
871
871
        """
872
872
        try:
873
 
            hashfile = self._control_files._transport.get('merge-hashes')
 
873
            hashfile = self._transport.get('merge-hashes')
874
874
        except errors.NoSuchFile:
875
875
            return {}
876
876
        merge_hashes = {}
1787
1787
    def read_basis_inventory(self):
1788
1788
        """Read the cached basis inventory."""
1789
1789
        path = self._basis_inventory_name()
1790
 
        return self._control_files._transport.get_bytes(path)
 
1790
        return self._transport.get_bytes(path)
1791
1791
        
1792
1792
    @needs_read_lock
1793
1793
    def read_working_inventory(self):
1802
1802
        # binary.
1803
1803
        if self._inventory_is_modified:
1804
1804
            raise errors.InventoryModified(self)
1805
 
        result = self._deserialize(self._control_files._transport.get('inventory'))
 
1805
        result = self._deserialize(self._transport.get('inventory'))
1806
1806
        self._set_inventory(result, dirty=False)
1807
1807
        return result
1808
1808
 
2513
2513
        """See WorkingTree._change_last_revision."""
2514
2514
        if revision_id is None or revision_id == NULL_REVISION:
2515
2515
            try:
2516
 
                self._control_files._transport.delete('last-revision')
 
2516
                self._transport.delete('last-revision')
2517
2517
            except errors.NoSuchFile:
2518
2518
                pass
2519
2519
            return False