← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/__init__.py
67
67
        m = CHANGESET_OLD_HEADER_RE.match(line)
68
68
        if m:
69
69
            version = m.group('version')
70
 
            raise errors.BundleNotSupported(version, 
 
70
            raise errors.BundleNotSupported(version,
71
71
                'old format bundles not supported')
72
72
 
73
73
    if version is None:
74
74
        raise errors.NotABundle('Did not find an opening header')
75
75
 
76
 
    # Now we have a version, to figure out how to read the bundle 
 
76
    # Now we have a version, to figure out how to read the bundle
77
77
    if version not in _serializers:
78
 
        raise errors.BundleNotSupported(version, 
 
78
        raise errors.BundleNotSupported(version,
79
79
            'version not listed in known versions')
80
80
 
81
81
    serializer = _serializers[version](version)