/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 bzrlib/workingtree_4.py

  • Committer: Martin Pool
  • Date: 2007-08-21 03:40:50 UTC
  • mfrom: (2736 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2737.
  • Revision ID: mbp@sourcefrog.net-20070821034050-gcppw53kbcm2gwgd
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
568
568
        if parent_ids:
569
569
            return parent_ids[0]
570
570
        else:
571
 
            return None
 
571
            return _mod_revision.NULL_REVISION
572
572
 
573
573
    def lock_read(self):
574
574
        """See Branch.lock_read, and WorkingTree.unlock."""
1521
1521
    def get_reference_revision(self, file_id, path=None):
1522
1522
        return self.inventory[file_id].reference_revision
1523
1523
 
 
1524
    def iter_files_bytes(self, desired_files):
 
1525
        """See Tree.iter_files_bytes.
 
1526
 
 
1527
        This version is implemented on top of Repository.iter_files_bytes"""
 
1528
        parent_index = self._get_parent_index()
 
1529
        repo_desired_files = []
 
1530
        for file_id, identifier in desired_files:
 
1531
            entry = self._get_entry(file_id)
 
1532
            if entry == (None, None):
 
1533
                raise errors.NoSuchId(self, file_id)
 
1534
            repo_desired_files.append((file_id, entry[1][parent_index][4],
 
1535
                                       identifier))
 
1536
        return self._repository.iter_files_bytes(repo_desired_files)
 
1537
 
1524
1538
    def get_symlink_target(self, file_id):
1525
1539
        entry = self._get_entry(file_id=file_id)
1526
1540
        parent_index = self._get_parent_index()