← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-09-06 07:39:09 UTC
  • Revision ID: mbp@sourcefrog.net-20050906073909-234eb078dfff15d9
- improved check for branch version

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
328
328
    def _check_format(self):
329
329
        """Check this branch format is supported.
330
330
 
331
 
        The current tool only supports the current unstable format.
 
331
        The format level is stored, as an integer, in
 
332
        self._branch_format for code that needs to check it later.
332
333
 
333
334
        In the future, we might need different in-memory Branch
334
335
        classes to support downlevel branches.  But not yet.
335
336
        """
336
 
        # This ignores newlines so that we can open branches created
337
 
        # on Windows from Linux and so on.  I think it might be better
338
 
        # to always make all internal files in unix format.
339
 
        fmt = self.controlfile('branch-format', 'r').read().rstrip('\r\n')
340
 
        if fmt != BZR_BRANCH_FORMAT_5:
 
337
        fmt = self.controlfile('branch-format', 'r').read()
 
338
        if fmt == BZR_BRANCH_FORMAT_5:
 
339
            self._branch_format = 5
 
340
        else:
341
341
            raise BzrError('sorry, branch format "%s" not supported; ' 
342
342
                           'use a different bzr version, '
343
343
                           'or run "bzr upgrade", '