~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remotebranch.py

  • Committer: Martin Pool
  • Date: 2005-09-07 04:00:21 UTC
  • Revision ID: mbp@sourcefrog.net-20050907040020-2c7a5e0176888d95
- BROKEN: partial support for commit into weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
from cStringIO import StringIO
29
29
import urllib2
30
30
 
31
 
from errors import BzrError, BzrCheckError
32
 
from branch import Branch, BZR_BRANCH_FORMAT_5
33
 
from trace import mutter
 
31
from bzrlib.errors import BzrError, BzrCheckError
 
32
from bzrlib.branch import Branch, BZR_BRANCH_FORMAT_5
 
33
from bzrlib.trace import mutter
 
34
from bzrlib.xml5 import serializer_v5
34
35
 
35
36
# velocitynet.com.au transparently proxies connections and thereby
36
37
# breaks keep-alive -- sucks!
158
159
            revf = self.revision_store[revision_id]
159
160
        except KeyError:
160
161
            raise NoSuchRevision(self, revision_id)
161
 
        r = serializer_v4.read_revision(revf)
 
162
        r = serializer_v5.read_revision(revf)
162
163
        if r.revision_id != revision_id:
163
164
            raise BzrCheckError('revision stored as {%s} actually contains {%s}'
164
165
                                % (revision_id, r.revision_id))