← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2009-03-10 02:54:16 UTC
  • mto: This revision was merged to the branch mainline in revision 4112.
  • Revision ID: aaron@aaronbentley.com-20090310025416-l9kp0uruhu9trobf
Disable autodetection of tree references

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
547
547
        entry = self._get_entry(file_id=file_id, path=path)
548
548
        state._observed_sha1(entry, sha1, statvalue)
549
549
 
 
550
    @needs_read_lock
550
551
    def kind(self, file_id):
551
552
        """Return the kind of a file.
552
553
 
564
565
    def _kind(self, relpath):
565
566
        abspath = self.abspath(relpath)
566
567
        kind = file_kind(abspath)
567
 
        if (self._repo_supports_tree_reference and
568
 
            kind == 'directory' and
569
 
            self._directory_is_tree_reference(relpath)):
570
 
            kind = 'tree-reference'
 
568
        if (self._repo_supports_tree_reference and kind == 'directory'):
 
569
            entry = self._get_entry(path=relpath)
 
570
            if entry[1] is not None:
 
571
                if entry[1][0] == 't':
 
572
                    kind = 'tree-reference'
571
573
        return kind
572
574
 
573
575
    @needs_read_lock