← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
2084
2084
        return osutils.lexists(self.abspath(path))
2085
2085
 
2086
2086
    def has_or_had_id(self, file_id):
2087
 
        if file_id == self.root_inventory.root.file_id:
 
2087
        if file_id == self.get_root_id():
2088
2088
            return True
2089
2089
        inv, inv_file_id = self._unpack_file_id(file_id)
2090
2090
        return inv.has_id(inv_file_id)
2912
2912
        This is the same order used by 'osutils.walkdirs'.
2913
2913
        """
2914
2914
        ## TODO: Work from given directory downwards
2915
 
        for path, dir_entry in self.root_inventory.directories():
 
2915
        for path, dir_entry in self.iter_entries_by_dir():
 
2916
            if dir_entry.kind != 'directory':
 
2917
                continue
2916
2918
            # mutter("search for unknowns in %r", path)
2917
2919
            dirabs = self.abspath(path)
2918
2920
            if not isdir(dirabs):