← 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: 2007-03-06 15:59:43 UTC
  • mfrom: (2309.4.14 unicode_id_warnings)
  • Revision ID: pqm@pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
(John Arbash Meinel) Change safe_*_id to issue a deprecation warning, and clean up places that were still generating unicode ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
857
857
        except StopIteration:
858
858
            raise errors.MergeModifiedFormatError()
859
859
        for s in RioReader(hashfile):
860
 
            file_id = s.get("file_id")
 
860
            # RioReader reads in Unicode, so convert file_ids back to utf8
 
861
            file_id = osutils.safe_file_id(s.get("file_id"), warn=False)
861
862
            if file_id not in self.inventory:
862
863
                continue
863
864
            text_hash = s.get("hash")