/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: Jelmer Vernooij
  • Date: 2018-11-21 02:50:08 UTC
  • mto: This revision was merged to the branch mainline in revision 7207.
  • Revision ID: jelmer@jelmer.uk-20181121025008-tiutar263ri5rvkm
Undo removal of kind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
403
403
                root_ie = self._get_file_ie(store, from_dir.encode("utf-8"),
404
404
                    posixpath.basename(from_dir), mode, hexsha)
405
405
        if include_root:
406
 
            yield (from_dir, "V", root_ie)
 
406
            yield (from_dir, "V", root_ie.kind, root_ie)
407
407
        todo = []
408
408
        if root_ie.kind == 'directory':
409
409
            todo.append((store, from_dir.encode("utf-8"), b"", hexsha, root_ie.file_id))
421
421
                        todo.append((store, child_path, child_relpath, hexsha, ie.file_id))
422
422
                else:
423
423
                    ie = self._get_file_ie(store, child_path, name, mode, hexsha, parent_id)
424
 
                yield child_relpath.decode('utf-8'), "V", ie
 
424
                yield child_relpath.decode('utf-8'), "V", ie.kind, ie
425
425
 
426
426
    def _get_file_ie(self, store, path, name, mode, hexsha, parent_id):
427
427
        if not isinstance(path, bytes):