Show More
@@ -1,379 +1,380 b'' | |||||
1 | # streamclone.py - producing and consuming streaming repository data |
|
1 | # streamclone.py - producing and consuming streaming repository data | |
2 | # |
|
2 | # | |
3 | # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com> |
|
3 | # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com> | |
4 | # |
|
4 | # | |
5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
7 |
|
7 | |||
8 | from __future__ import absolute_import |
|
8 | from __future__ import absolute_import | |
9 |
|
9 | |||
10 | import struct |
|
10 | import struct | |
11 | import time |
|
11 | import time | |
12 |
|
12 | |||
13 | from .i18n import _ |
|
13 | from .i18n import _ | |
14 | from . import ( |
|
14 | from . import ( | |
15 | branchmap, |
|
15 | branchmap, | |
16 | error, |
|
16 | error, | |
17 | store, |
|
17 | store, | |
18 | util, |
|
18 | util, | |
19 | ) |
|
19 | ) | |
20 |
|
20 | |||
21 | def canperformstreamclone(pullop, bailifbundle2supported=False): |
|
21 | def canperformstreamclone(pullop, bailifbundle2supported=False): | |
22 | """Whether it is possible to perform a streaming clone as part of pull. |
|
22 | """Whether it is possible to perform a streaming clone as part of pull. | |
23 |
|
23 | |||
24 | ``bailifbundle2supported`` will cause the function to return False if |
|
24 | ``bailifbundle2supported`` will cause the function to return False if | |
25 | bundle2 stream clones are supported. It should only be called by the |
|
25 | bundle2 stream clones are supported. It should only be called by the | |
26 | legacy stream clone code path. |
|
26 | legacy stream clone code path. | |
27 |
|
27 | |||
28 | Returns a tuple of (supported, requirements). ``supported`` is True if |
|
28 | Returns a tuple of (supported, requirements). ``supported`` is True if | |
29 | streaming clone is supported and False otherwise. ``requirements`` is |
|
29 | streaming clone is supported and False otherwise. ``requirements`` is | |
30 | a set of repo requirements from the remote, or ``None`` if stream clone |
|
30 | a set of repo requirements from the remote, or ``None`` if stream clone | |
31 | isn't supported. |
|
31 | isn't supported. | |
32 | """ |
|
32 | """ | |
33 | repo = pullop.repo |
|
33 | repo = pullop.repo | |
34 | remote = pullop.remote |
|
34 | remote = pullop.remote | |
35 |
|
35 | |||
36 | bundle2supported = False |
|
36 | bundle2supported = False | |
37 | if pullop.canusebundle2: |
|
37 | if pullop.canusebundle2: | |
38 | if 'v1' in pullop.remotebundle2caps.get('stream', []): |
|
38 | if 'v1' in pullop.remotebundle2caps.get('stream', []): | |
39 | bundle2supported = True |
|
39 | bundle2supported = True | |
40 | # else |
|
40 | # else | |
41 | # Server doesn't support bundle2 stream clone or doesn't support |
|
41 | # Server doesn't support bundle2 stream clone or doesn't support | |
42 | # the versions we support. Fall back and possibly allow legacy. |
|
42 | # the versions we support. Fall back and possibly allow legacy. | |
43 |
|
43 | |||
44 | # Ensures legacy code path uses available bundle2. |
|
44 | # Ensures legacy code path uses available bundle2. | |
45 | if bailifbundle2supported and bundle2supported: |
|
45 | if bailifbundle2supported and bundle2supported: | |
46 | return False, None |
|
46 | return False, None | |
47 | # Ensures bundle2 doesn't try to do a stream clone if it isn't supported. |
|
47 | # Ensures bundle2 doesn't try to do a stream clone if it isn't supported. | |
48 | #elif not bailifbundle2supported and not bundle2supported: |
|
48 | #elif not bailifbundle2supported and not bundle2supported: | |
49 | # return False, None |
|
49 | # return False, None | |
50 |
|
50 | |||
51 | # Streaming clone only works on empty repositories. |
|
51 | # Streaming clone only works on empty repositories. | |
52 | if len(repo): |
|
52 | if len(repo): | |
53 | return False, None |
|
53 | return False, None | |
54 |
|
54 | |||
55 | # Streaming clone only works if all data is being requested. |
|
55 | # Streaming clone only works if all data is being requested. | |
56 | if pullop.heads: |
|
56 | if pullop.heads: | |
57 | return False, None |
|
57 | return False, None | |
58 |
|
58 | |||
59 | streamrequested = pullop.streamclonerequested |
|
59 | streamrequested = pullop.streamclonerequested | |
60 |
|
60 | |||
61 | # If we don't have a preference, let the server decide for us. This |
|
61 | # If we don't have a preference, let the server decide for us. This | |
62 | # likely only comes into play in LANs. |
|
62 | # likely only comes into play in LANs. | |
63 | if streamrequested is None: |
|
63 | if streamrequested is None: | |
64 | # The server can advertise whether to prefer streaming clone. |
|
64 | # The server can advertise whether to prefer streaming clone. | |
65 | streamrequested = remote.capable('stream-preferred') |
|
65 | streamrequested = remote.capable('stream-preferred') | |
66 |
|
66 | |||
67 | if not streamrequested: |
|
67 | if not streamrequested: | |
68 | return False, None |
|
68 | return False, None | |
69 |
|
69 | |||
70 | # In order for stream clone to work, the client has to support all the |
|
70 | # In order for stream clone to work, the client has to support all the | |
71 | # requirements advertised by the server. |
|
71 | # requirements advertised by the server. | |
72 | # |
|
72 | # | |
73 | # The server advertises its requirements via the "stream" and "streamreqs" |
|
73 | # The server advertises its requirements via the "stream" and "streamreqs" | |
74 | # capability. "stream" (a value-less capability) is advertised if and only |
|
74 | # capability. "stream" (a value-less capability) is advertised if and only | |
75 | # if the only requirement is "revlogv1." Else, the "streamreqs" capability |
|
75 | # if the only requirement is "revlogv1." Else, the "streamreqs" capability | |
76 | # is advertised and contains a comma-delimited list of requirements. |
|
76 | # is advertised and contains a comma-delimited list of requirements. | |
77 | requirements = set() |
|
77 | requirements = set() | |
78 | if remote.capable('stream'): |
|
78 | if remote.capable('stream'): | |
79 | requirements.add('revlogv1') |
|
79 | requirements.add('revlogv1') | |
80 | else: |
|
80 | else: | |
81 | streamreqs = remote.capable('streamreqs') |
|
81 | streamreqs = remote.capable('streamreqs') | |
82 | # This is weird and shouldn't happen with modern servers. |
|
82 | # This is weird and shouldn't happen with modern servers. | |
83 | if not streamreqs: |
|
83 | if not streamreqs: | |
84 | return False, None |
|
84 | return False, None | |
85 |
|
85 | |||
86 | streamreqs = set(streamreqs.split(',')) |
|
86 | streamreqs = set(streamreqs.split(',')) | |
87 | # Server requires something we don't support. Bail. |
|
87 | # Server requires something we don't support. Bail. | |
88 | if streamreqs - repo.supportedformats: |
|
88 | if streamreqs - repo.supportedformats: | |
89 | return False, None |
|
89 | return False, None | |
90 | requirements = streamreqs |
|
90 | requirements = streamreqs | |
91 |
|
91 | |||
92 | return True, requirements |
|
92 | return True, requirements | |
93 |
|
93 | |||
94 | def maybeperformlegacystreamclone(pullop): |
|
94 | def maybeperformlegacystreamclone(pullop): | |
95 | """Possibly perform a legacy stream clone operation. |
|
95 | """Possibly perform a legacy stream clone operation. | |
96 |
|
96 | |||
97 | Legacy stream clones are performed as part of pull but before all other |
|
97 | Legacy stream clones are performed as part of pull but before all other | |
98 | operations. |
|
98 | operations. | |
99 |
|
99 | |||
100 | A legacy stream clone will not be performed if a bundle2 stream clone is |
|
100 | A legacy stream clone will not be performed if a bundle2 stream clone is | |
101 | supported. |
|
101 | supported. | |
102 | """ |
|
102 | """ | |
103 | supported, requirements = canperformstreamclone(pullop) |
|
103 | supported, requirements = canperformstreamclone(pullop) | |
104 |
|
104 | |||
105 | if not supported: |
|
105 | if not supported: | |
106 | return |
|
106 | return | |
107 |
|
107 | |||
108 | repo = pullop.repo |
|
108 | repo = pullop.repo | |
109 | remote = pullop.remote |
|
109 | remote = pullop.remote | |
110 |
|
110 | |||
111 | # Save remote branchmap. We will use it later to speed up branchcache |
|
111 | # Save remote branchmap. We will use it later to speed up branchcache | |
112 | # creation. |
|
112 | # creation. | |
113 | rbranchmap = None |
|
113 | rbranchmap = None | |
114 | if remote.capable('branchmap'): |
|
114 | if remote.capable('branchmap'): | |
115 | rbranchmap = remote.branchmap() |
|
115 | rbranchmap = remote.branchmap() | |
116 |
|
116 | |||
117 | repo.ui.status(_('streaming all changes\n')) |
|
117 | repo.ui.status(_('streaming all changes\n')) | |
118 |
|
118 | |||
119 | fp = remote.stream_out() |
|
119 | fp = remote.stream_out() | |
120 | l = fp.readline() |
|
120 | l = fp.readline() | |
121 | try: |
|
121 | try: | |
122 | resp = int(l) |
|
122 | resp = int(l) | |
123 | except ValueError: |
|
123 | except ValueError: | |
124 | raise error.ResponseError( |
|
124 | raise error.ResponseError( | |
125 | _('unexpected response from remote server:'), l) |
|
125 | _('unexpected response from remote server:'), l) | |
126 | if resp == 1: |
|
126 | if resp == 1: | |
127 | raise error.Abort(_('operation forbidden by server')) |
|
127 | raise error.Abort(_('operation forbidden by server')) | |
128 | elif resp == 2: |
|
128 | elif resp == 2: | |
129 | raise error.Abort(_('locking the remote repository failed')) |
|
129 | raise error.Abort(_('locking the remote repository failed')) | |
130 | elif resp != 0: |
|
130 | elif resp != 0: | |
131 | raise error.Abort(_('the server sent an unknown error code')) |
|
131 | raise error.Abort(_('the server sent an unknown error code')) | |
132 |
|
132 | |||
133 | l = fp.readline() |
|
133 | l = fp.readline() | |
134 | try: |
|
134 | try: | |
135 | filecount, bytecount = map(int, l.split(' ', 1)) |
|
135 | filecount, bytecount = map(int, l.split(' ', 1)) | |
136 | except (ValueError, TypeError): |
|
136 | except (ValueError, TypeError): | |
137 | raise error.ResponseError( |
|
137 | raise error.ResponseError( | |
138 | _('unexpected response from remote server:'), l) |
|
138 | _('unexpected response from remote server:'), l) | |
139 |
|
139 | |||
140 | with repo.lock(): |
|
140 | with repo.lock(): | |
141 | consumev1(repo, fp, filecount, bytecount) |
|
141 | consumev1(repo, fp, filecount, bytecount) | |
142 |
|
142 | |||
143 | # new requirements = old non-format requirements + |
|
143 | # new requirements = old non-format requirements + | |
144 | # new format-related remote requirements |
|
144 | # new format-related remote requirements | |
145 | # requirements from the streamed-in repository |
|
145 | # requirements from the streamed-in repository | |
146 | repo.requirements = requirements | ( |
|
146 | repo.requirements = requirements | ( | |
147 | repo.requirements - repo.supportedformats) |
|
147 | repo.requirements - repo.supportedformats) | |
148 | repo._applyopenerreqs() |
|
148 | repo._applyopenerreqs() | |
149 | repo._writerequirements() |
|
149 | repo._writerequirements() | |
150 |
|
150 | |||
151 | if rbranchmap: |
|
151 | if rbranchmap: | |
152 | branchmap.replacecache(repo, rbranchmap) |
|
152 | branchmap.replacecache(repo, rbranchmap) | |
153 |
|
153 | |||
154 | repo.invalidate() |
|
154 | repo.invalidate() | |
155 |
|
155 | |||
156 | def allowservergeneration(ui): |
|
156 | def allowservergeneration(ui): | |
157 | """Whether streaming clones are allowed from the server.""" |
|
157 | """Whether streaming clones are allowed from the server.""" | |
158 | return ui.configbool('server', 'uncompressed', True, untrusted=True) |
|
158 | return ui.configbool('server', 'uncompressed', True, untrusted=True) | |
159 |
|
159 | |||
160 | # This is it's own function so extensions can override it. |
|
160 | # This is it's own function so extensions can override it. | |
161 | def _walkstreamfiles(repo): |
|
161 | def _walkstreamfiles(repo): | |
162 | return repo.store.walk() |
|
162 | return repo.store.walk() | |
163 |
|
163 | |||
164 | def generatev1(repo): |
|
164 | def generatev1(repo): | |
165 | """Emit content for version 1 of a streaming clone. |
|
165 | """Emit content for version 1 of a streaming clone. | |
166 |
|
166 | |||
167 | This returns a 3-tuple of (file count, byte size, data iterator). |
|
167 | This returns a 3-tuple of (file count, byte size, data iterator). | |
168 |
|
168 | |||
169 | The data iterator consists of N entries for each file being transferred. |
|
169 | The data iterator consists of N entries for each file being transferred. | |
170 | Each file entry starts as a line with the file name and integer size |
|
170 | Each file entry starts as a line with the file name and integer size | |
171 | delimited by a null byte. |
|
171 | delimited by a null byte. | |
172 |
|
172 | |||
173 | The raw file data follows. Following the raw file data is the next file |
|
173 | The raw file data follows. Following the raw file data is the next file | |
174 | entry, or EOF. |
|
174 | entry, or EOF. | |
175 |
|
175 | |||
176 | When used on the wire protocol, an additional line indicating protocol |
|
176 | When used on the wire protocol, an additional line indicating protocol | |
177 | success will be prepended to the stream. This function is not responsible |
|
177 | success will be prepended to the stream. This function is not responsible | |
178 | for adding it. |
|
178 | for adding it. | |
179 |
|
179 | |||
180 | This function will obtain a repository lock to ensure a consistent view of |
|
180 | This function will obtain a repository lock to ensure a consistent view of | |
181 | the store is captured. It therefore may raise LockError. |
|
181 | the store is captured. It therefore may raise LockError. | |
182 | """ |
|
182 | """ | |
183 | entries = [] |
|
183 | entries = [] | |
184 | total_bytes = 0 |
|
184 | total_bytes = 0 | |
185 | # Get consistent snapshot of repo, lock during scan. |
|
185 | # Get consistent snapshot of repo, lock during scan. | |
186 | with repo.lock(): |
|
186 | with repo.lock(): | |
187 | repo.ui.debug('scanning\n') |
|
187 | repo.ui.debug('scanning\n') | |
188 | for name, ename, size in _walkstreamfiles(repo): |
|
188 | for name, ename, size in _walkstreamfiles(repo): | |
189 | if size: |
|
189 | if size: | |
190 | entries.append((name, size)) |
|
190 | entries.append((name, size)) | |
191 | total_bytes += size |
|
191 | total_bytes += size | |
192 |
|
192 | |||
193 | repo.ui.debug('%d files, %d bytes to transfer\n' % |
|
193 | repo.ui.debug('%d files, %d bytes to transfer\n' % | |
194 | (len(entries), total_bytes)) |
|
194 | (len(entries), total_bytes)) | |
195 |
|
195 | |||
196 | svfs = repo.svfs |
|
196 | svfs = repo.svfs | |
197 | oldaudit = svfs.mustaudit |
|
197 | oldaudit = svfs.mustaudit | |
198 | debugflag = repo.ui.debugflag |
|
198 | debugflag = repo.ui.debugflag | |
199 | svfs.mustaudit = False |
|
199 | svfs.mustaudit = False | |
200 |
|
200 | |||
201 | def emitrevlogdata(): |
|
201 | def emitrevlogdata(): | |
202 | try: |
|
202 | try: | |
203 | for name, size in entries: |
|
203 | for name, size in entries: | |
204 | if debugflag: |
|
204 | if debugflag: | |
205 | repo.ui.debug('sending %s (%d bytes)\n' % (name, size)) |
|
205 | repo.ui.debug('sending %s (%d bytes)\n' % (name, size)) | |
206 | # partially encode name over the wire for backwards compat |
|
206 | # partially encode name over the wire for backwards compat | |
207 | yield '%s\0%d\n' % (store.encodedir(name), size) |
|
207 | yield '%s\0%d\n' % (store.encodedir(name), size) | |
208 | if size <= 65536: |
|
208 | if size <= 65536: | |
209 | yield svfs.read(name) |
|
209 | yield svfs.read(name) | |
210 | else: |
|
210 | else: | |
211 | for chunk in util.filechunkiter(svfs(name), limit=size): |
|
211 | for chunk in util.filechunkiter(svfs(name), limit=size): | |
212 | yield chunk |
|
212 | yield chunk | |
213 | finally: |
|
213 | finally: | |
214 | svfs.mustaudit = oldaudit |
|
214 | svfs.mustaudit = oldaudit | |
215 |
|
215 | |||
216 | return len(entries), total_bytes, emitrevlogdata() |
|
216 | return len(entries), total_bytes, emitrevlogdata() | |
217 |
|
217 | |||
218 | def generatev1wireproto(repo): |
|
218 | def generatev1wireproto(repo): | |
219 | """Emit content for version 1 of streaming clone suitable for the wire. |
|
219 | """Emit content for version 1 of streaming clone suitable for the wire. | |
220 |
|
220 | |||
221 | This is the data output from ``generatev1()`` with a header line |
|
221 | This is the data output from ``generatev1()`` with a header line | |
222 | indicating file count and byte size. |
|
222 | indicating file count and byte size. | |
223 | """ |
|
223 | """ | |
224 | filecount, bytecount, it = generatev1(repo) |
|
224 | filecount, bytecount, it = generatev1(repo) | |
225 | yield '%d %d\n' % (filecount, bytecount) |
|
225 | yield '%d %d\n' % (filecount, bytecount) | |
226 | for chunk in it: |
|
226 | for chunk in it: | |
227 | yield chunk |
|
227 | yield chunk | |
228 |
|
228 | |||
229 | def generatebundlev1(repo, compression='UN'): |
|
229 | def generatebundlev1(repo, compression='UN'): | |
230 | """Emit content for version 1 of a stream clone bundle. |
|
230 | """Emit content for version 1 of a stream clone bundle. | |
231 |
|
231 | |||
232 | The first 4 bytes of the output ("HGS1") denote this as stream clone |
|
232 | The first 4 bytes of the output ("HGS1") denote this as stream clone | |
233 | bundle version 1. |
|
233 | bundle version 1. | |
234 |
|
234 | |||
235 | The next 2 bytes indicate the compression type. Only "UN" is currently |
|
235 | The next 2 bytes indicate the compression type. Only "UN" is currently | |
236 | supported. |
|
236 | supported. | |
237 |
|
237 | |||
238 | The next 16 bytes are two 64-bit big endian unsigned integers indicating |
|
238 | The next 16 bytes are two 64-bit big endian unsigned integers indicating | |
239 | file count and byte count, respectively. |
|
239 | file count and byte count, respectively. | |
240 |
|
240 | |||
241 | The next 2 bytes is a 16-bit big endian unsigned short declaring the length |
|
241 | The next 2 bytes is a 16-bit big endian unsigned short declaring the length | |
242 | of the requirements string, including a trailing \0. The following N bytes |
|
242 | of the requirements string, including a trailing \0. The following N bytes | |
243 | are the requirements string, which is ASCII containing a comma-delimited |
|
243 | are the requirements string, which is ASCII containing a comma-delimited | |
244 | list of repo requirements that are needed to support the data. |
|
244 | list of repo requirements that are needed to support the data. | |
245 |
|
245 | |||
246 | The remaining content is the output of ``generatev1()`` (which may be |
|
246 | The remaining content is the output of ``generatev1()`` (which may be | |
247 | compressed in the future). |
|
247 | compressed in the future). | |
248 |
|
248 | |||
249 | Returns a tuple of (requirements, data generator). |
|
249 | Returns a tuple of (requirements, data generator). | |
250 | """ |
|
250 | """ | |
251 | if compression != 'UN': |
|
251 | if compression != 'UN': | |
252 | raise ValueError('we do not support the compression argument yet') |
|
252 | raise ValueError('we do not support the compression argument yet') | |
253 |
|
253 | |||
254 | requirements = repo.requirements & repo.supportedformats |
|
254 | requirements = repo.requirements & repo.supportedformats | |
255 | requires = ','.join(sorted(requirements)) |
|
255 | requires = ','.join(sorted(requirements)) | |
256 |
|
256 | |||
257 | def gen(): |
|
257 | def gen(): | |
258 | yield 'HGS1' |
|
258 | yield 'HGS1' | |
259 | yield compression |
|
259 | yield compression | |
260 |
|
260 | |||
261 | filecount, bytecount, it = generatev1(repo) |
|
261 | filecount, bytecount, it = generatev1(repo) | |
262 | repo.ui.status(_('writing %d bytes for %d files\n') % |
|
262 | repo.ui.status(_('writing %d bytes for %d files\n') % | |
263 | (bytecount, filecount)) |
|
263 | (bytecount, filecount)) | |
264 |
|
264 | |||
265 | yield struct.pack('>QQ', filecount, bytecount) |
|
265 | yield struct.pack('>QQ', filecount, bytecount) | |
266 | yield struct.pack('>H', len(requires) + 1) |
|
266 | yield struct.pack('>H', len(requires) + 1) | |
267 | yield requires + '\0' |
|
267 | yield requires + '\0' | |
268 |
|
268 | |||
269 | # This is where we'll add compression in the future. |
|
269 | # This is where we'll add compression in the future. | |
270 | assert compression == 'UN' |
|
270 | assert compression == 'UN' | |
271 |
|
271 | |||
272 | seen = 0 |
|
272 | seen = 0 | |
273 | repo.ui.progress(_('bundle'), 0, total=bytecount) |
|
273 | repo.ui.progress(_('bundle'), 0, total=bytecount) | |
274 |
|
274 | |||
275 | for chunk in it: |
|
275 | for chunk in it: | |
276 | seen += len(chunk) |
|
276 | seen += len(chunk) | |
277 | repo.ui.progress(_('bundle'), seen, total=bytecount) |
|
277 | repo.ui.progress(_('bundle'), seen, total=bytecount) | |
278 | yield chunk |
|
278 | yield chunk | |
279 |
|
279 | |||
280 | repo.ui.progress(_('bundle'), None) |
|
280 | repo.ui.progress(_('bundle'), None) | |
281 |
|
281 | |||
282 | return requirements, gen() |
|
282 | return requirements, gen() | |
283 |
|
283 | |||
284 | def consumev1(repo, fp, filecount, bytecount): |
|
284 | def consumev1(repo, fp, filecount, bytecount): | |
285 | """Apply the contents from version 1 of a streaming clone file handle. |
|
285 | """Apply the contents from version 1 of a streaming clone file handle. | |
286 |
|
286 | |||
287 | This takes the output from "streamout" and applies it to the specified |
|
287 | This takes the output from "streamout" and applies it to the specified | |
288 | repository. |
|
288 | repository. | |
289 |
|
289 | |||
290 | Like "streamout," the status line added by the wire protocol is not handled |
|
290 | Like "streamout," the status line added by the wire protocol is not handled | |
291 | by this function. |
|
291 | by this function. | |
292 | """ |
|
292 | """ | |
293 | with repo.lock(): |
|
293 | with repo.lock(): | |
294 | repo.ui.status(_('%d files to transfer, %s of data\n') % |
|
294 | repo.ui.status(_('%d files to transfer, %s of data\n') % | |
295 | (filecount, util.bytecount(bytecount))) |
|
295 | (filecount, util.bytecount(bytecount))) | |
296 | handled_bytes = 0 |
|
296 | handled_bytes = 0 | |
297 | repo.ui.progress(_('clone'), 0, total=bytecount) |
|
297 | repo.ui.progress(_('clone'), 0, total=bytecount) | |
298 | start = time.time() |
|
298 | start = time.time() | |
299 |
|
299 | |||
300 | with repo.transaction('clone'): |
|
300 | with repo.transaction('clone'): | |
|
301 | if True: | |||
301 | for i in xrange(filecount): |
|
302 | for i in xrange(filecount): | |
302 | # XXX doesn't support '\n' or '\r' in filenames |
|
303 | # XXX doesn't support '\n' or '\r' in filenames | |
303 | l = fp.readline() |
|
304 | l = fp.readline() | |
304 | try: |
|
305 | try: | |
305 | name, size = l.split('\0', 1) |
|
306 | name, size = l.split('\0', 1) | |
306 | size = int(size) |
|
307 | size = int(size) | |
307 | except (ValueError, TypeError): |
|
308 | except (ValueError, TypeError): | |
308 | raise error.ResponseError( |
|
309 | raise error.ResponseError( | |
309 | _('unexpected response from remote server:'), l) |
|
310 | _('unexpected response from remote server:'), l) | |
310 | if repo.ui.debugflag: |
|
311 | if repo.ui.debugflag: | |
311 | repo.ui.debug('adding %s (%s)\n' % |
|
312 | repo.ui.debug('adding %s (%s)\n' % | |
312 | (name, util.bytecount(size))) |
|
313 | (name, util.bytecount(size))) | |
313 | # for backwards compat, name was partially encoded |
|
314 | # for backwards compat, name was partially encoded | |
314 | with repo.svfs(store.decodedir(name), 'w') as ofp: |
|
315 | with repo.svfs(store.decodedir(name), 'w') as ofp: | |
315 | for chunk in util.filechunkiter(fp, limit=size): |
|
316 | for chunk in util.filechunkiter(fp, limit=size): | |
316 | handled_bytes += len(chunk) |
|
317 | handled_bytes += len(chunk) | |
317 | repo.ui.progress(_('clone'), handled_bytes, |
|
318 | repo.ui.progress(_('clone'), handled_bytes, | |
318 | total=bytecount) |
|
319 | total=bytecount) | |
319 | ofp.write(chunk) |
|
320 | ofp.write(chunk) | |
320 |
|
321 | |||
321 | # Writing straight to files circumvented the inmemory caches |
|
322 | # Writing straight to files circumvented the inmemory caches | |
322 | repo.invalidate() |
|
323 | repo.invalidate() | |
323 |
|
324 | |||
324 | elapsed = time.time() - start |
|
325 | elapsed = time.time() - start | |
325 | if elapsed <= 0: |
|
326 | if elapsed <= 0: | |
326 | elapsed = 0.001 |
|
327 | elapsed = 0.001 | |
327 | repo.ui.progress(_('clone'), None) |
|
328 | repo.ui.progress(_('clone'), None) | |
328 | repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % |
|
329 | repo.ui.status(_('transferred %s in %.1f seconds (%s/sec)\n') % | |
329 | (util.bytecount(bytecount), elapsed, |
|
330 | (util.bytecount(bytecount), elapsed, | |
330 | util.bytecount(bytecount / elapsed))) |
|
331 | util.bytecount(bytecount / elapsed))) | |
331 |
|
332 | |||
332 | def readbundle1header(fp): |
|
333 | def readbundle1header(fp): | |
333 | compression = fp.read(2) |
|
334 | compression = fp.read(2) | |
334 | if compression != 'UN': |
|
335 | if compression != 'UN': | |
335 | raise error.Abort(_('only uncompressed stream clone bundles are ' |
|
336 | raise error.Abort(_('only uncompressed stream clone bundles are ' | |
336 | 'supported; got %s') % compression) |
|
337 | 'supported; got %s') % compression) | |
337 |
|
338 | |||
338 | filecount, bytecount = struct.unpack('>QQ', fp.read(16)) |
|
339 | filecount, bytecount = struct.unpack('>QQ', fp.read(16)) | |
339 | requireslen = struct.unpack('>H', fp.read(2))[0] |
|
340 | requireslen = struct.unpack('>H', fp.read(2))[0] | |
340 | requires = fp.read(requireslen) |
|
341 | requires = fp.read(requireslen) | |
341 |
|
342 | |||
342 | if not requires.endswith('\0'): |
|
343 | if not requires.endswith('\0'): | |
343 | raise error.Abort(_('malformed stream clone bundle: ' |
|
344 | raise error.Abort(_('malformed stream clone bundle: ' | |
344 | 'requirements not properly encoded')) |
|
345 | 'requirements not properly encoded')) | |
345 |
|
346 | |||
346 | requirements = set(requires.rstrip('\0').split(',')) |
|
347 | requirements = set(requires.rstrip('\0').split(',')) | |
347 |
|
348 | |||
348 | return filecount, bytecount, requirements |
|
349 | return filecount, bytecount, requirements | |
349 |
|
350 | |||
350 | def applybundlev1(repo, fp): |
|
351 | def applybundlev1(repo, fp): | |
351 | """Apply the content from a stream clone bundle version 1. |
|
352 | """Apply the content from a stream clone bundle version 1. | |
352 |
|
353 | |||
353 | We assume the 4 byte header has been read and validated and the file handle |
|
354 | We assume the 4 byte header has been read and validated and the file handle | |
354 | is at the 2 byte compression identifier. |
|
355 | is at the 2 byte compression identifier. | |
355 | """ |
|
356 | """ | |
356 | if len(repo): |
|
357 | if len(repo): | |
357 | raise error.Abort(_('cannot apply stream clone bundle on non-empty ' |
|
358 | raise error.Abort(_('cannot apply stream clone bundle on non-empty ' | |
358 | 'repo')) |
|
359 | 'repo')) | |
359 |
|
360 | |||
360 | filecount, bytecount, requirements = readbundle1header(fp) |
|
361 | filecount, bytecount, requirements = readbundle1header(fp) | |
361 | missingreqs = requirements - repo.supportedformats |
|
362 | missingreqs = requirements - repo.supportedformats | |
362 | if missingreqs: |
|
363 | if missingreqs: | |
363 | raise error.Abort(_('unable to apply stream clone: ' |
|
364 | raise error.Abort(_('unable to apply stream clone: ' | |
364 | 'unsupported format: %s') % |
|
365 | 'unsupported format: %s') % | |
365 | ', '.join(sorted(missingreqs))) |
|
366 | ', '.join(sorted(missingreqs))) | |
366 |
|
367 | |||
367 | consumev1(repo, fp, filecount, bytecount) |
|
368 | consumev1(repo, fp, filecount, bytecount) | |
368 |
|
369 | |||
369 | class streamcloneapplier(object): |
|
370 | class streamcloneapplier(object): | |
370 | """Class to manage applying streaming clone bundles. |
|
371 | """Class to manage applying streaming clone bundles. | |
371 |
|
372 | |||
372 | We need to wrap ``applybundlev1()`` in a dedicated type to enable bundle |
|
373 | We need to wrap ``applybundlev1()`` in a dedicated type to enable bundle | |
373 | readers to perform bundle type-specific functionality. |
|
374 | readers to perform bundle type-specific functionality. | |
374 | """ |
|
375 | """ | |
375 | def __init__(self, fh): |
|
376 | def __init__(self, fh): | |
376 | self._fh = fh |
|
377 | self._fh = fh | |
377 |
|
378 | |||
378 | def apply(self, repo): |
|
379 | def apply(self, repo): | |
379 | return applybundlev1(repo, self._fh) |
|
380 | return applybundlev1(repo, self._fh) |
General Comments 0
You need to be logged in to leave comments.
Login now