/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

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:51:31 UTC
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112225131-he8h411p6aeeb947
Delay grabbing an output stream until we actually go to show a diff.

This makes the test suite happy, but it also seems to be reasonable.
If we aren't going to write anything, we don't need to hold an
output stream open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config.py
1
 
# Copyright (C) 2009-2010 Jelmer Vernooij <jelmer@samba.org>
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
"""Config file handling for Git."""
18
 
 
19
 
from bzrlib import (
20
 
    config,
21
 
    )
22
 
 
23
 
class GitBranchConfig(config.BranchConfig):
24
 
    """BranchConfig that uses locations.conf in place of branch.conf"""
25
 
 
26
 
    def __init__(self, branch):
27
 
        config.BranchConfig.__init__(self, branch)
28
 
        # do not provide a BranchDataConfig
29
 
        self.option_sources = self.option_sources[0], self.option_sources[2]
30
 
 
31
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
32
 
            warn_masked=False):
33
 
        """Force local to True"""
34
 
        config.BranchConfig.set_user_option(self, name, value,
35
 
            store=config.STORE_LOCATION, warn_masked=warn_masked)
36
 
 
37
 
    def _get_user_id(self):
38
 
        # TODO: Read from ~/.gitconfig
39
 
        return self._get_best_value('_get_user_id')