← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
749
749
                kind = 'tree-reference'
750
750
            return kind, None, None, None
751
751
        elif kind == 'symlink':
752
 
            return ('symlink', None, None,
753
 
                    os.readlink(abspath.encode(osutils._fs_enc)
754
 
                                ).decode(osutils._fs_enc))
 
752
            target = osutils.readlink(abspath)
 
753
            return ('symlink', None, None, target)
755
754
        else:
756
755
            return (kind, None, None, None)
757
756
 
973
972
        return file_id
974
973
 
975
974
    def get_symlink_target(self, file_id):
976
 
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc)
977
 
            ).decode(osutils._fs_enc)
 
975
        abspath = self.id2abspath(file_id)
 
976
        target = osutils.readlink(abspath)
 
977
        return target
978
978
 
979
979
    @needs_write_lock
980
980
    def subsume(self, other_tree):
1561
1561
 
1562
1562
    @needs_write_lock
1563
1563
    def pull(self, source, overwrite=False, stop_revision=None,
1564
 
             change_reporter=None, possible_transports=None):
 
1564
             change_reporter=None, possible_transports=None, local=False):
1565
1565
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1566
1566
        source.lock_read()
1567
1567
        try:
1570
1570
            old_revision_info = self.branch.last_revision_info()
1571
1571
            basis_tree = self.basis_tree()
1572
1572
            count = self.branch.pull(source, overwrite, stop_revision,
1573
 
                                     possible_transports=possible_transports)
 
1573
                                     possible_transports=possible_transports,
 
1574
                                     local=local)
1574
1575
            new_revision_info = self.branch.last_revision_info()
1575
1576
            if new_revision_info != old_revision_info:
1576
1577
                pp.next_phase()