/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: 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/workingtree.py
756
756
        with self.lock_read():
757
757
            root_ie = self._get_dir_ie(u"", None)
758
758
            if include_root and not from_dir:
759
 
                yield "", "V", root_ie
 
759
                yield "", "V", root_ie.kind, root_ie
760
760
            dir_ids[u""] = root_ie.file_id
761
761
            if recursive:
762
762
                path_iterator = sorted(self._iter_files_recursive(from_dir, include_dirs=True))
791
791
                        else:
792
792
                            status = "?"
793
793
                            ie = fk_entries[kind]()
794
 
                        yield posixpath.relpath(path, from_dir), status, ie
 
794
                        yield posixpath.relpath(path, from_dir), status, kind, ie
795
795
                    continue
796
796
                if value is not None:
797
797
                    ie = self._get_file_ie(name, path, value, dir_ids[parent])
798
 
                    yield posixpath.relpath(path, from_dir), "V", ie
 
798
                    yield posixpath.relpath(path, from_dir), "V", ie.kind, ie
799
799
                else:
800
800
                    ie = fk_entries[kind]()
801
 
                    yield posixpath.relpath(path, from_dir), ("I" if self.is_ignored(path) else "?"), ie
 
801
                    yield posixpath.relpath(path, from_dir), ("I" if self.is_ignored(path) else "?"), kind, ie
802
802
 
803
803
    def all_file_ids(self):
804
804
        with self.lock_read():