← 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: 2007-02-09 17:24:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070209172423-xu5e0b12sf71m0pj
Make sure WorkingTree revision_ids are also returned as utf8 strings

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
503
503
        else:
504
504
            parents = [last_rev]
505
505
        try:
506
 
            merges_file = self._control_files.get_utf8('pending-merges')
 
506
            merges_file = self._control_files.get('pending-merges')
507
507
        except errors.NoSuchFile:
508
508
            pass
509
509
        else:
1955
1955
    def _last_revision(self):
1956
1956
        """See Mutable.last_revision."""
1957
1957
        try:
1958
 
            return self._control_files.get_utf8('last-revision').read()
 
1958
            return self._control_files.get('last-revision').read()
1959
1959
        except errors.NoSuchFile:
1960
1960
            return None
1961
1961