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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-03 22:15:13 UTC
  • mfrom: (7311.2.7 detect-local-wt)
  • Revision ID: breezy.the.bot@gmail.com-20190603221513-lwqguwnu6lpf2t1o
Remove WorkingTree.find_trees, simplify detection of subtrees.

Merged from https://code.launchpad.net/~jelmer/brz/detect-local-wt/+merge/368240

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
568
568
                    except OSError as e:
569
569
                        if e.errno == errno.ENOENT:
570
570
                            raise errors.NoSuchFile(fullpath)
571
 
                    if (kind == 'directory' and f != '' and
572
 
                            os.path.exists(os.path.join(fullpath, '.git'))):
 
571
                    if f != '' and self._directory_is_tree_reference(f):
573
572
                        kind = 'tree-reference'
574
573
                    kinds[pos] = kind
575
574