← 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: 2007-09-25 08:41:29 UTC
  • mto: This revision was merged to the branch mainline in revision 2862.
  • Revision ID: robertc@robertcollins.net-20070925084129-ca0kd25h23dmunrs
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
702
702
        if updated:
703
703
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
704
704
 
705
 
    def path_content_summary(self, path, _lstat=os.lstat,
 
705
    def path_content_summary(self, path, _lstat=osutils.lstat,
706
706
        _mapper=osutils.file_kind_from_stat_mode):
707
707
        """See Tree.path_content_summary."""
708
708
        abspath = self.abspath(path)
712
712
            if getattr(e, 'errno', None) == errno.ENOENT:
713
713
                # no file.
714
714
                return ('missing', None, None, None)
715
 
            # propogate other errors
 
715
            # propagate other errors
716
716
            raise
717
717
        kind = _mapper(stat_result.st_mode)
718
718
        if kind == 'file':