← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
88
88
    atomicfile,
89
89
    controldir,
90
90
    debug,
 
91
    directory_service,
91
92
    errors,
92
93
    lazy_regex,
93
94
    library_state,
4003
4004
            remove=False):
4004
4005
        if directory is None:
4005
4006
            directory = '.'
 
4007
        directory = directory_service.directories.dereference(directory)
4006
4008
        directory = urlutils.normalize_url(directory)
4007
4009
        if remove and all:
4008
4010
            raise errors.BzrError(