/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: 2019-06-22 12:07:42 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7357.
  • Revision ID: jelmer@jelmer.uk-20190622120742-cxdr5la8cav78tho
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
524
524
        if self.supports_tree_reference():
525
525
            for path, entry in self.iter_entries_by_dir():
526
526
                if entry.kind == 'tree-reference':
527
 
                    yield path, self.mapping.generate_file_id(b'')
 
527
                    yield path
528
528
 
529
529
    def get_revision_id(self):
530
530
        """See RevisionTree.get_revision_id."""
1136
1136
        # TODO(jelmer): Implement a more efficient version of this
1137
1137
        for path, entry in self.iter_entries_by_dir():
1138
1138
            if entry.kind == 'tree-reference':
1139
 
                yield path, self.mapping.generate_file_id(b'')
 
1139
                yield path
1140
1140
 
1141
1141
    def _get_dir_ie(self, path, parent_id):
1142
1142
        file_id = self.path2id(path)
1403
1403
    def _live_entry(self, relpath):
1404
1404
        raise NotImplementedError(self._live_entry)
1405
1405
 
 
1406
    def get_transform(self, pb=None):
 
1407
        from ..transform import TreeTransform
 
1408
        return TreeTransform(self, pb=pb)
 
1409
 
 
1410
 
1406
1411
 
1407
1412
class InterIndexGitTree(InterGitTrees):
1408
1413
    """InterTree that works between a Git revision tree and an index."""