/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

s/follow_tree_references/recurse_nested/g

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
528
528
        return osutils.lexists(self.abspath(filename))
529
529
 
530
530
    def _iter_files_recursive(self, from_dir=None, include_dirs=False,
531
 
                              follow_tree_references=False):
 
531
                              recurse_nested=False):
532
532
        if from_dir is None:
533
533
            from_dir = u""
534
534
        if not isinstance(from_dir, text_type):
545
545
                    dirnames.remove(name)
546
546
                    continue
547
547
                relpath = os.path.join(dir_relpath, name)
548
 
                if not follow_tree_references and self._directory_is_tree_reference(relpath.decode(osutils._fs_enc)):
 
548
                if not recurse_nested and self._directory_is_tree_reference(relpath.decode(osutils._fs_enc)):
549
549
                    dirnames.remove(name)
550
550
                if include_dirs:
551
551
                    try:
747
747
                path, stat_result)
748
748
 
749
749
    def list_files(self, include_root=False, from_dir=None, recursive=True,
750
 
                   follow_tree_references=False):
 
750
                   recurse_nested=False):
751
751
        if from_dir is None or from_dir == '.':
752
752
            from_dir = u""
753
753
        dir_ids = {}
764
764
                path_iterator = sorted(
765
765
                    self._iter_files_recursive(
766
766
                        from_dir, include_dirs=True,
767
 
                        follow_tree_references=follow_tree_references))
 
767
                        recurse_nested=recurse_nested))
768
768
            else:
769
769
                encoded_from_dir = self.abspath(from_dir).encode(
770
770
                    osutils._fs_enc)
791
791
                for dir_path, dir_ie in self._add_missing_parent_ids(
792
792
                        parent, dir_ids):
793
793
                    pass
794
 
                if kind == 'tree-reference' and follow_tree_references:
 
794
                if kind == 'tree-reference' and recurse_nested:
795
795
                    ie = self._get_dir_ie(path, self.path2id(path))
796
796
                    yield (posixpath.relpath(path, from_dir), 'V', 'directory',
797
797
                           ie)