← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1224
1224
            return
1225
1225
        try:
1226
1226
            if branch is None:
1227
 
                conf = config.GlobalConfig()
 
1227
                conf = config.GlobalStack()
1228
1228
            else:
1229
 
                conf = branch.get_config()
1230
 
            if conf.suppress_warning('format_deprecation'):
 
1229
                conf = branch.get_config_stack()
 
1230
            if 'format_deprecation' in conf.get('suppress_warnings'):
1231
1231
                return
1232
1232
            warning("Format %s for %s is deprecated -"
1233
1233
                    " please use 'bzr upgrade' to get better performance"