/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: Kent Gibson
  • Date: 2007-03-11 13:44:18 UTC
  • mfrom: (2334 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2350.
  • Revision ID: warthog618@gmail.com-20070311134418-nu57arul94zawbj4
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
945
945
        
946
946
        A new branch will be created, relative to the path for this tree.
947
947
        """
 
948
        self.flush()
948
949
        def mkdirs(path):
949
950
            segments = osutils.splitpath(path)
950
951
            transport = self.branch.bzrdir.root_transport
1012
1013
        self._control_files.put('inventory', sio)
1013
1014
        self._inventory_is_modified = False
1014
1015
 
 
1016
    def _kind(self, relpath):
 
1017
        return osutils.file_kind(self.abspath(relpath))
 
1018
 
1015
1019
    def list_files(self, include_root=False):
1016
1020
        """Recursively list all files as (path, class, kind, id, entry).
1017
1021
 
1032
1036
            yield ('', 'V', 'directory', inv.root.file_id, inv.root)
1033
1037
        # Convert these into local objects to save lookup times
1034
1038
        pathjoin = osutils.pathjoin
1035
 
        file_kind = osutils.file_kind
 
1039
        file_kind = self._kind
1036
1040
 
1037
1041
        # transport.base ends in a slash, we want the piece
1038
1042
        # between the last two slashes
1098
1102
 
1099
1103
                fk = file_kind(fap)
1100
1104
 
1101
 
                if f_ie:
1102
 
                    if f_ie.kind != fk:
1103
 
                        raise errors.BzrCheckError(
1104
 
                            "file %r entered as kind %r id %r, now of kind %r"
1105
 
                            % (fap, f_ie.kind, f_ie.file_id, fk))
1106
 
 
1107
1105
                # make a last minute entry
1108
1106
                if f_ie:
1109
1107
                    yield fp[1:], c, fk, f_ie.file_id, f_ie