← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin Pool
  • Date: 2010-04-21 10:13:50 UTC
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@canonical.com-20100421101350-6eq02ssg8kx1tmb3
Go back to opening branch using url, so it can use all possible transports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
47
47
    def convert(self):
48
48
        try:
49
49
            branch = self.bzrdir.open_branch()
50
 
            if branch.user_url != self.bzrdir.user_url:
 
50
            if branch.bzrdir.root_transport.base != \
 
51
                self.bzrdir.root_transport.base:
51
52
                ui.ui_factory.note("This is a checkout. The branch (%s) needs to be "
52
53
                             "upgraded separately." %
53
 
                             branch.user_url)
 
54
                             branch.bzrdir.root_transport.base)
54
55
            del branch
55
56
        except (errors.NotBranchError, errors.IncompatibleRepositories):
56
57
            # might not be a format we can open without upgrading; see e.g.