/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/transform.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/transform.py
2226
2226
                    if not path.startswith(prefix):
2227
2227
                        continue
2228
2228
                    path = path[len(prefix):]
2229
 
                yield path, 'V', entry
 
2229
                yield path, 'V', entry.kind, entry
2230
2230
        else:
2231
2231
            if from_dir is None and include_root is True:
2232
 
                root_entry = inventory.make_entry('directory', '',
2233
 
                    ROOT_PARENT, self.get_root_id())
2234
 
                yield '', 'V', root_entry
 
2232
                root_entry = inventory.make_entry(
 
2233
                    'directory', '', ROOT_PARENT, self.get_root_id())
 
2234
                yield '', 'V', 'directory', root_entry
2235
2235
            entries = self._iter_entries_for_dir(from_dir or '')
2236
2236
            for path, entry in entries:
2237
 
                yield path, 'V', entry
 
2237
                yield path, 'V', entry.kind, entry
2238
2238
 
2239
2239
    def kind(self, path, file_id=None):
2240
2240
        trans_id = self._path2trans_id(path)