← 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-17 18:55:58 UTC
  • mto: This revision was merged to the branch mainline in revision 2298.
  • Revision ID: john@arbash-meinel.com-20070217185558-mhsvsed3azztcuez
Track down and add tests that all tree.commit() can handle
non-ascii revision ids, as well as that file_ids_affected_by can handle
non-ascii revision ids. Also track down pending-merges needing to
write byte streams rather than unicode.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
705
705
 
706
706
    def _set_merges_from_parent_ids(self, parent_ids):
707
707
        merges = parent_ids[1:]
708
 
        self._control_files.put_utf8('pending-merges', '\n'.join(merges))
 
708
        self._control_files.put_bytes('pending-merges', '\n'.join(merges))
709
709
 
710
710
    @needs_tree_write_lock
711
711
    def set_parent_ids(self, revision_ids, allow_leftmost_as_ghost=False):
2133
2133
        sio.seek(0)
2134
2134
        control_files.put('inventory', sio)
2135
2135
 
2136
 
        control_files.put_utf8('pending-merges', '')
 
2136
        control_files.put_bytes('pending-merges', '')
2137
2137
        
2138
2138
 
2139
2139
    def initialize(self, a_bzrdir, revision_id=None):