← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-02 13:07:14 UTC
  • mto: (4524.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4525.
  • Revision ID: v.ladeuil+lp@free.fr-20090702130714-hsyqfusi8vn3a11m
Use tree.has_changes() where appropriate (the test suite caught a
bug in has_changes() (not filtering out the root) in an impressive
number of tests)

* bzrlib/send.py:
(send): Use tree.has_changes() instead of tree.changes_from().

* bzrlib/reconfigure.py:
(Reconfigure._check): Use tree.has_changes() instead of
tree.changes_from().

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.compare_basis): Use
tree.has_changes() instead of tree.changes_from().

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use
tree.has_changes() instead of tree.changes_from().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""bzr upgrade logic."""
18
18
 
19
19
 
20
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat
 
20
from bzrlib.bzrdir import BzrDir, BzrDirFormat, format_registry
21
21
import bzrlib.errors as errors
22
22
from bzrlib.remote import RemoteBzrDir
23
23
from bzrlib.transport import get_transport
26
26
 
27
27
class Convert(object):
28
28
 
29
 
    def __init__(self, url, format):
30
 
        if format is None:
31
 
            format = BzrDirFormat.get_default_format()
 
29
    def __init__(self, url, format=None):
32
30
        self.format = format
33
31
        self.bzrdir = BzrDir.open_unsupported(url)
34
32
        if isinstance(self.bzrdir, RemoteBzrDir):
53
51
                             branch.bzrdir.root_transport.base)
54
52
            del branch
55
53
        except (errors.NotBranchError, errors.IncompatibleRepositories):
56
 
            # might not be a format we can open without upgrading; see e.g. 
 
54
            # might not be a format we can open without upgrading; see e.g.
57
55
            # https://bugs.launchpad.net/bzr/+bug/253891
58
56
            pass
59
 
        if not self.bzrdir.needs_format_conversion(self.format):
 
57
        if self.format is None:
 
58
            try:
 
59
                rich_root = self.bzrdir.find_repository()._format.rich_root_data
 
60
            except errors.NoRepositoryPresent:
 
61
                rich_root = False # assume no rich roots
 
62
            if rich_root:
 
63
                format_name = "default-rich-root"
 
64
            else:
 
65
                format_name = "default"
 
66
            format = format_registry.make_bzrdir(format_name)
 
67
        else:
 
68
            format = self.format
 
69
        if not self.bzrdir.needs_format_conversion(format):
60
70
            raise errors.UpToDateFormat(self.bzrdir._format)
61
71
        if not self.bzrdir.can_convert_format():
62
72
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
63
73
                           self.bzrdir._format)
64
 
        self.bzrdir.check_conversion_target(self.format)
 
74
        self.bzrdir.check_conversion_target(format)
65
75
        self.pb.note('starting upgrade of %s', self.transport.base)
66
76
        self.bzrdir.backup_bzrdir()
67
 
        while self.bzrdir.needs_format_conversion(self.format):
68
 
            converter = self.bzrdir._format.get_converter(self.format)
 
77
        while self.bzrdir.needs_format_conversion(format):
 
78
            converter = self.bzrdir._format.get_converter(format)
69
79
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
70
80
        self.pb.note("finished")
71
81