/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: 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/transform.py
2240
2240
                    if not path.startswith(prefix):
2241
2241
                        continue
2242
2242
                    path = path[len(prefix):]
2243
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
2243
                yield path, 'V', entry.kind, entry
2244
2244
        else:
2245
2245
            if from_dir is None and include_root is True:
2246
 
                root_entry = inventory.make_entry('directory', '',
2247
 
                                                  ROOT_PARENT, self.get_root_id())
2248
 
                yield '', 'V', 'directory', root_entry.file_id, root_entry
 
2246
                root_entry = inventory.make_entry(
 
2247
                    'directory', '', ROOT_PARENT, self.get_root_id())
 
2248
                yield '', 'V', 'directory', root_entry
2249
2249
            entries = self._iter_entries_for_dir(from_dir or '')
2250
2250
            for path, entry in entries:
2251
 
                yield path, 'V', entry.kind, entry.file_id, entry
 
2251
                yield path, 'V', entry.kind, entry
2252
2252
 
2253
2253
    def kind(self, path):
2254
2254
        trans_id = self._path2trans_id(path)