← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
1
 
# Copyright (C) 2005, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
35
35
        if self.bzrdir.root_transport.is_readonly():
36
36
            raise errors.UpgradeReadonly
37
37
        self.transport = self.bzrdir.root_transport
38
 
        self.pb = ui.ui_factory.nested_progress_bar()
39
 
        try:
40
 
            self.convert()
41
 
        finally:
42
 
            self.pb.finished()
 
38
        self.convert()
43
39
 
44
40
    def convert(self):
45
41
        try:
77
73
        self.bzrdir.backup_bzrdir()
78
74
        while self.bzrdir.needs_format_conversion(format):
79
75
            converter = self.bzrdir._format.get_converter(format)
80
 
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
 
76
            self.bzrdir = converter.convert(self.bzrdir, None)
81
77
        ui.ui_factory.note("finished")
82
78
 
83
79