← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-01-27 20:24:43 UTC
  • mfrom: (3960.2.1 1.12-progress-warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20090127202443-ty2bu1hh91dumasz
(jam) Avoid getting a UserWarning by not creating an unused progress
        bar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
723
723
                kind = 'tree-reference'
724
724
            return kind, None, None, None
725
725
        elif kind == 'symlink':
726
 
            return ('symlink', None, None, os.readlink(abspath.encode(osutils._fs_enc)))
 
726
            return ('symlink', None, None, os.readlink(abspath))
727
727
        else:
728
728
            return (kind, None, None, None)
729
729
 
945
945
        return file_id
946
946
 
947
947
    def get_symlink_target(self, file_id):
948
 
        return os.readlink(self.id2abspath(file_id).encode(osutils._fs_enc))
 
948
        return os.readlink(self.id2abspath(file_id))
949
949
 
950
950
    @needs_write_lock
951
951
    def subsume(self, other_tree):