/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: 2010-04-09 03:58:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5146.
  • Revision ID: robertc@robertcollins.net-20100409035814-eqayfeknoncyoctr
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
2.1 method of calling run() to perform testing or direct use via the API
is now possible again. As part of this, the _operation attribute on
Command is now transient and only exists for the duration of ``run()``.
(Robert Collins)

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.