← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-08 00:37:41 UTC
  • mfrom: (1594.2.4 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060308003741-08afccbf89005e87
Merge in :
 * Knit repositories use knits
 * Nested progress bar support.
 * Ghost aware graph api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
1071
1071
            # as downgrades may not be available
1072
1072
            old_format = bzrdir.BzrDirFormat.get_default_format()
1073
1073
            bzrdir.BzrDirFormat.set_default_format(dir._format)
 
1074
            pb = ui.ui_factory.nested_progress_bar()
1074
1075
            try:
1075
 
                dir._format.get_converter(None).convert(dir,
1076
 
                    ui.ui_factory.progress_bar())
 
1076
                dir._format.get_converter(None).convert(dir, pb)
1077
1077
            finally:
1078
1078
                bzrdir.BzrDirFormat.set_default_format(old_format)
 
1079
                pb.finished()
1079
1080
            # and it should pass 'check' now.
1080
1081
            check(bzrdir.BzrDir.open(self.get_url('.')).open_branch(), False)
1081
1082