411
by Martin Pool
- start adding more useful RemoteBranch() class |
1 |
#! /usr/bin/env python
|
2 |
||
188
by mbp at sourcefrog
- experimental remote-branch support |
3 |
# Copyright (C) 2005 Canonical Ltd
|
4 |
||
5 |
# This program is free software; you can redistribute it and/or modify
|
|
6 |
# it under the terms of the GNU General Public License as published by
|
|
7 |
# the Free Software Foundation; either version 2 of the License, or
|
|
8 |
# (at your option) any later version.
|
|
9 |
||
10 |
# This program is distributed in the hope that it will be useful,
|
|
11 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13 |
# GNU General Public License for more details.
|
|
14 |
||
15 |
# You should have received a copy of the GNU General Public License
|
|
16 |
# along with this program; if not, write to the Free Software
|
|
17 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
18 |
||
19 |
||
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
20 |
"""Proxy object for access to remote branches.
|
21 |
||
22 |
At the moment remote branches are only for HTTP and only for read
|
|
23 |
access.
|
|
24 |
"""
|
|
25 |
||
26 |
||
27 |
import gzip |
|
192
by mbp at sourcefrog
- exercise the network more towards doing a remote clone |
28 |
from cStringIO import StringIO |
419
by Martin Pool
- RemoteBranch.__str__ and repr |
29 |
import urllib2 |
188
by mbp at sourcefrog
- experimental remote-branch support |
30 |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
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 |
|
188
by mbp at sourcefrog
- experimental remote-branch support |
35 |
|
193
by mbp at sourcefrog
more experiments with http get |
36 |
# velocitynet.com.au transparently proxies connections and thereby
|
37 |
# breaks keep-alive -- sucks!
|
|
38 |
||
39 |
||
974.1.53
by aaron.bentley at utoronto
Disabled urlgrabber |
40 |
ENABLE_URLGRABBER = False |
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
41 |
|
974.1.51
by aaron.bentley at utoronto
Caused remotebranch to throw a NoSuchRevision when appropriate |
42 |
from bzrlib.errors import BzrError, NoSuchRevision |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
43 |
|
44 |
class GetFailed(BzrError): |
|
45 |
def __init__(self, url, status): |
|
46 |
BzrError.__init__(self, "Get %s failed with status %s" % (url, status)) |
|
47 |
self.url = url |
|
48 |
self.status = status |
|
417
by Martin Pool
- trace when we fetch a URL |
49 |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
50 |
if ENABLE_URLGRABBER: |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
51 |
import util.urlgrabber |
52 |
import util.urlgrabber.keepalive |
|
53 |
util.urlgrabber.keepalive.DEBUG = 0 |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
54 |
def get_url(path, compressed=False): |
55 |
try: |
|
56 |
url = path |
|
57 |
if compressed: |
|
58 |
url += '.gz' |
|
450
by Martin Pool
- Use urlgrabber by default |
59 |
mutter("grab url %s" % url) |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
60 |
url_f = util.urlgrabber.urlopen(url, keepalive=1, close_connection=0) |
61 |
if url_f.status != 200: |
|
62 |
raise GetFailed(url, url_f.status) |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
63 |
if not compressed: |
64 |
return url_f |
|
65 |
else: |
|
66 |
return gzip.GzipFile(fileobj=StringIO(url_f.read())) |
|
67 |
except urllib2.URLError, e: |
|
68 |
raise BzrError("remote fetch failed: %r: %s" % (url, e)) |
|
450
by Martin Pool
- Use urlgrabber by default |
69 |
else: |
70 |
def get_url(url, compressed=False): |
|
71 |
import urllib2 |
|
72 |
if compressed: |
|
73 |
url += '.gz' |
|
74 |
mutter("get_url %s" % url) |
|
75 |
url_f = urllib2.urlopen(url) |
|
76 |
if compressed: |
|
77 |
return gzip.GzipFile(fileobj=StringIO(url_f.read())) |
|
78 |
else: |
|
79 |
return url_f |
|
188
by mbp at sourcefrog
- experimental remote-branch support |
80 |
|
192
by mbp at sourcefrog
- exercise the network more towards doing a remote clone |
81 |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
82 |
|
83 |
def _find_remote_root(url): |
|
84 |
"""Return the prefix URL that corresponds to the branch root."""
|
|
85 |
orig_url = url |
|
86 |
while True: |
|
87 |
try: |
|
88 |
ff = get_url(url + '/.bzr/branch-format') |
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
89 |
|
90 |
fmt = ff.read() |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
91 |
ff.close() |
419
by Martin Pool
- RemoteBranch.__str__ and repr |
92 |
|
1188
by Martin Pool
- clean up imports in commit code |
93 |
if fmt != BZR_BRANCH_FORMAT_5: |
419
by Martin Pool
- RemoteBranch.__str__ and repr |
94 |
raise BzrError("sorry, branch format %r not supported at url %s" |
95 |
% (fmt, url)) |
|
96 |
||
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
97 |
return url |
418
by Martin Pool
- fix typo |
98 |
except urllib2.URLError: |
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
99 |
pass
|
100 |
||
101 |
try: |
|
102 |
idx = url.rindex('/') |
|
103 |
except ValueError: |
|
104 |
raise BzrError('no branch root found for URL %s' % orig_url) |
|
105 |
||
106 |
url = url[:idx] |
|
107 |
||
108 |
||
109 |
||
411
by Martin Pool
- start adding more useful RemoteBranch() class |
110 |
class RemoteBranch(Branch): |
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
111 |
def __init__(self, baseurl, find_root=True): |
411
by Martin Pool
- start adding more useful RemoteBranch() class |
112 |
"""Create new proxy for a remote branch."""
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
113 |
if find_root: |
114 |
self.baseurl = _find_remote_root(baseurl) |
|
115 |
else: |
|
116 |
self.baseurl = baseurl |
|
117 |
self._check_format() |
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
118 |
|
534
by Martin Pool
- new RemoteStore class |
119 |
self.inventory_store = RemoteStore(baseurl + '/.bzr/inventory-store/') |
120 |
self.text_store = RemoteStore(baseurl + '/.bzr/text-store/') |
|
613
by Martin Pool
- fix locking for RemoteBranch |
121 |
self.revision_store = RemoteStore(baseurl + '/.bzr/revision-store/') |
534
by Martin Pool
- new RemoteStore class |
122 |
|
417
by Martin Pool
- trace when we fetch a URL |
123 |
def __str__(self): |
585
by Martin Pool
- make RemoteBranch.__str__ more robust |
124 |
b = getattr(self, 'baseurl', 'undefined') |
125 |
return '%s(%r)' % (self.__class__.__name__, b) |
|
417
by Martin Pool
- trace when we fetch a URL |
126 |
|
127 |
__repr__ = __str__ |
|
128 |
||
411
by Martin Pool
- start adding more useful RemoteBranch() class |
129 |
def controlfile(self, filename, mode): |
130 |
if mode not in ('rb', 'rt', 'r'): |
|
131 |
raise BzrError("file mode %r not supported for remote branches" % mode) |
|
132 |
return get_url(self.baseurl + '/.bzr/' + filename, False) |
|
133 |
||
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
134 |
|
613
by Martin Pool
- fix locking for RemoteBranch |
135 |
def lock_read(self): |
136 |
# no locking for remote branches yet
|
|
137 |
pass
|
|
138 |
||
139 |
def lock_write(self): |
|
140 |
from errors import LockError |
|
141 |
raise LockError("write lock not supported for remote branch %s" |
|
142 |
% self.baseurl) |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
143 |
|
144 |
def unlock(self): |
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
145 |
pass
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
146 |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
147 |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
148 |
def relpath(self, path): |
149 |
if not path.startswith(self.baseurl): |
|
150 |
raise BzrError('path %r is not under base URL %r' |
|
151 |
% (path, self.baseurl)) |
|
152 |
pl = len(self.baseurl) |
|
153 |
return path[pl:].lstrip('/') |
|
154 |
||
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
155 |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
156 |
def get_revision(self, revision_id): |
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
157 |
from bzrlib.revision import Revision |
974.1.51
by aaron.bentley at utoronto
Caused remotebranch to throw a NoSuchRevision when appropriate |
158 |
try: |
159 |
revf = self.revision_store[revision_id] |
|
160 |
except KeyError: |
|
161 |
raise NoSuchRevision(self, revision_id) |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
162 |
r = serializer_v5.read_revision(revf) |
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
163 |
if r.revision_id != revision_id: |
164 |
raise BzrCheckError('revision stored as {%s} actually contains {%s}' |
|
165 |
% (revision_id, r.revision_id)) |
|
166 |
return r |
|
534
by Martin Pool
- new RemoteStore class |
167 |
|
168 |
||
558
by Martin Pool
- All top-level classes inherit from object |
169 |
class RemoteStore(object): |
534
by Martin Pool
- new RemoteStore class |
170 |
def __init__(self, baseurl): |
171 |
self._baseurl = baseurl |
|
172 |
||
173 |
||
174 |
def _path(self, name): |
|
175 |
if '/' in name: |
|
176 |
raise ValueError('invalid store id', name) |
|
177 |
return self._baseurl + '/' + name |
|
178 |
||
179 |
def __getitem__(self, fileid): |
|
180 |
p = self._path(fileid) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
181 |
try: |
182 |
return get_url(p, compressed=True) |
|
183 |
except: |
|
184 |
raise KeyError(fileid) |
|
188
by mbp at sourcefrog
- experimental remote-branch support |
185 |
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
186 |
|
187 |