/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Andrew Bennetts
  • Date: 2008-05-07 22:47:56 UTC
  • mfrom: (3412 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3414.
  • Revision ID: andrew.bennetts@canonical.com-20080507224756-upxgmud0bdo4ysuf
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
643
643
        This is looked up in the email controlfile for the branch.
644
644
        """
645
645
        try:
646
 
            return (self.branch.control_files.get_utf8("email") 
647
 
                    .read()
 
646
            return (self.branch.control_files._transport.get_bytes("email")
648
647
                    .decode(bzrlib.user_encoding)
649
648
                    .rstrip("\r\n"))
650
649
        except errors.NoSuchFile, e:
891
890
class TreeConfig(IniBasedConfig):
892
891
    """Branch configuration data associated with its contents, not location"""
893
892
 
 
893
    # XXX: Really needs a better name, as this is not part of the tree! -- mbp 20080507
 
894
 
894
895
    def __init__(self, branch):
895
896
        transport = branch.control_files._transport
896
897
        self._config = TransportConfig(transport, 'branch.conf')