← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2006-01-13 15:15:52 UTC
  • mto: (1685.1.1 bzr-encoding)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060113151552-762691b30ad241bb
Fix WorkingTree to realize .bzrignore is utf-8 encoded.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
746
746
        l = bzrlib.DEFAULT_IGNORE[:]
747
747
        if self.has_filename(bzrlib.IGNORE_FILENAME):
748
748
            f = self.get_file_byname(bzrlib.IGNORE_FILENAME)
749
 
            l.extend([line.rstrip("\n\r") for line in f.readlines()])
 
749
            l.extend([line.rstrip("\n\r").decode('utf-8') 
 
750
                      for line in f.readlines()])
750
751
        self._ignorelist = l
751
752
        return l
752
753