/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

s/follow_tree_references/recurse_nested/g

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
434
434
        return self._submodules
435
435
 
436
436
    def list_files(self, include_root=False, from_dir=None, recursive=True,
437
 
                   follow_tree_references=False):
 
437
                   recurse_nested=False):
438
438
        if self.tree is None:
439
439
            return
440
440
        if from_dir is None or from_dir == '.':
465
465
                    continue
466
466
                child_path = posixpath.join(path, name)
467
467
                child_relpath = posixpath.join(relpath, name)
468
 
                if S_ISGITLINK(mode) and follow_tree_references:
 
468
                if S_ISGITLINK(mode) and recurse_nested:
469
469
                    mode = stat.S_IFDIR
470
470
                    store = self._get_submodule_store(child_relpath)
471
471
                    hexsha = store[hexsha].tree
1200
1200
            self._ensure_versioned_dir(index_path)
1201
1201
 
1202
1202
    def _recurse_index_entries(self, index=None, basepath=b"",
1203
 
                               follow_tree_references=False):
 
1203
                               recurse_nested=False):
1204
1204
        # Iterate over all index entries
1205
1205
        with self.lock_read():
1206
1206
            if index is None:
1208
1208
            for path, value in index.items():
1209
1209
                (ctime, mtime, dev, ino, mode, uid, gid, size, sha,
1210
1210
                 flags) = value
1211
 
                if S_ISGITLINK(mode) and follow_tree_references:
 
1211
                if S_ISGITLINK(mode) and recurse_nested:
1212
1212
                    subindex = self._get_submodule_index(path)
1213
1213
                    for entry in self._recurse_index_entries(
1214
1214
                            index=subindex, basepath=path,
1215
 
                            follow_tree_references=follow_tree_references):
 
1215
                            recurse_nested=recurse_nested):
1216
1216
                        yield entry
1217
1217
                else:
1218
1218
                    yield (posixpath.join(basepath, path), value)