← Back to branch summary

~bialix/bzr-git/bzr.exe

« back to all changes in this revision

Viewing changes to branch.py

  • Committer: Jelmer Vernooij
  • Date: 2009-01-27 13:00:24 UTC
  • mfrom: (159.1.56 git-serve)
  • Revision ID: jelmer@samba.org-20090127130024-tg24c8qdcgmrnxve
Merge John.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
63
63
        # do not provide a BranchDataConfig
64
64
        self.option_sources = self.option_sources[0], self.option_sources[2]
65
65
 
66
 
    def set_user_option(self, name, value, local=False):
 
66
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
67
67
        """Force local to True"""
68
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
68
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
69
69
 
70
70
 
71
71
class GitBranchFormat(branch.BranchFormat):
144
144
    def set_push_location(self, location):
145
145
        """See Branch.set_push_location."""
146
146
        self.get_config().set_user_option('push_location', location,
147
 
                                          local=True)
 
147
                                          store=config.STORE_LOCATION)
148
148
 
149
149
    def supports_tags(self):
150
150
        return True