/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-11-21 19:51:52 UTC
  • mfrom: (7143.19.8 namedtuple-list-files)
  • Revision ID: breezy.the.bot@gmail.com-20181121195152-ax5zwiz08bj4x6tc
Simplify the iterator for Tree.list_files() to exclude file kind and file_id.

Merged from https://code.launchpad.net/~jelmer/brz/namedtuple-list-files/+merge/358354

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
409
409
                    store, from_dir.encode("utf-8"),
410
410
                    posixpath.basename(from_dir), mode, hexsha)
411
411
        if include_root:
412
 
            yield (from_dir, "V", root_ie.kind, root_ie.file_id, root_ie)
 
412
            yield (from_dir, "V", root_ie.kind, root_ie)
413
413
        todo = []
414
414
        if root_ie.kind == 'directory':
415
415
            todo.append((store, from_dir.encode("utf-8"),
431
431
                else:
432
432
                    ie = self._get_file_ie(
433
433
                        store, child_path, name, mode, hexsha, parent_id)
434
 
                yield (child_relpath.decode('utf-8'), "V", ie.kind, ie.file_id,
435
 
                       ie)
 
434
                yield (child_relpath.decode('utf-8'), "V", ie.kind, ie)
436
435
 
437
436
    def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
438
437
        if not isinstance(path, bytes):