/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 breezy/git/tree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-14 00:49:33 UTC
  • mfrom: (7065.1.1 ignored-directory)
  • Revision ID: breezy.the.bot@gmail.com-20180814004933-kgyoaj2gee2n11uv
Properly handled ignored directories in Git trees.

Merged from https://code.launchpad.net/~jelmer/brz/ignored-directory/+merge/352937

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
1294
1294
        kind = osutils.file_kind(self.abspath(relpath))
1295
1295
        if kind == 'directory':
1296
1296
            (index, index_path) = self._lookup_index(relpath.encode('utf-8'))
 
1297
            if index is None:
 
1298
                return kind
1297
1299
            try:
1298
1300
                mode = index[index_path].mode
1299
1301
            except KeyError: