/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: Aaron Bentley
  • Date: 2009-03-10 07:41:16 UTC
  • mto: This revision was merged to the branch mainline in revision 4112.
  • Revision ID: aaron@aaronbentley.com-20090310074116-ky77036dajc58bsi
More support for not autodetecting tree refs

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 entry.kind == 'tree-reference'):
 
216
        if (self._repo_supports_tree_reference and kind == 'directory'
 
217
            and entry is not None and entry.kind == 'tree-reference'):
218
218
            kind = 'tree-reference'
219
219
        return kind, executable, stat_value
220
220
 
566
566
        if (self._repo_supports_tree_reference and kind == 'directory'):
567
567
            entry = self._get_entry(path=relpath)
568
568
            if entry[1] is not None:
569
 
                if entry[1][0] == 't':
 
569
                if entry[1][0][0] == 't':
570
570
                    kind = 'tree-reference'
571
571
        return kind
572
572