← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2011-08-12 09:49:24 UTC
  • mfrom: (6015.9.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6066.
  • Revision ID: v.ladeuil+lp@free.fr-20110812094924-knc5s0g7vs31a2f1
Merge 2.4 into trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
2287
2287
    help='Same as 2a.')
2288
2288
 
2289
2289
# The current format that is made on 'bzr init'.
2290
 
format_name = config.GlobalConfig().get_user_option('default_format')
2291
 
if format_name is None:
2292
 
    controldir.format_registry.set_default('2a')
2293
 
else:
2294
 
    controldir.format_registry.set_default(format_name)
 
2290
format_name = config.GlobalStack().get('default_format')
 
2291
controldir.format_registry.set_default(format_name)
2295
2292
 
2296
2293
# XXX 2010-08-20 JRV: There is still a lot of code relying on
2297
2294
# bzrlib.bzrdir.format_registry existing. When BzrDir.create/BzrDir.open/etc