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

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/config.py
22
22
    config,
23
23
    )
24
24
 
 
25
 
25
26
class GitBranchConfig(config.BranchConfig):
26
27
    """BranchConfig that uses locations.conf in place of branch.conf"""
27
28
 
34
35
        return "<%s of %r>" % (self.__class__.__name__, self.branch)
35
36
 
36
37
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
37
 
            warn_masked=False):
 
38
                        warn_masked=False):
38
39
        """Force local to True"""
39
 
        config.BranchConfig.set_user_option(self, name, value,
40
 
            store=config.STORE_LOCATION, warn_masked=warn_masked)
 
40
        config.BranchConfig.set_user_option(
 
41
            self, name, value, store=config.STORE_LOCATION,
 
42
            warn_masked=warn_masked)
41
43
 
42
44
    def _get_user_id(self):
43
45
        # TODO: Read from ~/.gitconfig