bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
188
by mbp at sourcefrog
- experimental remote-branch support |
1 |
# Copyright (C) 2005 Canonical Ltd
|
2 |
||
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
||
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
||
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
||
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
18 |
"""Proxy object for access to remote branches.
|
19 |
||
20 |
At the moment remote branches are only for HTTP and only for read
|
|
21 |
access.
|
|
22 |
"""
|
|
23 |
||
24 |
||
25 |
import gzip |
|
|
192
by mbp at sourcefrog
- exercise the network more towards doing a remote clone |
26 |
from cStringIO import StringIO |
|
1185.1.2
by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd |
27 |
import os |
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
28 |
import urllib2 |
|
1185.1.4
by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch |
29 |
import urlparse |
|
188
by mbp at sourcefrog
- experimental remote-branch support |
30 |
|
|
1185.1.3
by Martin Pool
- fix up imports in remotebranch |
31 |
from bzrlib.errors import BzrError, BzrCheckError |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
32 |
from bzrlib.branch import Branch, LocalBranch, BZR_BRANCH_FORMAT_5 |
|
1185.1.3
by Martin Pool
- fix up imports in remotebranch |
33 |
from bzrlib.trace import mutter |
|
1393
by Robert Collins
reenable remotebranch tests |
34 |
from bzrlib.weavestore import WeaveStore |
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
35 |
from bzrlib.xml5 import serializer_v5 |
|
188
by mbp at sourcefrog
- experimental remote-branch support |
36 |
|
|
1393
by Robert Collins
reenable remotebranch tests |
37 |
|
|
193
by mbp at sourcefrog
more experiments with http get |
38 |
# velocitynet.com.au transparently proxies connections and thereby
|
39 |
# breaks keep-alive -- sucks!
|
|
40 |
||
41 |
||
|
974.1.53
by aaron.bentley at utoronto
Disabled urlgrabber |
42 |
ENABLE_URLGRABBER = False |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
43 |
|
|
974.1.51
by aaron.bentley at utoronto
Caused remotebranch to throw a NoSuchRevision when appropriate |
44 |
from bzrlib.errors import BzrError, NoSuchRevision |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
45 |
|
46 |
class GetFailed(BzrError): |
|
47 |
def __init__(self, url, status): |
|
48 |
BzrError.__init__(self, "Get %s failed with status %s" % (url, status)) |
|
49 |
self.url = url |
|
50 |
self.status = status |
|
|
417
by Martin Pool
- trace when we fetch a URL |
51 |
|
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
52 |
if ENABLE_URLGRABBER: |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
53 |
import util.urlgrabber |
54 |
import util.urlgrabber.keepalive |
|
55 |
util.urlgrabber.keepalive.DEBUG = 0 |
|
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
56 |
def get_url(path, compressed=False): |
57 |
try: |
|
58 |
url = path |
|
59 |
if compressed: |
|
60 |
url += '.gz' |
|
|
450
by Martin Pool
- Use urlgrabber by default |
61 |
mutter("grab url %s" % url) |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
62 |
url_f = util.urlgrabber.urlopen(url, keepalive=1, close_connection=0) |
63 |
if url_f.status != 200: |
|
64 |
raise GetFailed(url, url_f.status) |
|
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
65 |
if not compressed: |
66 |
return url_f |
|
67 |
else: |
|
68 |
return gzip.GzipFile(fileobj=StringIO(url_f.read())) |
|
69 |
except urllib2.URLError, e: |
|
70 |
raise BzrError("remote fetch failed: %r: %s" % (url, e)) |
|
|
450
by Martin Pool
- Use urlgrabber by default |
71 |
else: |
72 |
def get_url(url, compressed=False): |
|
73 |
import urllib2 |
|
74 |
if compressed: |
|
75 |
url += '.gz' |
|
76 |
mutter("get_url %s" % url) |
|
77 |
url_f = urllib2.urlopen(url) |
|
78 |
if compressed: |
|
79 |
return gzip.GzipFile(fileobj=StringIO(url_f.read())) |
|
80 |
else: |
|
81 |
return url_f |
|
|
188
by mbp at sourcefrog
- experimental remote-branch support |
82 |
|
|
192
by mbp at sourcefrog
- exercise the network more towards doing a remote clone |
83 |
|
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
84 |
def _find_remote_root(url): |
85 |
"""Return the prefix URL that corresponds to the branch root.""" |
|
86 |
orig_url = url |
|
87 |
while True: |
|
88 |
try: |
|
|
1185.1.4
by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch |
89 |
fmt_url = url + '/.bzr/branch-format' |
90 |
ff = get_url(fmt_url) |
|
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
91 |
fmt = ff.read() |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
92 |
ff.close() |
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
93 |
|
|
1188
by Martin Pool
- clean up imports in commit code |
94 |
if fmt != BZR_BRANCH_FORMAT_5: |
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
95 |
raise BzrError("sorry, branch format %r not supported at url %s" |
96 |
% (fmt, url)) |
|
97 |
||
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
98 |
return url |
|
418
by Martin Pool
- fix typo |
99 |
except urllib2.URLError: |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
100 |
pass
|
101 |
||
|
1185.1.4
by Martin Pool
- fix _find_remote_branch to avoid strange error for nonexistent branch |
102 |
scheme, host, path = list(urlparse.urlparse(url))[:3] |
103 |
# discard params, query, fragment
|
|
104 |
||
105 |
# strip off one component of the path component
|
|
106 |
idx = path.rfind('/') |
|
107 |
if idx == -1 or path == '/': |
|
108 |
raise BzrError('no branch root found for URL %s' |
|
109 |
' or enclosing directories'
|
|
110 |
% orig_url) |
|
111 |
path = path[:idx] |
|
112 |
url = urlparse.urlunparse((scheme, host, path, '', '', '')) |
|
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
113 |
|
114 |
||
115 |
||
|
1185.2.17
by Lalo Martins
unbreaking RemoteBranch, by (temporarily) making it a subclass of LocalBranch. |
116 |
class RemoteBranch(LocalBranch): |
|
1092.2.2
by Robert Collins
move RemoteStore to store.py |
117 |
|
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
118 |
def __init__(self, baseurl, find_root=True): |
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
119 |
"""Create new proxy for a remote branch.""" |
|
1092.2.2
by Robert Collins
move RemoteStore to store.py |
120 |
# circular import protection
|
121 |
from bzrlib.store import RemoteStore |
|
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
122 |
if find_root: |
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
123 |
self.base = _find_remote_root(baseurl) |
|
419
by Martin Pool
- RemoteBranch.__str__ and repr |
124 |
else: |
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
125 |
self.base = baseurl |
|
1393
by Robert Collins
reenable remotebranch tests |
126 |
self._check_format(False) |
127 |
# is guaranteed to be a v5 store
|
|
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
128 |
|
|
1393
by Robert Collins
reenable remotebranch tests |
129 |
cfn = self.controlfilename |
130 |
assert self._branch_format == 5 |
|
131 |
self.control_weaves = WeaveStore(cfn([]), get_url) |
|
132 |
self.weave_store = WeaveStore(cfn('weaves'), get_url) |
|
133 |
self.revision_store = RemoteStore(cfn('revision-store')) |
|
|
534
by Martin Pool
- new RemoteStore class |
134 |
|
|
417
by Martin Pool
- trace when we fetch a URL |
135 |
def __str__(self): |
|
585
by Martin Pool
- make RemoteBranch.__str__ more robust |
136 |
b = getattr(self, 'baseurl', 'undefined') |
137 |
return '%s(%r)' % (self.__class__.__name__, b) |
|
|
417
by Martin Pool
- trace when we fetch a URL |
138 |
|
139 |
__repr__ = __str__ |
|
140 |
||
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
141 |
def setup_caching(self, cache_root): |
142 |
"""Set up cached stores located under cache_root""" |
|
143 |
from bzrlib.meta_store import CachedStore |
|
|
1395
by Robert Collins
dont try to cache the now absent inventory_store and text_store for remotebranches. TODO: cache or otherwise address performance of the text weaves and inventory weaves |
144 |
for store_name in ('revision_store',): |
|
1185.2.12
by Lalo Martins
killed find_cached_root() |
145 |
if not isinstance(getattr(self, store_name), CachedStore): |
146 |
cache_path = os.path.join(cache_root, store_name) |
|
147 |
os.mkdir(cache_path) |
|
148 |
new_store = CachedStore(getattr(self, store_name), cache_path) |
|
149 |
setattr(self, store_name, new_store) |
|
150 |
||
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
151 |
def controlfile(self, filename, mode): |
152 |
if mode not in ('rb', 'rt', 'r'): |
|
153 |
raise BzrError("file mode %r not supported for remote branches" % mode) |
|
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
154 |
return get_url(self.base + '/.bzr/' + filename, False) |
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
155 |
|
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
156 |
|
|
613
by Martin Pool
- fix locking for RemoteBranch |
157 |
def lock_read(self): |
158 |
# no locking for remote branches yet
|
|
159 |
pass
|
|
160 |
||
161 |
def lock_write(self): |
|
162 |
from errors import LockError |
|
163 |
raise LockError("write lock not supported for remote branch %s" |
|
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
164 |
% self.base) |
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
165 |
|
166 |
def unlock(self): |
|
|
411
by Martin Pool
- start adding more useful RemoteBranch() class |
167 |
pass
|
|
580
by Martin Pool
- Use explicit lock methods on a branch, rather than doing it |
168 |
|
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
169 |
|
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
170 |
def relpath(self, path): |
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
171 |
if not path.startswith(self.base): |
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
172 |
raise BzrError('path %r is not under base URL %r' |
|
1185.2.3
by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes; |
173 |
% (path, self.base)) |
174 |
pl = len(self.base) |
|
|
416
by Martin Pool
- bzr log and bzr root now accept an http URL |
175 |
return path[pl:].lstrip('/') |
176 |
||
|
802
by Martin Pool
- Remove XMLMixin class in favour of simple pack_xml, unpack_xml functions |
177 |
|
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
178 |
def get_revision(self, revision_id): |
|
974.1.51
by aaron.bentley at utoronto
Caused remotebranch to throw a NoSuchRevision when appropriate |
179 |
try: |
180 |
revf = self.revision_store[revision_id] |
|
181 |
except KeyError: |
|
182 |
raise NoSuchRevision(self, revision_id) |
|
|
1189
by Martin Pool
- BROKEN: partial support for commit into weave |
183 |
r = serializer_v5.read_revision(revf) |
|
412
by Martin Pool
- RemoteBranch displays the log of a remote branch. |
184 |
if r.revision_id != revision_id: |
185 |
raise BzrCheckError('revision stored as {%s} actually contains {%s}' |
|
186 |
% (revision_id, r.revision_id)) |
|
187 |
return r |