/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Robert Collins
  • Date: 2006-02-16 08:18:32 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060216081832-4ef742424a888da0
Advise users running upgrade on a checkout to also run it on the branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
22
22
from bzrlib.bzrdir import ConvertBzrDir4To5, ConvertBzrDir5To6, BzrDir, BzrDirFormat4, BzrDirFormat5
23
23
import bzrlib.errors as errors
24
24
from bzrlib.transport import get_transport
25
 
from bzrlib.ui import ui_factory
 
25
import bzrlib.ui as ui
26
26
 
27
27
 
28
28
class Convert(object):
35
35
        self.convert()
36
36
 
37
37
    def convert(self):
38
 
        self.pb = ui_factory.progress_bar()
 
38
        self.pb = ui.ui_factory.progress_bar()
 
39
        branch = self.bzrdir.open_branch()
 
40
        if branch.bzrdir.root_transport.base != self.bzrdir.root_transport.base:
 
41
            self.pb.note("This is a checkout. The branch (%s) needs to be "
 
42
                         "upgraded separately.",
 
43
                         branch.bzrdir.root_transport.base)
39
44
        if not self.bzrdir.can_update_format():
40
45
            raise errors.BzrError("cannot upgrade from branch format %s" %
41
46
                           self.bzrdir._format)