← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-23 05:15:23 UTC
  • mfrom: (3363.14.15 intertree)
  • Revision ID: pqm@pqm.ubuntu.com-20080923051523-7ghbp6v2i2dehplc
PreviewTree now passes intertree_implmentations tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1500
1500
            self.__by_parent = self._transform.by_parent()
1501
1501
        return self.__by_parent
1502
1502
 
 
1503
    def _comparison_data(self, entry, path):
 
1504
        kind, size, executable, link_or_sha1 = self.path_content_summary(path)
 
1505
        if kind == 'missing':
 
1506
            kind = None
 
1507
            executable = False
 
1508
        else:
 
1509
            file_id = self._transform.final_file_id(self._path2trans_id(path))
 
1510
            executable = self.is_executable(file_id, path)
 
1511
        return kind, executable, None
 
1512
 
1503
1513
    def lock_read(self):
1504
1514
        # Perhaps in theory, this should lock the TreeTransform?
1505
1515
        pass
1645
1655
            return self._transform._tree.get_file_mtime(file_id, path)
1646
1656
        return self._stat_limbo_file(file_id).st_mtime
1647
1657
 
 
1658
    def _file_size(self, entry, stat_value):
 
1659
        return self.get_file_size(entry.file_id)
 
1660
 
1648
1661
    def get_file_size(self, file_id):
1649
1662
        """See Tree.get_file_size"""
1650
1663
        if self.kind(file_id) == 'file':
1656
1669
        return self._transform._tree.get_file_sha1(file_id)
1657
1670
 
1658
1671
    def is_executable(self, file_id, path=None):
 
1672
        if file_id is None:
 
1673
            return False
1659
1674
        trans_id = self._transform.trans_id_file_id(file_id)
1660
1675
        try:
1661
1676
            return self._transform._new_executability[trans_id]
1703
1718
        ignored.
1704
1719
        """
1705
1720
        if from_tree is not self._transform._tree:
1706
 
            raise ValueError('from_tree must be transform source tree.')
 
1721
            return tree.InterTree(from_tree, self).iter_changes(
 
1722
                include_unchanged=include_unchanged,
 
1723
                specific_files=specific_files,
 
1724
                pb=pb,
 
1725
                extra_trees=extra_trees,
 
1726
                require_versioned=require_versioned,
 
1727
                want_unversioned=want_unversioned)
1707
1728
        if include_unchanged:
1708
1729
            raise ValueError('include_unchanged is not supported')
1709
1730
        if specific_files is not None: