~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

(robertc) Pull in patches from bzr.dev: Up to rev 4637, then 4639,
        4641, 4643, 4646, 4649, 4650, 4651. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
129
129
        return True
130
130
 
131
131
    def check_conversion_target(self, target_format):
 
132
        """Check that a bzrdir as a whole can be converted to a new format."""
 
133
        # The only current restriction is that the repository content can be 
 
134
        # fetched compatibly with the target.
132
135
        target_repo_format = target_format.repository_format
133
 
        self.open_repository()._format.check_conversion_target(target_repo_format)
 
136
        try:
 
137
            self.open_repository()._format.check_conversion_target(
 
138
                target_repo_format)
 
139
        except errors.NoRepositoryPresent:
 
140
            # No repo, no problem.
 
141
            pass
134
142
 
135
143
    @staticmethod
136
144
    def _check_supported(format, allow_unsupported,