← 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-09 12:49:08 UTC
  • mto: This revision was merged to the branch mainline in revision 6060.
  • Revision ID: v.ladeuil+lp@free.fr-20110809124908-aok36t6x2y0thov1
Fix news entry.

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.GlobalStack().get('default_format')
2291
 
controldir.format_registry.set_default(format_name)
 
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)
2292
2295
 
2293
2296
# XXX 2010-08-20 JRV: There is still a lot of code relying on
2294
2297
# bzrlib.bzrdir.format_registry existing. When BzrDir.create/BzrDir.open/etc