← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-02 06:19:45 UTC
  • mfrom: (4226.1.7 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090402061945-oh2qwvhwlpbeyyx4
(robertc) Reinstate the use of the Branch.get_config_file smart verb.
        (Robert Collins, Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
36
36
        ui,
37
37
        urlutils,
38
38
        )
39
 
from bzrlib.config import BranchConfig
 
39
from bzrlib.config import BranchConfig, TransportConfig
40
40
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack5RichRoot
41
41
from bzrlib.tag import (
42
42
    BasicTags,
167
167
    def get_config(self):
168
168
        return BranchConfig(self)
169
169
 
 
170
    def _get_config(self):
 
171
        """Get the concrete config for just the config in this branch.
 
172
 
 
173
        This is not intended for client use; see Branch.get_config for the
 
174
        public API.
 
175
 
 
176
        Added in 1.14.
 
177
 
 
178
        :return: An object supporting get_option and set_option.
 
179
        """
 
180
        raise NotImplementedError(self._get_config)
 
181
 
170
182
    def _get_fallback_repository(self, url):
171
183
        """Get the repository we fallback to at url."""
172
184
        url = urlutils.join(self.base, url)
1880
1892
 
1881
1893
    base = property(_get_base, doc="The URL for the root of this branch.")
1882
1894
 
 
1895
    def _get_config(self):
 
1896
        return TransportConfig(self._transport, 'branch.conf')
 
1897
 
1883
1898
    def is_locked(self):
1884
1899
        return self.control_files.is_locked()
1885
1900