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

merge bzr.dev r4221

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
973
973
        return file_id
974
974
 
975
975
    def get_symlink_target(self, file_id):
976
 
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
 
976
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc)
 
977
            ).decode(osutils._fs_enc)
977
978
 
978
979
    @needs_write_lock
979
980
    def subsume(self, other_tree):
1531
1532
        :raises: NoSuchId if any fileid is not currently versioned.
1532
1533
        """
1533
1534
        for file_id in file_ids:
 
1535
            if file_id not in self._inventory:
 
1536
                raise errors.NoSuchId(self, file_id)
 
1537
        for file_id in file_ids:
1534
1538
            if self._inventory.has_id(file_id):
1535
1539
                self._inventory.remove_recursive_id(file_id)
1536
 
            else:
1537
 
                raise errors.NoSuchId(self, file_id)
1538
1540
        if len(file_ids):
1539
1541
            # in the future this should just set a dirty bit to wait for the
1540
1542
            # final unlock. However, until all methods of workingtree start