← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2009-03-31 00:12:10 UTC
  • mto: This revision was merged to the branch mainline in revision 4219.
  • Revision ID: robertc@robertcollins.net-20090331001210-fufeq2heozx9jne0
Fix Tree.get_symlink_target to decode from the disk encoding to get a unicode encoded string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1739
1739
        if entry[1][parent_index][0] != 'l':
1740
1740
            return None
1741
1741
        else:
1742
 
            # At present, none of the tree implementations supports non-ascii
1743
 
            # symlink targets. So we will just assume that the dirstate path is
1744
 
            # correct.
1745
 
            return entry[1][parent_index][1]
 
1742
            target = entry[1][parent_index][1]
 
1743
            target = target.decode('utf8')
 
1744
            return target
1746
1745
 
1747
1746
    def get_revision_id(self):
1748
1747
        """Return the revision id for this tree."""