← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Robert Collins
  • Date: 2005-10-11 04:32:38 UTC
  • mto: This revision was merged to the branch mainline in revision 1443.
  • Revision ID: robertc@robertcollins.net-20051011043238-104295a8eb7eba91
move config_dir into bzrlib.config

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
29
29
import types
30
30
 
31
31
import bzrlib
 
32
from bzrlib.config import config_dir
32
33
from bzrlib.errors import BzrError
33
34
from bzrlib.trace import mutter
34
35
 
259
260
            'sha1': s.hexdigest()}
260
261
 
261
262
 
262
 
def config_dir():
263
 
    """Return per-user configuration directory.
264
 
 
265
 
    By default this is ~/.bzr.conf/
266
 
    
267
 
    TODO: Global option --config-dir to override this.
268
 
    """
269
 
    return os.path.join(os.path.expanduser("~"), ".bzr.conf")
270
 
 
271
 
 
272
263
def _auto_user_id():
273
264
    """Calculate automatic user identification.
274
265