← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remotebranch.py

- fix up imports in remotebranch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remotebranch.py
26
26
 
27
27
import gzip
28
28
from cStringIO import StringIO
 
29
import os
29
30
import urllib2
30
31
 
31
 
from errors import BzrError, BzrCheckError
32
 
from branch import Branch, BZR_BRANCH_FORMAT
33
 
from trace import mutter
34
 
 
35
 
# velocitynet.com.au transparently proxies connections and thereby
36
 
# breaks keep-alive -- sucks!
 
32
from bzrlib.errors import BzrError, BzrCheckError
 
33
from bzrlib.branch import Branch, BZR_BRANCH_FORMAT
 
34
from bzrlib.trace import mutter
 
35
from bzrlib.xml import serializer_v4
37
36
 
38
37
 
39
38
ENABLE_URLGRABBER = False
154
153
 
155
154
 
156
155
    def get_revision(self, revision_id):
157
 
        from bzrlib.revision import Revision
158
 
        from bzrlib.xml import unpack_xml
159
156
        try:
160
157
            revf = self.revision_store[revision_id]
161
158
        except KeyError:
162
159
            raise NoSuchRevision(self, revision_id)
163
 
        r = unpack_xml(Revision, revf)
 
160
        r = serializer_v4.read_revision(revf)
164
161
        if r.revision_id != revision_id:
165
162
            raise BzrCheckError('revision stored as {%s} actually contains {%s}'
166
163
                                % (revision_id, r.revision_id))