/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_4.py

  • Committer: Martin Pool
  • Date: 2009-03-12 05:44:43 UTC
  • mfrom: (4124 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4144.
  • Revision ID: mbp@sourcefrog.net-20090312054443-rz5kodxh1cjjx2id
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
213
213
            WorkingTree3._comparison_data(self, entry, path)
214
214
        # it looks like a plain directory, but it's really a reference -- see
215
215
        # also kind()
216
 
        if (self._repo_supports_tree_reference and
217
 
            kind == 'directory' and
218
 
            self._directory_is_tree_reference(path)):
 
216
        if (self._repo_supports_tree_reference and kind == 'directory'
 
217
            and entry is not None and entry.kind == 'tree-reference'):
219
218
            kind = 'tree-reference'
220
219
        return kind, executable, stat_value
221
220
 
564
563
    def _kind(self, relpath):
565
564
        abspath = self.abspath(relpath)
566
565
        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'
 
566
        if (self._repo_supports_tree_reference and kind == 'directory'):
 
567
            entry = self._get_entry(path=relpath)
 
568
            if entry[1] is not None:
 
569
                if entry[1][0][0] == 't':
 
570
                    kind = 'tree-reference'
571
571
        return kind
572
572
 
573
573
    @needs_read_lock