← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Martin Pool
  • Date: 2008-05-22 05:48:22 UTC
  • mfrom: (3407.2.16 controlfiles)
  • mto: This revision was merged to the branch mainline in revision 3448.
  • Revision ID: mbp@sourcefrog.net-20080522054822-lrq17tx62wbfzj8r
merge further LockableFile deprecations

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
76
76
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
77
77
    
78
78
    def do_with_branch(self, branch):
79
 
        """Return the content of branch.control_files.get('branch.conf').
 
79
        """Return the content of branch.conf
80
80
        
81
81
        The body is not utf8 decoded - its the literal bytestream from disk.
82
82
        """
86
86
        # allow the client to get the configuration without needing vfs
87
87
        # access.
88
88
        try:
89
 
            content = branch.control_files.get('branch.conf').read()
 
89
            content = branch._transport.get_bytes('branch.conf')
90
90
        except errors.NoSuchFile:
91
91
            content = ''
92
92
        return SuccessfulSmartServerResponse( ('ok', ), content)