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

Fix revision_history test when no DeprecationWarning is printed and bzr 2.5
is used.

Older prereleases of bzr 2.5 didn't deprecate Branch.revision_history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config.py
24
24
    """BranchConfig that uses locations.conf in place of branch.conf"""
25
25
 
26
26
    def __init__(self, branch):
27
 
        config.BranchConfig.__init__(self, branch)
 
27
        super(GitBranchConfig, self).__init__(branch)
28
28
        # do not provide a BranchDataConfig
29
29
        self.option_sources = self.option_sources[0], self.option_sources[2]
30
30
 
 
31
    def __repr__(self):
 
32
        return "<%s of %r>" % (self.__class__.__name__, self.branch)
 
33
 
31
34
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
32
35
            warn_masked=False):
33
36
        """Force local to True"""