← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Remove the only-used-once put_controlfiles, and change put_controlfile to put and put_utf8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
294
294
        ]
295
295
        cfn = self.control_files._rel_controlfilename
296
296
        self.control_files._transport.mkdir_multi([cfn(d) for d in dirs])
297
 
        self.control_files.put_controlfiles(files)
 
297
        for file, content in files:
 
298
            self.control_files.put_utf8(file, content)
298
299
        mutter('created control directory in ' + self.base)
299
300
 
300
301
    def _check_format(self, relax_version_check):
371
372
        bzrlib.xml5.serializer_v5.write_inventory(inv, sio)
372
373
        sio.seek(0)
373
374
        # Transport handles atomicity
374
 
        self.control_files.put_controlfile('inventory', sio)
 
375
        self.control_files.put_utf8('inventory', sio)
375
376
        
376
377
        mutter('wrote working inventory')
377
378
            
475
476
 
476
477
    @needs_write_lock
477
478
    def set_revision_history(self, rev_history):
478
 
        self.control_files.put_controlfile(
 
479
        self.control_files.put_utf8(
479
480
            'revision-history', '\n'.join(rev_history))
480
481
 
481
482
    def get_revision_delta(self, revno):
863
864
 
864
865
    @needs_write_lock
865
866
    def set_pending_merges(self, rev_list):
866
 
        self.control_files.put_controlfile(
 
867
        self.control_files.put_utf8(
867
868
            'pending-merges', '\n'.join(rev_list))
868
869
 
869
870
    def get_parent(self):