/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 branch.py

Move config to a separate file, support BranchConfig.username().

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
39
39
    mutter,
40
40
    )
41
41
 
 
42
from bzrlib.plugins.git.config import (
 
43
    GitBranchConfig,
 
44
    )
42
45
from bzrlib.plugins.git.errors import (
43
46
    NoSuchRef,
44
47
    )
85
88
        self.repository._git.tags[name] = revid
86
89
 
87
90
 
88
 
class GitBranchConfig(config.BranchConfig):
89
 
    """BranchConfig that uses locations.conf in place of branch.conf"""
90
 
 
91
 
    def __init__(self, branch):
92
 
        config.BranchConfig.__init__(self, branch)
93
 
        # do not provide a BranchDataConfig
94
 
        self.option_sources = self.option_sources[0], self.option_sources[2]
95
 
 
96
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
97
 
            warn_masked=False):
98
 
        """Force local to True"""
99
 
        config.BranchConfig.set_user_option(self, name, value,
100
 
            store=config.STORE_LOCATION, warn_masked=warn_masked)
101
 
 
102
 
 
103
91
class GitBranchFormat(branch.BranchFormat):
104
92
 
105
93
    def get_format_description(self):