/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remotebranch.py

  • Committer: Martin Pool
  • Date: 2005-09-16 09:43:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050916094355-d1a3d0aebe303f28
- rename entry_version to name_version
  (a better description since it covers the name and path)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remotebranch.py
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
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!
37
38
 
38
39
 
39
 
ENABLE_URLGRABBER = True
 
40
ENABLE_URLGRABBER = False
40
41
 
41
 
from bzrlib.errors import BzrError
 
42
from bzrlib.errors import BzrError, NoSuchRevision
42
43
 
43
44
class GetFailed(BzrError):
44
45
    def __init__(self, url, status):
47
48
        self.status = status
48
49
 
49
50
if ENABLE_URLGRABBER:
50
 
    import urlgrabber
51
 
    import urlgrabber.keepalive
52
 
    urlgrabber.keepalive.DEBUG = 0
 
51
    import util.urlgrabber
 
52
    import util.urlgrabber.keepalive
 
53
    util.urlgrabber.keepalive.DEBUG = 0
53
54
    def get_url(path, compressed=False):
54
55
        try:
55
56
            url = path
56
57
            if compressed:
57
58
                url += '.gz'
58
59
            mutter("grab url %s" % url)
59
 
            url_f = urlgrabber.urlopen(url, keepalive=1, close_connection=0)
 
60
            url_f = util.urlgrabber.urlopen(url, keepalive=1, close_connection=0)
60
61
            if url_f.status != 200:
61
62
                raise GetFailed(url, url_f.status)
62
63
            if not compressed:
89
90
            fmt = ff.read()
90
91
            ff.close()
91
92
 
92
 
            fmt = fmt.rstrip('\r\n')
93
 
            if fmt != BZR_BRANCH_FORMAT.rstrip('\r\n'):
 
93
            if fmt != BZR_BRANCH_FORMAT_5:
94
94
                raise BzrError("sorry, branch format %r not supported at url %s"
95
95
                               % (fmt, url))
96
96
            
155
155
 
156
156
    def get_revision(self, revision_id):
157
157
        from bzrlib.revision import Revision
158
 
        from bzrlib.xml import unpack_xml
159
 
        revf = self.revision_store[revision_id]
160
 
        r = unpack_xml(Revision, revf)
 
158
        try:
 
159
            revf = self.revision_store[revision_id]
 
160
        except KeyError:
 
161
            raise NoSuchRevision(self, revision_id)
 
162
        r = serializer_v5.read_revision(revf)
161
163
        if r.revision_id != revision_id:
162
164
            raise BzrCheckError('revision stored as {%s} actually contains {%s}'
163
165
                                % (revision_id, r.revision_id))