##// END OF EJS Templates
cleanup: directly use concurrent.futures instead of via pycompat...
Augie Fackler -
r49690:a0da5075 default
parent child Browse files
Show More
@@ -1,654 +1,655 b''
1 # httppeer.py - HTTP repository proxy classes for mercurial
1 # httppeer.py - HTTP repository proxy classes for mercurial
2 #
2 #
3 # Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005, 2006 Olivia Mackall <olivia@selenic.com>
4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
5 #
5 #
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 from __future__ import absolute_import
9 from __future__ import absolute_import
10
10
11 import errno
11 import errno
12 import io
12 import io
13 import os
13 import os
14 import socket
14 import socket
15 import struct
15 import struct
16
16
17 from concurrent import futures
17 from .i18n import _
18 from .i18n import _
18 from .pycompat import getattr
19 from .pycompat import getattr
19 from . import (
20 from . import (
20 bundle2,
21 bundle2,
21 error,
22 error,
22 httpconnection,
23 httpconnection,
23 pycompat,
24 pycompat,
24 statichttprepo,
25 statichttprepo,
25 url as urlmod,
26 url as urlmod,
26 util,
27 util,
27 wireprotov1peer,
28 wireprotov1peer,
28 )
29 )
29 from .utils import urlutil
30 from .utils import urlutil
30
31
31 httplib = util.httplib
32 httplib = util.httplib
32 urlerr = util.urlerr
33 urlerr = util.urlerr
33 urlreq = util.urlreq
34 urlreq = util.urlreq
34
35
35
36
36 def encodevalueinheaders(value, header, limit):
37 def encodevalueinheaders(value, header, limit):
37 """Encode a string value into multiple HTTP headers.
38 """Encode a string value into multiple HTTP headers.
38
39
39 ``value`` will be encoded into 1 or more HTTP headers with the names
40 ``value`` will be encoded into 1 or more HTTP headers with the names
40 ``header-<N>`` where ``<N>`` is an integer starting at 1. Each header
41 ``header-<N>`` where ``<N>`` is an integer starting at 1. Each header
41 name + value will be at most ``limit`` bytes long.
42 name + value will be at most ``limit`` bytes long.
42
43
43 Returns an iterable of 2-tuples consisting of header names and
44 Returns an iterable of 2-tuples consisting of header names and
44 values as native strings.
45 values as native strings.
45 """
46 """
46 # HTTP Headers are ASCII. Python 3 requires them to be unicodes,
47 # HTTP Headers are ASCII. Python 3 requires them to be unicodes,
47 # not bytes. This function always takes bytes in as arguments.
48 # not bytes. This function always takes bytes in as arguments.
48 fmt = pycompat.strurl(header) + r'-%s'
49 fmt = pycompat.strurl(header) + r'-%s'
49 # Note: it is *NOT* a bug that the last bit here is a bytestring
50 # Note: it is *NOT* a bug that the last bit here is a bytestring
50 # and not a unicode: we're just getting the encoded length anyway,
51 # and not a unicode: we're just getting the encoded length anyway,
51 # and using an r-string to make it portable between Python 2 and 3
52 # and using an r-string to make it portable between Python 2 and 3
52 # doesn't work because then the \r is a literal backslash-r
53 # doesn't work because then the \r is a literal backslash-r
53 # instead of a carriage return.
54 # instead of a carriage return.
54 valuelen = limit - len(fmt % '000') - len(b': \r\n')
55 valuelen = limit - len(fmt % '000') - len(b': \r\n')
55 result = []
56 result = []
56
57
57 n = 0
58 n = 0
58 for i in pycompat.xrange(0, len(value), valuelen):
59 for i in pycompat.xrange(0, len(value), valuelen):
59 n += 1
60 n += 1
60 result.append((fmt % str(n), pycompat.strurl(value[i : i + valuelen])))
61 result.append((fmt % str(n), pycompat.strurl(value[i : i + valuelen])))
61
62
62 return result
63 return result
63
64
64
65
65 class _multifile(object):
66 class _multifile(object):
66 def __init__(self, *fileobjs):
67 def __init__(self, *fileobjs):
67 for f in fileobjs:
68 for f in fileobjs:
68 if not util.safehasattr(f, b'length'):
69 if not util.safehasattr(f, b'length'):
69 raise ValueError(
70 raise ValueError(
70 b'_multifile only supports file objects that '
71 b'_multifile only supports file objects that '
71 b'have a length but this one does not:',
72 b'have a length but this one does not:',
72 type(f),
73 type(f),
73 f,
74 f,
74 )
75 )
75 self._fileobjs = fileobjs
76 self._fileobjs = fileobjs
76 self._index = 0
77 self._index = 0
77
78
78 @property
79 @property
79 def length(self):
80 def length(self):
80 return sum(f.length for f in self._fileobjs)
81 return sum(f.length for f in self._fileobjs)
81
82
82 def read(self, amt=None):
83 def read(self, amt=None):
83 if amt <= 0:
84 if amt <= 0:
84 return b''.join(f.read() for f in self._fileobjs)
85 return b''.join(f.read() for f in self._fileobjs)
85 parts = []
86 parts = []
86 while amt and self._index < len(self._fileobjs):
87 while amt and self._index < len(self._fileobjs):
87 parts.append(self._fileobjs[self._index].read(amt))
88 parts.append(self._fileobjs[self._index].read(amt))
88 got = len(parts[-1])
89 got = len(parts[-1])
89 if got < amt:
90 if got < amt:
90 self._index += 1
91 self._index += 1
91 amt -= got
92 amt -= got
92 return b''.join(parts)
93 return b''.join(parts)
93
94
94 def seek(self, offset, whence=os.SEEK_SET):
95 def seek(self, offset, whence=os.SEEK_SET):
95 if whence != os.SEEK_SET:
96 if whence != os.SEEK_SET:
96 raise NotImplementedError(
97 raise NotImplementedError(
97 b'_multifile does not support anything other'
98 b'_multifile does not support anything other'
98 b' than os.SEEK_SET for whence on seek()'
99 b' than os.SEEK_SET for whence on seek()'
99 )
100 )
100 if offset != 0:
101 if offset != 0:
101 raise NotImplementedError(
102 raise NotImplementedError(
102 b'_multifile only supports seeking to start, but that '
103 b'_multifile only supports seeking to start, but that '
103 b'could be fixed if you need it'
104 b'could be fixed if you need it'
104 )
105 )
105 for f in self._fileobjs:
106 for f in self._fileobjs:
106 f.seek(0)
107 f.seek(0)
107 self._index = 0
108 self._index = 0
108
109
109
110
110 def makev1commandrequest(
111 def makev1commandrequest(
111 ui, requestbuilder, caps, capablefn, repobaseurl, cmd, args
112 ui, requestbuilder, caps, capablefn, repobaseurl, cmd, args
112 ):
113 ):
113 """Make an HTTP request to run a command for a version 1 client.
114 """Make an HTTP request to run a command for a version 1 client.
114
115
115 ``caps`` is a set of known server capabilities. The value may be
116 ``caps`` is a set of known server capabilities. The value may be
116 None if capabilities are not yet known.
117 None if capabilities are not yet known.
117
118
118 ``capablefn`` is a function to evaluate a capability.
119 ``capablefn`` is a function to evaluate a capability.
119
120
120 ``cmd``, ``args``, and ``data`` define the command, its arguments, and
121 ``cmd``, ``args``, and ``data`` define the command, its arguments, and
121 raw data to pass to it.
122 raw data to pass to it.
122 """
123 """
123 if cmd == b'pushkey':
124 if cmd == b'pushkey':
124 args[b'data'] = b''
125 args[b'data'] = b''
125 data = args.pop(b'data', None)
126 data = args.pop(b'data', None)
126 headers = args.pop(b'headers', {})
127 headers = args.pop(b'headers', {})
127
128
128 ui.debug(b"sending %s command\n" % cmd)
129 ui.debug(b"sending %s command\n" % cmd)
129 q = [(b'cmd', cmd)]
130 q = [(b'cmd', cmd)]
130 headersize = 0
131 headersize = 0
131 # Important: don't use self.capable() here or else you end up
132 # Important: don't use self.capable() here or else you end up
132 # with infinite recursion when trying to look up capabilities
133 # with infinite recursion when trying to look up capabilities
133 # for the first time.
134 # for the first time.
134 postargsok = caps is not None and b'httppostargs' in caps
135 postargsok = caps is not None and b'httppostargs' in caps
135
136
136 # Send arguments via POST.
137 # Send arguments via POST.
137 if postargsok and args:
138 if postargsok and args:
138 strargs = urlreq.urlencode(sorted(args.items()))
139 strargs = urlreq.urlencode(sorted(args.items()))
139 if not data:
140 if not data:
140 data = strargs
141 data = strargs
141 else:
142 else:
142 if isinstance(data, bytes):
143 if isinstance(data, bytes):
143 i = io.BytesIO(data)
144 i = io.BytesIO(data)
144 i.length = len(data)
145 i.length = len(data)
145 data = i
146 data = i
146 argsio = io.BytesIO(strargs)
147 argsio = io.BytesIO(strargs)
147 argsio.length = len(strargs)
148 argsio.length = len(strargs)
148 data = _multifile(argsio, data)
149 data = _multifile(argsio, data)
149 headers['X-HgArgs-Post'] = len(strargs)
150 headers['X-HgArgs-Post'] = len(strargs)
150 elif args:
151 elif args:
151 # Calling self.capable() can infinite loop if we are calling
152 # Calling self.capable() can infinite loop if we are calling
152 # "capabilities". But that command should never accept wire
153 # "capabilities". But that command should never accept wire
153 # protocol arguments. So this should never happen.
154 # protocol arguments. So this should never happen.
154 assert cmd != b'capabilities'
155 assert cmd != b'capabilities'
155 httpheader = capablefn(b'httpheader')
156 httpheader = capablefn(b'httpheader')
156 if httpheader:
157 if httpheader:
157 headersize = int(httpheader.split(b',', 1)[0])
158 headersize = int(httpheader.split(b',', 1)[0])
158
159
159 # Send arguments via HTTP headers.
160 # Send arguments via HTTP headers.
160 if headersize > 0:
161 if headersize > 0:
161 # The headers can typically carry more data than the URL.
162 # The headers can typically carry more data than the URL.
162 encoded_args = urlreq.urlencode(sorted(args.items()))
163 encoded_args = urlreq.urlencode(sorted(args.items()))
163 for header, value in encodevalueinheaders(
164 for header, value in encodevalueinheaders(
164 encoded_args, b'X-HgArg', headersize
165 encoded_args, b'X-HgArg', headersize
165 ):
166 ):
166 headers[header] = value
167 headers[header] = value
167 # Send arguments via query string (Mercurial <1.9).
168 # Send arguments via query string (Mercurial <1.9).
168 else:
169 else:
169 q += sorted(args.items())
170 q += sorted(args.items())
170
171
171 qs = b'?%s' % urlreq.urlencode(q)
172 qs = b'?%s' % urlreq.urlencode(q)
172 cu = b"%s%s" % (repobaseurl, qs)
173 cu = b"%s%s" % (repobaseurl, qs)
173 size = 0
174 size = 0
174 if util.safehasattr(data, b'length'):
175 if util.safehasattr(data, b'length'):
175 size = data.length
176 size = data.length
176 elif data is not None:
177 elif data is not None:
177 size = len(data)
178 size = len(data)
178 if data is not None and 'Content-Type' not in headers:
179 if data is not None and 'Content-Type' not in headers:
179 headers['Content-Type'] = 'application/mercurial-0.1'
180 headers['Content-Type'] = 'application/mercurial-0.1'
180
181
181 # Tell the server we accept application/mercurial-0.2 and multiple
182 # Tell the server we accept application/mercurial-0.2 and multiple
182 # compression formats if the server is capable of emitting those
183 # compression formats if the server is capable of emitting those
183 # payloads.
184 # payloads.
184 # Note: Keep this set empty by default, as client advertisement of
185 # Note: Keep this set empty by default, as client advertisement of
185 # protocol parameters should only occur after the handshake.
186 # protocol parameters should only occur after the handshake.
186 protoparams = set()
187 protoparams = set()
187
188
188 mediatypes = set()
189 mediatypes = set()
189 if caps is not None:
190 if caps is not None:
190 mt = capablefn(b'httpmediatype')
191 mt = capablefn(b'httpmediatype')
191 if mt:
192 if mt:
192 protoparams.add(b'0.1')
193 protoparams.add(b'0.1')
193 mediatypes = set(mt.split(b','))
194 mediatypes = set(mt.split(b','))
194
195
195 protoparams.add(b'partial-pull')
196 protoparams.add(b'partial-pull')
196
197
197 if b'0.2tx' in mediatypes:
198 if b'0.2tx' in mediatypes:
198 protoparams.add(b'0.2')
199 protoparams.add(b'0.2')
199
200
200 if b'0.2tx' in mediatypes and capablefn(b'compression'):
201 if b'0.2tx' in mediatypes and capablefn(b'compression'):
201 # We /could/ compare supported compression formats and prune
202 # We /could/ compare supported compression formats and prune
202 # non-mutually supported or error if nothing is mutually supported.
203 # non-mutually supported or error if nothing is mutually supported.
203 # For now, send the full list to the server and have it error.
204 # For now, send the full list to the server and have it error.
204 comps = [
205 comps = [
205 e.wireprotosupport().name
206 e.wireprotosupport().name
206 for e in util.compengines.supportedwireengines(util.CLIENTROLE)
207 for e in util.compengines.supportedwireengines(util.CLIENTROLE)
207 ]
208 ]
208 protoparams.add(b'comp=%s' % b','.join(comps))
209 protoparams.add(b'comp=%s' % b','.join(comps))
209
210
210 if protoparams:
211 if protoparams:
211 protoheaders = encodevalueinheaders(
212 protoheaders = encodevalueinheaders(
212 b' '.join(sorted(protoparams)), b'X-HgProto', headersize or 1024
213 b' '.join(sorted(protoparams)), b'X-HgProto', headersize or 1024
213 )
214 )
214 for header, value in protoheaders:
215 for header, value in protoheaders:
215 headers[header] = value
216 headers[header] = value
216
217
217 varyheaders = []
218 varyheaders = []
218 for header in headers:
219 for header in headers:
219 if header.lower().startswith('x-hg'):
220 if header.lower().startswith('x-hg'):
220 varyheaders.append(header)
221 varyheaders.append(header)
221
222
222 if varyheaders:
223 if varyheaders:
223 headers['Vary'] = ','.join(sorted(varyheaders))
224 headers['Vary'] = ','.join(sorted(varyheaders))
224
225
225 req = requestbuilder(pycompat.strurl(cu), data, headers)
226 req = requestbuilder(pycompat.strurl(cu), data, headers)
226
227
227 if data is not None:
228 if data is not None:
228 ui.debug(b"sending %d bytes\n" % size)
229 ui.debug(b"sending %d bytes\n" % size)
229 req.add_unredirected_header('Content-Length', '%d' % size)
230 req.add_unredirected_header('Content-Length', '%d' % size)
230
231
231 return req, cu, qs
232 return req, cu, qs
232
233
233
234
234 def _reqdata(req):
235 def _reqdata(req):
235 """Get request data, if any. If no data, returns None."""
236 """Get request data, if any. If no data, returns None."""
236 if pycompat.ispy3:
237 if pycompat.ispy3:
237 return req.data
238 return req.data
238 if not req.has_data():
239 if not req.has_data():
239 return None
240 return None
240 return req.get_data()
241 return req.get_data()
241
242
242
243
243 def sendrequest(ui, opener, req):
244 def sendrequest(ui, opener, req):
244 """Send a prepared HTTP request.
245 """Send a prepared HTTP request.
245
246
246 Returns the response object.
247 Returns the response object.
247 """
248 """
248 dbg = ui.debug
249 dbg = ui.debug
249 if ui.debugflag and ui.configbool(b'devel', b'debug.peer-request'):
250 if ui.debugflag and ui.configbool(b'devel', b'debug.peer-request'):
250 line = b'devel-peer-request: %s\n'
251 line = b'devel-peer-request: %s\n'
251 dbg(
252 dbg(
252 line
253 line
253 % b'%s %s'
254 % b'%s %s'
254 % (
255 % (
255 pycompat.bytesurl(req.get_method()),
256 pycompat.bytesurl(req.get_method()),
256 pycompat.bytesurl(req.get_full_url()),
257 pycompat.bytesurl(req.get_full_url()),
257 )
258 )
258 )
259 )
259 hgargssize = None
260 hgargssize = None
260
261
261 for header, value in sorted(req.header_items()):
262 for header, value in sorted(req.header_items()):
262 header = pycompat.bytesurl(header)
263 header = pycompat.bytesurl(header)
263 value = pycompat.bytesurl(value)
264 value = pycompat.bytesurl(value)
264 if header.startswith(b'X-hgarg-'):
265 if header.startswith(b'X-hgarg-'):
265 if hgargssize is None:
266 if hgargssize is None:
266 hgargssize = 0
267 hgargssize = 0
267 hgargssize += len(value)
268 hgargssize += len(value)
268 else:
269 else:
269 dbg(line % b' %s %s' % (header, value))
270 dbg(line % b' %s %s' % (header, value))
270
271
271 if hgargssize is not None:
272 if hgargssize is not None:
272 dbg(
273 dbg(
273 line
274 line
274 % b' %d bytes of commands arguments in headers'
275 % b' %d bytes of commands arguments in headers'
275 % hgargssize
276 % hgargssize
276 )
277 )
277 data = _reqdata(req)
278 data = _reqdata(req)
278 if data is not None:
279 if data is not None:
279 length = getattr(data, 'length', None)
280 length = getattr(data, 'length', None)
280 if length is None:
281 if length is None:
281 length = len(data)
282 length = len(data)
282 dbg(line % b' %d bytes of data' % length)
283 dbg(line % b' %d bytes of data' % length)
283
284
284 start = util.timer()
285 start = util.timer()
285
286
286 res = None
287 res = None
287 try:
288 try:
288 res = opener.open(req)
289 res = opener.open(req)
289 except urlerr.httperror as inst:
290 except urlerr.httperror as inst:
290 if inst.code == 401:
291 if inst.code == 401:
291 raise error.Abort(_(b'authorization failed'))
292 raise error.Abort(_(b'authorization failed'))
292 raise
293 raise
293 except httplib.HTTPException as inst:
294 except httplib.HTTPException as inst:
294 ui.debug(
295 ui.debug(
295 b'http error requesting %s\n'
296 b'http error requesting %s\n'
296 % urlutil.hidepassword(req.get_full_url())
297 % urlutil.hidepassword(req.get_full_url())
297 )
298 )
298 ui.traceback()
299 ui.traceback()
299 raise IOError(None, inst)
300 raise IOError(None, inst)
300 finally:
301 finally:
301 if ui.debugflag and ui.configbool(b'devel', b'debug.peer-request'):
302 if ui.debugflag and ui.configbool(b'devel', b'debug.peer-request'):
302 code = res.code if res else -1
303 code = res.code if res else -1
303 dbg(
304 dbg(
304 line
305 line
305 % b' finished in %.4f seconds (%d)'
306 % b' finished in %.4f seconds (%d)'
306 % (util.timer() - start, code)
307 % (util.timer() - start, code)
307 )
308 )
308
309
309 # Insert error handlers for common I/O failures.
310 # Insert error handlers for common I/O failures.
310 urlmod.wrapresponse(res)
311 urlmod.wrapresponse(res)
311
312
312 return res
313 return res
313
314
314
315
315 class RedirectedRepoError(error.RepoError):
316 class RedirectedRepoError(error.RepoError):
316 def __init__(self, msg, respurl):
317 def __init__(self, msg, respurl):
317 super(RedirectedRepoError, self).__init__(msg)
318 super(RedirectedRepoError, self).__init__(msg)
318 self.respurl = respurl
319 self.respurl = respurl
319
320
320
321
321 def parsev1commandresponse(ui, baseurl, requrl, qs, resp, compressible):
322 def parsev1commandresponse(ui, baseurl, requrl, qs, resp, compressible):
322 # record the url we got redirected to
323 # record the url we got redirected to
323 redirected = False
324 redirected = False
324 respurl = pycompat.bytesurl(resp.geturl())
325 respurl = pycompat.bytesurl(resp.geturl())
325 if respurl.endswith(qs):
326 if respurl.endswith(qs):
326 respurl = respurl[: -len(qs)]
327 respurl = respurl[: -len(qs)]
327 qsdropped = False
328 qsdropped = False
328 else:
329 else:
329 qsdropped = True
330 qsdropped = True
330
331
331 if baseurl.rstrip(b'/') != respurl.rstrip(b'/'):
332 if baseurl.rstrip(b'/') != respurl.rstrip(b'/'):
332 redirected = True
333 redirected = True
333 if not ui.quiet:
334 if not ui.quiet:
334 ui.warn(_(b'real URL is %s\n') % respurl)
335 ui.warn(_(b'real URL is %s\n') % respurl)
335
336
336 try:
337 try:
337 proto = pycompat.bytesurl(resp.getheader('content-type', ''))
338 proto = pycompat.bytesurl(resp.getheader('content-type', ''))
338 except AttributeError:
339 except AttributeError:
339 proto = pycompat.bytesurl(resp.headers.get('content-type', ''))
340 proto = pycompat.bytesurl(resp.headers.get('content-type', ''))
340
341
341 safeurl = urlutil.hidepassword(baseurl)
342 safeurl = urlutil.hidepassword(baseurl)
342 if proto.startswith(b'application/hg-error'):
343 if proto.startswith(b'application/hg-error'):
343 raise error.OutOfBandError(resp.read())
344 raise error.OutOfBandError(resp.read())
344
345
345 # Pre 1.0 versions of Mercurial used text/plain and
346 # Pre 1.0 versions of Mercurial used text/plain and
346 # application/hg-changegroup. We don't support such old servers.
347 # application/hg-changegroup. We don't support such old servers.
347 if not proto.startswith(b'application/mercurial-'):
348 if not proto.startswith(b'application/mercurial-'):
348 ui.debug(b"requested URL: '%s'\n" % urlutil.hidepassword(requrl))
349 ui.debug(b"requested URL: '%s'\n" % urlutil.hidepassword(requrl))
349 msg = _(
350 msg = _(
350 b"'%s' does not appear to be an hg repository:\n"
351 b"'%s' does not appear to be an hg repository:\n"
351 b"---%%<--- (%s)\n%s\n---%%<---\n"
352 b"---%%<--- (%s)\n%s\n---%%<---\n"
352 ) % (safeurl, proto or b'no content-type', resp.read(1024))
353 ) % (safeurl, proto or b'no content-type', resp.read(1024))
353
354
354 # Some servers may strip the query string from the redirect. We
355 # Some servers may strip the query string from the redirect. We
355 # raise a special error type so callers can react to this specially.
356 # raise a special error type so callers can react to this specially.
356 if redirected and qsdropped:
357 if redirected and qsdropped:
357 raise RedirectedRepoError(msg, respurl)
358 raise RedirectedRepoError(msg, respurl)
358 else:
359 else:
359 raise error.RepoError(msg)
360 raise error.RepoError(msg)
360
361
361 try:
362 try:
362 subtype = proto.split(b'-', 1)[1]
363 subtype = proto.split(b'-', 1)[1]
363
364
364 version_info = tuple([int(n) for n in subtype.split(b'.')])
365 version_info = tuple([int(n) for n in subtype.split(b'.')])
365 except ValueError:
366 except ValueError:
366 raise error.RepoError(
367 raise error.RepoError(
367 _(b"'%s' sent a broken Content-Type header (%s)") % (safeurl, proto)
368 _(b"'%s' sent a broken Content-Type header (%s)") % (safeurl, proto)
368 )
369 )
369
370
370 # TODO consider switching to a decompression reader that uses
371 # TODO consider switching to a decompression reader that uses
371 # generators.
372 # generators.
372 if version_info == (0, 1):
373 if version_info == (0, 1):
373 if compressible:
374 if compressible:
374 resp = util.compengines[b'zlib'].decompressorreader(resp)
375 resp = util.compengines[b'zlib'].decompressorreader(resp)
375
376
376 elif version_info == (0, 2):
377 elif version_info == (0, 2):
377 # application/mercurial-0.2 always identifies the compression
378 # application/mercurial-0.2 always identifies the compression
378 # engine in the payload header.
379 # engine in the payload header.
379 elen = struct.unpack(b'B', util.readexactly(resp, 1))[0]
380 elen = struct.unpack(b'B', util.readexactly(resp, 1))[0]
380 ename = util.readexactly(resp, elen)
381 ename = util.readexactly(resp, elen)
381 engine = util.compengines.forwiretype(ename)
382 engine = util.compengines.forwiretype(ename)
382
383
383 resp = engine.decompressorreader(resp)
384 resp = engine.decompressorreader(resp)
384 else:
385 else:
385 raise error.RepoError(
386 raise error.RepoError(
386 _(b"'%s' uses newer protocol %s") % (safeurl, subtype)
387 _(b"'%s' uses newer protocol %s") % (safeurl, subtype)
387 )
388 )
388
389
389 return respurl, proto, resp
390 return respurl, proto, resp
390
391
391
392
392 class httppeer(wireprotov1peer.wirepeer):
393 class httppeer(wireprotov1peer.wirepeer):
393 def __init__(self, ui, path, url, opener, requestbuilder, caps):
394 def __init__(self, ui, path, url, opener, requestbuilder, caps):
394 self.ui = ui
395 self.ui = ui
395 self._path = path
396 self._path = path
396 self._url = url
397 self._url = url
397 self._caps = caps
398 self._caps = caps
398 self.limitedarguments = caps is not None and b'httppostargs' not in caps
399 self.limitedarguments = caps is not None and b'httppostargs' not in caps
399 self._urlopener = opener
400 self._urlopener = opener
400 self._requestbuilder = requestbuilder
401 self._requestbuilder = requestbuilder
401
402
402 def __del__(self):
403 def __del__(self):
403 for h in self._urlopener.handlers:
404 for h in self._urlopener.handlers:
404 h.close()
405 h.close()
405 getattr(h, "close_all", lambda: None)()
406 getattr(h, "close_all", lambda: None)()
406
407
407 # Begin of ipeerconnection interface.
408 # Begin of ipeerconnection interface.
408
409
409 def url(self):
410 def url(self):
410 return self._path
411 return self._path
411
412
412 def local(self):
413 def local(self):
413 return None
414 return None
414
415
415 def peer(self):
416 def peer(self):
416 return self
417 return self
417
418
418 def canpush(self):
419 def canpush(self):
419 return True
420 return True
420
421
421 def close(self):
422 def close(self):
422 try:
423 try:
423 reqs, sent, recv = (
424 reqs, sent, recv = (
424 self._urlopener.requestscount,
425 self._urlopener.requestscount,
425 self._urlopener.sentbytescount,
426 self._urlopener.sentbytescount,
426 self._urlopener.receivedbytescount,
427 self._urlopener.receivedbytescount,
427 )
428 )
428 except AttributeError:
429 except AttributeError:
429 return
430 return
430 self.ui.note(
431 self.ui.note(
431 _(
432 _(
432 b'(sent %d HTTP requests and %d bytes; '
433 b'(sent %d HTTP requests and %d bytes; '
433 b'received %d bytes in responses)\n'
434 b'received %d bytes in responses)\n'
434 )
435 )
435 % (reqs, sent, recv)
436 % (reqs, sent, recv)
436 )
437 )
437
438
438 # End of ipeerconnection interface.
439 # End of ipeerconnection interface.
439
440
440 # Begin of ipeercommands interface.
441 # Begin of ipeercommands interface.
441
442
442 def capabilities(self):
443 def capabilities(self):
443 return self._caps
444 return self._caps
444
445
445 # End of ipeercommands interface.
446 # End of ipeercommands interface.
446
447
447 def _callstream(self, cmd, _compressible=False, **args):
448 def _callstream(self, cmd, _compressible=False, **args):
448 args = pycompat.byteskwargs(args)
449 args = pycompat.byteskwargs(args)
449
450
450 req, cu, qs = makev1commandrequest(
451 req, cu, qs = makev1commandrequest(
451 self.ui,
452 self.ui,
452 self._requestbuilder,
453 self._requestbuilder,
453 self._caps,
454 self._caps,
454 self.capable,
455 self.capable,
455 self._url,
456 self._url,
456 cmd,
457 cmd,
457 args,
458 args,
458 )
459 )
459
460
460 resp = sendrequest(self.ui, self._urlopener, req)
461 resp = sendrequest(self.ui, self._urlopener, req)
461
462
462 self._url, ct, resp = parsev1commandresponse(
463 self._url, ct, resp = parsev1commandresponse(
463 self.ui, self._url, cu, qs, resp, _compressible
464 self.ui, self._url, cu, qs, resp, _compressible
464 )
465 )
465
466
466 return resp
467 return resp
467
468
468 def _call(self, cmd, **args):
469 def _call(self, cmd, **args):
469 fp = self._callstream(cmd, **args)
470 fp = self._callstream(cmd, **args)
470 try:
471 try:
471 return fp.read()
472 return fp.read()
472 finally:
473 finally:
473 # if using keepalive, allow connection to be reused
474 # if using keepalive, allow connection to be reused
474 fp.close()
475 fp.close()
475
476
476 def _callpush(self, cmd, cg, **args):
477 def _callpush(self, cmd, cg, **args):
477 # have to stream bundle to a temp file because we do not have
478 # have to stream bundle to a temp file because we do not have
478 # http 1.1 chunked transfer.
479 # http 1.1 chunked transfer.
479
480
480 types = self.capable(b'unbundle')
481 types = self.capable(b'unbundle')
481 try:
482 try:
482 types = types.split(b',')
483 types = types.split(b',')
483 except AttributeError:
484 except AttributeError:
484 # servers older than d1b16a746db6 will send 'unbundle' as a
485 # servers older than d1b16a746db6 will send 'unbundle' as a
485 # boolean capability. They only support headerless/uncompressed
486 # boolean capability. They only support headerless/uncompressed
486 # bundles.
487 # bundles.
487 types = [b""]
488 types = [b""]
488 for x in types:
489 for x in types:
489 if x in bundle2.bundletypes:
490 if x in bundle2.bundletypes:
490 type = x
491 type = x
491 break
492 break
492
493
493 tempname = bundle2.writebundle(self.ui, cg, None, type)
494 tempname = bundle2.writebundle(self.ui, cg, None, type)
494 fp = httpconnection.httpsendfile(self.ui, tempname, b"rb")
495 fp = httpconnection.httpsendfile(self.ui, tempname, b"rb")
495 headers = {'Content-Type': 'application/mercurial-0.1'}
496 headers = {'Content-Type': 'application/mercurial-0.1'}
496
497
497 try:
498 try:
498 r = self._call(cmd, data=fp, headers=headers, **args)
499 r = self._call(cmd, data=fp, headers=headers, **args)
499 vals = r.split(b'\n', 1)
500 vals = r.split(b'\n', 1)
500 if len(vals) < 2:
501 if len(vals) < 2:
501 raise error.ResponseError(_(b"unexpected response:"), r)
502 raise error.ResponseError(_(b"unexpected response:"), r)
502 return vals
503 return vals
503 except urlerr.httperror:
504 except urlerr.httperror:
504 # Catch and re-raise these so we don't try and treat them
505 # Catch and re-raise these so we don't try and treat them
505 # like generic socket errors. They lack any values in
506 # like generic socket errors. They lack any values in
506 # .args on Python 3 which breaks our socket.error block.
507 # .args on Python 3 which breaks our socket.error block.
507 raise
508 raise
508 except socket.error as err:
509 except socket.error as err:
509 if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
510 if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
510 raise error.Abort(_(b'push failed: %s') % err.args[1])
511 raise error.Abort(_(b'push failed: %s') % err.args[1])
511 raise error.Abort(err.args[1])
512 raise error.Abort(err.args[1])
512 finally:
513 finally:
513 fp.close()
514 fp.close()
514 os.unlink(tempname)
515 os.unlink(tempname)
515
516
516 def _calltwowaystream(self, cmd, fp, **args):
517 def _calltwowaystream(self, cmd, fp, **args):
517 filename = None
518 filename = None
518 try:
519 try:
519 # dump bundle to disk
520 # dump bundle to disk
520 fd, filename = pycompat.mkstemp(prefix=b"hg-bundle-", suffix=b".hg")
521 fd, filename = pycompat.mkstemp(prefix=b"hg-bundle-", suffix=b".hg")
521 with os.fdopen(fd, "wb") as fh:
522 with os.fdopen(fd, "wb") as fh:
522 d = fp.read(4096)
523 d = fp.read(4096)
523 while d:
524 while d:
524 fh.write(d)
525 fh.write(d)
525 d = fp.read(4096)
526 d = fp.read(4096)
526 # start http push
527 # start http push
527 with httpconnection.httpsendfile(self.ui, filename, b"rb") as fp_:
528 with httpconnection.httpsendfile(self.ui, filename, b"rb") as fp_:
528 headers = {'Content-Type': 'application/mercurial-0.1'}
529 headers = {'Content-Type': 'application/mercurial-0.1'}
529 return self._callstream(cmd, data=fp_, headers=headers, **args)
530 return self._callstream(cmd, data=fp_, headers=headers, **args)
530 finally:
531 finally:
531 if filename is not None:
532 if filename is not None:
532 os.unlink(filename)
533 os.unlink(filename)
533
534
534 def _callcompressable(self, cmd, **args):
535 def _callcompressable(self, cmd, **args):
535 return self._callstream(cmd, _compressible=True, **args)
536 return self._callstream(cmd, _compressible=True, **args)
536
537
537 def _abort(self, exception):
538 def _abort(self, exception):
538 raise exception
539 raise exception
539
540
540
541
541 class queuedcommandfuture(pycompat.futures.Future):
542 class queuedcommandfuture(futures.Future):
542 """Wraps result() on command futures to trigger submission on call."""
543 """Wraps result() on command futures to trigger submission on call."""
543
544
544 def result(self, timeout=None):
545 def result(self, timeout=None):
545 if self.done():
546 if self.done():
546 return pycompat.futures.Future.result(self, timeout)
547 return futures.Future.result(self, timeout)
547
548
548 self._peerexecutor.sendcommands()
549 self._peerexecutor.sendcommands()
549
550
550 # sendcommands() will restore the original __class__ and self.result
551 # sendcommands() will restore the original __class__ and self.result
551 # will resolve to Future.result.
552 # will resolve to Future.result.
552 return self.result(timeout)
553 return self.result(timeout)
553
554
554
555
555 def performhandshake(ui, url, opener, requestbuilder):
556 def performhandshake(ui, url, opener, requestbuilder):
556 # The handshake is a request to the capabilities command.
557 # The handshake is a request to the capabilities command.
557
558
558 caps = None
559 caps = None
559
560
560 def capable(x):
561 def capable(x):
561 raise error.ProgrammingError(b'should not be called')
562 raise error.ProgrammingError(b'should not be called')
562
563
563 args = {}
564 args = {}
564
565
565 req, requrl, qs = makev1commandrequest(
566 req, requrl, qs = makev1commandrequest(
566 ui, requestbuilder, caps, capable, url, b'capabilities', args
567 ui, requestbuilder, caps, capable, url, b'capabilities', args
567 )
568 )
568 resp = sendrequest(ui, opener, req)
569 resp = sendrequest(ui, opener, req)
569
570
570 # The server may redirect us to the repo root, stripping the
571 # The server may redirect us to the repo root, stripping the
571 # ?cmd=capabilities query string from the URL. The server would likely
572 # ?cmd=capabilities query string from the URL. The server would likely
572 # return HTML in this case and ``parsev1commandresponse()`` would raise.
573 # return HTML in this case and ``parsev1commandresponse()`` would raise.
573 # We catch this special case and re-issue the capabilities request against
574 # We catch this special case and re-issue the capabilities request against
574 # the new URL.
575 # the new URL.
575 #
576 #
576 # We should ideally not do this, as a redirect that drops the query
577 # We should ideally not do this, as a redirect that drops the query
577 # string from the URL is arguably a server bug. (Garbage in, garbage out).
578 # string from the URL is arguably a server bug. (Garbage in, garbage out).
578 # However, Mercurial clients for several years appeared to handle this
579 # However, Mercurial clients for several years appeared to handle this
579 # issue without behavior degradation. And according to issue 5860, it may
580 # issue without behavior degradation. And according to issue 5860, it may
580 # be a longstanding bug in some server implementations. So we allow a
581 # be a longstanding bug in some server implementations. So we allow a
581 # redirect that drops the query string to "just work."
582 # redirect that drops the query string to "just work."
582 try:
583 try:
583 respurl, ct, resp = parsev1commandresponse(
584 respurl, ct, resp = parsev1commandresponse(
584 ui, url, requrl, qs, resp, compressible=False
585 ui, url, requrl, qs, resp, compressible=False
585 )
586 )
586 except RedirectedRepoError as e:
587 except RedirectedRepoError as e:
587 req, requrl, qs = makev1commandrequest(
588 req, requrl, qs = makev1commandrequest(
588 ui, requestbuilder, caps, capable, e.respurl, b'capabilities', args
589 ui, requestbuilder, caps, capable, e.respurl, b'capabilities', args
589 )
590 )
590 resp = sendrequest(ui, opener, req)
591 resp = sendrequest(ui, opener, req)
591 respurl, ct, resp = parsev1commandresponse(
592 respurl, ct, resp = parsev1commandresponse(
592 ui, url, requrl, qs, resp, compressible=False
593 ui, url, requrl, qs, resp, compressible=False
593 )
594 )
594
595
595 try:
596 try:
596 rawdata = resp.read()
597 rawdata = resp.read()
597 finally:
598 finally:
598 resp.close()
599 resp.close()
599
600
600 if not ct.startswith(b'application/mercurial-'):
601 if not ct.startswith(b'application/mercurial-'):
601 raise error.ProgrammingError(b'unexpected content-type: %s' % ct)
602 raise error.ProgrammingError(b'unexpected content-type: %s' % ct)
602
603
603 info = {b'v1capabilities': set(rawdata.split())}
604 info = {b'v1capabilities': set(rawdata.split())}
604
605
605 return respurl, info
606 return respurl, info
606
607
607
608
608 def makepeer(ui, path, opener=None, requestbuilder=urlreq.request):
609 def makepeer(ui, path, opener=None, requestbuilder=urlreq.request):
609 """Construct an appropriate HTTP peer instance.
610 """Construct an appropriate HTTP peer instance.
610
611
611 ``opener`` is an ``url.opener`` that should be used to establish
612 ``opener`` is an ``url.opener`` that should be used to establish
612 connections, perform HTTP requests.
613 connections, perform HTTP requests.
613
614
614 ``requestbuilder`` is the type used for constructing HTTP requests.
615 ``requestbuilder`` is the type used for constructing HTTP requests.
615 It exists as an argument so extensions can override the default.
616 It exists as an argument so extensions can override the default.
616 """
617 """
617 u = urlutil.url(path)
618 u = urlutil.url(path)
618 if u.query or u.fragment:
619 if u.query or u.fragment:
619 raise error.Abort(
620 raise error.Abort(
620 _(b'unsupported URL component: "%s"') % (u.query or u.fragment)
621 _(b'unsupported URL component: "%s"') % (u.query or u.fragment)
621 )
622 )
622
623
623 # urllib cannot handle URLs with embedded user or passwd.
624 # urllib cannot handle URLs with embedded user or passwd.
624 url, authinfo = u.authinfo()
625 url, authinfo = u.authinfo()
625 ui.debug(b'using %s\n' % url)
626 ui.debug(b'using %s\n' % url)
626
627
627 opener = opener or urlmod.opener(ui, authinfo)
628 opener = opener or urlmod.opener(ui, authinfo)
628
629
629 respurl, info = performhandshake(ui, url, opener, requestbuilder)
630 respurl, info = performhandshake(ui, url, opener, requestbuilder)
630
631
631 return httppeer(
632 return httppeer(
632 ui, path, respurl, opener, requestbuilder, info[b'v1capabilities']
633 ui, path, respurl, opener, requestbuilder, info[b'v1capabilities']
633 )
634 )
634
635
635
636
636 def instance(ui, path, create, intents=None, createopts=None):
637 def instance(ui, path, create, intents=None, createopts=None):
637 if create:
638 if create:
638 raise error.Abort(_(b'cannot create new http repository'))
639 raise error.Abort(_(b'cannot create new http repository'))
639 try:
640 try:
640 if path.startswith(b'https:') and not urlmod.has_https:
641 if path.startswith(b'https:') and not urlmod.has_https:
641 raise error.Abort(
642 raise error.Abort(
642 _(b'Python support for SSL and HTTPS is not installed')
643 _(b'Python support for SSL and HTTPS is not installed')
643 )
644 )
644
645
645 inst = makepeer(ui, path)
646 inst = makepeer(ui, path)
646
647
647 return inst
648 return inst
648 except error.RepoError as httpexception:
649 except error.RepoError as httpexception:
649 try:
650 try:
650 r = statichttprepo.instance(ui, b"static-" + path, create)
651 r = statichttprepo.instance(ui, b"static-" + path, create)
651 ui.note(_(b'(falling back to static-http)\n'))
652 ui.note(_(b'(falling back to static-http)\n'))
652 return r
653 return r
653 except error.RepoError:
654 except error.RepoError:
654 raise httpexception # use the original http RepoError instead
655 raise httpexception # use the original http RepoError instead
@@ -1,3930 +1,3931 b''
1 # localrepo.py - read/write repository class for mercurial
1 # localrepo.py - read/write repository class for mercurial
2 # coding: utf-8
2 # coding: utf-8
3 #
3 #
4 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
4 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
5 #
5 #
6 # This software may be used and distributed according to the terms of the
6 # This software may be used and distributed according to the terms of the
7 # GNU General Public License version 2 or any later version.
7 # GNU General Public License version 2 or any later version.
8
8
9 from __future__ import absolute_import
9 from __future__ import absolute_import
10
10
11 import errno
11 import errno
12 import functools
12 import functools
13 import os
13 import os
14 import random
14 import random
15 import sys
15 import sys
16 import time
16 import time
17 import weakref
17 import weakref
18
18
19 from concurrent import futures
19 from .i18n import _
20 from .i18n import _
20 from .node import (
21 from .node import (
21 bin,
22 bin,
22 hex,
23 hex,
23 nullrev,
24 nullrev,
24 sha1nodeconstants,
25 sha1nodeconstants,
25 short,
26 short,
26 )
27 )
27 from .pycompat import (
28 from .pycompat import (
28 delattr,
29 delattr,
29 getattr,
30 getattr,
30 )
31 )
31 from . import (
32 from . import (
32 bookmarks,
33 bookmarks,
33 branchmap,
34 branchmap,
34 bundle2,
35 bundle2,
35 bundlecaches,
36 bundlecaches,
36 changegroup,
37 changegroup,
37 color,
38 color,
38 commit,
39 commit,
39 context,
40 context,
40 dirstate,
41 dirstate,
41 dirstateguard,
42 dirstateguard,
42 discovery,
43 discovery,
43 encoding,
44 encoding,
44 error,
45 error,
45 exchange,
46 exchange,
46 extensions,
47 extensions,
47 filelog,
48 filelog,
48 hook,
49 hook,
49 lock as lockmod,
50 lock as lockmod,
50 match as matchmod,
51 match as matchmod,
51 mergestate as mergestatemod,
52 mergestate as mergestatemod,
52 mergeutil,
53 mergeutil,
53 namespaces,
54 namespaces,
54 narrowspec,
55 narrowspec,
55 obsolete,
56 obsolete,
56 pathutil,
57 pathutil,
57 phases,
58 phases,
58 pushkey,
59 pushkey,
59 pycompat,
60 pycompat,
60 rcutil,
61 rcutil,
61 repoview,
62 repoview,
62 requirements as requirementsmod,
63 requirements as requirementsmod,
63 revlog,
64 revlog,
64 revset,
65 revset,
65 revsetlang,
66 revsetlang,
66 scmutil,
67 scmutil,
67 sparse,
68 sparse,
68 store as storemod,
69 store as storemod,
69 subrepoutil,
70 subrepoutil,
70 tags as tagsmod,
71 tags as tagsmod,
71 transaction,
72 transaction,
72 txnutil,
73 txnutil,
73 util,
74 util,
74 vfs as vfsmod,
75 vfs as vfsmod,
75 wireprototypes,
76 wireprototypes,
76 )
77 )
77
78
78 from .interfaces import (
79 from .interfaces import (
79 repository,
80 repository,
80 util as interfaceutil,
81 util as interfaceutil,
81 )
82 )
82
83
83 from .utils import (
84 from .utils import (
84 hashutil,
85 hashutil,
85 procutil,
86 procutil,
86 stringutil,
87 stringutil,
87 urlutil,
88 urlutil,
88 )
89 )
89
90
90 from .revlogutils import (
91 from .revlogutils import (
91 concurrency_checker as revlogchecker,
92 concurrency_checker as revlogchecker,
92 constants as revlogconst,
93 constants as revlogconst,
93 sidedata as sidedatamod,
94 sidedata as sidedatamod,
94 )
95 )
95
96
96 release = lockmod.release
97 release = lockmod.release
97 urlerr = util.urlerr
98 urlerr = util.urlerr
98 urlreq = util.urlreq
99 urlreq = util.urlreq
99
100
100 # set of (path, vfs-location) tuples. vfs-location is:
101 # set of (path, vfs-location) tuples. vfs-location is:
101 # - 'plain for vfs relative paths
102 # - 'plain for vfs relative paths
102 # - '' for svfs relative paths
103 # - '' for svfs relative paths
103 _cachedfiles = set()
104 _cachedfiles = set()
104
105
105
106
106 class _basefilecache(scmutil.filecache):
107 class _basefilecache(scmutil.filecache):
107 """All filecache usage on repo are done for logic that should be unfiltered"""
108 """All filecache usage on repo are done for logic that should be unfiltered"""
108
109
109 def __get__(self, repo, type=None):
110 def __get__(self, repo, type=None):
110 if repo is None:
111 if repo is None:
111 return self
112 return self
112 # proxy to unfiltered __dict__ since filtered repo has no entry
113 # proxy to unfiltered __dict__ since filtered repo has no entry
113 unfi = repo.unfiltered()
114 unfi = repo.unfiltered()
114 try:
115 try:
115 return unfi.__dict__[self.sname]
116 return unfi.__dict__[self.sname]
116 except KeyError:
117 except KeyError:
117 pass
118 pass
118 return super(_basefilecache, self).__get__(unfi, type)
119 return super(_basefilecache, self).__get__(unfi, type)
119
120
120 def set(self, repo, value):
121 def set(self, repo, value):
121 return super(_basefilecache, self).set(repo.unfiltered(), value)
122 return super(_basefilecache, self).set(repo.unfiltered(), value)
122
123
123
124
124 class repofilecache(_basefilecache):
125 class repofilecache(_basefilecache):
125 """filecache for files in .hg but outside of .hg/store"""
126 """filecache for files in .hg but outside of .hg/store"""
126
127
127 def __init__(self, *paths):
128 def __init__(self, *paths):
128 super(repofilecache, self).__init__(*paths)
129 super(repofilecache, self).__init__(*paths)
129 for path in paths:
130 for path in paths:
130 _cachedfiles.add((path, b'plain'))
131 _cachedfiles.add((path, b'plain'))
131
132
132 def join(self, obj, fname):
133 def join(self, obj, fname):
133 return obj.vfs.join(fname)
134 return obj.vfs.join(fname)
134
135
135
136
136 class storecache(_basefilecache):
137 class storecache(_basefilecache):
137 """filecache for files in the store"""
138 """filecache for files in the store"""
138
139
139 def __init__(self, *paths):
140 def __init__(self, *paths):
140 super(storecache, self).__init__(*paths)
141 super(storecache, self).__init__(*paths)
141 for path in paths:
142 for path in paths:
142 _cachedfiles.add((path, b''))
143 _cachedfiles.add((path, b''))
143
144
144 def join(self, obj, fname):
145 def join(self, obj, fname):
145 return obj.sjoin(fname)
146 return obj.sjoin(fname)
146
147
147
148
148 class changelogcache(storecache):
149 class changelogcache(storecache):
149 """filecache for the changelog"""
150 """filecache for the changelog"""
150
151
151 def __init__(self):
152 def __init__(self):
152 super(changelogcache, self).__init__()
153 super(changelogcache, self).__init__()
153 _cachedfiles.add((b'00changelog.i', b''))
154 _cachedfiles.add((b'00changelog.i', b''))
154 _cachedfiles.add((b'00changelog.n', b''))
155 _cachedfiles.add((b'00changelog.n', b''))
155
156
156 def tracked_paths(self, obj):
157 def tracked_paths(self, obj):
157 paths = [self.join(obj, b'00changelog.i')]
158 paths = [self.join(obj, b'00changelog.i')]
158 if obj.store.opener.options.get(b'persistent-nodemap', False):
159 if obj.store.opener.options.get(b'persistent-nodemap', False):
159 paths.append(self.join(obj, b'00changelog.n'))
160 paths.append(self.join(obj, b'00changelog.n'))
160 return paths
161 return paths
161
162
162
163
163 class manifestlogcache(storecache):
164 class manifestlogcache(storecache):
164 """filecache for the manifestlog"""
165 """filecache for the manifestlog"""
165
166
166 def __init__(self):
167 def __init__(self):
167 super(manifestlogcache, self).__init__()
168 super(manifestlogcache, self).__init__()
168 _cachedfiles.add((b'00manifest.i', b''))
169 _cachedfiles.add((b'00manifest.i', b''))
169 _cachedfiles.add((b'00manifest.n', b''))
170 _cachedfiles.add((b'00manifest.n', b''))
170
171
171 def tracked_paths(self, obj):
172 def tracked_paths(self, obj):
172 paths = [self.join(obj, b'00manifest.i')]
173 paths = [self.join(obj, b'00manifest.i')]
173 if obj.store.opener.options.get(b'persistent-nodemap', False):
174 if obj.store.opener.options.get(b'persistent-nodemap', False):
174 paths.append(self.join(obj, b'00manifest.n'))
175 paths.append(self.join(obj, b'00manifest.n'))
175 return paths
176 return paths
176
177
177
178
178 class mixedrepostorecache(_basefilecache):
179 class mixedrepostorecache(_basefilecache):
179 """filecache for a mix files in .hg/store and outside"""
180 """filecache for a mix files in .hg/store and outside"""
180
181
181 def __init__(self, *pathsandlocations):
182 def __init__(self, *pathsandlocations):
182 # scmutil.filecache only uses the path for passing back into our
183 # scmutil.filecache only uses the path for passing back into our
183 # join(), so we can safely pass a list of paths and locations
184 # join(), so we can safely pass a list of paths and locations
184 super(mixedrepostorecache, self).__init__(*pathsandlocations)
185 super(mixedrepostorecache, self).__init__(*pathsandlocations)
185 _cachedfiles.update(pathsandlocations)
186 _cachedfiles.update(pathsandlocations)
186
187
187 def join(self, obj, fnameandlocation):
188 def join(self, obj, fnameandlocation):
188 fname, location = fnameandlocation
189 fname, location = fnameandlocation
189 if location == b'plain':
190 if location == b'plain':
190 return obj.vfs.join(fname)
191 return obj.vfs.join(fname)
191 else:
192 else:
192 if location != b'':
193 if location != b'':
193 raise error.ProgrammingError(
194 raise error.ProgrammingError(
194 b'unexpected location: %s' % location
195 b'unexpected location: %s' % location
195 )
196 )
196 return obj.sjoin(fname)
197 return obj.sjoin(fname)
197
198
198
199
199 def isfilecached(repo, name):
200 def isfilecached(repo, name):
200 """check if a repo has already cached "name" filecache-ed property
201 """check if a repo has already cached "name" filecache-ed property
201
202
202 This returns (cachedobj-or-None, iscached) tuple.
203 This returns (cachedobj-or-None, iscached) tuple.
203 """
204 """
204 cacheentry = repo.unfiltered()._filecache.get(name, None)
205 cacheentry = repo.unfiltered()._filecache.get(name, None)
205 if not cacheentry:
206 if not cacheentry:
206 return None, False
207 return None, False
207 return cacheentry.obj, True
208 return cacheentry.obj, True
208
209
209
210
210 class unfilteredpropertycache(util.propertycache):
211 class unfilteredpropertycache(util.propertycache):
211 """propertycache that apply to unfiltered repo only"""
212 """propertycache that apply to unfiltered repo only"""
212
213
213 def __get__(self, repo, type=None):
214 def __get__(self, repo, type=None):
214 unfi = repo.unfiltered()
215 unfi = repo.unfiltered()
215 if unfi is repo:
216 if unfi is repo:
216 return super(unfilteredpropertycache, self).__get__(unfi)
217 return super(unfilteredpropertycache, self).__get__(unfi)
217 return getattr(unfi, self.name)
218 return getattr(unfi, self.name)
218
219
219
220
220 class filteredpropertycache(util.propertycache):
221 class filteredpropertycache(util.propertycache):
221 """propertycache that must take filtering in account"""
222 """propertycache that must take filtering in account"""
222
223
223 def cachevalue(self, obj, value):
224 def cachevalue(self, obj, value):
224 object.__setattr__(obj, self.name, value)
225 object.__setattr__(obj, self.name, value)
225
226
226
227
227 def hasunfilteredcache(repo, name):
228 def hasunfilteredcache(repo, name):
228 """check if a repo has an unfilteredpropertycache value for <name>"""
229 """check if a repo has an unfilteredpropertycache value for <name>"""
229 return name in vars(repo.unfiltered())
230 return name in vars(repo.unfiltered())
230
231
231
232
232 def unfilteredmethod(orig):
233 def unfilteredmethod(orig):
233 """decorate method that always need to be run on unfiltered version"""
234 """decorate method that always need to be run on unfiltered version"""
234
235
235 @functools.wraps(orig)
236 @functools.wraps(orig)
236 def wrapper(repo, *args, **kwargs):
237 def wrapper(repo, *args, **kwargs):
237 return orig(repo.unfiltered(), *args, **kwargs)
238 return orig(repo.unfiltered(), *args, **kwargs)
238
239
239 return wrapper
240 return wrapper
240
241
241
242
242 moderncaps = {
243 moderncaps = {
243 b'lookup',
244 b'lookup',
244 b'branchmap',
245 b'branchmap',
245 b'pushkey',
246 b'pushkey',
246 b'known',
247 b'known',
247 b'getbundle',
248 b'getbundle',
248 b'unbundle',
249 b'unbundle',
249 }
250 }
250 legacycaps = moderncaps.union({b'changegroupsubset'})
251 legacycaps = moderncaps.union({b'changegroupsubset'})
251
252
252
253
253 @interfaceutil.implementer(repository.ipeercommandexecutor)
254 @interfaceutil.implementer(repository.ipeercommandexecutor)
254 class localcommandexecutor(object):
255 class localcommandexecutor(object):
255 def __init__(self, peer):
256 def __init__(self, peer):
256 self._peer = peer
257 self._peer = peer
257 self._sent = False
258 self._sent = False
258 self._closed = False
259 self._closed = False
259
260
260 def __enter__(self):
261 def __enter__(self):
261 return self
262 return self
262
263
263 def __exit__(self, exctype, excvalue, exctb):
264 def __exit__(self, exctype, excvalue, exctb):
264 self.close()
265 self.close()
265
266
266 def callcommand(self, command, args):
267 def callcommand(self, command, args):
267 if self._sent:
268 if self._sent:
268 raise error.ProgrammingError(
269 raise error.ProgrammingError(
269 b'callcommand() cannot be used after sendcommands()'
270 b'callcommand() cannot be used after sendcommands()'
270 )
271 )
271
272
272 if self._closed:
273 if self._closed:
273 raise error.ProgrammingError(
274 raise error.ProgrammingError(
274 b'callcommand() cannot be used after close()'
275 b'callcommand() cannot be used after close()'
275 )
276 )
276
277
277 # We don't need to support anything fancy. Just call the named
278 # We don't need to support anything fancy. Just call the named
278 # method on the peer and return a resolved future.
279 # method on the peer and return a resolved future.
279 fn = getattr(self._peer, pycompat.sysstr(command))
280 fn = getattr(self._peer, pycompat.sysstr(command))
280
281
281 f = pycompat.futures.Future()
282 f = futures.Future()
282
283
283 try:
284 try:
284 result = fn(**pycompat.strkwargs(args))
285 result = fn(**pycompat.strkwargs(args))
285 except Exception:
286 except Exception:
286 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
287 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
287 else:
288 else:
288 f.set_result(result)
289 f.set_result(result)
289
290
290 return f
291 return f
291
292
292 def sendcommands(self):
293 def sendcommands(self):
293 self._sent = True
294 self._sent = True
294
295
295 def close(self):
296 def close(self):
296 self._closed = True
297 self._closed = True
297
298
298
299
299 @interfaceutil.implementer(repository.ipeercommands)
300 @interfaceutil.implementer(repository.ipeercommands)
300 class localpeer(repository.peer):
301 class localpeer(repository.peer):
301 '''peer for a local repo; reflects only the most recent API'''
302 '''peer for a local repo; reflects only the most recent API'''
302
303
303 def __init__(self, repo, caps=None):
304 def __init__(self, repo, caps=None):
304 super(localpeer, self).__init__()
305 super(localpeer, self).__init__()
305
306
306 if caps is None:
307 if caps is None:
307 caps = moderncaps.copy()
308 caps = moderncaps.copy()
308 self._repo = repo.filtered(b'served')
309 self._repo = repo.filtered(b'served')
309 self.ui = repo.ui
310 self.ui = repo.ui
310
311
311 if repo._wanted_sidedata:
312 if repo._wanted_sidedata:
312 formatted = bundle2.format_remote_wanted_sidedata(repo)
313 formatted = bundle2.format_remote_wanted_sidedata(repo)
313 caps.add(b'exp-wanted-sidedata=' + formatted)
314 caps.add(b'exp-wanted-sidedata=' + formatted)
314
315
315 self._caps = repo._restrictcapabilities(caps)
316 self._caps = repo._restrictcapabilities(caps)
316
317
317 # Begin of _basepeer interface.
318 # Begin of _basepeer interface.
318
319
319 def url(self):
320 def url(self):
320 return self._repo.url()
321 return self._repo.url()
321
322
322 def local(self):
323 def local(self):
323 return self._repo
324 return self._repo
324
325
325 def peer(self):
326 def peer(self):
326 return self
327 return self
327
328
328 def canpush(self):
329 def canpush(self):
329 return True
330 return True
330
331
331 def close(self):
332 def close(self):
332 self._repo.close()
333 self._repo.close()
333
334
334 # End of _basepeer interface.
335 # End of _basepeer interface.
335
336
336 # Begin of _basewirecommands interface.
337 # Begin of _basewirecommands interface.
337
338
338 def branchmap(self):
339 def branchmap(self):
339 return self._repo.branchmap()
340 return self._repo.branchmap()
340
341
341 def capabilities(self):
342 def capabilities(self):
342 return self._caps
343 return self._caps
343
344
344 def clonebundles(self):
345 def clonebundles(self):
345 return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE)
346 return self._repo.tryread(bundlecaches.CB_MANIFEST_FILE)
346
347
347 def debugwireargs(self, one, two, three=None, four=None, five=None):
348 def debugwireargs(self, one, two, three=None, four=None, five=None):
348 """Used to test argument passing over the wire"""
349 """Used to test argument passing over the wire"""
349 return b"%s %s %s %s %s" % (
350 return b"%s %s %s %s %s" % (
350 one,
351 one,
351 two,
352 two,
352 pycompat.bytestr(three),
353 pycompat.bytestr(three),
353 pycompat.bytestr(four),
354 pycompat.bytestr(four),
354 pycompat.bytestr(five),
355 pycompat.bytestr(five),
355 )
356 )
356
357
357 def getbundle(
358 def getbundle(
358 self,
359 self,
359 source,
360 source,
360 heads=None,
361 heads=None,
361 common=None,
362 common=None,
362 bundlecaps=None,
363 bundlecaps=None,
363 remote_sidedata=None,
364 remote_sidedata=None,
364 **kwargs
365 **kwargs
365 ):
366 ):
366 chunks = exchange.getbundlechunks(
367 chunks = exchange.getbundlechunks(
367 self._repo,
368 self._repo,
368 source,
369 source,
369 heads=heads,
370 heads=heads,
370 common=common,
371 common=common,
371 bundlecaps=bundlecaps,
372 bundlecaps=bundlecaps,
372 remote_sidedata=remote_sidedata,
373 remote_sidedata=remote_sidedata,
373 **kwargs
374 **kwargs
374 )[1]
375 )[1]
375 cb = util.chunkbuffer(chunks)
376 cb = util.chunkbuffer(chunks)
376
377
377 if exchange.bundle2requested(bundlecaps):
378 if exchange.bundle2requested(bundlecaps):
378 # When requesting a bundle2, getbundle returns a stream to make the
379 # When requesting a bundle2, getbundle returns a stream to make the
379 # wire level function happier. We need to build a proper object
380 # wire level function happier. We need to build a proper object
380 # from it in local peer.
381 # from it in local peer.
381 return bundle2.getunbundler(self.ui, cb)
382 return bundle2.getunbundler(self.ui, cb)
382 else:
383 else:
383 return changegroup.getunbundler(b'01', cb, None)
384 return changegroup.getunbundler(b'01', cb, None)
384
385
385 def heads(self):
386 def heads(self):
386 return self._repo.heads()
387 return self._repo.heads()
387
388
388 def known(self, nodes):
389 def known(self, nodes):
389 return self._repo.known(nodes)
390 return self._repo.known(nodes)
390
391
391 def listkeys(self, namespace):
392 def listkeys(self, namespace):
392 return self._repo.listkeys(namespace)
393 return self._repo.listkeys(namespace)
393
394
394 def lookup(self, key):
395 def lookup(self, key):
395 return self._repo.lookup(key)
396 return self._repo.lookup(key)
396
397
397 def pushkey(self, namespace, key, old, new):
398 def pushkey(self, namespace, key, old, new):
398 return self._repo.pushkey(namespace, key, old, new)
399 return self._repo.pushkey(namespace, key, old, new)
399
400
400 def stream_out(self):
401 def stream_out(self):
401 raise error.Abort(_(b'cannot perform stream clone against local peer'))
402 raise error.Abort(_(b'cannot perform stream clone against local peer'))
402
403
403 def unbundle(self, bundle, heads, url):
404 def unbundle(self, bundle, heads, url):
404 """apply a bundle on a repo
405 """apply a bundle on a repo
405
406
406 This function handles the repo locking itself."""
407 This function handles the repo locking itself."""
407 try:
408 try:
408 try:
409 try:
409 bundle = exchange.readbundle(self.ui, bundle, None)
410 bundle = exchange.readbundle(self.ui, bundle, None)
410 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url)
411 ret = exchange.unbundle(self._repo, bundle, heads, b'push', url)
411 if util.safehasattr(ret, b'getchunks'):
412 if util.safehasattr(ret, b'getchunks'):
412 # This is a bundle20 object, turn it into an unbundler.
413 # This is a bundle20 object, turn it into an unbundler.
413 # This little dance should be dropped eventually when the
414 # This little dance should be dropped eventually when the
414 # API is finally improved.
415 # API is finally improved.
415 stream = util.chunkbuffer(ret.getchunks())
416 stream = util.chunkbuffer(ret.getchunks())
416 ret = bundle2.getunbundler(self.ui, stream)
417 ret = bundle2.getunbundler(self.ui, stream)
417 return ret
418 return ret
418 except Exception as exc:
419 except Exception as exc:
419 # If the exception contains output salvaged from a bundle2
420 # If the exception contains output salvaged from a bundle2
420 # reply, we need to make sure it is printed before continuing
421 # reply, we need to make sure it is printed before continuing
421 # to fail. So we build a bundle2 with such output and consume
422 # to fail. So we build a bundle2 with such output and consume
422 # it directly.
423 # it directly.
423 #
424 #
424 # This is not very elegant but allows a "simple" solution for
425 # This is not very elegant but allows a "simple" solution for
425 # issue4594
426 # issue4594
426 output = getattr(exc, '_bundle2salvagedoutput', ())
427 output = getattr(exc, '_bundle2salvagedoutput', ())
427 if output:
428 if output:
428 bundler = bundle2.bundle20(self._repo.ui)
429 bundler = bundle2.bundle20(self._repo.ui)
429 for out in output:
430 for out in output:
430 bundler.addpart(out)
431 bundler.addpart(out)
431 stream = util.chunkbuffer(bundler.getchunks())
432 stream = util.chunkbuffer(bundler.getchunks())
432 b = bundle2.getunbundler(self.ui, stream)
433 b = bundle2.getunbundler(self.ui, stream)
433 bundle2.processbundle(self._repo, b)
434 bundle2.processbundle(self._repo, b)
434 raise
435 raise
435 except error.PushRaced as exc:
436 except error.PushRaced as exc:
436 raise error.ResponseError(
437 raise error.ResponseError(
437 _(b'push failed:'), stringutil.forcebytestr(exc)
438 _(b'push failed:'), stringutil.forcebytestr(exc)
438 )
439 )
439
440
440 # End of _basewirecommands interface.
441 # End of _basewirecommands interface.
441
442
442 # Begin of peer interface.
443 # Begin of peer interface.
443
444
444 def commandexecutor(self):
445 def commandexecutor(self):
445 return localcommandexecutor(self)
446 return localcommandexecutor(self)
446
447
447 # End of peer interface.
448 # End of peer interface.
448
449
449
450
450 @interfaceutil.implementer(repository.ipeerlegacycommands)
451 @interfaceutil.implementer(repository.ipeerlegacycommands)
451 class locallegacypeer(localpeer):
452 class locallegacypeer(localpeer):
452 """peer extension which implements legacy methods too; used for tests with
453 """peer extension which implements legacy methods too; used for tests with
453 restricted capabilities"""
454 restricted capabilities"""
454
455
455 def __init__(self, repo):
456 def __init__(self, repo):
456 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
457 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
457
458
458 # Begin of baselegacywirecommands interface.
459 # Begin of baselegacywirecommands interface.
459
460
460 def between(self, pairs):
461 def between(self, pairs):
461 return self._repo.between(pairs)
462 return self._repo.between(pairs)
462
463
463 def branches(self, nodes):
464 def branches(self, nodes):
464 return self._repo.branches(nodes)
465 return self._repo.branches(nodes)
465
466
466 def changegroup(self, nodes, source):
467 def changegroup(self, nodes, source):
467 outgoing = discovery.outgoing(
468 outgoing = discovery.outgoing(
468 self._repo, missingroots=nodes, ancestorsof=self._repo.heads()
469 self._repo, missingroots=nodes, ancestorsof=self._repo.heads()
469 )
470 )
470 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
471 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
471
472
472 def changegroupsubset(self, bases, heads, source):
473 def changegroupsubset(self, bases, heads, source):
473 outgoing = discovery.outgoing(
474 outgoing = discovery.outgoing(
474 self._repo, missingroots=bases, ancestorsof=heads
475 self._repo, missingroots=bases, ancestorsof=heads
475 )
476 )
476 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
477 return changegroup.makechangegroup(self._repo, outgoing, b'01', source)
477
478
478 # End of baselegacywirecommands interface.
479 # End of baselegacywirecommands interface.
479
480
480
481
481 # Functions receiving (ui, features) that extensions can register to impact
482 # Functions receiving (ui, features) that extensions can register to impact
482 # the ability to load repositories with custom requirements. Only
483 # the ability to load repositories with custom requirements. Only
483 # functions defined in loaded extensions are called.
484 # functions defined in loaded extensions are called.
484 #
485 #
485 # The function receives a set of requirement strings that the repository
486 # The function receives a set of requirement strings that the repository
486 # is capable of opening. Functions will typically add elements to the
487 # is capable of opening. Functions will typically add elements to the
487 # set to reflect that the extension knows how to handle that requirements.
488 # set to reflect that the extension knows how to handle that requirements.
488 featuresetupfuncs = set()
489 featuresetupfuncs = set()
489
490
490
491
491 def _getsharedvfs(hgvfs, requirements):
492 def _getsharedvfs(hgvfs, requirements):
492 """returns the vfs object pointing to root of shared source
493 """returns the vfs object pointing to root of shared source
493 repo for a shared repository
494 repo for a shared repository
494
495
495 hgvfs is vfs pointing at .hg/ of current repo (shared one)
496 hgvfs is vfs pointing at .hg/ of current repo (shared one)
496 requirements is a set of requirements of current repo (shared one)
497 requirements is a set of requirements of current repo (shared one)
497 """
498 """
498 # The ``shared`` or ``relshared`` requirements indicate the
499 # The ``shared`` or ``relshared`` requirements indicate the
499 # store lives in the path contained in the ``.hg/sharedpath`` file.
500 # store lives in the path contained in the ``.hg/sharedpath`` file.
500 # This is an absolute path for ``shared`` and relative to
501 # This is an absolute path for ``shared`` and relative to
501 # ``.hg/`` for ``relshared``.
502 # ``.hg/`` for ``relshared``.
502 sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n')
503 sharedpath = hgvfs.read(b'sharedpath').rstrip(b'\n')
503 if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements:
504 if requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements:
504 sharedpath = util.normpath(hgvfs.join(sharedpath))
505 sharedpath = util.normpath(hgvfs.join(sharedpath))
505
506
506 sharedvfs = vfsmod.vfs(sharedpath, realpath=True)
507 sharedvfs = vfsmod.vfs(sharedpath, realpath=True)
507
508
508 if not sharedvfs.exists():
509 if not sharedvfs.exists():
509 raise error.RepoError(
510 raise error.RepoError(
510 _(b'.hg/sharedpath points to nonexistent directory %s')
511 _(b'.hg/sharedpath points to nonexistent directory %s')
511 % sharedvfs.base
512 % sharedvfs.base
512 )
513 )
513 return sharedvfs
514 return sharedvfs
514
515
515
516
516 def _readrequires(vfs, allowmissing):
517 def _readrequires(vfs, allowmissing):
517 """reads the require file present at root of this vfs
518 """reads the require file present at root of this vfs
518 and return a set of requirements
519 and return a set of requirements
519
520
520 If allowmissing is True, we suppress ENOENT if raised"""
521 If allowmissing is True, we suppress ENOENT if raised"""
521 # requires file contains a newline-delimited list of
522 # requires file contains a newline-delimited list of
522 # features/capabilities the opener (us) must have in order to use
523 # features/capabilities the opener (us) must have in order to use
523 # the repository. This file was introduced in Mercurial 0.9.2,
524 # the repository. This file was introduced in Mercurial 0.9.2,
524 # which means very old repositories may not have one. We assume
525 # which means very old repositories may not have one. We assume
525 # a missing file translates to no requirements.
526 # a missing file translates to no requirements.
526 try:
527 try:
527 requirements = set(vfs.read(b'requires').splitlines())
528 requirements = set(vfs.read(b'requires').splitlines())
528 except IOError as e:
529 except IOError as e:
529 if not (allowmissing and e.errno == errno.ENOENT):
530 if not (allowmissing and e.errno == errno.ENOENT):
530 raise
531 raise
531 requirements = set()
532 requirements = set()
532 return requirements
533 return requirements
533
534
534
535
535 def makelocalrepository(baseui, path, intents=None):
536 def makelocalrepository(baseui, path, intents=None):
536 """Create a local repository object.
537 """Create a local repository object.
537
538
538 Given arguments needed to construct a local repository, this function
539 Given arguments needed to construct a local repository, this function
539 performs various early repository loading functionality (such as
540 performs various early repository loading functionality (such as
540 reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that
541 reading the ``.hg/requires`` and ``.hg/hgrc`` files), validates that
541 the repository can be opened, derives a type suitable for representing
542 the repository can be opened, derives a type suitable for representing
542 that repository, and returns an instance of it.
543 that repository, and returns an instance of it.
543
544
544 The returned object conforms to the ``repository.completelocalrepository``
545 The returned object conforms to the ``repository.completelocalrepository``
545 interface.
546 interface.
546
547
547 The repository type is derived by calling a series of factory functions
548 The repository type is derived by calling a series of factory functions
548 for each aspect/interface of the final repository. These are defined by
549 for each aspect/interface of the final repository. These are defined by
549 ``REPO_INTERFACES``.
550 ``REPO_INTERFACES``.
550
551
551 Each factory function is called to produce a type implementing a specific
552 Each factory function is called to produce a type implementing a specific
552 interface. The cumulative list of returned types will be combined into a
553 interface. The cumulative list of returned types will be combined into a
553 new type and that type will be instantiated to represent the local
554 new type and that type will be instantiated to represent the local
554 repository.
555 repository.
555
556
556 The factory functions each receive various state that may be consulted
557 The factory functions each receive various state that may be consulted
557 as part of deriving a type.
558 as part of deriving a type.
558
559
559 Extensions should wrap these factory functions to customize repository type
560 Extensions should wrap these factory functions to customize repository type
560 creation. Note that an extension's wrapped function may be called even if
561 creation. Note that an extension's wrapped function may be called even if
561 that extension is not loaded for the repo being constructed. Extensions
562 that extension is not loaded for the repo being constructed. Extensions
562 should check if their ``__name__`` appears in the
563 should check if their ``__name__`` appears in the
563 ``extensionmodulenames`` set passed to the factory function and no-op if
564 ``extensionmodulenames`` set passed to the factory function and no-op if
564 not.
565 not.
565 """
566 """
566 ui = baseui.copy()
567 ui = baseui.copy()
567 # Prevent copying repo configuration.
568 # Prevent copying repo configuration.
568 ui.copy = baseui.copy
569 ui.copy = baseui.copy
569
570
570 # Working directory VFS rooted at repository root.
571 # Working directory VFS rooted at repository root.
571 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
572 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
572
573
573 # Main VFS for .hg/ directory.
574 # Main VFS for .hg/ directory.
574 hgpath = wdirvfs.join(b'.hg')
575 hgpath = wdirvfs.join(b'.hg')
575 hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
576 hgvfs = vfsmod.vfs(hgpath, cacheaudited=True)
576 # Whether this repository is shared one or not
577 # Whether this repository is shared one or not
577 shared = False
578 shared = False
578 # If this repository is shared, vfs pointing to shared repo
579 # If this repository is shared, vfs pointing to shared repo
579 sharedvfs = None
580 sharedvfs = None
580
581
581 # The .hg/ path should exist and should be a directory. All other
582 # The .hg/ path should exist and should be a directory. All other
582 # cases are errors.
583 # cases are errors.
583 if not hgvfs.isdir():
584 if not hgvfs.isdir():
584 try:
585 try:
585 hgvfs.stat()
586 hgvfs.stat()
586 except OSError as e:
587 except OSError as e:
587 if e.errno != errno.ENOENT:
588 if e.errno != errno.ENOENT:
588 raise
589 raise
589 except ValueError as e:
590 except ValueError as e:
590 # Can be raised on Python 3.8 when path is invalid.
591 # Can be raised on Python 3.8 when path is invalid.
591 raise error.Abort(
592 raise error.Abort(
592 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
593 _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e))
593 )
594 )
594
595
595 raise error.RepoError(_(b'repository %s not found') % path)
596 raise error.RepoError(_(b'repository %s not found') % path)
596
597
597 requirements = _readrequires(hgvfs, True)
598 requirements = _readrequires(hgvfs, True)
598 shared = (
599 shared = (
599 requirementsmod.SHARED_REQUIREMENT in requirements
600 requirementsmod.SHARED_REQUIREMENT in requirements
600 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
601 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
601 )
602 )
602 storevfs = None
603 storevfs = None
603 if shared:
604 if shared:
604 # This is a shared repo
605 # This is a shared repo
605 sharedvfs = _getsharedvfs(hgvfs, requirements)
606 sharedvfs = _getsharedvfs(hgvfs, requirements)
606 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
607 storevfs = vfsmod.vfs(sharedvfs.join(b'store'))
607 else:
608 else:
608 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
609 storevfs = vfsmod.vfs(hgvfs.join(b'store'))
609
610
610 # if .hg/requires contains the sharesafe requirement, it means
611 # if .hg/requires contains the sharesafe requirement, it means
611 # there exists a `.hg/store/requires` too and we should read it
612 # there exists a `.hg/store/requires` too and we should read it
612 # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
613 # NOTE: presence of SHARESAFE_REQUIREMENT imply that store requirement
613 # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
614 # is present. We never write SHARESAFE_REQUIREMENT for a repo if store
614 # is not present, refer checkrequirementscompat() for that
615 # is not present, refer checkrequirementscompat() for that
615 #
616 #
616 # However, if SHARESAFE_REQUIREMENT is not present, it means that the
617 # However, if SHARESAFE_REQUIREMENT is not present, it means that the
617 # repository was shared the old way. We check the share source .hg/requires
618 # repository was shared the old way. We check the share source .hg/requires
618 # for SHARESAFE_REQUIREMENT to detect whether the current repository needs
619 # for SHARESAFE_REQUIREMENT to detect whether the current repository needs
619 # to be reshared
620 # to be reshared
620 hint = _(b"see `hg help config.format.use-share-safe` for more information")
621 hint = _(b"see `hg help config.format.use-share-safe` for more information")
621 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
622 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
622
623
623 if (
624 if (
624 shared
625 shared
625 and requirementsmod.SHARESAFE_REQUIREMENT
626 and requirementsmod.SHARESAFE_REQUIREMENT
626 not in _readrequires(sharedvfs, True)
627 not in _readrequires(sharedvfs, True)
627 ):
628 ):
628 mismatch_warn = ui.configbool(
629 mismatch_warn = ui.configbool(
629 b'share', b'safe-mismatch.source-not-safe.warn'
630 b'share', b'safe-mismatch.source-not-safe.warn'
630 )
631 )
631 mismatch_config = ui.config(
632 mismatch_config = ui.config(
632 b'share', b'safe-mismatch.source-not-safe'
633 b'share', b'safe-mismatch.source-not-safe'
633 )
634 )
634 if mismatch_config in (
635 if mismatch_config in (
635 b'downgrade-allow',
636 b'downgrade-allow',
636 b'allow',
637 b'allow',
637 b'downgrade-abort',
638 b'downgrade-abort',
638 ):
639 ):
639 # prevent cyclic import localrepo -> upgrade -> localrepo
640 # prevent cyclic import localrepo -> upgrade -> localrepo
640 from . import upgrade
641 from . import upgrade
641
642
642 upgrade.downgrade_share_to_non_safe(
643 upgrade.downgrade_share_to_non_safe(
643 ui,
644 ui,
644 hgvfs,
645 hgvfs,
645 sharedvfs,
646 sharedvfs,
646 requirements,
647 requirements,
647 mismatch_config,
648 mismatch_config,
648 mismatch_warn,
649 mismatch_warn,
649 )
650 )
650 elif mismatch_config == b'abort':
651 elif mismatch_config == b'abort':
651 raise error.Abort(
652 raise error.Abort(
652 _(b"share source does not support share-safe requirement"),
653 _(b"share source does not support share-safe requirement"),
653 hint=hint,
654 hint=hint,
654 )
655 )
655 else:
656 else:
656 raise error.Abort(
657 raise error.Abort(
657 _(
658 _(
658 b"share-safe mismatch with source.\nUnrecognized"
659 b"share-safe mismatch with source.\nUnrecognized"
659 b" value '%s' of `share.safe-mismatch.source-not-safe`"
660 b" value '%s' of `share.safe-mismatch.source-not-safe`"
660 b" set."
661 b" set."
661 )
662 )
662 % mismatch_config,
663 % mismatch_config,
663 hint=hint,
664 hint=hint,
664 )
665 )
665 else:
666 else:
666 requirements |= _readrequires(storevfs, False)
667 requirements |= _readrequires(storevfs, False)
667 elif shared:
668 elif shared:
668 sourcerequires = _readrequires(sharedvfs, False)
669 sourcerequires = _readrequires(sharedvfs, False)
669 if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
670 if requirementsmod.SHARESAFE_REQUIREMENT in sourcerequires:
670 mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe')
671 mismatch_config = ui.config(b'share', b'safe-mismatch.source-safe')
671 mismatch_warn = ui.configbool(
672 mismatch_warn = ui.configbool(
672 b'share', b'safe-mismatch.source-safe.warn'
673 b'share', b'safe-mismatch.source-safe.warn'
673 )
674 )
674 if mismatch_config in (
675 if mismatch_config in (
675 b'upgrade-allow',
676 b'upgrade-allow',
676 b'allow',
677 b'allow',
677 b'upgrade-abort',
678 b'upgrade-abort',
678 ):
679 ):
679 # prevent cyclic import localrepo -> upgrade -> localrepo
680 # prevent cyclic import localrepo -> upgrade -> localrepo
680 from . import upgrade
681 from . import upgrade
681
682
682 upgrade.upgrade_share_to_safe(
683 upgrade.upgrade_share_to_safe(
683 ui,
684 ui,
684 hgvfs,
685 hgvfs,
685 storevfs,
686 storevfs,
686 requirements,
687 requirements,
687 mismatch_config,
688 mismatch_config,
688 mismatch_warn,
689 mismatch_warn,
689 )
690 )
690 elif mismatch_config == b'abort':
691 elif mismatch_config == b'abort':
691 raise error.Abort(
692 raise error.Abort(
692 _(
693 _(
693 b'version mismatch: source uses share-safe'
694 b'version mismatch: source uses share-safe'
694 b' functionality while the current share does not'
695 b' functionality while the current share does not'
695 ),
696 ),
696 hint=hint,
697 hint=hint,
697 )
698 )
698 else:
699 else:
699 raise error.Abort(
700 raise error.Abort(
700 _(
701 _(
701 b"share-safe mismatch with source.\nUnrecognized"
702 b"share-safe mismatch with source.\nUnrecognized"
702 b" value '%s' of `share.safe-mismatch.source-safe` set."
703 b" value '%s' of `share.safe-mismatch.source-safe` set."
703 )
704 )
704 % mismatch_config,
705 % mismatch_config,
705 hint=hint,
706 hint=hint,
706 )
707 )
707
708
708 # The .hg/hgrc file may load extensions or contain config options
709 # The .hg/hgrc file may load extensions or contain config options
709 # that influence repository construction. Attempt to load it and
710 # that influence repository construction. Attempt to load it and
710 # process any new extensions that it may have pulled in.
711 # process any new extensions that it may have pulled in.
711 if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
712 if loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs):
712 afterhgrcload(ui, wdirvfs, hgvfs, requirements)
713 afterhgrcload(ui, wdirvfs, hgvfs, requirements)
713 extensions.loadall(ui)
714 extensions.loadall(ui)
714 extensions.populateui(ui)
715 extensions.populateui(ui)
715
716
716 # Set of module names of extensions loaded for this repository.
717 # Set of module names of extensions loaded for this repository.
717 extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)}
718 extensionmodulenames = {m.__name__ for n, m in extensions.extensions(ui)}
718
719
719 supportedrequirements = gathersupportedrequirements(ui)
720 supportedrequirements = gathersupportedrequirements(ui)
720
721
721 # We first validate the requirements are known.
722 # We first validate the requirements are known.
722 ensurerequirementsrecognized(requirements, supportedrequirements)
723 ensurerequirementsrecognized(requirements, supportedrequirements)
723
724
724 # Then we validate that the known set is reasonable to use together.
725 # Then we validate that the known set is reasonable to use together.
725 ensurerequirementscompatible(ui, requirements)
726 ensurerequirementscompatible(ui, requirements)
726
727
727 # TODO there are unhandled edge cases related to opening repositories with
728 # TODO there are unhandled edge cases related to opening repositories with
728 # shared storage. If storage is shared, we should also test for requirements
729 # shared storage. If storage is shared, we should also test for requirements
729 # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in
730 # compatibility in the pointed-to repo. This entails loading the .hg/hgrc in
730 # that repo, as that repo may load extensions needed to open it. This is a
731 # that repo, as that repo may load extensions needed to open it. This is a
731 # bit complicated because we don't want the other hgrc to overwrite settings
732 # bit complicated because we don't want the other hgrc to overwrite settings
732 # in this hgrc.
733 # in this hgrc.
733 #
734 #
734 # This bug is somewhat mitigated by the fact that we copy the .hg/requires
735 # This bug is somewhat mitigated by the fact that we copy the .hg/requires
735 # file when sharing repos. But if a requirement is added after the share is
736 # file when sharing repos. But if a requirement is added after the share is
736 # performed, thereby introducing a new requirement for the opener, we may
737 # performed, thereby introducing a new requirement for the opener, we may
737 # will not see that and could encounter a run-time error interacting with
738 # will not see that and could encounter a run-time error interacting with
738 # that shared store since it has an unknown-to-us requirement.
739 # that shared store since it has an unknown-to-us requirement.
739
740
740 # At this point, we know we should be capable of opening the repository.
741 # At this point, we know we should be capable of opening the repository.
741 # Now get on with doing that.
742 # Now get on with doing that.
742
743
743 features = set()
744 features = set()
744
745
745 # The "store" part of the repository holds versioned data. How it is
746 # The "store" part of the repository holds versioned data. How it is
746 # accessed is determined by various requirements. If `shared` or
747 # accessed is determined by various requirements. If `shared` or
747 # `relshared` requirements are present, this indicates current repository
748 # `relshared` requirements are present, this indicates current repository
748 # is a share and store exists in path mentioned in `.hg/sharedpath`
749 # is a share and store exists in path mentioned in `.hg/sharedpath`
749 if shared:
750 if shared:
750 storebasepath = sharedvfs.base
751 storebasepath = sharedvfs.base
751 cachepath = sharedvfs.join(b'cache')
752 cachepath = sharedvfs.join(b'cache')
752 features.add(repository.REPO_FEATURE_SHARED_STORAGE)
753 features.add(repository.REPO_FEATURE_SHARED_STORAGE)
753 else:
754 else:
754 storebasepath = hgvfs.base
755 storebasepath = hgvfs.base
755 cachepath = hgvfs.join(b'cache')
756 cachepath = hgvfs.join(b'cache')
756 wcachepath = hgvfs.join(b'wcache')
757 wcachepath = hgvfs.join(b'wcache')
757
758
758 # The store has changed over time and the exact layout is dictated by
759 # The store has changed over time and the exact layout is dictated by
759 # requirements. The store interface abstracts differences across all
760 # requirements. The store interface abstracts differences across all
760 # of them.
761 # of them.
761 store = makestore(
762 store = makestore(
762 requirements,
763 requirements,
763 storebasepath,
764 storebasepath,
764 lambda base: vfsmod.vfs(base, cacheaudited=True),
765 lambda base: vfsmod.vfs(base, cacheaudited=True),
765 )
766 )
766 hgvfs.createmode = store.createmode
767 hgvfs.createmode = store.createmode
767
768
768 storevfs = store.vfs
769 storevfs = store.vfs
769 storevfs.options = resolvestorevfsoptions(ui, requirements, features)
770 storevfs.options = resolvestorevfsoptions(ui, requirements, features)
770
771
771 if (
772 if (
772 requirementsmod.REVLOGV2_REQUIREMENT in requirements
773 requirementsmod.REVLOGV2_REQUIREMENT in requirements
773 or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements
774 or requirementsmod.CHANGELOGV2_REQUIREMENT in requirements
774 ):
775 ):
775 features.add(repository.REPO_FEATURE_SIDE_DATA)
776 features.add(repository.REPO_FEATURE_SIDE_DATA)
776 # the revlogv2 docket introduced race condition that we need to fix
777 # the revlogv2 docket introduced race condition that we need to fix
777 features.discard(repository.REPO_FEATURE_STREAM_CLONE)
778 features.discard(repository.REPO_FEATURE_STREAM_CLONE)
778
779
779 # The cache vfs is used to manage cache files.
780 # The cache vfs is used to manage cache files.
780 cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
781 cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
781 cachevfs.createmode = store.createmode
782 cachevfs.createmode = store.createmode
782 # The cache vfs is used to manage cache files related to the working copy
783 # The cache vfs is used to manage cache files related to the working copy
783 wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True)
784 wcachevfs = vfsmod.vfs(wcachepath, cacheaudited=True)
784 wcachevfs.createmode = store.createmode
785 wcachevfs.createmode = store.createmode
785
786
786 # Now resolve the type for the repository object. We do this by repeatedly
787 # Now resolve the type for the repository object. We do this by repeatedly
787 # calling a factory function to produces types for specific aspects of the
788 # calling a factory function to produces types for specific aspects of the
788 # repo's operation. The aggregate returned types are used as base classes
789 # repo's operation. The aggregate returned types are used as base classes
789 # for a dynamically-derived type, which will represent our new repository.
790 # for a dynamically-derived type, which will represent our new repository.
790
791
791 bases = []
792 bases = []
792 extrastate = {}
793 extrastate = {}
793
794
794 for iface, fn in REPO_INTERFACES:
795 for iface, fn in REPO_INTERFACES:
795 # We pass all potentially useful state to give extensions tons of
796 # We pass all potentially useful state to give extensions tons of
796 # flexibility.
797 # flexibility.
797 typ = fn()(
798 typ = fn()(
798 ui=ui,
799 ui=ui,
799 intents=intents,
800 intents=intents,
800 requirements=requirements,
801 requirements=requirements,
801 features=features,
802 features=features,
802 wdirvfs=wdirvfs,
803 wdirvfs=wdirvfs,
803 hgvfs=hgvfs,
804 hgvfs=hgvfs,
804 store=store,
805 store=store,
805 storevfs=storevfs,
806 storevfs=storevfs,
806 storeoptions=storevfs.options,
807 storeoptions=storevfs.options,
807 cachevfs=cachevfs,
808 cachevfs=cachevfs,
808 wcachevfs=wcachevfs,
809 wcachevfs=wcachevfs,
809 extensionmodulenames=extensionmodulenames,
810 extensionmodulenames=extensionmodulenames,
810 extrastate=extrastate,
811 extrastate=extrastate,
811 baseclasses=bases,
812 baseclasses=bases,
812 )
813 )
813
814
814 if not isinstance(typ, type):
815 if not isinstance(typ, type):
815 raise error.ProgrammingError(
816 raise error.ProgrammingError(
816 b'unable to construct type for %s' % iface
817 b'unable to construct type for %s' % iface
817 )
818 )
818
819
819 bases.append(typ)
820 bases.append(typ)
820
821
821 # type() allows you to use characters in type names that wouldn't be
822 # type() allows you to use characters in type names that wouldn't be
822 # recognized as Python symbols in source code. We abuse that to add
823 # recognized as Python symbols in source code. We abuse that to add
823 # rich information about our constructed repo.
824 # rich information about our constructed repo.
824 name = pycompat.sysstr(
825 name = pycompat.sysstr(
825 b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements)))
826 b'derivedrepo:%s<%s>' % (wdirvfs.base, b','.join(sorted(requirements)))
826 )
827 )
827
828
828 cls = type(name, tuple(bases), {})
829 cls = type(name, tuple(bases), {})
829
830
830 return cls(
831 return cls(
831 baseui=baseui,
832 baseui=baseui,
832 ui=ui,
833 ui=ui,
833 origroot=path,
834 origroot=path,
834 wdirvfs=wdirvfs,
835 wdirvfs=wdirvfs,
835 hgvfs=hgvfs,
836 hgvfs=hgvfs,
836 requirements=requirements,
837 requirements=requirements,
837 supportedrequirements=supportedrequirements,
838 supportedrequirements=supportedrequirements,
838 sharedpath=storebasepath,
839 sharedpath=storebasepath,
839 store=store,
840 store=store,
840 cachevfs=cachevfs,
841 cachevfs=cachevfs,
841 wcachevfs=wcachevfs,
842 wcachevfs=wcachevfs,
842 features=features,
843 features=features,
843 intents=intents,
844 intents=intents,
844 )
845 )
845
846
846
847
847 def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None):
848 def loadhgrc(ui, wdirvfs, hgvfs, requirements, sharedvfs=None):
848 """Load hgrc files/content into a ui instance.
849 """Load hgrc files/content into a ui instance.
849
850
850 This is called during repository opening to load any additional
851 This is called during repository opening to load any additional
851 config files or settings relevant to the current repository.
852 config files or settings relevant to the current repository.
852
853
853 Returns a bool indicating whether any additional configs were loaded.
854 Returns a bool indicating whether any additional configs were loaded.
854
855
855 Extensions should monkeypatch this function to modify how per-repo
856 Extensions should monkeypatch this function to modify how per-repo
856 configs are loaded. For example, an extension may wish to pull in
857 configs are loaded. For example, an extension may wish to pull in
857 configs from alternate files or sources.
858 configs from alternate files or sources.
858
859
859 sharedvfs is vfs object pointing to source repo if the current one is a
860 sharedvfs is vfs object pointing to source repo if the current one is a
860 shared one
861 shared one
861 """
862 """
862 if not rcutil.use_repo_hgrc():
863 if not rcutil.use_repo_hgrc():
863 return False
864 return False
864
865
865 ret = False
866 ret = False
866 # first load config from shared source if we has to
867 # first load config from shared source if we has to
867 if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs:
868 if requirementsmod.SHARESAFE_REQUIREMENT in requirements and sharedvfs:
868 try:
869 try:
869 ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base)
870 ui.readconfig(sharedvfs.join(b'hgrc'), root=sharedvfs.base)
870 ret = True
871 ret = True
871 except IOError:
872 except IOError:
872 pass
873 pass
873
874
874 try:
875 try:
875 ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
876 ui.readconfig(hgvfs.join(b'hgrc'), root=wdirvfs.base)
876 ret = True
877 ret = True
877 except IOError:
878 except IOError:
878 pass
879 pass
879
880
880 try:
881 try:
881 ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base)
882 ui.readconfig(hgvfs.join(b'hgrc-not-shared'), root=wdirvfs.base)
882 ret = True
883 ret = True
883 except IOError:
884 except IOError:
884 pass
885 pass
885
886
886 return ret
887 return ret
887
888
888
889
889 def afterhgrcload(ui, wdirvfs, hgvfs, requirements):
890 def afterhgrcload(ui, wdirvfs, hgvfs, requirements):
890 """Perform additional actions after .hg/hgrc is loaded.
891 """Perform additional actions after .hg/hgrc is loaded.
891
892
892 This function is called during repository loading immediately after
893 This function is called during repository loading immediately after
893 the .hg/hgrc file is loaded and before per-repo extensions are loaded.
894 the .hg/hgrc file is loaded and before per-repo extensions are loaded.
894
895
895 The function can be used to validate configs, automatically add
896 The function can be used to validate configs, automatically add
896 options (including extensions) based on requirements, etc.
897 options (including extensions) based on requirements, etc.
897 """
898 """
898
899
899 # Map of requirements to list of extensions to load automatically when
900 # Map of requirements to list of extensions to load automatically when
900 # requirement is present.
901 # requirement is present.
901 autoextensions = {
902 autoextensions = {
902 b'git': [b'git'],
903 b'git': [b'git'],
903 b'largefiles': [b'largefiles'],
904 b'largefiles': [b'largefiles'],
904 b'lfs': [b'lfs'],
905 b'lfs': [b'lfs'],
905 }
906 }
906
907
907 for requirement, names in sorted(autoextensions.items()):
908 for requirement, names in sorted(autoextensions.items()):
908 if requirement not in requirements:
909 if requirement not in requirements:
909 continue
910 continue
910
911
911 for name in names:
912 for name in names:
912 if not ui.hasconfig(b'extensions', name):
913 if not ui.hasconfig(b'extensions', name):
913 ui.setconfig(b'extensions', name, b'', source=b'autoload')
914 ui.setconfig(b'extensions', name, b'', source=b'autoload')
914
915
915
916
916 def gathersupportedrequirements(ui):
917 def gathersupportedrequirements(ui):
917 """Determine the complete set of recognized requirements."""
918 """Determine the complete set of recognized requirements."""
918 # Start with all requirements supported by this file.
919 # Start with all requirements supported by this file.
919 supported = set(localrepository._basesupported)
920 supported = set(localrepository._basesupported)
920
921
921 # Execute ``featuresetupfuncs`` entries if they belong to an extension
922 # Execute ``featuresetupfuncs`` entries if they belong to an extension
922 # relevant to this ui instance.
923 # relevant to this ui instance.
923 modules = {m.__name__ for n, m in extensions.extensions(ui)}
924 modules = {m.__name__ for n, m in extensions.extensions(ui)}
924
925
925 for fn in featuresetupfuncs:
926 for fn in featuresetupfuncs:
926 if fn.__module__ in modules:
927 if fn.__module__ in modules:
927 fn(ui, supported)
928 fn(ui, supported)
928
929
929 # Add derived requirements from registered compression engines.
930 # Add derived requirements from registered compression engines.
930 for name in util.compengines:
931 for name in util.compengines:
931 engine = util.compengines[name]
932 engine = util.compengines[name]
932 if engine.available() and engine.revlogheader():
933 if engine.available() and engine.revlogheader():
933 supported.add(b'exp-compression-%s' % name)
934 supported.add(b'exp-compression-%s' % name)
934 if engine.name() == b'zstd':
935 if engine.name() == b'zstd':
935 supported.add(requirementsmod.REVLOG_COMPRESSION_ZSTD)
936 supported.add(requirementsmod.REVLOG_COMPRESSION_ZSTD)
936
937
937 return supported
938 return supported
938
939
939
940
940 def ensurerequirementsrecognized(requirements, supported):
941 def ensurerequirementsrecognized(requirements, supported):
941 """Validate that a set of local requirements is recognized.
942 """Validate that a set of local requirements is recognized.
942
943
943 Receives a set of requirements. Raises an ``error.RepoError`` if there
944 Receives a set of requirements. Raises an ``error.RepoError`` if there
944 exists any requirement in that set that currently loaded code doesn't
945 exists any requirement in that set that currently loaded code doesn't
945 recognize.
946 recognize.
946
947
947 Returns a set of supported requirements.
948 Returns a set of supported requirements.
948 """
949 """
949 missing = set()
950 missing = set()
950
951
951 for requirement in requirements:
952 for requirement in requirements:
952 if requirement in supported:
953 if requirement in supported:
953 continue
954 continue
954
955
955 if not requirement or not requirement[0:1].isalnum():
956 if not requirement or not requirement[0:1].isalnum():
956 raise error.RequirementError(_(b'.hg/requires file is corrupt'))
957 raise error.RequirementError(_(b'.hg/requires file is corrupt'))
957
958
958 missing.add(requirement)
959 missing.add(requirement)
959
960
960 if missing:
961 if missing:
961 raise error.RequirementError(
962 raise error.RequirementError(
962 _(b'repository requires features unknown to this Mercurial: %s')
963 _(b'repository requires features unknown to this Mercurial: %s')
963 % b' '.join(sorted(missing)),
964 % b' '.join(sorted(missing)),
964 hint=_(
965 hint=_(
965 b'see https://mercurial-scm.org/wiki/MissingRequirement '
966 b'see https://mercurial-scm.org/wiki/MissingRequirement '
966 b'for more information'
967 b'for more information'
967 ),
968 ),
968 )
969 )
969
970
970
971
971 def ensurerequirementscompatible(ui, requirements):
972 def ensurerequirementscompatible(ui, requirements):
972 """Validates that a set of recognized requirements is mutually compatible.
973 """Validates that a set of recognized requirements is mutually compatible.
973
974
974 Some requirements may not be compatible with others or require
975 Some requirements may not be compatible with others or require
975 config options that aren't enabled. This function is called during
976 config options that aren't enabled. This function is called during
976 repository opening to ensure that the set of requirements needed
977 repository opening to ensure that the set of requirements needed
977 to open a repository is sane and compatible with config options.
978 to open a repository is sane and compatible with config options.
978
979
979 Extensions can monkeypatch this function to perform additional
980 Extensions can monkeypatch this function to perform additional
980 checking.
981 checking.
981
982
982 ``error.RepoError`` should be raised on failure.
983 ``error.RepoError`` should be raised on failure.
983 """
984 """
984 if (
985 if (
985 requirementsmod.SPARSE_REQUIREMENT in requirements
986 requirementsmod.SPARSE_REQUIREMENT in requirements
986 and not sparse.enabled
987 and not sparse.enabled
987 ):
988 ):
988 raise error.RepoError(
989 raise error.RepoError(
989 _(
990 _(
990 b'repository is using sparse feature but '
991 b'repository is using sparse feature but '
991 b'sparse is not enabled; enable the '
992 b'sparse is not enabled; enable the '
992 b'"sparse" extensions to access'
993 b'"sparse" extensions to access'
993 )
994 )
994 )
995 )
995
996
996
997
997 def makestore(requirements, path, vfstype):
998 def makestore(requirements, path, vfstype):
998 """Construct a storage object for a repository."""
999 """Construct a storage object for a repository."""
999 if requirementsmod.STORE_REQUIREMENT in requirements:
1000 if requirementsmod.STORE_REQUIREMENT in requirements:
1000 if requirementsmod.FNCACHE_REQUIREMENT in requirements:
1001 if requirementsmod.FNCACHE_REQUIREMENT in requirements:
1001 dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements
1002 dotencode = requirementsmod.DOTENCODE_REQUIREMENT in requirements
1002 return storemod.fncachestore(path, vfstype, dotencode)
1003 return storemod.fncachestore(path, vfstype, dotencode)
1003
1004
1004 return storemod.encodedstore(path, vfstype)
1005 return storemod.encodedstore(path, vfstype)
1005
1006
1006 return storemod.basicstore(path, vfstype)
1007 return storemod.basicstore(path, vfstype)
1007
1008
1008
1009
1009 def resolvestorevfsoptions(ui, requirements, features):
1010 def resolvestorevfsoptions(ui, requirements, features):
1010 """Resolve the options to pass to the store vfs opener.
1011 """Resolve the options to pass to the store vfs opener.
1011
1012
1012 The returned dict is used to influence behavior of the storage layer.
1013 The returned dict is used to influence behavior of the storage layer.
1013 """
1014 """
1014 options = {}
1015 options = {}
1015
1016
1016 if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements:
1017 if requirementsmod.TREEMANIFEST_REQUIREMENT in requirements:
1017 options[b'treemanifest'] = True
1018 options[b'treemanifest'] = True
1018
1019
1019 # experimental config: format.manifestcachesize
1020 # experimental config: format.manifestcachesize
1020 manifestcachesize = ui.configint(b'format', b'manifestcachesize')
1021 manifestcachesize = ui.configint(b'format', b'manifestcachesize')
1021 if manifestcachesize is not None:
1022 if manifestcachesize is not None:
1022 options[b'manifestcachesize'] = manifestcachesize
1023 options[b'manifestcachesize'] = manifestcachesize
1023
1024
1024 # In the absence of another requirement superseding a revlog-related
1025 # In the absence of another requirement superseding a revlog-related
1025 # requirement, we have to assume the repo is using revlog version 0.
1026 # requirement, we have to assume the repo is using revlog version 0.
1026 # This revlog format is super old and we don't bother trying to parse
1027 # This revlog format is super old and we don't bother trying to parse
1027 # opener options for it because those options wouldn't do anything
1028 # opener options for it because those options wouldn't do anything
1028 # meaningful on such old repos.
1029 # meaningful on such old repos.
1029 if (
1030 if (
1030 requirementsmod.REVLOGV1_REQUIREMENT in requirements
1031 requirementsmod.REVLOGV1_REQUIREMENT in requirements
1031 or requirementsmod.REVLOGV2_REQUIREMENT in requirements
1032 or requirementsmod.REVLOGV2_REQUIREMENT in requirements
1032 ):
1033 ):
1033 options.update(resolverevlogstorevfsoptions(ui, requirements, features))
1034 options.update(resolverevlogstorevfsoptions(ui, requirements, features))
1034 else: # explicitly mark repo as using revlogv0
1035 else: # explicitly mark repo as using revlogv0
1035 options[b'revlogv0'] = True
1036 options[b'revlogv0'] = True
1036
1037
1037 if requirementsmod.COPIESSDC_REQUIREMENT in requirements:
1038 if requirementsmod.COPIESSDC_REQUIREMENT in requirements:
1038 options[b'copies-storage'] = b'changeset-sidedata'
1039 options[b'copies-storage'] = b'changeset-sidedata'
1039 else:
1040 else:
1040 writecopiesto = ui.config(b'experimental', b'copies.write-to')
1041 writecopiesto = ui.config(b'experimental', b'copies.write-to')
1041 copiesextramode = (b'changeset-only', b'compatibility')
1042 copiesextramode = (b'changeset-only', b'compatibility')
1042 if writecopiesto in copiesextramode:
1043 if writecopiesto in copiesextramode:
1043 options[b'copies-storage'] = b'extra'
1044 options[b'copies-storage'] = b'extra'
1044
1045
1045 return options
1046 return options
1046
1047
1047
1048
1048 def resolverevlogstorevfsoptions(ui, requirements, features):
1049 def resolverevlogstorevfsoptions(ui, requirements, features):
1049 """Resolve opener options specific to revlogs."""
1050 """Resolve opener options specific to revlogs."""
1050
1051
1051 options = {}
1052 options = {}
1052 options[b'flagprocessors'] = {}
1053 options[b'flagprocessors'] = {}
1053
1054
1054 if requirementsmod.REVLOGV1_REQUIREMENT in requirements:
1055 if requirementsmod.REVLOGV1_REQUIREMENT in requirements:
1055 options[b'revlogv1'] = True
1056 options[b'revlogv1'] = True
1056 if requirementsmod.REVLOGV2_REQUIREMENT in requirements:
1057 if requirementsmod.REVLOGV2_REQUIREMENT in requirements:
1057 options[b'revlogv2'] = True
1058 options[b'revlogv2'] = True
1058 if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements:
1059 if requirementsmod.CHANGELOGV2_REQUIREMENT in requirements:
1059 options[b'changelogv2'] = True
1060 options[b'changelogv2'] = True
1060
1061
1061 if requirementsmod.GENERALDELTA_REQUIREMENT in requirements:
1062 if requirementsmod.GENERALDELTA_REQUIREMENT in requirements:
1062 options[b'generaldelta'] = True
1063 options[b'generaldelta'] = True
1063
1064
1064 # experimental config: format.chunkcachesize
1065 # experimental config: format.chunkcachesize
1065 chunkcachesize = ui.configint(b'format', b'chunkcachesize')
1066 chunkcachesize = ui.configint(b'format', b'chunkcachesize')
1066 if chunkcachesize is not None:
1067 if chunkcachesize is not None:
1067 options[b'chunkcachesize'] = chunkcachesize
1068 options[b'chunkcachesize'] = chunkcachesize
1068
1069
1069 deltabothparents = ui.configbool(
1070 deltabothparents = ui.configbool(
1070 b'storage', b'revlog.optimize-delta-parent-choice'
1071 b'storage', b'revlog.optimize-delta-parent-choice'
1071 )
1072 )
1072 options[b'deltabothparents'] = deltabothparents
1073 options[b'deltabothparents'] = deltabothparents
1073
1074
1074 issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming')
1075 issue6528 = ui.configbool(b'storage', b'revlog.issue6528.fix-incoming')
1075 options[b'issue6528.fix-incoming'] = issue6528
1076 options[b'issue6528.fix-incoming'] = issue6528
1076
1077
1077 lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta')
1078 lazydelta = ui.configbool(b'storage', b'revlog.reuse-external-delta')
1078 lazydeltabase = False
1079 lazydeltabase = False
1079 if lazydelta:
1080 if lazydelta:
1080 lazydeltabase = ui.configbool(
1081 lazydeltabase = ui.configbool(
1081 b'storage', b'revlog.reuse-external-delta-parent'
1082 b'storage', b'revlog.reuse-external-delta-parent'
1082 )
1083 )
1083 if lazydeltabase is None:
1084 if lazydeltabase is None:
1084 lazydeltabase = not scmutil.gddeltaconfig(ui)
1085 lazydeltabase = not scmutil.gddeltaconfig(ui)
1085 options[b'lazydelta'] = lazydelta
1086 options[b'lazydelta'] = lazydelta
1086 options[b'lazydeltabase'] = lazydeltabase
1087 options[b'lazydeltabase'] = lazydeltabase
1087
1088
1088 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan')
1089 chainspan = ui.configbytes(b'experimental', b'maxdeltachainspan')
1089 if 0 <= chainspan:
1090 if 0 <= chainspan:
1090 options[b'maxdeltachainspan'] = chainspan
1091 options[b'maxdeltachainspan'] = chainspan
1091
1092
1092 mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold')
1093 mmapindexthreshold = ui.configbytes(b'experimental', b'mmapindexthreshold')
1093 if mmapindexthreshold is not None:
1094 if mmapindexthreshold is not None:
1094 options[b'mmapindexthreshold'] = mmapindexthreshold
1095 options[b'mmapindexthreshold'] = mmapindexthreshold
1095
1096
1096 withsparseread = ui.configbool(b'experimental', b'sparse-read')
1097 withsparseread = ui.configbool(b'experimental', b'sparse-read')
1097 srdensitythres = float(
1098 srdensitythres = float(
1098 ui.config(b'experimental', b'sparse-read.density-threshold')
1099 ui.config(b'experimental', b'sparse-read.density-threshold')
1099 )
1100 )
1100 srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size')
1101 srmingapsize = ui.configbytes(b'experimental', b'sparse-read.min-gap-size')
1101 options[b'with-sparse-read'] = withsparseread
1102 options[b'with-sparse-read'] = withsparseread
1102 options[b'sparse-read-density-threshold'] = srdensitythres
1103 options[b'sparse-read-density-threshold'] = srdensitythres
1103 options[b'sparse-read-min-gap-size'] = srmingapsize
1104 options[b'sparse-read-min-gap-size'] = srmingapsize
1104
1105
1105 sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
1106 sparserevlog = requirementsmod.SPARSEREVLOG_REQUIREMENT in requirements
1106 options[b'sparse-revlog'] = sparserevlog
1107 options[b'sparse-revlog'] = sparserevlog
1107 if sparserevlog:
1108 if sparserevlog:
1108 options[b'generaldelta'] = True
1109 options[b'generaldelta'] = True
1109
1110
1110 maxchainlen = None
1111 maxchainlen = None
1111 if sparserevlog:
1112 if sparserevlog:
1112 maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH
1113 maxchainlen = revlogconst.SPARSE_REVLOG_MAX_CHAIN_LENGTH
1113 # experimental config: format.maxchainlen
1114 # experimental config: format.maxchainlen
1114 maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen)
1115 maxchainlen = ui.configint(b'format', b'maxchainlen', maxchainlen)
1115 if maxchainlen is not None:
1116 if maxchainlen is not None:
1116 options[b'maxchainlen'] = maxchainlen
1117 options[b'maxchainlen'] = maxchainlen
1117
1118
1118 for r in requirements:
1119 for r in requirements:
1119 # we allow multiple compression engine requirement to co-exist because
1120 # we allow multiple compression engine requirement to co-exist because
1120 # strickly speaking, revlog seems to support mixed compression style.
1121 # strickly speaking, revlog seems to support mixed compression style.
1121 #
1122 #
1122 # The compression used for new entries will be "the last one"
1123 # The compression used for new entries will be "the last one"
1123 prefix = r.startswith
1124 prefix = r.startswith
1124 if prefix(b'revlog-compression-') or prefix(b'exp-compression-'):
1125 if prefix(b'revlog-compression-') or prefix(b'exp-compression-'):
1125 options[b'compengine'] = r.split(b'-', 2)[2]
1126 options[b'compengine'] = r.split(b'-', 2)[2]
1126
1127
1127 options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level')
1128 options[b'zlib.level'] = ui.configint(b'storage', b'revlog.zlib.level')
1128 if options[b'zlib.level'] is not None:
1129 if options[b'zlib.level'] is not None:
1129 if not (0 <= options[b'zlib.level'] <= 9):
1130 if not (0 <= options[b'zlib.level'] <= 9):
1130 msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d')
1131 msg = _(b'invalid value for `storage.revlog.zlib.level` config: %d')
1131 raise error.Abort(msg % options[b'zlib.level'])
1132 raise error.Abort(msg % options[b'zlib.level'])
1132 options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level')
1133 options[b'zstd.level'] = ui.configint(b'storage', b'revlog.zstd.level')
1133 if options[b'zstd.level'] is not None:
1134 if options[b'zstd.level'] is not None:
1134 if not (0 <= options[b'zstd.level'] <= 22):
1135 if not (0 <= options[b'zstd.level'] <= 22):
1135 msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d')
1136 msg = _(b'invalid value for `storage.revlog.zstd.level` config: %d')
1136 raise error.Abort(msg % options[b'zstd.level'])
1137 raise error.Abort(msg % options[b'zstd.level'])
1137
1138
1138 if requirementsmod.NARROW_REQUIREMENT in requirements:
1139 if requirementsmod.NARROW_REQUIREMENT in requirements:
1139 options[b'enableellipsis'] = True
1140 options[b'enableellipsis'] = True
1140
1141
1141 if ui.configbool(b'experimental', b'rust.index'):
1142 if ui.configbool(b'experimental', b'rust.index'):
1142 options[b'rust.index'] = True
1143 options[b'rust.index'] = True
1143 if requirementsmod.NODEMAP_REQUIREMENT in requirements:
1144 if requirementsmod.NODEMAP_REQUIREMENT in requirements:
1144 slow_path = ui.config(
1145 slow_path = ui.config(
1145 b'storage', b'revlog.persistent-nodemap.slow-path'
1146 b'storage', b'revlog.persistent-nodemap.slow-path'
1146 )
1147 )
1147 if slow_path not in (b'allow', b'warn', b'abort'):
1148 if slow_path not in (b'allow', b'warn', b'abort'):
1148 default = ui.config_default(
1149 default = ui.config_default(
1149 b'storage', b'revlog.persistent-nodemap.slow-path'
1150 b'storage', b'revlog.persistent-nodemap.slow-path'
1150 )
1151 )
1151 msg = _(
1152 msg = _(
1152 b'unknown value for config '
1153 b'unknown value for config '
1153 b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
1154 b'"storage.revlog.persistent-nodemap.slow-path": "%s"\n'
1154 )
1155 )
1155 ui.warn(msg % slow_path)
1156 ui.warn(msg % slow_path)
1156 if not ui.quiet:
1157 if not ui.quiet:
1157 ui.warn(_(b'falling back to default value: %s\n') % default)
1158 ui.warn(_(b'falling back to default value: %s\n') % default)
1158 slow_path = default
1159 slow_path = default
1159
1160
1160 msg = _(
1161 msg = _(
1161 b"accessing `persistent-nodemap` repository without associated "
1162 b"accessing `persistent-nodemap` repository without associated "
1162 b"fast implementation."
1163 b"fast implementation."
1163 )
1164 )
1164 hint = _(
1165 hint = _(
1165 b"check `hg help config.format.use-persistent-nodemap` "
1166 b"check `hg help config.format.use-persistent-nodemap` "
1166 b"for details"
1167 b"for details"
1167 )
1168 )
1168 if not revlog.HAS_FAST_PERSISTENT_NODEMAP:
1169 if not revlog.HAS_FAST_PERSISTENT_NODEMAP:
1169 if slow_path == b'warn':
1170 if slow_path == b'warn':
1170 msg = b"warning: " + msg + b'\n'
1171 msg = b"warning: " + msg + b'\n'
1171 ui.warn(msg)
1172 ui.warn(msg)
1172 if not ui.quiet:
1173 if not ui.quiet:
1173 hint = b'(' + hint + b')\n'
1174 hint = b'(' + hint + b')\n'
1174 ui.warn(hint)
1175 ui.warn(hint)
1175 if slow_path == b'abort':
1176 if slow_path == b'abort':
1176 raise error.Abort(msg, hint=hint)
1177 raise error.Abort(msg, hint=hint)
1177 options[b'persistent-nodemap'] = True
1178 options[b'persistent-nodemap'] = True
1178 if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements:
1179 if requirementsmod.DIRSTATE_V2_REQUIREMENT in requirements:
1179 slow_path = ui.config(b'storage', b'dirstate-v2.slow-path')
1180 slow_path = ui.config(b'storage', b'dirstate-v2.slow-path')
1180 if slow_path not in (b'allow', b'warn', b'abort'):
1181 if slow_path not in (b'allow', b'warn', b'abort'):
1181 default = ui.config_default(b'storage', b'dirstate-v2.slow-path')
1182 default = ui.config_default(b'storage', b'dirstate-v2.slow-path')
1182 msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n')
1183 msg = _(b'unknown value for config "dirstate-v2.slow-path": "%s"\n')
1183 ui.warn(msg % slow_path)
1184 ui.warn(msg % slow_path)
1184 if not ui.quiet:
1185 if not ui.quiet:
1185 ui.warn(_(b'falling back to default value: %s\n') % default)
1186 ui.warn(_(b'falling back to default value: %s\n') % default)
1186 slow_path = default
1187 slow_path = default
1187
1188
1188 msg = _(
1189 msg = _(
1189 b"accessing `dirstate-v2` repository without associated "
1190 b"accessing `dirstate-v2` repository without associated "
1190 b"fast implementation."
1191 b"fast implementation."
1191 )
1192 )
1192 hint = _(
1193 hint = _(
1193 b"check `hg help config.format.use-dirstate-v2` " b"for details"
1194 b"check `hg help config.format.use-dirstate-v2` " b"for details"
1194 )
1195 )
1195 if not dirstate.HAS_FAST_DIRSTATE_V2:
1196 if not dirstate.HAS_FAST_DIRSTATE_V2:
1196 if slow_path == b'warn':
1197 if slow_path == b'warn':
1197 msg = b"warning: " + msg + b'\n'
1198 msg = b"warning: " + msg + b'\n'
1198 ui.warn(msg)
1199 ui.warn(msg)
1199 if not ui.quiet:
1200 if not ui.quiet:
1200 hint = b'(' + hint + b')\n'
1201 hint = b'(' + hint + b')\n'
1201 ui.warn(hint)
1202 ui.warn(hint)
1202 if slow_path == b'abort':
1203 if slow_path == b'abort':
1203 raise error.Abort(msg, hint=hint)
1204 raise error.Abort(msg, hint=hint)
1204 if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
1205 if ui.configbool(b'storage', b'revlog.persistent-nodemap.mmap'):
1205 options[b'persistent-nodemap.mmap'] = True
1206 options[b'persistent-nodemap.mmap'] = True
1206 if ui.configbool(b'devel', b'persistent-nodemap'):
1207 if ui.configbool(b'devel', b'persistent-nodemap'):
1207 options[b'devel-force-nodemap'] = True
1208 options[b'devel-force-nodemap'] = True
1208
1209
1209 return options
1210 return options
1210
1211
1211
1212
1212 def makemain(**kwargs):
1213 def makemain(**kwargs):
1213 """Produce a type conforming to ``ilocalrepositorymain``."""
1214 """Produce a type conforming to ``ilocalrepositorymain``."""
1214 return localrepository
1215 return localrepository
1215
1216
1216
1217
1217 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1218 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1218 class revlogfilestorage(object):
1219 class revlogfilestorage(object):
1219 """File storage when using revlogs."""
1220 """File storage when using revlogs."""
1220
1221
1221 def file(self, path):
1222 def file(self, path):
1222 if path.startswith(b'/'):
1223 if path.startswith(b'/'):
1223 path = path[1:]
1224 path = path[1:]
1224
1225
1225 return filelog.filelog(self.svfs, path)
1226 return filelog.filelog(self.svfs, path)
1226
1227
1227
1228
1228 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1229 @interfaceutil.implementer(repository.ilocalrepositoryfilestorage)
1229 class revlognarrowfilestorage(object):
1230 class revlognarrowfilestorage(object):
1230 """File storage when using revlogs and narrow files."""
1231 """File storage when using revlogs and narrow files."""
1231
1232
1232 def file(self, path):
1233 def file(self, path):
1233 if path.startswith(b'/'):
1234 if path.startswith(b'/'):
1234 path = path[1:]
1235 path = path[1:]
1235
1236
1236 return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch)
1237 return filelog.narrowfilelog(self.svfs, path, self._storenarrowmatch)
1237
1238
1238
1239
1239 def makefilestorage(requirements, features, **kwargs):
1240 def makefilestorage(requirements, features, **kwargs):
1240 """Produce a type conforming to ``ilocalrepositoryfilestorage``."""
1241 """Produce a type conforming to ``ilocalrepositoryfilestorage``."""
1241 features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE)
1242 features.add(repository.REPO_FEATURE_REVLOG_FILE_STORAGE)
1242 features.add(repository.REPO_FEATURE_STREAM_CLONE)
1243 features.add(repository.REPO_FEATURE_STREAM_CLONE)
1243
1244
1244 if requirementsmod.NARROW_REQUIREMENT in requirements:
1245 if requirementsmod.NARROW_REQUIREMENT in requirements:
1245 return revlognarrowfilestorage
1246 return revlognarrowfilestorage
1246 else:
1247 else:
1247 return revlogfilestorage
1248 return revlogfilestorage
1248
1249
1249
1250
1250 # List of repository interfaces and factory functions for them. Each
1251 # List of repository interfaces and factory functions for them. Each
1251 # will be called in order during ``makelocalrepository()`` to iteratively
1252 # will be called in order during ``makelocalrepository()`` to iteratively
1252 # derive the final type for a local repository instance. We capture the
1253 # derive the final type for a local repository instance. We capture the
1253 # function as a lambda so we don't hold a reference and the module-level
1254 # function as a lambda so we don't hold a reference and the module-level
1254 # functions can be wrapped.
1255 # functions can be wrapped.
1255 REPO_INTERFACES = [
1256 REPO_INTERFACES = [
1256 (repository.ilocalrepositorymain, lambda: makemain),
1257 (repository.ilocalrepositorymain, lambda: makemain),
1257 (repository.ilocalrepositoryfilestorage, lambda: makefilestorage),
1258 (repository.ilocalrepositoryfilestorage, lambda: makefilestorage),
1258 ]
1259 ]
1259
1260
1260
1261
1261 @interfaceutil.implementer(repository.ilocalrepositorymain)
1262 @interfaceutil.implementer(repository.ilocalrepositorymain)
1262 class localrepository(object):
1263 class localrepository(object):
1263 """Main class for representing local repositories.
1264 """Main class for representing local repositories.
1264
1265
1265 All local repositories are instances of this class.
1266 All local repositories are instances of this class.
1266
1267
1267 Constructed on its own, instances of this class are not usable as
1268 Constructed on its own, instances of this class are not usable as
1268 repository objects. To obtain a usable repository object, call
1269 repository objects. To obtain a usable repository object, call
1269 ``hg.repository()``, ``localrepo.instance()``, or
1270 ``hg.repository()``, ``localrepo.instance()``, or
1270 ``localrepo.makelocalrepository()``. The latter is the lowest-level.
1271 ``localrepo.makelocalrepository()``. The latter is the lowest-level.
1271 ``instance()`` adds support for creating new repositories.
1272 ``instance()`` adds support for creating new repositories.
1272 ``hg.repository()`` adds more extension integration, including calling
1273 ``hg.repository()`` adds more extension integration, including calling
1273 ``reposetup()``. Generally speaking, ``hg.repository()`` should be
1274 ``reposetup()``. Generally speaking, ``hg.repository()`` should be
1274 used.
1275 used.
1275 """
1276 """
1276
1277
1277 _basesupported = {
1278 _basesupported = {
1278 requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT,
1279 requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT,
1279 requirementsmod.CHANGELOGV2_REQUIREMENT,
1280 requirementsmod.CHANGELOGV2_REQUIREMENT,
1280 requirementsmod.COPIESSDC_REQUIREMENT,
1281 requirementsmod.COPIESSDC_REQUIREMENT,
1281 requirementsmod.DIRSTATE_TRACKED_HINT_V1,
1282 requirementsmod.DIRSTATE_TRACKED_HINT_V1,
1282 requirementsmod.DIRSTATE_V2_REQUIREMENT,
1283 requirementsmod.DIRSTATE_V2_REQUIREMENT,
1283 requirementsmod.DOTENCODE_REQUIREMENT,
1284 requirementsmod.DOTENCODE_REQUIREMENT,
1284 requirementsmod.FNCACHE_REQUIREMENT,
1285 requirementsmod.FNCACHE_REQUIREMENT,
1285 requirementsmod.GENERALDELTA_REQUIREMENT,
1286 requirementsmod.GENERALDELTA_REQUIREMENT,
1286 requirementsmod.INTERNAL_PHASE_REQUIREMENT,
1287 requirementsmod.INTERNAL_PHASE_REQUIREMENT,
1287 requirementsmod.NODEMAP_REQUIREMENT,
1288 requirementsmod.NODEMAP_REQUIREMENT,
1288 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
1289 requirementsmod.RELATIVE_SHARED_REQUIREMENT,
1289 requirementsmod.REVLOGV1_REQUIREMENT,
1290 requirementsmod.REVLOGV1_REQUIREMENT,
1290 requirementsmod.REVLOGV2_REQUIREMENT,
1291 requirementsmod.REVLOGV2_REQUIREMENT,
1291 requirementsmod.SHARED_REQUIREMENT,
1292 requirementsmod.SHARED_REQUIREMENT,
1292 requirementsmod.SHARESAFE_REQUIREMENT,
1293 requirementsmod.SHARESAFE_REQUIREMENT,
1293 requirementsmod.SPARSE_REQUIREMENT,
1294 requirementsmod.SPARSE_REQUIREMENT,
1294 requirementsmod.SPARSEREVLOG_REQUIREMENT,
1295 requirementsmod.SPARSEREVLOG_REQUIREMENT,
1295 requirementsmod.STORE_REQUIREMENT,
1296 requirementsmod.STORE_REQUIREMENT,
1296 requirementsmod.TREEMANIFEST_REQUIREMENT,
1297 requirementsmod.TREEMANIFEST_REQUIREMENT,
1297 }
1298 }
1298
1299
1299 # list of prefix for file which can be written without 'wlock'
1300 # list of prefix for file which can be written without 'wlock'
1300 # Extensions should extend this list when needed
1301 # Extensions should extend this list when needed
1301 _wlockfreeprefix = {
1302 _wlockfreeprefix = {
1302 # We migh consider requiring 'wlock' for the next
1303 # We migh consider requiring 'wlock' for the next
1303 # two, but pretty much all the existing code assume
1304 # two, but pretty much all the existing code assume
1304 # wlock is not needed so we keep them excluded for
1305 # wlock is not needed so we keep them excluded for
1305 # now.
1306 # now.
1306 b'hgrc',
1307 b'hgrc',
1307 b'requires',
1308 b'requires',
1308 # XXX cache is a complicatged business someone
1309 # XXX cache is a complicatged business someone
1309 # should investigate this in depth at some point
1310 # should investigate this in depth at some point
1310 b'cache/',
1311 b'cache/',
1311 # XXX shouldn't be dirstate covered by the wlock?
1312 # XXX shouldn't be dirstate covered by the wlock?
1312 b'dirstate',
1313 b'dirstate',
1313 # XXX bisect was still a bit too messy at the time
1314 # XXX bisect was still a bit too messy at the time
1314 # this changeset was introduced. Someone should fix
1315 # this changeset was introduced. Someone should fix
1315 # the remainig bit and drop this line
1316 # the remainig bit and drop this line
1316 b'bisect.state',
1317 b'bisect.state',
1317 }
1318 }
1318
1319
1319 def __init__(
1320 def __init__(
1320 self,
1321 self,
1321 baseui,
1322 baseui,
1322 ui,
1323 ui,
1323 origroot,
1324 origroot,
1324 wdirvfs,
1325 wdirvfs,
1325 hgvfs,
1326 hgvfs,
1326 requirements,
1327 requirements,
1327 supportedrequirements,
1328 supportedrequirements,
1328 sharedpath,
1329 sharedpath,
1329 store,
1330 store,
1330 cachevfs,
1331 cachevfs,
1331 wcachevfs,
1332 wcachevfs,
1332 features,
1333 features,
1333 intents=None,
1334 intents=None,
1334 ):
1335 ):
1335 """Create a new local repository instance.
1336 """Create a new local repository instance.
1336
1337
1337 Most callers should use ``hg.repository()``, ``localrepo.instance()``,
1338 Most callers should use ``hg.repository()``, ``localrepo.instance()``,
1338 or ``localrepo.makelocalrepository()`` for obtaining a new repository
1339 or ``localrepo.makelocalrepository()`` for obtaining a new repository
1339 object.
1340 object.
1340
1341
1341 Arguments:
1342 Arguments:
1342
1343
1343 baseui
1344 baseui
1344 ``ui.ui`` instance that ``ui`` argument was based off of.
1345 ``ui.ui`` instance that ``ui`` argument was based off of.
1345
1346
1346 ui
1347 ui
1347 ``ui.ui`` instance for use by the repository.
1348 ``ui.ui`` instance for use by the repository.
1348
1349
1349 origroot
1350 origroot
1350 ``bytes`` path to working directory root of this repository.
1351 ``bytes`` path to working directory root of this repository.
1351
1352
1352 wdirvfs
1353 wdirvfs
1353 ``vfs.vfs`` rooted at the working directory.
1354 ``vfs.vfs`` rooted at the working directory.
1354
1355
1355 hgvfs
1356 hgvfs
1356 ``vfs.vfs`` rooted at .hg/
1357 ``vfs.vfs`` rooted at .hg/
1357
1358
1358 requirements
1359 requirements
1359 ``set`` of bytestrings representing repository opening requirements.
1360 ``set`` of bytestrings representing repository opening requirements.
1360
1361
1361 supportedrequirements
1362 supportedrequirements
1362 ``set`` of bytestrings representing repository requirements that we
1363 ``set`` of bytestrings representing repository requirements that we
1363 know how to open. May be a supetset of ``requirements``.
1364 know how to open. May be a supetset of ``requirements``.
1364
1365
1365 sharedpath
1366 sharedpath
1366 ``bytes`` Defining path to storage base directory. Points to a
1367 ``bytes`` Defining path to storage base directory. Points to a
1367 ``.hg/`` directory somewhere.
1368 ``.hg/`` directory somewhere.
1368
1369
1369 store
1370 store
1370 ``store.basicstore`` (or derived) instance providing access to
1371 ``store.basicstore`` (or derived) instance providing access to
1371 versioned storage.
1372 versioned storage.
1372
1373
1373 cachevfs
1374 cachevfs
1374 ``vfs.vfs`` used for cache files.
1375 ``vfs.vfs`` used for cache files.
1375
1376
1376 wcachevfs
1377 wcachevfs
1377 ``vfs.vfs`` used for cache files related to the working copy.
1378 ``vfs.vfs`` used for cache files related to the working copy.
1378
1379
1379 features
1380 features
1380 ``set`` of bytestrings defining features/capabilities of this
1381 ``set`` of bytestrings defining features/capabilities of this
1381 instance.
1382 instance.
1382
1383
1383 intents
1384 intents
1384 ``set`` of system strings indicating what this repo will be used
1385 ``set`` of system strings indicating what this repo will be used
1385 for.
1386 for.
1386 """
1387 """
1387 self.baseui = baseui
1388 self.baseui = baseui
1388 self.ui = ui
1389 self.ui = ui
1389 self.origroot = origroot
1390 self.origroot = origroot
1390 # vfs rooted at working directory.
1391 # vfs rooted at working directory.
1391 self.wvfs = wdirvfs
1392 self.wvfs = wdirvfs
1392 self.root = wdirvfs.base
1393 self.root = wdirvfs.base
1393 # vfs rooted at .hg/. Used to access most non-store paths.
1394 # vfs rooted at .hg/. Used to access most non-store paths.
1394 self.vfs = hgvfs
1395 self.vfs = hgvfs
1395 self.path = hgvfs.base
1396 self.path = hgvfs.base
1396 self.requirements = requirements
1397 self.requirements = requirements
1397 self.nodeconstants = sha1nodeconstants
1398 self.nodeconstants = sha1nodeconstants
1398 self.nullid = self.nodeconstants.nullid
1399 self.nullid = self.nodeconstants.nullid
1399 self.supported = supportedrequirements
1400 self.supported = supportedrequirements
1400 self.sharedpath = sharedpath
1401 self.sharedpath = sharedpath
1401 self.store = store
1402 self.store = store
1402 self.cachevfs = cachevfs
1403 self.cachevfs = cachevfs
1403 self.wcachevfs = wcachevfs
1404 self.wcachevfs = wcachevfs
1404 self.features = features
1405 self.features = features
1405
1406
1406 self.filtername = None
1407 self.filtername = None
1407
1408
1408 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1409 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1409 b'devel', b'check-locks'
1410 b'devel', b'check-locks'
1410 ):
1411 ):
1411 self.vfs.audit = self._getvfsward(self.vfs.audit)
1412 self.vfs.audit = self._getvfsward(self.vfs.audit)
1412 # A list of callback to shape the phase if no data were found.
1413 # A list of callback to shape the phase if no data were found.
1413 # Callback are in the form: func(repo, roots) --> processed root.
1414 # Callback are in the form: func(repo, roots) --> processed root.
1414 # This list it to be filled by extension during repo setup
1415 # This list it to be filled by extension during repo setup
1415 self._phasedefaults = []
1416 self._phasedefaults = []
1416
1417
1417 color.setup(self.ui)
1418 color.setup(self.ui)
1418
1419
1419 self.spath = self.store.path
1420 self.spath = self.store.path
1420 self.svfs = self.store.vfs
1421 self.svfs = self.store.vfs
1421 self.sjoin = self.store.join
1422 self.sjoin = self.store.join
1422 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1423 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1423 b'devel', b'check-locks'
1424 b'devel', b'check-locks'
1424 ):
1425 ):
1425 if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs
1426 if util.safehasattr(self.svfs, b'vfs'): # this is filtervfs
1426 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
1427 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
1427 else: # standard vfs
1428 else: # standard vfs
1428 self.svfs.audit = self._getsvfsward(self.svfs.audit)
1429 self.svfs.audit = self._getsvfsward(self.svfs.audit)
1429
1430
1430 self._dirstatevalidatewarned = False
1431 self._dirstatevalidatewarned = False
1431
1432
1432 self._branchcaches = branchmap.BranchMapCache()
1433 self._branchcaches = branchmap.BranchMapCache()
1433 self._revbranchcache = None
1434 self._revbranchcache = None
1434 self._filterpats = {}
1435 self._filterpats = {}
1435 self._datafilters = {}
1436 self._datafilters = {}
1436 self._transref = self._lockref = self._wlockref = None
1437 self._transref = self._lockref = self._wlockref = None
1437
1438
1438 # A cache for various files under .hg/ that tracks file changes,
1439 # A cache for various files under .hg/ that tracks file changes,
1439 # (used by the filecache decorator)
1440 # (used by the filecache decorator)
1440 #
1441 #
1441 # Maps a property name to its util.filecacheentry
1442 # Maps a property name to its util.filecacheentry
1442 self._filecache = {}
1443 self._filecache = {}
1443
1444
1444 # hold sets of revision to be filtered
1445 # hold sets of revision to be filtered
1445 # should be cleared when something might have changed the filter value:
1446 # should be cleared when something might have changed the filter value:
1446 # - new changesets,
1447 # - new changesets,
1447 # - phase change,
1448 # - phase change,
1448 # - new obsolescence marker,
1449 # - new obsolescence marker,
1449 # - working directory parent change,
1450 # - working directory parent change,
1450 # - bookmark changes
1451 # - bookmark changes
1451 self.filteredrevcache = {}
1452 self.filteredrevcache = {}
1452
1453
1453 # post-dirstate-status hooks
1454 # post-dirstate-status hooks
1454 self._postdsstatus = []
1455 self._postdsstatus = []
1455
1456
1456 # generic mapping between names and nodes
1457 # generic mapping between names and nodes
1457 self.names = namespaces.namespaces()
1458 self.names = namespaces.namespaces()
1458
1459
1459 # Key to signature value.
1460 # Key to signature value.
1460 self._sparsesignaturecache = {}
1461 self._sparsesignaturecache = {}
1461 # Signature to cached matcher instance.
1462 # Signature to cached matcher instance.
1462 self._sparsematchercache = {}
1463 self._sparsematchercache = {}
1463
1464
1464 self._extrafilterid = repoview.extrafilter(ui)
1465 self._extrafilterid = repoview.extrafilter(ui)
1465
1466
1466 self.filecopiesmode = None
1467 self.filecopiesmode = None
1467 if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements:
1468 if requirementsmod.COPIESSDC_REQUIREMENT in self.requirements:
1468 self.filecopiesmode = b'changeset-sidedata'
1469 self.filecopiesmode = b'changeset-sidedata'
1469
1470
1470 self._wanted_sidedata = set()
1471 self._wanted_sidedata = set()
1471 self._sidedata_computers = {}
1472 self._sidedata_computers = {}
1472 sidedatamod.set_sidedata_spec_for_repo(self)
1473 sidedatamod.set_sidedata_spec_for_repo(self)
1473
1474
1474 def _getvfsward(self, origfunc):
1475 def _getvfsward(self, origfunc):
1475 """build a ward for self.vfs"""
1476 """build a ward for self.vfs"""
1476 rref = weakref.ref(self)
1477 rref = weakref.ref(self)
1477
1478
1478 def checkvfs(path, mode=None):
1479 def checkvfs(path, mode=None):
1479 ret = origfunc(path, mode=mode)
1480 ret = origfunc(path, mode=mode)
1480 repo = rref()
1481 repo = rref()
1481 if (
1482 if (
1482 repo is None
1483 repo is None
1483 or not util.safehasattr(repo, b'_wlockref')
1484 or not util.safehasattr(repo, b'_wlockref')
1484 or not util.safehasattr(repo, b'_lockref')
1485 or not util.safehasattr(repo, b'_lockref')
1485 ):
1486 ):
1486 return
1487 return
1487 if mode in (None, b'r', b'rb'):
1488 if mode in (None, b'r', b'rb'):
1488 return
1489 return
1489 if path.startswith(repo.path):
1490 if path.startswith(repo.path):
1490 # truncate name relative to the repository (.hg)
1491 # truncate name relative to the repository (.hg)
1491 path = path[len(repo.path) + 1 :]
1492 path = path[len(repo.path) + 1 :]
1492 if path.startswith(b'cache/'):
1493 if path.startswith(b'cache/'):
1493 msg = b'accessing cache with vfs instead of cachevfs: "%s"'
1494 msg = b'accessing cache with vfs instead of cachevfs: "%s"'
1494 repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs")
1495 repo.ui.develwarn(msg % path, stacklevel=3, config=b"cache-vfs")
1495 # path prefixes covered by 'lock'
1496 # path prefixes covered by 'lock'
1496 vfs_path_prefixes = (
1497 vfs_path_prefixes = (
1497 b'journal.',
1498 b'journal.',
1498 b'undo.',
1499 b'undo.',
1499 b'strip-backup/',
1500 b'strip-backup/',
1500 b'cache/',
1501 b'cache/',
1501 )
1502 )
1502 if any(path.startswith(prefix) for prefix in vfs_path_prefixes):
1503 if any(path.startswith(prefix) for prefix in vfs_path_prefixes):
1503 if repo._currentlock(repo._lockref) is None:
1504 if repo._currentlock(repo._lockref) is None:
1504 repo.ui.develwarn(
1505 repo.ui.develwarn(
1505 b'write with no lock: "%s"' % path,
1506 b'write with no lock: "%s"' % path,
1506 stacklevel=3,
1507 stacklevel=3,
1507 config=b'check-locks',
1508 config=b'check-locks',
1508 )
1509 )
1509 elif repo._currentlock(repo._wlockref) is None:
1510 elif repo._currentlock(repo._wlockref) is None:
1510 # rest of vfs files are covered by 'wlock'
1511 # rest of vfs files are covered by 'wlock'
1511 #
1512 #
1512 # exclude special files
1513 # exclude special files
1513 for prefix in self._wlockfreeprefix:
1514 for prefix in self._wlockfreeprefix:
1514 if path.startswith(prefix):
1515 if path.startswith(prefix):
1515 return
1516 return
1516 repo.ui.develwarn(
1517 repo.ui.develwarn(
1517 b'write with no wlock: "%s"' % path,
1518 b'write with no wlock: "%s"' % path,
1518 stacklevel=3,
1519 stacklevel=3,
1519 config=b'check-locks',
1520 config=b'check-locks',
1520 )
1521 )
1521 return ret
1522 return ret
1522
1523
1523 return checkvfs
1524 return checkvfs
1524
1525
1525 def _getsvfsward(self, origfunc):
1526 def _getsvfsward(self, origfunc):
1526 """build a ward for self.svfs"""
1527 """build a ward for self.svfs"""
1527 rref = weakref.ref(self)
1528 rref = weakref.ref(self)
1528
1529
1529 def checksvfs(path, mode=None):
1530 def checksvfs(path, mode=None):
1530 ret = origfunc(path, mode=mode)
1531 ret = origfunc(path, mode=mode)
1531 repo = rref()
1532 repo = rref()
1532 if repo is None or not util.safehasattr(repo, b'_lockref'):
1533 if repo is None or not util.safehasattr(repo, b'_lockref'):
1533 return
1534 return
1534 if mode in (None, b'r', b'rb'):
1535 if mode in (None, b'r', b'rb'):
1535 return
1536 return
1536 if path.startswith(repo.sharedpath):
1537 if path.startswith(repo.sharedpath):
1537 # truncate name relative to the repository (.hg)
1538 # truncate name relative to the repository (.hg)
1538 path = path[len(repo.sharedpath) + 1 :]
1539 path = path[len(repo.sharedpath) + 1 :]
1539 if repo._currentlock(repo._lockref) is None:
1540 if repo._currentlock(repo._lockref) is None:
1540 repo.ui.develwarn(
1541 repo.ui.develwarn(
1541 b'write with no lock: "%s"' % path, stacklevel=4
1542 b'write with no lock: "%s"' % path, stacklevel=4
1542 )
1543 )
1543 return ret
1544 return ret
1544
1545
1545 return checksvfs
1546 return checksvfs
1546
1547
1547 def close(self):
1548 def close(self):
1548 self._writecaches()
1549 self._writecaches()
1549
1550
1550 def _writecaches(self):
1551 def _writecaches(self):
1551 if self._revbranchcache:
1552 if self._revbranchcache:
1552 self._revbranchcache.write()
1553 self._revbranchcache.write()
1553
1554
1554 def _restrictcapabilities(self, caps):
1555 def _restrictcapabilities(self, caps):
1555 if self.ui.configbool(b'experimental', b'bundle2-advertise'):
1556 if self.ui.configbool(b'experimental', b'bundle2-advertise'):
1556 caps = set(caps)
1557 caps = set(caps)
1557 capsblob = bundle2.encodecaps(
1558 capsblob = bundle2.encodecaps(
1558 bundle2.getrepocaps(self, role=b'client')
1559 bundle2.getrepocaps(self, role=b'client')
1559 )
1560 )
1560 caps.add(b'bundle2=' + urlreq.quote(capsblob))
1561 caps.add(b'bundle2=' + urlreq.quote(capsblob))
1561 if self.ui.configbool(b'experimental', b'narrow'):
1562 if self.ui.configbool(b'experimental', b'narrow'):
1562 caps.add(wireprototypes.NARROWCAP)
1563 caps.add(wireprototypes.NARROWCAP)
1563 return caps
1564 return caps
1564
1565
1565 # Don't cache auditor/nofsauditor, or you'll end up with reference cycle:
1566 # Don't cache auditor/nofsauditor, or you'll end up with reference cycle:
1566 # self -> auditor -> self._checknested -> self
1567 # self -> auditor -> self._checknested -> self
1567
1568
1568 @property
1569 @property
1569 def auditor(self):
1570 def auditor(self):
1570 # This is only used by context.workingctx.match in order to
1571 # This is only used by context.workingctx.match in order to
1571 # detect files in subrepos.
1572 # detect files in subrepos.
1572 return pathutil.pathauditor(self.root, callback=self._checknested)
1573 return pathutil.pathauditor(self.root, callback=self._checknested)
1573
1574
1574 @property
1575 @property
1575 def nofsauditor(self):
1576 def nofsauditor(self):
1576 # This is only used by context.basectx.match in order to detect
1577 # This is only used by context.basectx.match in order to detect
1577 # files in subrepos.
1578 # files in subrepos.
1578 return pathutil.pathauditor(
1579 return pathutil.pathauditor(
1579 self.root, callback=self._checknested, realfs=False, cached=True
1580 self.root, callback=self._checknested, realfs=False, cached=True
1580 )
1581 )
1581
1582
1582 def _checknested(self, path):
1583 def _checknested(self, path):
1583 """Determine if path is a legal nested repository."""
1584 """Determine if path is a legal nested repository."""
1584 if not path.startswith(self.root):
1585 if not path.startswith(self.root):
1585 return False
1586 return False
1586 subpath = path[len(self.root) + 1 :]
1587 subpath = path[len(self.root) + 1 :]
1587 normsubpath = util.pconvert(subpath)
1588 normsubpath = util.pconvert(subpath)
1588
1589
1589 # XXX: Checking against the current working copy is wrong in
1590 # XXX: Checking against the current working copy is wrong in
1590 # the sense that it can reject things like
1591 # the sense that it can reject things like
1591 #
1592 #
1592 # $ hg cat -r 10 sub/x.txt
1593 # $ hg cat -r 10 sub/x.txt
1593 #
1594 #
1594 # if sub/ is no longer a subrepository in the working copy
1595 # if sub/ is no longer a subrepository in the working copy
1595 # parent revision.
1596 # parent revision.
1596 #
1597 #
1597 # However, it can of course also allow things that would have
1598 # However, it can of course also allow things that would have
1598 # been rejected before, such as the above cat command if sub/
1599 # been rejected before, such as the above cat command if sub/
1599 # is a subrepository now, but was a normal directory before.
1600 # is a subrepository now, but was a normal directory before.
1600 # The old path auditor would have rejected by mistake since it
1601 # The old path auditor would have rejected by mistake since it
1601 # panics when it sees sub/.hg/.
1602 # panics when it sees sub/.hg/.
1602 #
1603 #
1603 # All in all, checking against the working copy seems sensible
1604 # All in all, checking against the working copy seems sensible
1604 # since we want to prevent access to nested repositories on
1605 # since we want to prevent access to nested repositories on
1605 # the filesystem *now*.
1606 # the filesystem *now*.
1606 ctx = self[None]
1607 ctx = self[None]
1607 parts = util.splitpath(subpath)
1608 parts = util.splitpath(subpath)
1608 while parts:
1609 while parts:
1609 prefix = b'/'.join(parts)
1610 prefix = b'/'.join(parts)
1610 if prefix in ctx.substate:
1611 if prefix in ctx.substate:
1611 if prefix == normsubpath:
1612 if prefix == normsubpath:
1612 return True
1613 return True
1613 else:
1614 else:
1614 sub = ctx.sub(prefix)
1615 sub = ctx.sub(prefix)
1615 return sub.checknested(subpath[len(prefix) + 1 :])
1616 return sub.checknested(subpath[len(prefix) + 1 :])
1616 else:
1617 else:
1617 parts.pop()
1618 parts.pop()
1618 return False
1619 return False
1619
1620
1620 def peer(self):
1621 def peer(self):
1621 return localpeer(self) # not cached to avoid reference cycle
1622 return localpeer(self) # not cached to avoid reference cycle
1622
1623
1623 def unfiltered(self):
1624 def unfiltered(self):
1624 """Return unfiltered version of the repository
1625 """Return unfiltered version of the repository
1625
1626
1626 Intended to be overwritten by filtered repo."""
1627 Intended to be overwritten by filtered repo."""
1627 return self
1628 return self
1628
1629
1629 def filtered(self, name, visibilityexceptions=None):
1630 def filtered(self, name, visibilityexceptions=None):
1630 """Return a filtered version of a repository
1631 """Return a filtered version of a repository
1631
1632
1632 The `name` parameter is the identifier of the requested view. This
1633 The `name` parameter is the identifier of the requested view. This
1633 will return a repoview object set "exactly" to the specified view.
1634 will return a repoview object set "exactly" to the specified view.
1634
1635
1635 This function does not apply recursive filtering to a repository. For
1636 This function does not apply recursive filtering to a repository. For
1636 example calling `repo.filtered("served")` will return a repoview using
1637 example calling `repo.filtered("served")` will return a repoview using
1637 the "served" view, regardless of the initial view used by `repo`.
1638 the "served" view, regardless of the initial view used by `repo`.
1638
1639
1639 In other word, there is always only one level of `repoview` "filtering".
1640 In other word, there is always only one level of `repoview` "filtering".
1640 """
1641 """
1641 if self._extrafilterid is not None and b'%' not in name:
1642 if self._extrafilterid is not None and b'%' not in name:
1642 name = name + b'%' + self._extrafilterid
1643 name = name + b'%' + self._extrafilterid
1643
1644
1644 cls = repoview.newtype(self.unfiltered().__class__)
1645 cls = repoview.newtype(self.unfiltered().__class__)
1645 return cls(self, name, visibilityexceptions)
1646 return cls(self, name, visibilityexceptions)
1646
1647
1647 @mixedrepostorecache(
1648 @mixedrepostorecache(
1648 (b'bookmarks', b'plain'),
1649 (b'bookmarks', b'plain'),
1649 (b'bookmarks.current', b'plain'),
1650 (b'bookmarks.current', b'plain'),
1650 (b'bookmarks', b''),
1651 (b'bookmarks', b''),
1651 (b'00changelog.i', b''),
1652 (b'00changelog.i', b''),
1652 )
1653 )
1653 def _bookmarks(self):
1654 def _bookmarks(self):
1654 # Since the multiple files involved in the transaction cannot be
1655 # Since the multiple files involved in the transaction cannot be
1655 # written atomically (with current repository format), there is a race
1656 # written atomically (with current repository format), there is a race
1656 # condition here.
1657 # condition here.
1657 #
1658 #
1658 # 1) changelog content A is read
1659 # 1) changelog content A is read
1659 # 2) outside transaction update changelog to content B
1660 # 2) outside transaction update changelog to content B
1660 # 3) outside transaction update bookmark file referring to content B
1661 # 3) outside transaction update bookmark file referring to content B
1661 # 4) bookmarks file content is read and filtered against changelog-A
1662 # 4) bookmarks file content is read and filtered against changelog-A
1662 #
1663 #
1663 # When this happens, bookmarks against nodes missing from A are dropped.
1664 # When this happens, bookmarks against nodes missing from A are dropped.
1664 #
1665 #
1665 # Having this happening during read is not great, but it become worse
1666 # Having this happening during read is not great, but it become worse
1666 # when this happen during write because the bookmarks to the "unknown"
1667 # when this happen during write because the bookmarks to the "unknown"
1667 # nodes will be dropped for good. However, writes happen within locks.
1668 # nodes will be dropped for good. However, writes happen within locks.
1668 # This locking makes it possible to have a race free consistent read.
1669 # This locking makes it possible to have a race free consistent read.
1669 # For this purpose data read from disc before locking are
1670 # For this purpose data read from disc before locking are
1670 # "invalidated" right after the locks are taken. This invalidations are
1671 # "invalidated" right after the locks are taken. This invalidations are
1671 # "light", the `filecache` mechanism keep the data in memory and will
1672 # "light", the `filecache` mechanism keep the data in memory and will
1672 # reuse them if the underlying files did not changed. Not parsing the
1673 # reuse them if the underlying files did not changed. Not parsing the
1673 # same data multiple times helps performances.
1674 # same data multiple times helps performances.
1674 #
1675 #
1675 # Unfortunately in the case describe above, the files tracked by the
1676 # Unfortunately in the case describe above, the files tracked by the
1676 # bookmarks file cache might not have changed, but the in-memory
1677 # bookmarks file cache might not have changed, but the in-memory
1677 # content is still "wrong" because we used an older changelog content
1678 # content is still "wrong" because we used an older changelog content
1678 # to process the on-disk data. So after locking, the changelog would be
1679 # to process the on-disk data. So after locking, the changelog would be
1679 # refreshed but `_bookmarks` would be preserved.
1680 # refreshed but `_bookmarks` would be preserved.
1680 # Adding `00changelog.i` to the list of tracked file is not
1681 # Adding `00changelog.i` to the list of tracked file is not
1681 # enough, because at the time we build the content for `_bookmarks` in
1682 # enough, because at the time we build the content for `_bookmarks` in
1682 # (4), the changelog file has already diverged from the content used
1683 # (4), the changelog file has already diverged from the content used
1683 # for loading `changelog` in (1)
1684 # for loading `changelog` in (1)
1684 #
1685 #
1685 # To prevent the issue, we force the changelog to be explicitly
1686 # To prevent the issue, we force the changelog to be explicitly
1686 # reloaded while computing `_bookmarks`. The data race can still happen
1687 # reloaded while computing `_bookmarks`. The data race can still happen
1687 # without the lock (with a narrower window), but it would no longer go
1688 # without the lock (with a narrower window), but it would no longer go
1688 # undetected during the lock time refresh.
1689 # undetected during the lock time refresh.
1689 #
1690 #
1690 # The new schedule is as follow
1691 # The new schedule is as follow
1691 #
1692 #
1692 # 1) filecache logic detect that `_bookmarks` needs to be computed
1693 # 1) filecache logic detect that `_bookmarks` needs to be computed
1693 # 2) cachestat for `bookmarks` and `changelog` are captured (for book)
1694 # 2) cachestat for `bookmarks` and `changelog` are captured (for book)
1694 # 3) We force `changelog` filecache to be tested
1695 # 3) We force `changelog` filecache to be tested
1695 # 4) cachestat for `changelog` are captured (for changelog)
1696 # 4) cachestat for `changelog` are captured (for changelog)
1696 # 5) `_bookmarks` is computed and cached
1697 # 5) `_bookmarks` is computed and cached
1697 #
1698 #
1698 # The step in (3) ensure we have a changelog at least as recent as the
1699 # The step in (3) ensure we have a changelog at least as recent as the
1699 # cache stat computed in (1). As a result at locking time:
1700 # cache stat computed in (1). As a result at locking time:
1700 # * if the changelog did not changed since (1) -> we can reuse the data
1701 # * if the changelog did not changed since (1) -> we can reuse the data
1701 # * otherwise -> the bookmarks get refreshed.
1702 # * otherwise -> the bookmarks get refreshed.
1702 self._refreshchangelog()
1703 self._refreshchangelog()
1703 return bookmarks.bmstore(self)
1704 return bookmarks.bmstore(self)
1704
1705
1705 def _refreshchangelog(self):
1706 def _refreshchangelog(self):
1706 """make sure the in memory changelog match the on-disk one"""
1707 """make sure the in memory changelog match the on-disk one"""
1707 if 'changelog' in vars(self) and self.currenttransaction() is None:
1708 if 'changelog' in vars(self) and self.currenttransaction() is None:
1708 del self.changelog
1709 del self.changelog
1709
1710
1710 @property
1711 @property
1711 def _activebookmark(self):
1712 def _activebookmark(self):
1712 return self._bookmarks.active
1713 return self._bookmarks.active
1713
1714
1714 # _phasesets depend on changelog. what we need is to call
1715 # _phasesets depend on changelog. what we need is to call
1715 # _phasecache.invalidate() if '00changelog.i' was changed, but it
1716 # _phasecache.invalidate() if '00changelog.i' was changed, but it
1716 # can't be easily expressed in filecache mechanism.
1717 # can't be easily expressed in filecache mechanism.
1717 @storecache(b'phaseroots', b'00changelog.i')
1718 @storecache(b'phaseroots', b'00changelog.i')
1718 def _phasecache(self):
1719 def _phasecache(self):
1719 return phases.phasecache(self, self._phasedefaults)
1720 return phases.phasecache(self, self._phasedefaults)
1720
1721
1721 @storecache(b'obsstore')
1722 @storecache(b'obsstore')
1722 def obsstore(self):
1723 def obsstore(self):
1723 return obsolete.makestore(self.ui, self)
1724 return obsolete.makestore(self.ui, self)
1724
1725
1725 @changelogcache()
1726 @changelogcache()
1726 def changelog(repo):
1727 def changelog(repo):
1727 # load dirstate before changelog to avoid race see issue6303
1728 # load dirstate before changelog to avoid race see issue6303
1728 repo.dirstate.prefetch_parents()
1729 repo.dirstate.prefetch_parents()
1729 return repo.store.changelog(
1730 return repo.store.changelog(
1730 txnutil.mayhavepending(repo.root),
1731 txnutil.mayhavepending(repo.root),
1731 concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'),
1732 concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'),
1732 )
1733 )
1733
1734
1734 @manifestlogcache()
1735 @manifestlogcache()
1735 def manifestlog(self):
1736 def manifestlog(self):
1736 return self.store.manifestlog(self, self._storenarrowmatch)
1737 return self.store.manifestlog(self, self._storenarrowmatch)
1737
1738
1738 @repofilecache(b'dirstate')
1739 @repofilecache(b'dirstate')
1739 def dirstate(self):
1740 def dirstate(self):
1740 return self._makedirstate()
1741 return self._makedirstate()
1741
1742
1742 def _makedirstate(self):
1743 def _makedirstate(self):
1743 """Extension point for wrapping the dirstate per-repo."""
1744 """Extension point for wrapping the dirstate per-repo."""
1744 sparsematchfn = lambda: sparse.matcher(self)
1745 sparsematchfn = lambda: sparse.matcher(self)
1745 v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT
1746 v2_req = requirementsmod.DIRSTATE_V2_REQUIREMENT
1746 th = requirementsmod.DIRSTATE_TRACKED_HINT_V1
1747 th = requirementsmod.DIRSTATE_TRACKED_HINT_V1
1747 use_dirstate_v2 = v2_req in self.requirements
1748 use_dirstate_v2 = v2_req in self.requirements
1748 use_tracked_hint = th in self.requirements
1749 use_tracked_hint = th in self.requirements
1749
1750
1750 return dirstate.dirstate(
1751 return dirstate.dirstate(
1751 self.vfs,
1752 self.vfs,
1752 self.ui,
1753 self.ui,
1753 self.root,
1754 self.root,
1754 self._dirstatevalidate,
1755 self._dirstatevalidate,
1755 sparsematchfn,
1756 sparsematchfn,
1756 self.nodeconstants,
1757 self.nodeconstants,
1757 use_dirstate_v2,
1758 use_dirstate_v2,
1758 use_tracked_hint=use_tracked_hint,
1759 use_tracked_hint=use_tracked_hint,
1759 )
1760 )
1760
1761
1761 def _dirstatevalidate(self, node):
1762 def _dirstatevalidate(self, node):
1762 try:
1763 try:
1763 self.changelog.rev(node)
1764 self.changelog.rev(node)
1764 return node
1765 return node
1765 except error.LookupError:
1766 except error.LookupError:
1766 if not self._dirstatevalidatewarned:
1767 if not self._dirstatevalidatewarned:
1767 self._dirstatevalidatewarned = True
1768 self._dirstatevalidatewarned = True
1768 self.ui.warn(
1769 self.ui.warn(
1769 _(b"warning: ignoring unknown working parent %s!\n")
1770 _(b"warning: ignoring unknown working parent %s!\n")
1770 % short(node)
1771 % short(node)
1771 )
1772 )
1772 return self.nullid
1773 return self.nullid
1773
1774
1774 @storecache(narrowspec.FILENAME)
1775 @storecache(narrowspec.FILENAME)
1775 def narrowpats(self):
1776 def narrowpats(self):
1776 """matcher patterns for this repository's narrowspec
1777 """matcher patterns for this repository's narrowspec
1777
1778
1778 A tuple of (includes, excludes).
1779 A tuple of (includes, excludes).
1779 """
1780 """
1780 return narrowspec.load(self)
1781 return narrowspec.load(self)
1781
1782
1782 @storecache(narrowspec.FILENAME)
1783 @storecache(narrowspec.FILENAME)
1783 def _storenarrowmatch(self):
1784 def _storenarrowmatch(self):
1784 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1785 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1785 return matchmod.always()
1786 return matchmod.always()
1786 include, exclude = self.narrowpats
1787 include, exclude = self.narrowpats
1787 return narrowspec.match(self.root, include=include, exclude=exclude)
1788 return narrowspec.match(self.root, include=include, exclude=exclude)
1788
1789
1789 @storecache(narrowspec.FILENAME)
1790 @storecache(narrowspec.FILENAME)
1790 def _narrowmatch(self):
1791 def _narrowmatch(self):
1791 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1792 if requirementsmod.NARROW_REQUIREMENT not in self.requirements:
1792 return matchmod.always()
1793 return matchmod.always()
1793 narrowspec.checkworkingcopynarrowspec(self)
1794 narrowspec.checkworkingcopynarrowspec(self)
1794 include, exclude = self.narrowpats
1795 include, exclude = self.narrowpats
1795 return narrowspec.match(self.root, include=include, exclude=exclude)
1796 return narrowspec.match(self.root, include=include, exclude=exclude)
1796
1797
1797 def narrowmatch(self, match=None, includeexact=False):
1798 def narrowmatch(self, match=None, includeexact=False):
1798 """matcher corresponding the the repo's narrowspec
1799 """matcher corresponding the the repo's narrowspec
1799
1800
1800 If `match` is given, then that will be intersected with the narrow
1801 If `match` is given, then that will be intersected with the narrow
1801 matcher.
1802 matcher.
1802
1803
1803 If `includeexact` is True, then any exact matches from `match` will
1804 If `includeexact` is True, then any exact matches from `match` will
1804 be included even if they're outside the narrowspec.
1805 be included even if they're outside the narrowspec.
1805 """
1806 """
1806 if match:
1807 if match:
1807 if includeexact and not self._narrowmatch.always():
1808 if includeexact and not self._narrowmatch.always():
1808 # do not exclude explicitly-specified paths so that they can
1809 # do not exclude explicitly-specified paths so that they can
1809 # be warned later on
1810 # be warned later on
1810 em = matchmod.exact(match.files())
1811 em = matchmod.exact(match.files())
1811 nm = matchmod.unionmatcher([self._narrowmatch, em])
1812 nm = matchmod.unionmatcher([self._narrowmatch, em])
1812 return matchmod.intersectmatchers(match, nm)
1813 return matchmod.intersectmatchers(match, nm)
1813 return matchmod.intersectmatchers(match, self._narrowmatch)
1814 return matchmod.intersectmatchers(match, self._narrowmatch)
1814 return self._narrowmatch
1815 return self._narrowmatch
1815
1816
1816 def setnarrowpats(self, newincludes, newexcludes):
1817 def setnarrowpats(self, newincludes, newexcludes):
1817 narrowspec.save(self, newincludes, newexcludes)
1818 narrowspec.save(self, newincludes, newexcludes)
1818 self.invalidate(clearfilecache=True)
1819 self.invalidate(clearfilecache=True)
1819
1820
1820 @unfilteredpropertycache
1821 @unfilteredpropertycache
1821 def _quick_access_changeid_null(self):
1822 def _quick_access_changeid_null(self):
1822 return {
1823 return {
1823 b'null': (nullrev, self.nodeconstants.nullid),
1824 b'null': (nullrev, self.nodeconstants.nullid),
1824 nullrev: (nullrev, self.nodeconstants.nullid),
1825 nullrev: (nullrev, self.nodeconstants.nullid),
1825 self.nullid: (nullrev, self.nullid),
1826 self.nullid: (nullrev, self.nullid),
1826 }
1827 }
1827
1828
1828 @unfilteredpropertycache
1829 @unfilteredpropertycache
1829 def _quick_access_changeid_wc(self):
1830 def _quick_access_changeid_wc(self):
1830 # also fast path access to the working copy parents
1831 # also fast path access to the working copy parents
1831 # however, only do it for filter that ensure wc is visible.
1832 # however, only do it for filter that ensure wc is visible.
1832 quick = self._quick_access_changeid_null.copy()
1833 quick = self._quick_access_changeid_null.copy()
1833 cl = self.unfiltered().changelog
1834 cl = self.unfiltered().changelog
1834 for node in self.dirstate.parents():
1835 for node in self.dirstate.parents():
1835 if node == self.nullid:
1836 if node == self.nullid:
1836 continue
1837 continue
1837 rev = cl.index.get_rev(node)
1838 rev = cl.index.get_rev(node)
1838 if rev is None:
1839 if rev is None:
1839 # unknown working copy parent case:
1840 # unknown working copy parent case:
1840 #
1841 #
1841 # skip the fast path and let higher code deal with it
1842 # skip the fast path and let higher code deal with it
1842 continue
1843 continue
1843 pair = (rev, node)
1844 pair = (rev, node)
1844 quick[rev] = pair
1845 quick[rev] = pair
1845 quick[node] = pair
1846 quick[node] = pair
1846 # also add the parents of the parents
1847 # also add the parents of the parents
1847 for r in cl.parentrevs(rev):
1848 for r in cl.parentrevs(rev):
1848 if r == nullrev:
1849 if r == nullrev:
1849 continue
1850 continue
1850 n = cl.node(r)
1851 n = cl.node(r)
1851 pair = (r, n)
1852 pair = (r, n)
1852 quick[r] = pair
1853 quick[r] = pair
1853 quick[n] = pair
1854 quick[n] = pair
1854 p1node = self.dirstate.p1()
1855 p1node = self.dirstate.p1()
1855 if p1node != self.nullid:
1856 if p1node != self.nullid:
1856 quick[b'.'] = quick[p1node]
1857 quick[b'.'] = quick[p1node]
1857 return quick
1858 return quick
1858
1859
1859 @unfilteredmethod
1860 @unfilteredmethod
1860 def _quick_access_changeid_invalidate(self):
1861 def _quick_access_changeid_invalidate(self):
1861 if '_quick_access_changeid_wc' in vars(self):
1862 if '_quick_access_changeid_wc' in vars(self):
1862 del self.__dict__['_quick_access_changeid_wc']
1863 del self.__dict__['_quick_access_changeid_wc']
1863
1864
1864 @property
1865 @property
1865 def _quick_access_changeid(self):
1866 def _quick_access_changeid(self):
1866 """an helper dictionnary for __getitem__ calls
1867 """an helper dictionnary for __getitem__ calls
1867
1868
1868 This contains a list of symbol we can recognise right away without
1869 This contains a list of symbol we can recognise right away without
1869 further processing.
1870 further processing.
1870 """
1871 """
1871 if self.filtername in repoview.filter_has_wc:
1872 if self.filtername in repoview.filter_has_wc:
1872 return self._quick_access_changeid_wc
1873 return self._quick_access_changeid_wc
1873 return self._quick_access_changeid_null
1874 return self._quick_access_changeid_null
1874
1875
1875 def __getitem__(self, changeid):
1876 def __getitem__(self, changeid):
1876 # dealing with special cases
1877 # dealing with special cases
1877 if changeid is None:
1878 if changeid is None:
1878 return context.workingctx(self)
1879 return context.workingctx(self)
1879 if isinstance(changeid, context.basectx):
1880 if isinstance(changeid, context.basectx):
1880 return changeid
1881 return changeid
1881
1882
1882 # dealing with multiple revisions
1883 # dealing with multiple revisions
1883 if isinstance(changeid, slice):
1884 if isinstance(changeid, slice):
1884 # wdirrev isn't contiguous so the slice shouldn't include it
1885 # wdirrev isn't contiguous so the slice shouldn't include it
1885 return [
1886 return [
1886 self[i]
1887 self[i]
1887 for i in pycompat.xrange(*changeid.indices(len(self)))
1888 for i in pycompat.xrange(*changeid.indices(len(self)))
1888 if i not in self.changelog.filteredrevs
1889 if i not in self.changelog.filteredrevs
1889 ]
1890 ]
1890
1891
1891 # dealing with some special values
1892 # dealing with some special values
1892 quick_access = self._quick_access_changeid.get(changeid)
1893 quick_access = self._quick_access_changeid.get(changeid)
1893 if quick_access is not None:
1894 if quick_access is not None:
1894 rev, node = quick_access
1895 rev, node = quick_access
1895 return context.changectx(self, rev, node, maybe_filtered=False)
1896 return context.changectx(self, rev, node, maybe_filtered=False)
1896 if changeid == b'tip':
1897 if changeid == b'tip':
1897 node = self.changelog.tip()
1898 node = self.changelog.tip()
1898 rev = self.changelog.rev(node)
1899 rev = self.changelog.rev(node)
1899 return context.changectx(self, rev, node)
1900 return context.changectx(self, rev, node)
1900
1901
1901 # dealing with arbitrary values
1902 # dealing with arbitrary values
1902 try:
1903 try:
1903 if isinstance(changeid, int):
1904 if isinstance(changeid, int):
1904 node = self.changelog.node(changeid)
1905 node = self.changelog.node(changeid)
1905 rev = changeid
1906 rev = changeid
1906 elif changeid == b'.':
1907 elif changeid == b'.':
1907 # this is a hack to delay/avoid loading obsmarkers
1908 # this is a hack to delay/avoid loading obsmarkers
1908 # when we know that '.' won't be hidden
1909 # when we know that '.' won't be hidden
1909 node = self.dirstate.p1()
1910 node = self.dirstate.p1()
1910 rev = self.unfiltered().changelog.rev(node)
1911 rev = self.unfiltered().changelog.rev(node)
1911 elif len(changeid) == self.nodeconstants.nodelen:
1912 elif len(changeid) == self.nodeconstants.nodelen:
1912 try:
1913 try:
1913 node = changeid
1914 node = changeid
1914 rev = self.changelog.rev(changeid)
1915 rev = self.changelog.rev(changeid)
1915 except error.FilteredLookupError:
1916 except error.FilteredLookupError:
1916 changeid = hex(changeid) # for the error message
1917 changeid = hex(changeid) # for the error message
1917 raise
1918 raise
1918 except LookupError:
1919 except LookupError:
1919 # check if it might have come from damaged dirstate
1920 # check if it might have come from damaged dirstate
1920 #
1921 #
1921 # XXX we could avoid the unfiltered if we had a recognizable
1922 # XXX we could avoid the unfiltered if we had a recognizable
1922 # exception for filtered changeset access
1923 # exception for filtered changeset access
1923 if (
1924 if (
1924 self.local()
1925 self.local()
1925 and changeid in self.unfiltered().dirstate.parents()
1926 and changeid in self.unfiltered().dirstate.parents()
1926 ):
1927 ):
1927 msg = _(b"working directory has unknown parent '%s'!")
1928 msg = _(b"working directory has unknown parent '%s'!")
1928 raise error.Abort(msg % short(changeid))
1929 raise error.Abort(msg % short(changeid))
1929 changeid = hex(changeid) # for the error message
1930 changeid = hex(changeid) # for the error message
1930 raise
1931 raise
1931
1932
1932 elif len(changeid) == 2 * self.nodeconstants.nodelen:
1933 elif len(changeid) == 2 * self.nodeconstants.nodelen:
1933 node = bin(changeid)
1934 node = bin(changeid)
1934 rev = self.changelog.rev(node)
1935 rev = self.changelog.rev(node)
1935 else:
1936 else:
1936 raise error.ProgrammingError(
1937 raise error.ProgrammingError(
1937 b"unsupported changeid '%s' of type %s"
1938 b"unsupported changeid '%s' of type %s"
1938 % (changeid, pycompat.bytestr(type(changeid)))
1939 % (changeid, pycompat.bytestr(type(changeid)))
1939 )
1940 )
1940
1941
1941 return context.changectx(self, rev, node)
1942 return context.changectx(self, rev, node)
1942
1943
1943 except (error.FilteredIndexError, error.FilteredLookupError):
1944 except (error.FilteredIndexError, error.FilteredLookupError):
1944 raise error.FilteredRepoLookupError(
1945 raise error.FilteredRepoLookupError(
1945 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1946 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1946 )
1947 )
1947 except (IndexError, LookupError):
1948 except (IndexError, LookupError):
1948 raise error.RepoLookupError(
1949 raise error.RepoLookupError(
1949 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1950 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1950 )
1951 )
1951 except error.WdirUnsupported:
1952 except error.WdirUnsupported:
1952 return context.workingctx(self)
1953 return context.workingctx(self)
1953
1954
1954 def __contains__(self, changeid):
1955 def __contains__(self, changeid):
1955 """True if the given changeid exists"""
1956 """True if the given changeid exists"""
1956 try:
1957 try:
1957 self[changeid]
1958 self[changeid]
1958 return True
1959 return True
1959 except error.RepoLookupError:
1960 except error.RepoLookupError:
1960 return False
1961 return False
1961
1962
1962 def __nonzero__(self):
1963 def __nonzero__(self):
1963 return True
1964 return True
1964
1965
1965 __bool__ = __nonzero__
1966 __bool__ = __nonzero__
1966
1967
1967 def __len__(self):
1968 def __len__(self):
1968 # no need to pay the cost of repoview.changelog
1969 # no need to pay the cost of repoview.changelog
1969 unfi = self.unfiltered()
1970 unfi = self.unfiltered()
1970 return len(unfi.changelog)
1971 return len(unfi.changelog)
1971
1972
1972 def __iter__(self):
1973 def __iter__(self):
1973 return iter(self.changelog)
1974 return iter(self.changelog)
1974
1975
1975 def revs(self, expr, *args):
1976 def revs(self, expr, *args):
1976 """Find revisions matching a revset.
1977 """Find revisions matching a revset.
1977
1978
1978 The revset is specified as a string ``expr`` that may contain
1979 The revset is specified as a string ``expr`` that may contain
1979 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1980 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1980
1981
1981 Revset aliases from the configuration are not expanded. To expand
1982 Revset aliases from the configuration are not expanded. To expand
1982 user aliases, consider calling ``scmutil.revrange()`` or
1983 user aliases, consider calling ``scmutil.revrange()`` or
1983 ``repo.anyrevs([expr], user=True)``.
1984 ``repo.anyrevs([expr], user=True)``.
1984
1985
1985 Returns a smartset.abstractsmartset, which is a list-like interface
1986 Returns a smartset.abstractsmartset, which is a list-like interface
1986 that contains integer revisions.
1987 that contains integer revisions.
1987 """
1988 """
1988 tree = revsetlang.spectree(expr, *args)
1989 tree = revsetlang.spectree(expr, *args)
1989 return revset.makematcher(tree)(self)
1990 return revset.makematcher(tree)(self)
1990
1991
1991 def set(self, expr, *args):
1992 def set(self, expr, *args):
1992 """Find revisions matching a revset and emit changectx instances.
1993 """Find revisions matching a revset and emit changectx instances.
1993
1994
1994 This is a convenience wrapper around ``revs()`` that iterates the
1995 This is a convenience wrapper around ``revs()`` that iterates the
1995 result and is a generator of changectx instances.
1996 result and is a generator of changectx instances.
1996
1997
1997 Revset aliases from the configuration are not expanded. To expand
1998 Revset aliases from the configuration are not expanded. To expand
1998 user aliases, consider calling ``scmutil.revrange()``.
1999 user aliases, consider calling ``scmutil.revrange()``.
1999 """
2000 """
2000 for r in self.revs(expr, *args):
2001 for r in self.revs(expr, *args):
2001 yield self[r]
2002 yield self[r]
2002
2003
2003 def anyrevs(self, specs, user=False, localalias=None):
2004 def anyrevs(self, specs, user=False, localalias=None):
2004 """Find revisions matching one of the given revsets.
2005 """Find revisions matching one of the given revsets.
2005
2006
2006 Revset aliases from the configuration are not expanded by default. To
2007 Revset aliases from the configuration are not expanded by default. To
2007 expand user aliases, specify ``user=True``. To provide some local
2008 expand user aliases, specify ``user=True``. To provide some local
2008 definitions overriding user aliases, set ``localalias`` to
2009 definitions overriding user aliases, set ``localalias`` to
2009 ``{name: definitionstring}``.
2010 ``{name: definitionstring}``.
2010 """
2011 """
2011 if specs == [b'null']:
2012 if specs == [b'null']:
2012 return revset.baseset([nullrev])
2013 return revset.baseset([nullrev])
2013 if specs == [b'.']:
2014 if specs == [b'.']:
2014 quick_data = self._quick_access_changeid.get(b'.')
2015 quick_data = self._quick_access_changeid.get(b'.')
2015 if quick_data is not None:
2016 if quick_data is not None:
2016 return revset.baseset([quick_data[0]])
2017 return revset.baseset([quick_data[0]])
2017 if user:
2018 if user:
2018 m = revset.matchany(
2019 m = revset.matchany(
2019 self.ui,
2020 self.ui,
2020 specs,
2021 specs,
2021 lookup=revset.lookupfn(self),
2022 lookup=revset.lookupfn(self),
2022 localalias=localalias,
2023 localalias=localalias,
2023 )
2024 )
2024 else:
2025 else:
2025 m = revset.matchany(None, specs, localalias=localalias)
2026 m = revset.matchany(None, specs, localalias=localalias)
2026 return m(self)
2027 return m(self)
2027
2028
2028 def url(self):
2029 def url(self):
2029 return b'file:' + self.root
2030 return b'file:' + self.root
2030
2031
2031 def hook(self, name, throw=False, **args):
2032 def hook(self, name, throw=False, **args):
2032 """Call a hook, passing this repo instance.
2033 """Call a hook, passing this repo instance.
2033
2034
2034 This a convenience method to aid invoking hooks. Extensions likely
2035 This a convenience method to aid invoking hooks. Extensions likely
2035 won't call this unless they have registered a custom hook or are
2036 won't call this unless they have registered a custom hook or are
2036 replacing code that is expected to call a hook.
2037 replacing code that is expected to call a hook.
2037 """
2038 """
2038 return hook.hook(self.ui, self, name, throw, **args)
2039 return hook.hook(self.ui, self, name, throw, **args)
2039
2040
2040 @filteredpropertycache
2041 @filteredpropertycache
2041 def _tagscache(self):
2042 def _tagscache(self):
2042 """Returns a tagscache object that contains various tags related
2043 """Returns a tagscache object that contains various tags related
2043 caches."""
2044 caches."""
2044
2045
2045 # This simplifies its cache management by having one decorated
2046 # This simplifies its cache management by having one decorated
2046 # function (this one) and the rest simply fetch things from it.
2047 # function (this one) and the rest simply fetch things from it.
2047 class tagscache(object):
2048 class tagscache(object):
2048 def __init__(self):
2049 def __init__(self):
2049 # These two define the set of tags for this repository. tags
2050 # These two define the set of tags for this repository. tags
2050 # maps tag name to node; tagtypes maps tag name to 'global' or
2051 # maps tag name to node; tagtypes maps tag name to 'global' or
2051 # 'local'. (Global tags are defined by .hgtags across all
2052 # 'local'. (Global tags are defined by .hgtags across all
2052 # heads, and local tags are defined in .hg/localtags.)
2053 # heads, and local tags are defined in .hg/localtags.)
2053 # They constitute the in-memory cache of tags.
2054 # They constitute the in-memory cache of tags.
2054 self.tags = self.tagtypes = None
2055 self.tags = self.tagtypes = None
2055
2056
2056 self.nodetagscache = self.tagslist = None
2057 self.nodetagscache = self.tagslist = None
2057
2058
2058 cache = tagscache()
2059 cache = tagscache()
2059 cache.tags, cache.tagtypes = self._findtags()
2060 cache.tags, cache.tagtypes = self._findtags()
2060
2061
2061 return cache
2062 return cache
2062
2063
2063 def tags(self):
2064 def tags(self):
2064 '''return a mapping of tag to node'''
2065 '''return a mapping of tag to node'''
2065 t = {}
2066 t = {}
2066 if self.changelog.filteredrevs:
2067 if self.changelog.filteredrevs:
2067 tags, tt = self._findtags()
2068 tags, tt = self._findtags()
2068 else:
2069 else:
2069 tags = self._tagscache.tags
2070 tags = self._tagscache.tags
2070 rev = self.changelog.rev
2071 rev = self.changelog.rev
2071 for k, v in pycompat.iteritems(tags):
2072 for k, v in pycompat.iteritems(tags):
2072 try:
2073 try:
2073 # ignore tags to unknown nodes
2074 # ignore tags to unknown nodes
2074 rev(v)
2075 rev(v)
2075 t[k] = v
2076 t[k] = v
2076 except (error.LookupError, ValueError):
2077 except (error.LookupError, ValueError):
2077 pass
2078 pass
2078 return t
2079 return t
2079
2080
2080 def _findtags(self):
2081 def _findtags(self):
2081 """Do the hard work of finding tags. Return a pair of dicts
2082 """Do the hard work of finding tags. Return a pair of dicts
2082 (tags, tagtypes) where tags maps tag name to node, and tagtypes
2083 (tags, tagtypes) where tags maps tag name to node, and tagtypes
2083 maps tag name to a string like \'global\' or \'local\'.
2084 maps tag name to a string like \'global\' or \'local\'.
2084 Subclasses or extensions are free to add their own tags, but
2085 Subclasses or extensions are free to add their own tags, but
2085 should be aware that the returned dicts will be retained for the
2086 should be aware that the returned dicts will be retained for the
2086 duration of the localrepo object."""
2087 duration of the localrepo object."""
2087
2088
2088 # XXX what tagtype should subclasses/extensions use? Currently
2089 # XXX what tagtype should subclasses/extensions use? Currently
2089 # mq and bookmarks add tags, but do not set the tagtype at all.
2090 # mq and bookmarks add tags, but do not set the tagtype at all.
2090 # Should each extension invent its own tag type? Should there
2091 # Should each extension invent its own tag type? Should there
2091 # be one tagtype for all such "virtual" tags? Or is the status
2092 # be one tagtype for all such "virtual" tags? Or is the status
2092 # quo fine?
2093 # quo fine?
2093
2094
2094 # map tag name to (node, hist)
2095 # map tag name to (node, hist)
2095 alltags = tagsmod.findglobaltags(self.ui, self)
2096 alltags = tagsmod.findglobaltags(self.ui, self)
2096 # map tag name to tag type
2097 # map tag name to tag type
2097 tagtypes = {tag: b'global' for tag in alltags}
2098 tagtypes = {tag: b'global' for tag in alltags}
2098
2099
2099 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
2100 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
2100
2101
2101 # Build the return dicts. Have to re-encode tag names because
2102 # Build the return dicts. Have to re-encode tag names because
2102 # the tags module always uses UTF-8 (in order not to lose info
2103 # the tags module always uses UTF-8 (in order not to lose info
2103 # writing to the cache), but the rest of Mercurial wants them in
2104 # writing to the cache), but the rest of Mercurial wants them in
2104 # local encoding.
2105 # local encoding.
2105 tags = {}
2106 tags = {}
2106 for (name, (node, hist)) in pycompat.iteritems(alltags):
2107 for (name, (node, hist)) in pycompat.iteritems(alltags):
2107 if node != self.nullid:
2108 if node != self.nullid:
2108 tags[encoding.tolocal(name)] = node
2109 tags[encoding.tolocal(name)] = node
2109 tags[b'tip'] = self.changelog.tip()
2110 tags[b'tip'] = self.changelog.tip()
2110 tagtypes = {
2111 tagtypes = {
2111 encoding.tolocal(name): value
2112 encoding.tolocal(name): value
2112 for (name, value) in pycompat.iteritems(tagtypes)
2113 for (name, value) in pycompat.iteritems(tagtypes)
2113 }
2114 }
2114 return (tags, tagtypes)
2115 return (tags, tagtypes)
2115
2116
2116 def tagtype(self, tagname):
2117 def tagtype(self, tagname):
2117 """
2118 """
2118 return the type of the given tag. result can be:
2119 return the type of the given tag. result can be:
2119
2120
2120 'local' : a local tag
2121 'local' : a local tag
2121 'global' : a global tag
2122 'global' : a global tag
2122 None : tag does not exist
2123 None : tag does not exist
2123 """
2124 """
2124
2125
2125 return self._tagscache.tagtypes.get(tagname)
2126 return self._tagscache.tagtypes.get(tagname)
2126
2127
2127 def tagslist(self):
2128 def tagslist(self):
2128 '''return a list of tags ordered by revision'''
2129 '''return a list of tags ordered by revision'''
2129 if not self._tagscache.tagslist:
2130 if not self._tagscache.tagslist:
2130 l = []
2131 l = []
2131 for t, n in pycompat.iteritems(self.tags()):
2132 for t, n in pycompat.iteritems(self.tags()):
2132 l.append((self.changelog.rev(n), t, n))
2133 l.append((self.changelog.rev(n), t, n))
2133 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
2134 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
2134
2135
2135 return self._tagscache.tagslist
2136 return self._tagscache.tagslist
2136
2137
2137 def nodetags(self, node):
2138 def nodetags(self, node):
2138 '''return the tags associated with a node'''
2139 '''return the tags associated with a node'''
2139 if not self._tagscache.nodetagscache:
2140 if not self._tagscache.nodetagscache:
2140 nodetagscache = {}
2141 nodetagscache = {}
2141 for t, n in pycompat.iteritems(self._tagscache.tags):
2142 for t, n in pycompat.iteritems(self._tagscache.tags):
2142 nodetagscache.setdefault(n, []).append(t)
2143 nodetagscache.setdefault(n, []).append(t)
2143 for tags in pycompat.itervalues(nodetagscache):
2144 for tags in pycompat.itervalues(nodetagscache):
2144 tags.sort()
2145 tags.sort()
2145 self._tagscache.nodetagscache = nodetagscache
2146 self._tagscache.nodetagscache = nodetagscache
2146 return self._tagscache.nodetagscache.get(node, [])
2147 return self._tagscache.nodetagscache.get(node, [])
2147
2148
2148 def nodebookmarks(self, node):
2149 def nodebookmarks(self, node):
2149 """return the list of bookmarks pointing to the specified node"""
2150 """return the list of bookmarks pointing to the specified node"""
2150 return self._bookmarks.names(node)
2151 return self._bookmarks.names(node)
2151
2152
2152 def branchmap(self):
2153 def branchmap(self):
2153 """returns a dictionary {branch: [branchheads]} with branchheads
2154 """returns a dictionary {branch: [branchheads]} with branchheads
2154 ordered by increasing revision number"""
2155 ordered by increasing revision number"""
2155 return self._branchcaches[self]
2156 return self._branchcaches[self]
2156
2157
2157 @unfilteredmethod
2158 @unfilteredmethod
2158 def revbranchcache(self):
2159 def revbranchcache(self):
2159 if not self._revbranchcache:
2160 if not self._revbranchcache:
2160 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
2161 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
2161 return self._revbranchcache
2162 return self._revbranchcache
2162
2163
2163 def register_changeset(self, rev, changelogrevision):
2164 def register_changeset(self, rev, changelogrevision):
2164 self.revbranchcache().setdata(rev, changelogrevision)
2165 self.revbranchcache().setdata(rev, changelogrevision)
2165
2166
2166 def branchtip(self, branch, ignoremissing=False):
2167 def branchtip(self, branch, ignoremissing=False):
2167 """return the tip node for a given branch
2168 """return the tip node for a given branch
2168
2169
2169 If ignoremissing is True, then this method will not raise an error.
2170 If ignoremissing is True, then this method will not raise an error.
2170 This is helpful for callers that only expect None for a missing branch
2171 This is helpful for callers that only expect None for a missing branch
2171 (e.g. namespace).
2172 (e.g. namespace).
2172
2173
2173 """
2174 """
2174 try:
2175 try:
2175 return self.branchmap().branchtip(branch)
2176 return self.branchmap().branchtip(branch)
2176 except KeyError:
2177 except KeyError:
2177 if not ignoremissing:
2178 if not ignoremissing:
2178 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
2179 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
2179 else:
2180 else:
2180 pass
2181 pass
2181
2182
2182 def lookup(self, key):
2183 def lookup(self, key):
2183 node = scmutil.revsymbol(self, key).node()
2184 node = scmutil.revsymbol(self, key).node()
2184 if node is None:
2185 if node is None:
2185 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
2186 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
2186 return node
2187 return node
2187
2188
2188 def lookupbranch(self, key):
2189 def lookupbranch(self, key):
2189 if self.branchmap().hasbranch(key):
2190 if self.branchmap().hasbranch(key):
2190 return key
2191 return key
2191
2192
2192 return scmutil.revsymbol(self, key).branch()
2193 return scmutil.revsymbol(self, key).branch()
2193
2194
2194 def known(self, nodes):
2195 def known(self, nodes):
2195 cl = self.changelog
2196 cl = self.changelog
2196 get_rev = cl.index.get_rev
2197 get_rev = cl.index.get_rev
2197 filtered = cl.filteredrevs
2198 filtered = cl.filteredrevs
2198 result = []
2199 result = []
2199 for n in nodes:
2200 for n in nodes:
2200 r = get_rev(n)
2201 r = get_rev(n)
2201 resp = not (r is None or r in filtered)
2202 resp = not (r is None or r in filtered)
2202 result.append(resp)
2203 result.append(resp)
2203 return result
2204 return result
2204
2205
2205 def local(self):
2206 def local(self):
2206 return self
2207 return self
2207
2208
2208 def publishing(self):
2209 def publishing(self):
2209 # it's safe (and desirable) to trust the publish flag unconditionally
2210 # it's safe (and desirable) to trust the publish flag unconditionally
2210 # so that we don't finalize changes shared between users via ssh or nfs
2211 # so that we don't finalize changes shared between users via ssh or nfs
2211 return self.ui.configbool(b'phases', b'publish', untrusted=True)
2212 return self.ui.configbool(b'phases', b'publish', untrusted=True)
2212
2213
2213 def cancopy(self):
2214 def cancopy(self):
2214 # so statichttprepo's override of local() works
2215 # so statichttprepo's override of local() works
2215 if not self.local():
2216 if not self.local():
2216 return False
2217 return False
2217 if not self.publishing():
2218 if not self.publishing():
2218 return True
2219 return True
2219 # if publishing we can't copy if there is filtered content
2220 # if publishing we can't copy if there is filtered content
2220 return not self.filtered(b'visible').changelog.filteredrevs
2221 return not self.filtered(b'visible').changelog.filteredrevs
2221
2222
2222 def shared(self):
2223 def shared(self):
2223 '''the type of shared repository (None if not shared)'''
2224 '''the type of shared repository (None if not shared)'''
2224 if self.sharedpath != self.path:
2225 if self.sharedpath != self.path:
2225 return b'store'
2226 return b'store'
2226 return None
2227 return None
2227
2228
2228 def wjoin(self, f, *insidef):
2229 def wjoin(self, f, *insidef):
2229 return self.vfs.reljoin(self.root, f, *insidef)
2230 return self.vfs.reljoin(self.root, f, *insidef)
2230
2231
2231 def setparents(self, p1, p2=None):
2232 def setparents(self, p1, p2=None):
2232 if p2 is None:
2233 if p2 is None:
2233 p2 = self.nullid
2234 p2 = self.nullid
2234 self[None].setparents(p1, p2)
2235 self[None].setparents(p1, p2)
2235 self._quick_access_changeid_invalidate()
2236 self._quick_access_changeid_invalidate()
2236
2237
2237 def filectx(self, path, changeid=None, fileid=None, changectx=None):
2238 def filectx(self, path, changeid=None, fileid=None, changectx=None):
2238 """changeid must be a changeset revision, if specified.
2239 """changeid must be a changeset revision, if specified.
2239 fileid can be a file revision or node."""
2240 fileid can be a file revision or node."""
2240 return context.filectx(
2241 return context.filectx(
2241 self, path, changeid, fileid, changectx=changectx
2242 self, path, changeid, fileid, changectx=changectx
2242 )
2243 )
2243
2244
2244 def getcwd(self):
2245 def getcwd(self):
2245 return self.dirstate.getcwd()
2246 return self.dirstate.getcwd()
2246
2247
2247 def pathto(self, f, cwd=None):
2248 def pathto(self, f, cwd=None):
2248 return self.dirstate.pathto(f, cwd)
2249 return self.dirstate.pathto(f, cwd)
2249
2250
2250 def _loadfilter(self, filter):
2251 def _loadfilter(self, filter):
2251 if filter not in self._filterpats:
2252 if filter not in self._filterpats:
2252 l = []
2253 l = []
2253 for pat, cmd in self.ui.configitems(filter):
2254 for pat, cmd in self.ui.configitems(filter):
2254 if cmd == b'!':
2255 if cmd == b'!':
2255 continue
2256 continue
2256 mf = matchmod.match(self.root, b'', [pat])
2257 mf = matchmod.match(self.root, b'', [pat])
2257 fn = None
2258 fn = None
2258 params = cmd
2259 params = cmd
2259 for name, filterfn in pycompat.iteritems(self._datafilters):
2260 for name, filterfn in pycompat.iteritems(self._datafilters):
2260 if cmd.startswith(name):
2261 if cmd.startswith(name):
2261 fn = filterfn
2262 fn = filterfn
2262 params = cmd[len(name) :].lstrip()
2263 params = cmd[len(name) :].lstrip()
2263 break
2264 break
2264 if not fn:
2265 if not fn:
2265 fn = lambda s, c, **kwargs: procutil.filter(s, c)
2266 fn = lambda s, c, **kwargs: procutil.filter(s, c)
2266 fn.__name__ = 'commandfilter'
2267 fn.__name__ = 'commandfilter'
2267 # Wrap old filters not supporting keyword arguments
2268 # Wrap old filters not supporting keyword arguments
2268 if not pycompat.getargspec(fn)[2]:
2269 if not pycompat.getargspec(fn)[2]:
2269 oldfn = fn
2270 oldfn = fn
2270 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
2271 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
2271 fn.__name__ = 'compat-' + oldfn.__name__
2272 fn.__name__ = 'compat-' + oldfn.__name__
2272 l.append((mf, fn, params))
2273 l.append((mf, fn, params))
2273 self._filterpats[filter] = l
2274 self._filterpats[filter] = l
2274 return self._filterpats[filter]
2275 return self._filterpats[filter]
2275
2276
2276 def _filter(self, filterpats, filename, data):
2277 def _filter(self, filterpats, filename, data):
2277 for mf, fn, cmd in filterpats:
2278 for mf, fn, cmd in filterpats:
2278 if mf(filename):
2279 if mf(filename):
2279 self.ui.debug(
2280 self.ui.debug(
2280 b"filtering %s through %s\n"
2281 b"filtering %s through %s\n"
2281 % (filename, cmd or pycompat.sysbytes(fn.__name__))
2282 % (filename, cmd or pycompat.sysbytes(fn.__name__))
2282 )
2283 )
2283 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
2284 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
2284 break
2285 break
2285
2286
2286 return data
2287 return data
2287
2288
2288 @unfilteredpropertycache
2289 @unfilteredpropertycache
2289 def _encodefilterpats(self):
2290 def _encodefilterpats(self):
2290 return self._loadfilter(b'encode')
2291 return self._loadfilter(b'encode')
2291
2292
2292 @unfilteredpropertycache
2293 @unfilteredpropertycache
2293 def _decodefilterpats(self):
2294 def _decodefilterpats(self):
2294 return self._loadfilter(b'decode')
2295 return self._loadfilter(b'decode')
2295
2296
2296 def adddatafilter(self, name, filter):
2297 def adddatafilter(self, name, filter):
2297 self._datafilters[name] = filter
2298 self._datafilters[name] = filter
2298
2299
2299 def wread(self, filename):
2300 def wread(self, filename):
2300 if self.wvfs.islink(filename):
2301 if self.wvfs.islink(filename):
2301 data = self.wvfs.readlink(filename)
2302 data = self.wvfs.readlink(filename)
2302 else:
2303 else:
2303 data = self.wvfs.read(filename)
2304 data = self.wvfs.read(filename)
2304 return self._filter(self._encodefilterpats, filename, data)
2305 return self._filter(self._encodefilterpats, filename, data)
2305
2306
2306 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
2307 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
2307 """write ``data`` into ``filename`` in the working directory
2308 """write ``data`` into ``filename`` in the working directory
2308
2309
2309 This returns length of written (maybe decoded) data.
2310 This returns length of written (maybe decoded) data.
2310 """
2311 """
2311 data = self._filter(self._decodefilterpats, filename, data)
2312 data = self._filter(self._decodefilterpats, filename, data)
2312 if b'l' in flags:
2313 if b'l' in flags:
2313 self.wvfs.symlink(data, filename)
2314 self.wvfs.symlink(data, filename)
2314 else:
2315 else:
2315 self.wvfs.write(
2316 self.wvfs.write(
2316 filename, data, backgroundclose=backgroundclose, **kwargs
2317 filename, data, backgroundclose=backgroundclose, **kwargs
2317 )
2318 )
2318 if b'x' in flags:
2319 if b'x' in flags:
2319 self.wvfs.setflags(filename, False, True)
2320 self.wvfs.setflags(filename, False, True)
2320 else:
2321 else:
2321 self.wvfs.setflags(filename, False, False)
2322 self.wvfs.setflags(filename, False, False)
2322 return len(data)
2323 return len(data)
2323
2324
2324 def wwritedata(self, filename, data):
2325 def wwritedata(self, filename, data):
2325 return self._filter(self._decodefilterpats, filename, data)
2326 return self._filter(self._decodefilterpats, filename, data)
2326
2327
2327 def currenttransaction(self):
2328 def currenttransaction(self):
2328 """return the current transaction or None if non exists"""
2329 """return the current transaction or None if non exists"""
2329 if self._transref:
2330 if self._transref:
2330 tr = self._transref()
2331 tr = self._transref()
2331 else:
2332 else:
2332 tr = None
2333 tr = None
2333
2334
2334 if tr and tr.running():
2335 if tr and tr.running():
2335 return tr
2336 return tr
2336 return None
2337 return None
2337
2338
2338 def transaction(self, desc, report=None):
2339 def transaction(self, desc, report=None):
2339 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
2340 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
2340 b'devel', b'check-locks'
2341 b'devel', b'check-locks'
2341 ):
2342 ):
2342 if self._currentlock(self._lockref) is None:
2343 if self._currentlock(self._lockref) is None:
2343 raise error.ProgrammingError(b'transaction requires locking')
2344 raise error.ProgrammingError(b'transaction requires locking')
2344 tr = self.currenttransaction()
2345 tr = self.currenttransaction()
2345 if tr is not None:
2346 if tr is not None:
2346 return tr.nest(name=desc)
2347 return tr.nest(name=desc)
2347
2348
2348 # abort here if the journal already exists
2349 # abort here if the journal already exists
2349 if self.svfs.exists(b"journal"):
2350 if self.svfs.exists(b"journal"):
2350 raise error.RepoError(
2351 raise error.RepoError(
2351 _(b"abandoned transaction found"),
2352 _(b"abandoned transaction found"),
2352 hint=_(b"run 'hg recover' to clean up transaction"),
2353 hint=_(b"run 'hg recover' to clean up transaction"),
2353 )
2354 )
2354
2355
2355 idbase = b"%.40f#%f" % (random.random(), time.time())
2356 idbase = b"%.40f#%f" % (random.random(), time.time())
2356 ha = hex(hashutil.sha1(idbase).digest())
2357 ha = hex(hashutil.sha1(idbase).digest())
2357 txnid = b'TXN:' + ha
2358 txnid = b'TXN:' + ha
2358 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
2359 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
2359
2360
2360 self._writejournal(desc)
2361 self._writejournal(desc)
2361 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2362 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2362 if report:
2363 if report:
2363 rp = report
2364 rp = report
2364 else:
2365 else:
2365 rp = self.ui.warn
2366 rp = self.ui.warn
2366 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2367 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2367 # we must avoid cyclic reference between repo and transaction.
2368 # we must avoid cyclic reference between repo and transaction.
2368 reporef = weakref.ref(self)
2369 reporef = weakref.ref(self)
2369 # Code to track tag movement
2370 # Code to track tag movement
2370 #
2371 #
2371 # Since tags are all handled as file content, it is actually quite hard
2372 # Since tags are all handled as file content, it is actually quite hard
2372 # to track these movement from a code perspective. So we fallback to a
2373 # to track these movement from a code perspective. So we fallback to a
2373 # tracking at the repository level. One could envision to track changes
2374 # tracking at the repository level. One could envision to track changes
2374 # to the '.hgtags' file through changegroup apply but that fails to
2375 # to the '.hgtags' file through changegroup apply but that fails to
2375 # cope with case where transaction expose new heads without changegroup
2376 # cope with case where transaction expose new heads without changegroup
2376 # being involved (eg: phase movement).
2377 # being involved (eg: phase movement).
2377 #
2378 #
2378 # For now, We gate the feature behind a flag since this likely comes
2379 # For now, We gate the feature behind a flag since this likely comes
2379 # with performance impacts. The current code run more often than needed
2380 # with performance impacts. The current code run more often than needed
2380 # and do not use caches as much as it could. The current focus is on
2381 # and do not use caches as much as it could. The current focus is on
2381 # the behavior of the feature so we disable it by default. The flag
2382 # the behavior of the feature so we disable it by default. The flag
2382 # will be removed when we are happy with the performance impact.
2383 # will be removed when we are happy with the performance impact.
2383 #
2384 #
2384 # Once this feature is no longer experimental move the following
2385 # Once this feature is no longer experimental move the following
2385 # documentation to the appropriate help section:
2386 # documentation to the appropriate help section:
2386 #
2387 #
2387 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2388 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2388 # tags (new or changed or deleted tags). In addition the details of
2389 # tags (new or changed or deleted tags). In addition the details of
2389 # these changes are made available in a file at:
2390 # these changes are made available in a file at:
2390 # ``REPOROOT/.hg/changes/tags.changes``.
2391 # ``REPOROOT/.hg/changes/tags.changes``.
2391 # Make sure you check for HG_TAG_MOVED before reading that file as it
2392 # Make sure you check for HG_TAG_MOVED before reading that file as it
2392 # might exist from a previous transaction even if no tag were touched
2393 # might exist from a previous transaction even if no tag were touched
2393 # in this one. Changes are recorded in a line base format::
2394 # in this one. Changes are recorded in a line base format::
2394 #
2395 #
2395 # <action> <hex-node> <tag-name>\n
2396 # <action> <hex-node> <tag-name>\n
2396 #
2397 #
2397 # Actions are defined as follow:
2398 # Actions are defined as follow:
2398 # "-R": tag is removed,
2399 # "-R": tag is removed,
2399 # "+A": tag is added,
2400 # "+A": tag is added,
2400 # "-M": tag is moved (old value),
2401 # "-M": tag is moved (old value),
2401 # "+M": tag is moved (new value),
2402 # "+M": tag is moved (new value),
2402 tracktags = lambda x: None
2403 tracktags = lambda x: None
2403 # experimental config: experimental.hook-track-tags
2404 # experimental config: experimental.hook-track-tags
2404 shouldtracktags = self.ui.configbool(
2405 shouldtracktags = self.ui.configbool(
2405 b'experimental', b'hook-track-tags'
2406 b'experimental', b'hook-track-tags'
2406 )
2407 )
2407 if desc != b'strip' and shouldtracktags:
2408 if desc != b'strip' and shouldtracktags:
2408 oldheads = self.changelog.headrevs()
2409 oldheads = self.changelog.headrevs()
2409
2410
2410 def tracktags(tr2):
2411 def tracktags(tr2):
2411 repo = reporef()
2412 repo = reporef()
2412 assert repo is not None # help pytype
2413 assert repo is not None # help pytype
2413 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2414 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2414 newheads = repo.changelog.headrevs()
2415 newheads = repo.changelog.headrevs()
2415 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2416 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2416 # notes: we compare lists here.
2417 # notes: we compare lists here.
2417 # As we do it only once buiding set would not be cheaper
2418 # As we do it only once buiding set would not be cheaper
2418 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2419 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2419 if changes:
2420 if changes:
2420 tr2.hookargs[b'tag_moved'] = b'1'
2421 tr2.hookargs[b'tag_moved'] = b'1'
2421 with repo.vfs(
2422 with repo.vfs(
2422 b'changes/tags.changes', b'w', atomictemp=True
2423 b'changes/tags.changes', b'w', atomictemp=True
2423 ) as changesfile:
2424 ) as changesfile:
2424 # note: we do not register the file to the transaction
2425 # note: we do not register the file to the transaction
2425 # because we needs it to still exist on the transaction
2426 # because we needs it to still exist on the transaction
2426 # is close (for txnclose hooks)
2427 # is close (for txnclose hooks)
2427 tagsmod.writediff(changesfile, changes)
2428 tagsmod.writediff(changesfile, changes)
2428
2429
2429 def validate(tr2):
2430 def validate(tr2):
2430 """will run pre-closing hooks"""
2431 """will run pre-closing hooks"""
2431 # XXX the transaction API is a bit lacking here so we take a hacky
2432 # XXX the transaction API is a bit lacking here so we take a hacky
2432 # path for now
2433 # path for now
2433 #
2434 #
2434 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2435 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2435 # dict is copied before these run. In addition we needs the data
2436 # dict is copied before these run. In addition we needs the data
2436 # available to in memory hooks too.
2437 # available to in memory hooks too.
2437 #
2438 #
2438 # Moreover, we also need to make sure this runs before txnclose
2439 # Moreover, we also need to make sure this runs before txnclose
2439 # hooks and there is no "pending" mechanism that would execute
2440 # hooks and there is no "pending" mechanism that would execute
2440 # logic only if hooks are about to run.
2441 # logic only if hooks are about to run.
2441 #
2442 #
2442 # Fixing this limitation of the transaction is also needed to track
2443 # Fixing this limitation of the transaction is also needed to track
2443 # other families of changes (bookmarks, phases, obsolescence).
2444 # other families of changes (bookmarks, phases, obsolescence).
2444 #
2445 #
2445 # This will have to be fixed before we remove the experimental
2446 # This will have to be fixed before we remove the experimental
2446 # gating.
2447 # gating.
2447 tracktags(tr2)
2448 tracktags(tr2)
2448 repo = reporef()
2449 repo = reporef()
2449 assert repo is not None # help pytype
2450 assert repo is not None # help pytype
2450
2451
2451 singleheadopt = (b'experimental', b'single-head-per-branch')
2452 singleheadopt = (b'experimental', b'single-head-per-branch')
2452 singlehead = repo.ui.configbool(*singleheadopt)
2453 singlehead = repo.ui.configbool(*singleheadopt)
2453 if singlehead:
2454 if singlehead:
2454 singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1]
2455 singleheadsub = repo.ui.configsuboptions(*singleheadopt)[1]
2455 accountclosed = singleheadsub.get(
2456 accountclosed = singleheadsub.get(
2456 b"account-closed-heads", False
2457 b"account-closed-heads", False
2457 )
2458 )
2458 if singleheadsub.get(b"public-changes-only", False):
2459 if singleheadsub.get(b"public-changes-only", False):
2459 filtername = b"immutable"
2460 filtername = b"immutable"
2460 else:
2461 else:
2461 filtername = b"visible"
2462 filtername = b"visible"
2462 scmutil.enforcesinglehead(
2463 scmutil.enforcesinglehead(
2463 repo, tr2, desc, accountclosed, filtername
2464 repo, tr2, desc, accountclosed, filtername
2464 )
2465 )
2465 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2466 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2466 for name, (old, new) in sorted(
2467 for name, (old, new) in sorted(
2467 tr.changes[b'bookmarks'].items()
2468 tr.changes[b'bookmarks'].items()
2468 ):
2469 ):
2469 args = tr.hookargs.copy()
2470 args = tr.hookargs.copy()
2470 args.update(bookmarks.preparehookargs(name, old, new))
2471 args.update(bookmarks.preparehookargs(name, old, new))
2471 repo.hook(
2472 repo.hook(
2472 b'pretxnclose-bookmark',
2473 b'pretxnclose-bookmark',
2473 throw=True,
2474 throw=True,
2474 **pycompat.strkwargs(args)
2475 **pycompat.strkwargs(args)
2475 )
2476 )
2476 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2477 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2477 cl = repo.unfiltered().changelog
2478 cl = repo.unfiltered().changelog
2478 for revs, (old, new) in tr.changes[b'phases']:
2479 for revs, (old, new) in tr.changes[b'phases']:
2479 for rev in revs:
2480 for rev in revs:
2480 args = tr.hookargs.copy()
2481 args = tr.hookargs.copy()
2481 node = hex(cl.node(rev))
2482 node = hex(cl.node(rev))
2482 args.update(phases.preparehookargs(node, old, new))
2483 args.update(phases.preparehookargs(node, old, new))
2483 repo.hook(
2484 repo.hook(
2484 b'pretxnclose-phase',
2485 b'pretxnclose-phase',
2485 throw=True,
2486 throw=True,
2486 **pycompat.strkwargs(args)
2487 **pycompat.strkwargs(args)
2487 )
2488 )
2488
2489
2489 repo.hook(
2490 repo.hook(
2490 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2491 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2491 )
2492 )
2492
2493
2493 def releasefn(tr, success):
2494 def releasefn(tr, success):
2494 repo = reporef()
2495 repo = reporef()
2495 if repo is None:
2496 if repo is None:
2496 # If the repo has been GC'd (and this release function is being
2497 # If the repo has been GC'd (and this release function is being
2497 # called from transaction.__del__), there's not much we can do,
2498 # called from transaction.__del__), there's not much we can do,
2498 # so just leave the unfinished transaction there and let the
2499 # so just leave the unfinished transaction there and let the
2499 # user run `hg recover`.
2500 # user run `hg recover`.
2500 return
2501 return
2501 if success:
2502 if success:
2502 # this should be explicitly invoked here, because
2503 # this should be explicitly invoked here, because
2503 # in-memory changes aren't written out at closing
2504 # in-memory changes aren't written out at closing
2504 # transaction, if tr.addfilegenerator (via
2505 # transaction, if tr.addfilegenerator (via
2505 # dirstate.write or so) isn't invoked while
2506 # dirstate.write or so) isn't invoked while
2506 # transaction running
2507 # transaction running
2507 repo.dirstate.write(None)
2508 repo.dirstate.write(None)
2508 else:
2509 else:
2509 # discard all changes (including ones already written
2510 # discard all changes (including ones already written
2510 # out) in this transaction
2511 # out) in this transaction
2511 narrowspec.restorebackup(self, b'journal.narrowspec')
2512 narrowspec.restorebackup(self, b'journal.narrowspec')
2512 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2513 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2513 repo.dirstate.restorebackup(None, b'journal.dirstate')
2514 repo.dirstate.restorebackup(None, b'journal.dirstate')
2514
2515
2515 repo.invalidate(clearfilecache=True)
2516 repo.invalidate(clearfilecache=True)
2516
2517
2517 tr = transaction.transaction(
2518 tr = transaction.transaction(
2518 rp,
2519 rp,
2519 self.svfs,
2520 self.svfs,
2520 vfsmap,
2521 vfsmap,
2521 b"journal",
2522 b"journal",
2522 b"undo",
2523 b"undo",
2523 aftertrans(renames),
2524 aftertrans(renames),
2524 self.store.createmode,
2525 self.store.createmode,
2525 validator=validate,
2526 validator=validate,
2526 releasefn=releasefn,
2527 releasefn=releasefn,
2527 checkambigfiles=_cachedfiles,
2528 checkambigfiles=_cachedfiles,
2528 name=desc,
2529 name=desc,
2529 )
2530 )
2530 tr.changes[b'origrepolen'] = len(self)
2531 tr.changes[b'origrepolen'] = len(self)
2531 tr.changes[b'obsmarkers'] = set()
2532 tr.changes[b'obsmarkers'] = set()
2532 tr.changes[b'phases'] = []
2533 tr.changes[b'phases'] = []
2533 tr.changes[b'bookmarks'] = {}
2534 tr.changes[b'bookmarks'] = {}
2534
2535
2535 tr.hookargs[b'txnid'] = txnid
2536 tr.hookargs[b'txnid'] = txnid
2536 tr.hookargs[b'txnname'] = desc
2537 tr.hookargs[b'txnname'] = desc
2537 tr.hookargs[b'changes'] = tr.changes
2538 tr.hookargs[b'changes'] = tr.changes
2538 # note: writing the fncache only during finalize mean that the file is
2539 # note: writing the fncache only during finalize mean that the file is
2539 # outdated when running hooks. As fncache is used for streaming clone,
2540 # outdated when running hooks. As fncache is used for streaming clone,
2540 # this is not expected to break anything that happen during the hooks.
2541 # this is not expected to break anything that happen during the hooks.
2541 tr.addfinalize(b'flush-fncache', self.store.write)
2542 tr.addfinalize(b'flush-fncache', self.store.write)
2542
2543
2543 def txnclosehook(tr2):
2544 def txnclosehook(tr2):
2544 """To be run if transaction is successful, will schedule a hook run"""
2545 """To be run if transaction is successful, will schedule a hook run"""
2545 # Don't reference tr2 in hook() so we don't hold a reference.
2546 # Don't reference tr2 in hook() so we don't hold a reference.
2546 # This reduces memory consumption when there are multiple
2547 # This reduces memory consumption when there are multiple
2547 # transactions per lock. This can likely go away if issue5045
2548 # transactions per lock. This can likely go away if issue5045
2548 # fixes the function accumulation.
2549 # fixes the function accumulation.
2549 hookargs = tr2.hookargs
2550 hookargs = tr2.hookargs
2550
2551
2551 def hookfunc(unused_success):
2552 def hookfunc(unused_success):
2552 repo = reporef()
2553 repo = reporef()
2553 assert repo is not None # help pytype
2554 assert repo is not None # help pytype
2554
2555
2555 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2556 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2556 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2557 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2557 for name, (old, new) in bmchanges:
2558 for name, (old, new) in bmchanges:
2558 args = tr.hookargs.copy()
2559 args = tr.hookargs.copy()
2559 args.update(bookmarks.preparehookargs(name, old, new))
2560 args.update(bookmarks.preparehookargs(name, old, new))
2560 repo.hook(
2561 repo.hook(
2561 b'txnclose-bookmark',
2562 b'txnclose-bookmark',
2562 throw=False,
2563 throw=False,
2563 **pycompat.strkwargs(args)
2564 **pycompat.strkwargs(args)
2564 )
2565 )
2565
2566
2566 if hook.hashook(repo.ui, b'txnclose-phase'):
2567 if hook.hashook(repo.ui, b'txnclose-phase'):
2567 cl = repo.unfiltered().changelog
2568 cl = repo.unfiltered().changelog
2568 phasemv = sorted(
2569 phasemv = sorted(
2569 tr.changes[b'phases'], key=lambda r: r[0][0]
2570 tr.changes[b'phases'], key=lambda r: r[0][0]
2570 )
2571 )
2571 for revs, (old, new) in phasemv:
2572 for revs, (old, new) in phasemv:
2572 for rev in revs:
2573 for rev in revs:
2573 args = tr.hookargs.copy()
2574 args = tr.hookargs.copy()
2574 node = hex(cl.node(rev))
2575 node = hex(cl.node(rev))
2575 args.update(phases.preparehookargs(node, old, new))
2576 args.update(phases.preparehookargs(node, old, new))
2576 repo.hook(
2577 repo.hook(
2577 b'txnclose-phase',
2578 b'txnclose-phase',
2578 throw=False,
2579 throw=False,
2579 **pycompat.strkwargs(args)
2580 **pycompat.strkwargs(args)
2580 )
2581 )
2581
2582
2582 repo.hook(
2583 repo.hook(
2583 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2584 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2584 )
2585 )
2585
2586
2586 repo = reporef()
2587 repo = reporef()
2587 assert repo is not None # help pytype
2588 assert repo is not None # help pytype
2588 repo._afterlock(hookfunc)
2589 repo._afterlock(hookfunc)
2589
2590
2590 tr.addfinalize(b'txnclose-hook', txnclosehook)
2591 tr.addfinalize(b'txnclose-hook', txnclosehook)
2591 # Include a leading "-" to make it happen before the transaction summary
2592 # Include a leading "-" to make it happen before the transaction summary
2592 # reports registered via scmutil.registersummarycallback() whose names
2593 # reports registered via scmutil.registersummarycallback() whose names
2593 # are 00-txnreport etc. That way, the caches will be warm when the
2594 # are 00-txnreport etc. That way, the caches will be warm when the
2594 # callbacks run.
2595 # callbacks run.
2595 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2596 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2596
2597
2597 def txnaborthook(tr2):
2598 def txnaborthook(tr2):
2598 """To be run if transaction is aborted"""
2599 """To be run if transaction is aborted"""
2599 repo = reporef()
2600 repo = reporef()
2600 assert repo is not None # help pytype
2601 assert repo is not None # help pytype
2601 repo.hook(
2602 repo.hook(
2602 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2603 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2603 )
2604 )
2604
2605
2605 tr.addabort(b'txnabort-hook', txnaborthook)
2606 tr.addabort(b'txnabort-hook', txnaborthook)
2606 # avoid eager cache invalidation. in-memory data should be identical
2607 # avoid eager cache invalidation. in-memory data should be identical
2607 # to stored data if transaction has no error.
2608 # to stored data if transaction has no error.
2608 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2609 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2609 self._transref = weakref.ref(tr)
2610 self._transref = weakref.ref(tr)
2610 scmutil.registersummarycallback(self, tr, desc)
2611 scmutil.registersummarycallback(self, tr, desc)
2611 return tr
2612 return tr
2612
2613
2613 def _journalfiles(self):
2614 def _journalfiles(self):
2614 return (
2615 return (
2615 (self.svfs, b'journal'),
2616 (self.svfs, b'journal'),
2616 (self.svfs, b'journal.narrowspec'),
2617 (self.svfs, b'journal.narrowspec'),
2617 (self.vfs, b'journal.narrowspec.dirstate'),
2618 (self.vfs, b'journal.narrowspec.dirstate'),
2618 (self.vfs, b'journal.dirstate'),
2619 (self.vfs, b'journal.dirstate'),
2619 (self.vfs, b'journal.branch'),
2620 (self.vfs, b'journal.branch'),
2620 (self.vfs, b'journal.desc'),
2621 (self.vfs, b'journal.desc'),
2621 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2622 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2622 (self.svfs, b'journal.phaseroots'),
2623 (self.svfs, b'journal.phaseroots'),
2623 )
2624 )
2624
2625
2625 def undofiles(self):
2626 def undofiles(self):
2626 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2627 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2627
2628
2628 @unfilteredmethod
2629 @unfilteredmethod
2629 def _writejournal(self, desc):
2630 def _writejournal(self, desc):
2630 self.dirstate.savebackup(None, b'journal.dirstate')
2631 self.dirstate.savebackup(None, b'journal.dirstate')
2631 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2632 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2632 narrowspec.savebackup(self, b'journal.narrowspec')
2633 narrowspec.savebackup(self, b'journal.narrowspec')
2633 self.vfs.write(
2634 self.vfs.write(
2634 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2635 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2635 )
2636 )
2636 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2637 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2637 bookmarksvfs = bookmarks.bookmarksvfs(self)
2638 bookmarksvfs = bookmarks.bookmarksvfs(self)
2638 bookmarksvfs.write(
2639 bookmarksvfs.write(
2639 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2640 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2640 )
2641 )
2641 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2642 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2642
2643
2643 def recover(self):
2644 def recover(self):
2644 with self.lock():
2645 with self.lock():
2645 if self.svfs.exists(b"journal"):
2646 if self.svfs.exists(b"journal"):
2646 self.ui.status(_(b"rolling back interrupted transaction\n"))
2647 self.ui.status(_(b"rolling back interrupted transaction\n"))
2647 vfsmap = {
2648 vfsmap = {
2648 b'': self.svfs,
2649 b'': self.svfs,
2649 b'plain': self.vfs,
2650 b'plain': self.vfs,
2650 }
2651 }
2651 transaction.rollback(
2652 transaction.rollback(
2652 self.svfs,
2653 self.svfs,
2653 vfsmap,
2654 vfsmap,
2654 b"journal",
2655 b"journal",
2655 self.ui.warn,
2656 self.ui.warn,
2656 checkambigfiles=_cachedfiles,
2657 checkambigfiles=_cachedfiles,
2657 )
2658 )
2658 self.invalidate()
2659 self.invalidate()
2659 return True
2660 return True
2660 else:
2661 else:
2661 self.ui.warn(_(b"no interrupted transaction available\n"))
2662 self.ui.warn(_(b"no interrupted transaction available\n"))
2662 return False
2663 return False
2663
2664
2664 def rollback(self, dryrun=False, force=False):
2665 def rollback(self, dryrun=False, force=False):
2665 wlock = lock = dsguard = None
2666 wlock = lock = dsguard = None
2666 try:
2667 try:
2667 wlock = self.wlock()
2668 wlock = self.wlock()
2668 lock = self.lock()
2669 lock = self.lock()
2669 if self.svfs.exists(b"undo"):
2670 if self.svfs.exists(b"undo"):
2670 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2671 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2671
2672
2672 return self._rollback(dryrun, force, dsguard)
2673 return self._rollback(dryrun, force, dsguard)
2673 else:
2674 else:
2674 self.ui.warn(_(b"no rollback information available\n"))
2675 self.ui.warn(_(b"no rollback information available\n"))
2675 return 1
2676 return 1
2676 finally:
2677 finally:
2677 release(dsguard, lock, wlock)
2678 release(dsguard, lock, wlock)
2678
2679
2679 @unfilteredmethod # Until we get smarter cache management
2680 @unfilteredmethod # Until we get smarter cache management
2680 def _rollback(self, dryrun, force, dsguard):
2681 def _rollback(self, dryrun, force, dsguard):
2681 ui = self.ui
2682 ui = self.ui
2682 try:
2683 try:
2683 args = self.vfs.read(b'undo.desc').splitlines()
2684 args = self.vfs.read(b'undo.desc').splitlines()
2684 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2685 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2685 if len(args) >= 3:
2686 if len(args) >= 3:
2686 detail = args[2]
2687 detail = args[2]
2687 oldtip = oldlen - 1
2688 oldtip = oldlen - 1
2688
2689
2689 if detail and ui.verbose:
2690 if detail and ui.verbose:
2690 msg = _(
2691 msg = _(
2691 b'repository tip rolled back to revision %d'
2692 b'repository tip rolled back to revision %d'
2692 b' (undo %s: %s)\n'
2693 b' (undo %s: %s)\n'
2693 ) % (oldtip, desc, detail)
2694 ) % (oldtip, desc, detail)
2694 else:
2695 else:
2695 msg = _(
2696 msg = _(
2696 b'repository tip rolled back to revision %d (undo %s)\n'
2697 b'repository tip rolled back to revision %d (undo %s)\n'
2697 ) % (oldtip, desc)
2698 ) % (oldtip, desc)
2698 except IOError:
2699 except IOError:
2699 msg = _(b'rolling back unknown transaction\n')
2700 msg = _(b'rolling back unknown transaction\n')
2700 desc = None
2701 desc = None
2701
2702
2702 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2703 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2703 raise error.Abort(
2704 raise error.Abort(
2704 _(
2705 _(
2705 b'rollback of last commit while not checked out '
2706 b'rollback of last commit while not checked out '
2706 b'may lose data'
2707 b'may lose data'
2707 ),
2708 ),
2708 hint=_(b'use -f to force'),
2709 hint=_(b'use -f to force'),
2709 )
2710 )
2710
2711
2711 ui.status(msg)
2712 ui.status(msg)
2712 if dryrun:
2713 if dryrun:
2713 return 0
2714 return 0
2714
2715
2715 parents = self.dirstate.parents()
2716 parents = self.dirstate.parents()
2716 self.destroying()
2717 self.destroying()
2717 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2718 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2718 transaction.rollback(
2719 transaction.rollback(
2719 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2720 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2720 )
2721 )
2721 bookmarksvfs = bookmarks.bookmarksvfs(self)
2722 bookmarksvfs = bookmarks.bookmarksvfs(self)
2722 if bookmarksvfs.exists(b'undo.bookmarks'):
2723 if bookmarksvfs.exists(b'undo.bookmarks'):
2723 bookmarksvfs.rename(
2724 bookmarksvfs.rename(
2724 b'undo.bookmarks', b'bookmarks', checkambig=True
2725 b'undo.bookmarks', b'bookmarks', checkambig=True
2725 )
2726 )
2726 if self.svfs.exists(b'undo.phaseroots'):
2727 if self.svfs.exists(b'undo.phaseroots'):
2727 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2728 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2728 self.invalidate()
2729 self.invalidate()
2729
2730
2730 has_node = self.changelog.index.has_node
2731 has_node = self.changelog.index.has_node
2731 parentgone = any(not has_node(p) for p in parents)
2732 parentgone = any(not has_node(p) for p in parents)
2732 if parentgone:
2733 if parentgone:
2733 # prevent dirstateguard from overwriting already restored one
2734 # prevent dirstateguard from overwriting already restored one
2734 dsguard.close()
2735 dsguard.close()
2735
2736
2736 narrowspec.restorebackup(self, b'undo.narrowspec')
2737 narrowspec.restorebackup(self, b'undo.narrowspec')
2737 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2738 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2738 self.dirstate.restorebackup(None, b'undo.dirstate')
2739 self.dirstate.restorebackup(None, b'undo.dirstate')
2739 try:
2740 try:
2740 branch = self.vfs.read(b'undo.branch')
2741 branch = self.vfs.read(b'undo.branch')
2741 self.dirstate.setbranch(encoding.tolocal(branch))
2742 self.dirstate.setbranch(encoding.tolocal(branch))
2742 except IOError:
2743 except IOError:
2743 ui.warn(
2744 ui.warn(
2744 _(
2745 _(
2745 b'named branch could not be reset: '
2746 b'named branch could not be reset: '
2746 b'current branch is still \'%s\'\n'
2747 b'current branch is still \'%s\'\n'
2747 )
2748 )
2748 % self.dirstate.branch()
2749 % self.dirstate.branch()
2749 )
2750 )
2750
2751
2751 parents = tuple([p.rev() for p in self[None].parents()])
2752 parents = tuple([p.rev() for p in self[None].parents()])
2752 if len(parents) > 1:
2753 if len(parents) > 1:
2753 ui.status(
2754 ui.status(
2754 _(
2755 _(
2755 b'working directory now based on '
2756 b'working directory now based on '
2756 b'revisions %d and %d\n'
2757 b'revisions %d and %d\n'
2757 )
2758 )
2758 % parents
2759 % parents
2759 )
2760 )
2760 else:
2761 else:
2761 ui.status(
2762 ui.status(
2762 _(b'working directory now based on revision %d\n') % parents
2763 _(b'working directory now based on revision %d\n') % parents
2763 )
2764 )
2764 mergestatemod.mergestate.clean(self)
2765 mergestatemod.mergestate.clean(self)
2765
2766
2766 # TODO: if we know which new heads may result from this rollback, pass
2767 # TODO: if we know which new heads may result from this rollback, pass
2767 # them to destroy(), which will prevent the branchhead cache from being
2768 # them to destroy(), which will prevent the branchhead cache from being
2768 # invalidated.
2769 # invalidated.
2769 self.destroyed()
2770 self.destroyed()
2770 return 0
2771 return 0
2771
2772
2772 def _buildcacheupdater(self, newtransaction):
2773 def _buildcacheupdater(self, newtransaction):
2773 """called during transaction to build the callback updating cache
2774 """called during transaction to build the callback updating cache
2774
2775
2775 Lives on the repository to help extension who might want to augment
2776 Lives on the repository to help extension who might want to augment
2776 this logic. For this purpose, the created transaction is passed to the
2777 this logic. For this purpose, the created transaction is passed to the
2777 method.
2778 method.
2778 """
2779 """
2779 # we must avoid cyclic reference between repo and transaction.
2780 # we must avoid cyclic reference between repo and transaction.
2780 reporef = weakref.ref(self)
2781 reporef = weakref.ref(self)
2781
2782
2782 def updater(tr):
2783 def updater(tr):
2783 repo = reporef()
2784 repo = reporef()
2784 assert repo is not None # help pytype
2785 assert repo is not None # help pytype
2785 repo.updatecaches(tr)
2786 repo.updatecaches(tr)
2786
2787
2787 return updater
2788 return updater
2788
2789
2789 @unfilteredmethod
2790 @unfilteredmethod
2790 def updatecaches(self, tr=None, full=False, caches=None):
2791 def updatecaches(self, tr=None, full=False, caches=None):
2791 """warm appropriate caches
2792 """warm appropriate caches
2792
2793
2793 If this function is called after a transaction closed. The transaction
2794 If this function is called after a transaction closed. The transaction
2794 will be available in the 'tr' argument. This can be used to selectively
2795 will be available in the 'tr' argument. This can be used to selectively
2795 update caches relevant to the changes in that transaction.
2796 update caches relevant to the changes in that transaction.
2796
2797
2797 If 'full' is set, make sure all caches the function knows about have
2798 If 'full' is set, make sure all caches the function knows about have
2798 up-to-date data. Even the ones usually loaded more lazily.
2799 up-to-date data. Even the ones usually loaded more lazily.
2799
2800
2800 The `full` argument can take a special "post-clone" value. In this case
2801 The `full` argument can take a special "post-clone" value. In this case
2801 the cache warming is made after a clone and of the slower cache might
2802 the cache warming is made after a clone and of the slower cache might
2802 be skipped, namely the `.fnodetags` one. This argument is 5.8 specific
2803 be skipped, namely the `.fnodetags` one. This argument is 5.8 specific
2803 as we plan for a cleaner way to deal with this for 5.9.
2804 as we plan for a cleaner way to deal with this for 5.9.
2804 """
2805 """
2805 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2806 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2806 # During strip, many caches are invalid but
2807 # During strip, many caches are invalid but
2807 # later call to `destroyed` will refresh them.
2808 # later call to `destroyed` will refresh them.
2808 return
2809 return
2809
2810
2810 unfi = self.unfiltered()
2811 unfi = self.unfiltered()
2811
2812
2812 if full:
2813 if full:
2813 msg = (
2814 msg = (
2814 "`full` argument for `repo.updatecaches` is deprecated\n"
2815 "`full` argument for `repo.updatecaches` is deprecated\n"
2815 "(use `caches=repository.CACHE_ALL` instead)"
2816 "(use `caches=repository.CACHE_ALL` instead)"
2816 )
2817 )
2817 self.ui.deprecwarn(msg, b"5.9")
2818 self.ui.deprecwarn(msg, b"5.9")
2818 caches = repository.CACHES_ALL
2819 caches = repository.CACHES_ALL
2819 if full == b"post-clone":
2820 if full == b"post-clone":
2820 caches = repository.CACHES_POST_CLONE
2821 caches = repository.CACHES_POST_CLONE
2821 caches = repository.CACHES_ALL
2822 caches = repository.CACHES_ALL
2822 elif caches is None:
2823 elif caches is None:
2823 caches = repository.CACHES_DEFAULT
2824 caches = repository.CACHES_DEFAULT
2824
2825
2825 if repository.CACHE_BRANCHMAP_SERVED in caches:
2826 if repository.CACHE_BRANCHMAP_SERVED in caches:
2826 if tr is None or tr.changes[b'origrepolen'] < len(self):
2827 if tr is None or tr.changes[b'origrepolen'] < len(self):
2827 # accessing the 'served' branchmap should refresh all the others,
2828 # accessing the 'served' branchmap should refresh all the others,
2828 self.ui.debug(b'updating the branch cache\n')
2829 self.ui.debug(b'updating the branch cache\n')
2829 self.filtered(b'served').branchmap()
2830 self.filtered(b'served').branchmap()
2830 self.filtered(b'served.hidden').branchmap()
2831 self.filtered(b'served.hidden').branchmap()
2831 # flush all possibly delayed write.
2832 # flush all possibly delayed write.
2832 self._branchcaches.write_delayed(self)
2833 self._branchcaches.write_delayed(self)
2833
2834
2834 if repository.CACHE_CHANGELOG_CACHE in caches:
2835 if repository.CACHE_CHANGELOG_CACHE in caches:
2835 self.changelog.update_caches(transaction=tr)
2836 self.changelog.update_caches(transaction=tr)
2836
2837
2837 if repository.CACHE_MANIFESTLOG_CACHE in caches:
2838 if repository.CACHE_MANIFESTLOG_CACHE in caches:
2838 self.manifestlog.update_caches(transaction=tr)
2839 self.manifestlog.update_caches(transaction=tr)
2839
2840
2840 if repository.CACHE_REV_BRANCH in caches:
2841 if repository.CACHE_REV_BRANCH in caches:
2841 rbc = unfi.revbranchcache()
2842 rbc = unfi.revbranchcache()
2842 for r in unfi.changelog:
2843 for r in unfi.changelog:
2843 rbc.branchinfo(r)
2844 rbc.branchinfo(r)
2844 rbc.write()
2845 rbc.write()
2845
2846
2846 if repository.CACHE_FULL_MANIFEST in caches:
2847 if repository.CACHE_FULL_MANIFEST in caches:
2847 # ensure the working copy parents are in the manifestfulltextcache
2848 # ensure the working copy parents are in the manifestfulltextcache
2848 for ctx in self[b'.'].parents():
2849 for ctx in self[b'.'].parents():
2849 ctx.manifest() # accessing the manifest is enough
2850 ctx.manifest() # accessing the manifest is enough
2850
2851
2851 if repository.CACHE_FILE_NODE_TAGS in caches:
2852 if repository.CACHE_FILE_NODE_TAGS in caches:
2852 # accessing fnode cache warms the cache
2853 # accessing fnode cache warms the cache
2853 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2854 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2854
2855
2855 if repository.CACHE_TAGS_DEFAULT in caches:
2856 if repository.CACHE_TAGS_DEFAULT in caches:
2856 # accessing tags warm the cache
2857 # accessing tags warm the cache
2857 self.tags()
2858 self.tags()
2858 if repository.CACHE_TAGS_SERVED in caches:
2859 if repository.CACHE_TAGS_SERVED in caches:
2859 self.filtered(b'served').tags()
2860 self.filtered(b'served').tags()
2860
2861
2861 if repository.CACHE_BRANCHMAP_ALL in caches:
2862 if repository.CACHE_BRANCHMAP_ALL in caches:
2862 # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately,
2863 # The CACHE_BRANCHMAP_ALL updates lazily-loaded caches immediately,
2863 # so we're forcing a write to cause these caches to be warmed up
2864 # so we're forcing a write to cause these caches to be warmed up
2864 # even if they haven't explicitly been requested yet (if they've
2865 # even if they haven't explicitly been requested yet (if they've
2865 # never been used by hg, they won't ever have been written, even if
2866 # never been used by hg, they won't ever have been written, even if
2866 # they're a subset of another kind of cache that *has* been used).
2867 # they're a subset of another kind of cache that *has* been used).
2867 for filt in repoview.filtertable.keys():
2868 for filt in repoview.filtertable.keys():
2868 filtered = self.filtered(filt)
2869 filtered = self.filtered(filt)
2869 filtered.branchmap().write(filtered)
2870 filtered.branchmap().write(filtered)
2870
2871
2871 def invalidatecaches(self):
2872 def invalidatecaches(self):
2872
2873
2873 if '_tagscache' in vars(self):
2874 if '_tagscache' in vars(self):
2874 # can't use delattr on proxy
2875 # can't use delattr on proxy
2875 del self.__dict__['_tagscache']
2876 del self.__dict__['_tagscache']
2876
2877
2877 self._branchcaches.clear()
2878 self._branchcaches.clear()
2878 self.invalidatevolatilesets()
2879 self.invalidatevolatilesets()
2879 self._sparsesignaturecache.clear()
2880 self._sparsesignaturecache.clear()
2880
2881
2881 def invalidatevolatilesets(self):
2882 def invalidatevolatilesets(self):
2882 self.filteredrevcache.clear()
2883 self.filteredrevcache.clear()
2883 obsolete.clearobscaches(self)
2884 obsolete.clearobscaches(self)
2884 self._quick_access_changeid_invalidate()
2885 self._quick_access_changeid_invalidate()
2885
2886
2886 def invalidatedirstate(self):
2887 def invalidatedirstate(self):
2887 """Invalidates the dirstate, causing the next call to dirstate
2888 """Invalidates the dirstate, causing the next call to dirstate
2888 to check if it was modified since the last time it was read,
2889 to check if it was modified since the last time it was read,
2889 rereading it if it has.
2890 rereading it if it has.
2890
2891
2891 This is different to dirstate.invalidate() that it doesn't always
2892 This is different to dirstate.invalidate() that it doesn't always
2892 rereads the dirstate. Use dirstate.invalidate() if you want to
2893 rereads the dirstate. Use dirstate.invalidate() if you want to
2893 explicitly read the dirstate again (i.e. restoring it to a previous
2894 explicitly read the dirstate again (i.e. restoring it to a previous
2894 known good state)."""
2895 known good state)."""
2895 if hasunfilteredcache(self, 'dirstate'):
2896 if hasunfilteredcache(self, 'dirstate'):
2896 for k in self.dirstate._filecache:
2897 for k in self.dirstate._filecache:
2897 try:
2898 try:
2898 delattr(self.dirstate, k)
2899 delattr(self.dirstate, k)
2899 except AttributeError:
2900 except AttributeError:
2900 pass
2901 pass
2901 delattr(self.unfiltered(), 'dirstate')
2902 delattr(self.unfiltered(), 'dirstate')
2902
2903
2903 def invalidate(self, clearfilecache=False):
2904 def invalidate(self, clearfilecache=False):
2904 """Invalidates both store and non-store parts other than dirstate
2905 """Invalidates both store and non-store parts other than dirstate
2905
2906
2906 If a transaction is running, invalidation of store is omitted,
2907 If a transaction is running, invalidation of store is omitted,
2907 because discarding in-memory changes might cause inconsistency
2908 because discarding in-memory changes might cause inconsistency
2908 (e.g. incomplete fncache causes unintentional failure, but
2909 (e.g. incomplete fncache causes unintentional failure, but
2909 redundant one doesn't).
2910 redundant one doesn't).
2910 """
2911 """
2911 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2912 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2912 for k in list(self._filecache.keys()):
2913 for k in list(self._filecache.keys()):
2913 # dirstate is invalidated separately in invalidatedirstate()
2914 # dirstate is invalidated separately in invalidatedirstate()
2914 if k == b'dirstate':
2915 if k == b'dirstate':
2915 continue
2916 continue
2916 if (
2917 if (
2917 k == b'changelog'
2918 k == b'changelog'
2918 and self.currenttransaction()
2919 and self.currenttransaction()
2919 and self.changelog._delayed
2920 and self.changelog._delayed
2920 ):
2921 ):
2921 # The changelog object may store unwritten revisions. We don't
2922 # The changelog object may store unwritten revisions. We don't
2922 # want to lose them.
2923 # want to lose them.
2923 # TODO: Solve the problem instead of working around it.
2924 # TODO: Solve the problem instead of working around it.
2924 continue
2925 continue
2925
2926
2926 if clearfilecache:
2927 if clearfilecache:
2927 del self._filecache[k]
2928 del self._filecache[k]
2928 try:
2929 try:
2929 delattr(unfiltered, k)
2930 delattr(unfiltered, k)
2930 except AttributeError:
2931 except AttributeError:
2931 pass
2932 pass
2932 self.invalidatecaches()
2933 self.invalidatecaches()
2933 if not self.currenttransaction():
2934 if not self.currenttransaction():
2934 # TODO: Changing contents of store outside transaction
2935 # TODO: Changing contents of store outside transaction
2935 # causes inconsistency. We should make in-memory store
2936 # causes inconsistency. We should make in-memory store
2936 # changes detectable, and abort if changed.
2937 # changes detectable, and abort if changed.
2937 self.store.invalidatecaches()
2938 self.store.invalidatecaches()
2938
2939
2939 def invalidateall(self):
2940 def invalidateall(self):
2940 """Fully invalidates both store and non-store parts, causing the
2941 """Fully invalidates both store and non-store parts, causing the
2941 subsequent operation to reread any outside changes."""
2942 subsequent operation to reread any outside changes."""
2942 # extension should hook this to invalidate its caches
2943 # extension should hook this to invalidate its caches
2943 self.invalidate()
2944 self.invalidate()
2944 self.invalidatedirstate()
2945 self.invalidatedirstate()
2945
2946
2946 @unfilteredmethod
2947 @unfilteredmethod
2947 def _refreshfilecachestats(self, tr):
2948 def _refreshfilecachestats(self, tr):
2948 """Reload stats of cached files so that they are flagged as valid"""
2949 """Reload stats of cached files so that they are flagged as valid"""
2949 for k, ce in self._filecache.items():
2950 for k, ce in self._filecache.items():
2950 k = pycompat.sysstr(k)
2951 k = pycompat.sysstr(k)
2951 if k == 'dirstate' or k not in self.__dict__:
2952 if k == 'dirstate' or k not in self.__dict__:
2952 continue
2953 continue
2953 ce.refresh()
2954 ce.refresh()
2954
2955
2955 def _lock(
2956 def _lock(
2956 self,
2957 self,
2957 vfs,
2958 vfs,
2958 lockname,
2959 lockname,
2959 wait,
2960 wait,
2960 releasefn,
2961 releasefn,
2961 acquirefn,
2962 acquirefn,
2962 desc,
2963 desc,
2963 ):
2964 ):
2964 timeout = 0
2965 timeout = 0
2965 warntimeout = 0
2966 warntimeout = 0
2966 if wait:
2967 if wait:
2967 timeout = self.ui.configint(b"ui", b"timeout")
2968 timeout = self.ui.configint(b"ui", b"timeout")
2968 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2969 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2969 # internal config: ui.signal-safe-lock
2970 # internal config: ui.signal-safe-lock
2970 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2971 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2971
2972
2972 l = lockmod.trylock(
2973 l = lockmod.trylock(
2973 self.ui,
2974 self.ui,
2974 vfs,
2975 vfs,
2975 lockname,
2976 lockname,
2976 timeout,
2977 timeout,
2977 warntimeout,
2978 warntimeout,
2978 releasefn=releasefn,
2979 releasefn=releasefn,
2979 acquirefn=acquirefn,
2980 acquirefn=acquirefn,
2980 desc=desc,
2981 desc=desc,
2981 signalsafe=signalsafe,
2982 signalsafe=signalsafe,
2982 )
2983 )
2983 return l
2984 return l
2984
2985
2985 def _afterlock(self, callback):
2986 def _afterlock(self, callback):
2986 """add a callback to be run when the repository is fully unlocked
2987 """add a callback to be run when the repository is fully unlocked
2987
2988
2988 The callback will be executed when the outermost lock is released
2989 The callback will be executed when the outermost lock is released
2989 (with wlock being higher level than 'lock')."""
2990 (with wlock being higher level than 'lock')."""
2990 for ref in (self._wlockref, self._lockref):
2991 for ref in (self._wlockref, self._lockref):
2991 l = ref and ref()
2992 l = ref and ref()
2992 if l and l.held:
2993 if l and l.held:
2993 l.postrelease.append(callback)
2994 l.postrelease.append(callback)
2994 break
2995 break
2995 else: # no lock have been found.
2996 else: # no lock have been found.
2996 callback(True)
2997 callback(True)
2997
2998
2998 def lock(self, wait=True):
2999 def lock(self, wait=True):
2999 """Lock the repository store (.hg/store) and return a weak reference
3000 """Lock the repository store (.hg/store) and return a weak reference
3000 to the lock. Use this before modifying the store (e.g. committing or
3001 to the lock. Use this before modifying the store (e.g. committing or
3001 stripping). If you are opening a transaction, get a lock as well.)
3002 stripping). If you are opening a transaction, get a lock as well.)
3002
3003
3003 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
3004 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
3004 'wlock' first to avoid a dead-lock hazard."""
3005 'wlock' first to avoid a dead-lock hazard."""
3005 l = self._currentlock(self._lockref)
3006 l = self._currentlock(self._lockref)
3006 if l is not None:
3007 if l is not None:
3007 l.lock()
3008 l.lock()
3008 return l
3009 return l
3009
3010
3010 l = self._lock(
3011 l = self._lock(
3011 vfs=self.svfs,
3012 vfs=self.svfs,
3012 lockname=b"lock",
3013 lockname=b"lock",
3013 wait=wait,
3014 wait=wait,
3014 releasefn=None,
3015 releasefn=None,
3015 acquirefn=self.invalidate,
3016 acquirefn=self.invalidate,
3016 desc=_(b'repository %s') % self.origroot,
3017 desc=_(b'repository %s') % self.origroot,
3017 )
3018 )
3018 self._lockref = weakref.ref(l)
3019 self._lockref = weakref.ref(l)
3019 return l
3020 return l
3020
3021
3021 def wlock(self, wait=True):
3022 def wlock(self, wait=True):
3022 """Lock the non-store parts of the repository (everything under
3023 """Lock the non-store parts of the repository (everything under
3023 .hg except .hg/store) and return a weak reference to the lock.
3024 .hg except .hg/store) and return a weak reference to the lock.
3024
3025
3025 Use this before modifying files in .hg.
3026 Use this before modifying files in .hg.
3026
3027
3027 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
3028 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
3028 'wlock' first to avoid a dead-lock hazard."""
3029 'wlock' first to avoid a dead-lock hazard."""
3029 l = self._wlockref() if self._wlockref else None
3030 l = self._wlockref() if self._wlockref else None
3030 if l is not None and l.held:
3031 if l is not None and l.held:
3031 l.lock()
3032 l.lock()
3032 return l
3033 return l
3033
3034
3034 # We do not need to check for non-waiting lock acquisition. Such
3035 # We do not need to check for non-waiting lock acquisition. Such
3035 # acquisition would not cause dead-lock as they would just fail.
3036 # acquisition would not cause dead-lock as they would just fail.
3036 if wait and (
3037 if wait and (
3037 self.ui.configbool(b'devel', b'all-warnings')
3038 self.ui.configbool(b'devel', b'all-warnings')
3038 or self.ui.configbool(b'devel', b'check-locks')
3039 or self.ui.configbool(b'devel', b'check-locks')
3039 ):
3040 ):
3040 if self._currentlock(self._lockref) is not None:
3041 if self._currentlock(self._lockref) is not None:
3041 self.ui.develwarn(b'"wlock" acquired after "lock"')
3042 self.ui.develwarn(b'"wlock" acquired after "lock"')
3042
3043
3043 def unlock():
3044 def unlock():
3044 if self.dirstate.pendingparentchange():
3045 if self.dirstate.pendingparentchange():
3045 self.dirstate.invalidate()
3046 self.dirstate.invalidate()
3046 else:
3047 else:
3047 self.dirstate.write(None)
3048 self.dirstate.write(None)
3048
3049
3049 self._filecache[b'dirstate'].refresh()
3050 self._filecache[b'dirstate'].refresh()
3050
3051
3051 l = self._lock(
3052 l = self._lock(
3052 self.vfs,
3053 self.vfs,
3053 b"wlock",
3054 b"wlock",
3054 wait,
3055 wait,
3055 unlock,
3056 unlock,
3056 self.invalidatedirstate,
3057 self.invalidatedirstate,
3057 _(b'working directory of %s') % self.origroot,
3058 _(b'working directory of %s') % self.origroot,
3058 )
3059 )
3059 self._wlockref = weakref.ref(l)
3060 self._wlockref = weakref.ref(l)
3060 return l
3061 return l
3061
3062
3062 def _currentlock(self, lockref):
3063 def _currentlock(self, lockref):
3063 """Returns the lock if it's held, or None if it's not."""
3064 """Returns the lock if it's held, or None if it's not."""
3064 if lockref is None:
3065 if lockref is None:
3065 return None
3066 return None
3066 l = lockref()
3067 l = lockref()
3067 if l is None or not l.held:
3068 if l is None or not l.held:
3068 return None
3069 return None
3069 return l
3070 return l
3070
3071
3071 def currentwlock(self):
3072 def currentwlock(self):
3072 """Returns the wlock if it's held, or None if it's not."""
3073 """Returns the wlock if it's held, or None if it's not."""
3073 return self._currentlock(self._wlockref)
3074 return self._currentlock(self._wlockref)
3074
3075
3075 def checkcommitpatterns(self, wctx, match, status, fail):
3076 def checkcommitpatterns(self, wctx, match, status, fail):
3076 """check for commit arguments that aren't committable"""
3077 """check for commit arguments that aren't committable"""
3077 if match.isexact() or match.prefix():
3078 if match.isexact() or match.prefix():
3078 matched = set(status.modified + status.added + status.removed)
3079 matched = set(status.modified + status.added + status.removed)
3079
3080
3080 for f in match.files():
3081 for f in match.files():
3081 f = self.dirstate.normalize(f)
3082 f = self.dirstate.normalize(f)
3082 if f == b'.' or f in matched or f in wctx.substate:
3083 if f == b'.' or f in matched or f in wctx.substate:
3083 continue
3084 continue
3084 if f in status.deleted:
3085 if f in status.deleted:
3085 fail(f, _(b'file not found!'))
3086 fail(f, _(b'file not found!'))
3086 # Is it a directory that exists or used to exist?
3087 # Is it a directory that exists or used to exist?
3087 if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
3088 if self.wvfs.isdir(f) or wctx.p1().hasdir(f):
3088 d = f + b'/'
3089 d = f + b'/'
3089 for mf in matched:
3090 for mf in matched:
3090 if mf.startswith(d):
3091 if mf.startswith(d):
3091 break
3092 break
3092 else:
3093 else:
3093 fail(f, _(b"no match under directory!"))
3094 fail(f, _(b"no match under directory!"))
3094 elif f not in self.dirstate:
3095 elif f not in self.dirstate:
3095 fail(f, _(b"file not tracked!"))
3096 fail(f, _(b"file not tracked!"))
3096
3097
3097 @unfilteredmethod
3098 @unfilteredmethod
3098 def commit(
3099 def commit(
3099 self,
3100 self,
3100 text=b"",
3101 text=b"",
3101 user=None,
3102 user=None,
3102 date=None,
3103 date=None,
3103 match=None,
3104 match=None,
3104 force=False,
3105 force=False,
3105 editor=None,
3106 editor=None,
3106 extra=None,
3107 extra=None,
3107 ):
3108 ):
3108 """Add a new revision to current repository.
3109 """Add a new revision to current repository.
3109
3110
3110 Revision information is gathered from the working directory,
3111 Revision information is gathered from the working directory,
3111 match can be used to filter the committed files. If editor is
3112 match can be used to filter the committed files. If editor is
3112 supplied, it is called to get a commit message.
3113 supplied, it is called to get a commit message.
3113 """
3114 """
3114 if extra is None:
3115 if extra is None:
3115 extra = {}
3116 extra = {}
3116
3117
3117 def fail(f, msg):
3118 def fail(f, msg):
3118 raise error.InputError(b'%s: %s' % (f, msg))
3119 raise error.InputError(b'%s: %s' % (f, msg))
3119
3120
3120 if not match:
3121 if not match:
3121 match = matchmod.always()
3122 match = matchmod.always()
3122
3123
3123 if not force:
3124 if not force:
3124 match.bad = fail
3125 match.bad = fail
3125
3126
3126 # lock() for recent changelog (see issue4368)
3127 # lock() for recent changelog (see issue4368)
3127 with self.wlock(), self.lock():
3128 with self.wlock(), self.lock():
3128 wctx = self[None]
3129 wctx = self[None]
3129 merge = len(wctx.parents()) > 1
3130 merge = len(wctx.parents()) > 1
3130
3131
3131 if not force and merge and not match.always():
3132 if not force and merge and not match.always():
3132 raise error.Abort(
3133 raise error.Abort(
3133 _(
3134 _(
3134 b'cannot partially commit a merge '
3135 b'cannot partially commit a merge '
3135 b'(do not specify files or patterns)'
3136 b'(do not specify files or patterns)'
3136 )
3137 )
3137 )
3138 )
3138
3139
3139 status = self.status(match=match, clean=force)
3140 status = self.status(match=match, clean=force)
3140 if force:
3141 if force:
3141 status.modified.extend(
3142 status.modified.extend(
3142 status.clean
3143 status.clean
3143 ) # mq may commit clean files
3144 ) # mq may commit clean files
3144
3145
3145 # check subrepos
3146 # check subrepos
3146 subs, commitsubs, newstate = subrepoutil.precommit(
3147 subs, commitsubs, newstate = subrepoutil.precommit(
3147 self.ui, wctx, status, match, force=force
3148 self.ui, wctx, status, match, force=force
3148 )
3149 )
3149
3150
3150 # make sure all explicit patterns are matched
3151 # make sure all explicit patterns are matched
3151 if not force:
3152 if not force:
3152 self.checkcommitpatterns(wctx, match, status, fail)
3153 self.checkcommitpatterns(wctx, match, status, fail)
3153
3154
3154 cctx = context.workingcommitctx(
3155 cctx = context.workingcommitctx(
3155 self, status, text, user, date, extra
3156 self, status, text, user, date, extra
3156 )
3157 )
3157
3158
3158 ms = mergestatemod.mergestate.read(self)
3159 ms = mergestatemod.mergestate.read(self)
3159 mergeutil.checkunresolved(ms)
3160 mergeutil.checkunresolved(ms)
3160
3161
3161 # internal config: ui.allowemptycommit
3162 # internal config: ui.allowemptycommit
3162 if cctx.isempty() and not self.ui.configbool(
3163 if cctx.isempty() and not self.ui.configbool(
3163 b'ui', b'allowemptycommit'
3164 b'ui', b'allowemptycommit'
3164 ):
3165 ):
3165 self.ui.debug(b'nothing to commit, clearing merge state\n')
3166 self.ui.debug(b'nothing to commit, clearing merge state\n')
3166 ms.reset()
3167 ms.reset()
3167 return None
3168 return None
3168
3169
3169 if merge and cctx.deleted():
3170 if merge and cctx.deleted():
3170 raise error.Abort(_(b"cannot commit merge with missing files"))
3171 raise error.Abort(_(b"cannot commit merge with missing files"))
3171
3172
3172 if editor:
3173 if editor:
3173 cctx._text = editor(self, cctx, subs)
3174 cctx._text = editor(self, cctx, subs)
3174 edited = text != cctx._text
3175 edited = text != cctx._text
3175
3176
3176 # Save commit message in case this transaction gets rolled back
3177 # Save commit message in case this transaction gets rolled back
3177 # (e.g. by a pretxncommit hook). Leave the content alone on
3178 # (e.g. by a pretxncommit hook). Leave the content alone on
3178 # the assumption that the user will use the same editor again.
3179 # the assumption that the user will use the same editor again.
3179 msgfn = self.savecommitmessage(cctx._text)
3180 msgfn = self.savecommitmessage(cctx._text)
3180
3181
3181 # commit subs and write new state
3182 # commit subs and write new state
3182 if subs:
3183 if subs:
3183 uipathfn = scmutil.getuipathfn(self)
3184 uipathfn = scmutil.getuipathfn(self)
3184 for s in sorted(commitsubs):
3185 for s in sorted(commitsubs):
3185 sub = wctx.sub(s)
3186 sub = wctx.sub(s)
3186 self.ui.status(
3187 self.ui.status(
3187 _(b'committing subrepository %s\n')
3188 _(b'committing subrepository %s\n')
3188 % uipathfn(subrepoutil.subrelpath(sub))
3189 % uipathfn(subrepoutil.subrelpath(sub))
3189 )
3190 )
3190 sr = sub.commit(cctx._text, user, date)
3191 sr = sub.commit(cctx._text, user, date)
3191 newstate[s] = (newstate[s][0], sr)
3192 newstate[s] = (newstate[s][0], sr)
3192 subrepoutil.writestate(self, newstate)
3193 subrepoutil.writestate(self, newstate)
3193
3194
3194 p1, p2 = self.dirstate.parents()
3195 p1, p2 = self.dirstate.parents()
3195 hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'')
3196 hookp1, hookp2 = hex(p1), (p2 != self.nullid and hex(p2) or b'')
3196 try:
3197 try:
3197 self.hook(
3198 self.hook(
3198 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
3199 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
3199 )
3200 )
3200 with self.transaction(b'commit'):
3201 with self.transaction(b'commit'):
3201 ret = self.commitctx(cctx, True)
3202 ret = self.commitctx(cctx, True)
3202 # update bookmarks, dirstate and mergestate
3203 # update bookmarks, dirstate and mergestate
3203 bookmarks.update(self, [p1, p2], ret)
3204 bookmarks.update(self, [p1, p2], ret)
3204 cctx.markcommitted(ret)
3205 cctx.markcommitted(ret)
3205 ms.reset()
3206 ms.reset()
3206 except: # re-raises
3207 except: # re-raises
3207 if edited:
3208 if edited:
3208 self.ui.write(
3209 self.ui.write(
3209 _(b'note: commit message saved in %s\n') % msgfn
3210 _(b'note: commit message saved in %s\n') % msgfn
3210 )
3211 )
3211 self.ui.write(
3212 self.ui.write(
3212 _(
3213 _(
3213 b"note: use 'hg commit --logfile "
3214 b"note: use 'hg commit --logfile "
3214 b".hg/last-message.txt --edit' to reuse it\n"
3215 b".hg/last-message.txt --edit' to reuse it\n"
3215 )
3216 )
3216 )
3217 )
3217 raise
3218 raise
3218
3219
3219 def commithook(unused_success):
3220 def commithook(unused_success):
3220 # hack for command that use a temporary commit (eg: histedit)
3221 # hack for command that use a temporary commit (eg: histedit)
3221 # temporary commit got stripped before hook release
3222 # temporary commit got stripped before hook release
3222 if self.changelog.hasnode(ret):
3223 if self.changelog.hasnode(ret):
3223 self.hook(
3224 self.hook(
3224 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
3225 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
3225 )
3226 )
3226
3227
3227 self._afterlock(commithook)
3228 self._afterlock(commithook)
3228 return ret
3229 return ret
3229
3230
3230 @unfilteredmethod
3231 @unfilteredmethod
3231 def commitctx(self, ctx, error=False, origctx=None):
3232 def commitctx(self, ctx, error=False, origctx=None):
3232 return commit.commitctx(self, ctx, error=error, origctx=origctx)
3233 return commit.commitctx(self, ctx, error=error, origctx=origctx)
3233
3234
3234 @unfilteredmethod
3235 @unfilteredmethod
3235 def destroying(self):
3236 def destroying(self):
3236 """Inform the repository that nodes are about to be destroyed.
3237 """Inform the repository that nodes are about to be destroyed.
3237 Intended for use by strip and rollback, so there's a common
3238 Intended for use by strip and rollback, so there's a common
3238 place for anything that has to be done before destroying history.
3239 place for anything that has to be done before destroying history.
3239
3240
3240 This is mostly useful for saving state that is in memory and waiting
3241 This is mostly useful for saving state that is in memory and waiting
3241 to be flushed when the current lock is released. Because a call to
3242 to be flushed when the current lock is released. Because a call to
3242 destroyed is imminent, the repo will be invalidated causing those
3243 destroyed is imminent, the repo will be invalidated causing those
3243 changes to stay in memory (waiting for the next unlock), or vanish
3244 changes to stay in memory (waiting for the next unlock), or vanish
3244 completely.
3245 completely.
3245 """
3246 """
3246 # When using the same lock to commit and strip, the phasecache is left
3247 # When using the same lock to commit and strip, the phasecache is left
3247 # dirty after committing. Then when we strip, the repo is invalidated,
3248 # dirty after committing. Then when we strip, the repo is invalidated,
3248 # causing those changes to disappear.
3249 # causing those changes to disappear.
3249 if '_phasecache' in vars(self):
3250 if '_phasecache' in vars(self):
3250 self._phasecache.write()
3251 self._phasecache.write()
3251
3252
3252 @unfilteredmethod
3253 @unfilteredmethod
3253 def destroyed(self):
3254 def destroyed(self):
3254 """Inform the repository that nodes have been destroyed.
3255 """Inform the repository that nodes have been destroyed.
3255 Intended for use by strip and rollback, so there's a common
3256 Intended for use by strip and rollback, so there's a common
3256 place for anything that has to be done after destroying history.
3257 place for anything that has to be done after destroying history.
3257 """
3258 """
3258 # When one tries to:
3259 # When one tries to:
3259 # 1) destroy nodes thus calling this method (e.g. strip)
3260 # 1) destroy nodes thus calling this method (e.g. strip)
3260 # 2) use phasecache somewhere (e.g. commit)
3261 # 2) use phasecache somewhere (e.g. commit)
3261 #
3262 #
3262 # then 2) will fail because the phasecache contains nodes that were
3263 # then 2) will fail because the phasecache contains nodes that were
3263 # removed. We can either remove phasecache from the filecache,
3264 # removed. We can either remove phasecache from the filecache,
3264 # causing it to reload next time it is accessed, or simply filter
3265 # causing it to reload next time it is accessed, or simply filter
3265 # the removed nodes now and write the updated cache.
3266 # the removed nodes now and write the updated cache.
3266 self._phasecache.filterunknown(self)
3267 self._phasecache.filterunknown(self)
3267 self._phasecache.write()
3268 self._phasecache.write()
3268
3269
3269 # refresh all repository caches
3270 # refresh all repository caches
3270 self.updatecaches()
3271 self.updatecaches()
3271
3272
3272 # Ensure the persistent tag cache is updated. Doing it now
3273 # Ensure the persistent tag cache is updated. Doing it now
3273 # means that the tag cache only has to worry about destroyed
3274 # means that the tag cache only has to worry about destroyed
3274 # heads immediately after a strip/rollback. That in turn
3275 # heads immediately after a strip/rollback. That in turn
3275 # guarantees that "cachetip == currenttip" (comparing both rev
3276 # guarantees that "cachetip == currenttip" (comparing both rev
3276 # and node) always means no nodes have been added or destroyed.
3277 # and node) always means no nodes have been added or destroyed.
3277
3278
3278 # XXX this is suboptimal when qrefresh'ing: we strip the current
3279 # XXX this is suboptimal when qrefresh'ing: we strip the current
3279 # head, refresh the tag cache, then immediately add a new head.
3280 # head, refresh the tag cache, then immediately add a new head.
3280 # But I think doing it this way is necessary for the "instant
3281 # But I think doing it this way is necessary for the "instant
3281 # tag cache retrieval" case to work.
3282 # tag cache retrieval" case to work.
3282 self.invalidate()
3283 self.invalidate()
3283
3284
3284 def status(
3285 def status(
3285 self,
3286 self,
3286 node1=b'.',
3287 node1=b'.',
3287 node2=None,
3288 node2=None,
3288 match=None,
3289 match=None,
3289 ignored=False,
3290 ignored=False,
3290 clean=False,
3291 clean=False,
3291 unknown=False,
3292 unknown=False,
3292 listsubrepos=False,
3293 listsubrepos=False,
3293 ):
3294 ):
3294 '''a convenience method that calls node1.status(node2)'''
3295 '''a convenience method that calls node1.status(node2)'''
3295 return self[node1].status(
3296 return self[node1].status(
3296 node2, match, ignored, clean, unknown, listsubrepos
3297 node2, match, ignored, clean, unknown, listsubrepos
3297 )
3298 )
3298
3299
3299 def addpostdsstatus(self, ps):
3300 def addpostdsstatus(self, ps):
3300 """Add a callback to run within the wlock, at the point at which status
3301 """Add a callback to run within the wlock, at the point at which status
3301 fixups happen.
3302 fixups happen.
3302
3303
3303 On status completion, callback(wctx, status) will be called with the
3304 On status completion, callback(wctx, status) will be called with the
3304 wlock held, unless the dirstate has changed from underneath or the wlock
3305 wlock held, unless the dirstate has changed from underneath or the wlock
3305 couldn't be grabbed.
3306 couldn't be grabbed.
3306
3307
3307 Callbacks should not capture and use a cached copy of the dirstate --
3308 Callbacks should not capture and use a cached copy of the dirstate --
3308 it might change in the meanwhile. Instead, they should access the
3309 it might change in the meanwhile. Instead, they should access the
3309 dirstate via wctx.repo().dirstate.
3310 dirstate via wctx.repo().dirstate.
3310
3311
3311 This list is emptied out after each status run -- extensions should
3312 This list is emptied out after each status run -- extensions should
3312 make sure it adds to this list each time dirstate.status is called.
3313 make sure it adds to this list each time dirstate.status is called.
3313 Extensions should also make sure they don't call this for statuses
3314 Extensions should also make sure they don't call this for statuses
3314 that don't involve the dirstate.
3315 that don't involve the dirstate.
3315 """
3316 """
3316
3317
3317 # The list is located here for uniqueness reasons -- it is actually
3318 # The list is located here for uniqueness reasons -- it is actually
3318 # managed by the workingctx, but that isn't unique per-repo.
3319 # managed by the workingctx, but that isn't unique per-repo.
3319 self._postdsstatus.append(ps)
3320 self._postdsstatus.append(ps)
3320
3321
3321 def postdsstatus(self):
3322 def postdsstatus(self):
3322 """Used by workingctx to get the list of post-dirstate-status hooks."""
3323 """Used by workingctx to get the list of post-dirstate-status hooks."""
3323 return self._postdsstatus
3324 return self._postdsstatus
3324
3325
3325 def clearpostdsstatus(self):
3326 def clearpostdsstatus(self):
3326 """Used by workingctx to clear post-dirstate-status hooks."""
3327 """Used by workingctx to clear post-dirstate-status hooks."""
3327 del self._postdsstatus[:]
3328 del self._postdsstatus[:]
3328
3329
3329 def heads(self, start=None):
3330 def heads(self, start=None):
3330 if start is None:
3331 if start is None:
3331 cl = self.changelog
3332 cl = self.changelog
3332 headrevs = reversed(cl.headrevs())
3333 headrevs = reversed(cl.headrevs())
3333 return [cl.node(rev) for rev in headrevs]
3334 return [cl.node(rev) for rev in headrevs]
3334
3335
3335 heads = self.changelog.heads(start)
3336 heads = self.changelog.heads(start)
3336 # sort the output in rev descending order
3337 # sort the output in rev descending order
3337 return sorted(heads, key=self.changelog.rev, reverse=True)
3338 return sorted(heads, key=self.changelog.rev, reverse=True)
3338
3339
3339 def branchheads(self, branch=None, start=None, closed=False):
3340 def branchheads(self, branch=None, start=None, closed=False):
3340 """return a (possibly filtered) list of heads for the given branch
3341 """return a (possibly filtered) list of heads for the given branch
3341
3342
3342 Heads are returned in topological order, from newest to oldest.
3343 Heads are returned in topological order, from newest to oldest.
3343 If branch is None, use the dirstate branch.
3344 If branch is None, use the dirstate branch.
3344 If start is not None, return only heads reachable from start.
3345 If start is not None, return only heads reachable from start.
3345 If closed is True, return heads that are marked as closed as well.
3346 If closed is True, return heads that are marked as closed as well.
3346 """
3347 """
3347 if branch is None:
3348 if branch is None:
3348 branch = self[None].branch()
3349 branch = self[None].branch()
3349 branches = self.branchmap()
3350 branches = self.branchmap()
3350 if not branches.hasbranch(branch):
3351 if not branches.hasbranch(branch):
3351 return []
3352 return []
3352 # the cache returns heads ordered lowest to highest
3353 # the cache returns heads ordered lowest to highest
3353 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3354 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3354 if start is not None:
3355 if start is not None:
3355 # filter out the heads that cannot be reached from startrev
3356 # filter out the heads that cannot be reached from startrev
3356 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3357 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3357 bheads = [h for h in bheads if h in fbheads]
3358 bheads = [h for h in bheads if h in fbheads]
3358 return bheads
3359 return bheads
3359
3360
3360 def branches(self, nodes):
3361 def branches(self, nodes):
3361 if not nodes:
3362 if not nodes:
3362 nodes = [self.changelog.tip()]
3363 nodes = [self.changelog.tip()]
3363 b = []
3364 b = []
3364 for n in nodes:
3365 for n in nodes:
3365 t = n
3366 t = n
3366 while True:
3367 while True:
3367 p = self.changelog.parents(n)
3368 p = self.changelog.parents(n)
3368 if p[1] != self.nullid or p[0] == self.nullid:
3369 if p[1] != self.nullid or p[0] == self.nullid:
3369 b.append((t, n, p[0], p[1]))
3370 b.append((t, n, p[0], p[1]))
3370 break
3371 break
3371 n = p[0]
3372 n = p[0]
3372 return b
3373 return b
3373
3374
3374 def between(self, pairs):
3375 def between(self, pairs):
3375 r = []
3376 r = []
3376
3377
3377 for top, bottom in pairs:
3378 for top, bottom in pairs:
3378 n, l, i = top, [], 0
3379 n, l, i = top, [], 0
3379 f = 1
3380 f = 1
3380
3381
3381 while n != bottom and n != self.nullid:
3382 while n != bottom and n != self.nullid:
3382 p = self.changelog.parents(n)[0]
3383 p = self.changelog.parents(n)[0]
3383 if i == f:
3384 if i == f:
3384 l.append(n)
3385 l.append(n)
3385 f = f * 2
3386 f = f * 2
3386 n = p
3387 n = p
3387 i += 1
3388 i += 1
3388
3389
3389 r.append(l)
3390 r.append(l)
3390
3391
3391 return r
3392 return r
3392
3393
3393 def checkpush(self, pushop):
3394 def checkpush(self, pushop):
3394 """Extensions can override this function if additional checks have
3395 """Extensions can override this function if additional checks have
3395 to be performed before pushing, or call it if they override push
3396 to be performed before pushing, or call it if they override push
3396 command.
3397 command.
3397 """
3398 """
3398
3399
3399 @unfilteredpropertycache
3400 @unfilteredpropertycache
3400 def prepushoutgoinghooks(self):
3401 def prepushoutgoinghooks(self):
3401 """Return util.hooks consists of a pushop with repo, remote, outgoing
3402 """Return util.hooks consists of a pushop with repo, remote, outgoing
3402 methods, which are called before pushing changesets.
3403 methods, which are called before pushing changesets.
3403 """
3404 """
3404 return util.hooks()
3405 return util.hooks()
3405
3406
3406 def pushkey(self, namespace, key, old, new):
3407 def pushkey(self, namespace, key, old, new):
3407 try:
3408 try:
3408 tr = self.currenttransaction()
3409 tr = self.currenttransaction()
3409 hookargs = {}
3410 hookargs = {}
3410 if tr is not None:
3411 if tr is not None:
3411 hookargs.update(tr.hookargs)
3412 hookargs.update(tr.hookargs)
3412 hookargs = pycompat.strkwargs(hookargs)
3413 hookargs = pycompat.strkwargs(hookargs)
3413 hookargs['namespace'] = namespace
3414 hookargs['namespace'] = namespace
3414 hookargs['key'] = key
3415 hookargs['key'] = key
3415 hookargs['old'] = old
3416 hookargs['old'] = old
3416 hookargs['new'] = new
3417 hookargs['new'] = new
3417 self.hook(b'prepushkey', throw=True, **hookargs)
3418 self.hook(b'prepushkey', throw=True, **hookargs)
3418 except error.HookAbort as exc:
3419 except error.HookAbort as exc:
3419 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3420 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3420 if exc.hint:
3421 if exc.hint:
3421 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3422 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3422 return False
3423 return False
3423 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3424 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3424 ret = pushkey.push(self, namespace, key, old, new)
3425 ret = pushkey.push(self, namespace, key, old, new)
3425
3426
3426 def runhook(unused_success):
3427 def runhook(unused_success):
3427 self.hook(
3428 self.hook(
3428 b'pushkey',
3429 b'pushkey',
3429 namespace=namespace,
3430 namespace=namespace,
3430 key=key,
3431 key=key,
3431 old=old,
3432 old=old,
3432 new=new,
3433 new=new,
3433 ret=ret,
3434 ret=ret,
3434 )
3435 )
3435
3436
3436 self._afterlock(runhook)
3437 self._afterlock(runhook)
3437 return ret
3438 return ret
3438
3439
3439 def listkeys(self, namespace):
3440 def listkeys(self, namespace):
3440 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3441 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3441 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3442 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3442 values = pushkey.list(self, namespace)
3443 values = pushkey.list(self, namespace)
3443 self.hook(b'listkeys', namespace=namespace, values=values)
3444 self.hook(b'listkeys', namespace=namespace, values=values)
3444 return values
3445 return values
3445
3446
3446 def debugwireargs(self, one, two, three=None, four=None, five=None):
3447 def debugwireargs(self, one, two, three=None, four=None, five=None):
3447 '''used to test argument passing over the wire'''
3448 '''used to test argument passing over the wire'''
3448 return b"%s %s %s %s %s" % (
3449 return b"%s %s %s %s %s" % (
3449 one,
3450 one,
3450 two,
3451 two,
3451 pycompat.bytestr(three),
3452 pycompat.bytestr(three),
3452 pycompat.bytestr(four),
3453 pycompat.bytestr(four),
3453 pycompat.bytestr(five),
3454 pycompat.bytestr(five),
3454 )
3455 )
3455
3456
3456 def savecommitmessage(self, text):
3457 def savecommitmessage(self, text):
3457 fp = self.vfs(b'last-message.txt', b'wb')
3458 fp = self.vfs(b'last-message.txt', b'wb')
3458 try:
3459 try:
3459 fp.write(text)
3460 fp.write(text)
3460 finally:
3461 finally:
3461 fp.close()
3462 fp.close()
3462 return self.pathto(fp.name[len(self.root) + 1 :])
3463 return self.pathto(fp.name[len(self.root) + 1 :])
3463
3464
3464 def register_wanted_sidedata(self, category):
3465 def register_wanted_sidedata(self, category):
3465 if repository.REPO_FEATURE_SIDE_DATA not in self.features:
3466 if repository.REPO_FEATURE_SIDE_DATA not in self.features:
3466 # Only revlogv2 repos can want sidedata.
3467 # Only revlogv2 repos can want sidedata.
3467 return
3468 return
3468 self._wanted_sidedata.add(pycompat.bytestr(category))
3469 self._wanted_sidedata.add(pycompat.bytestr(category))
3469
3470
3470 def register_sidedata_computer(
3471 def register_sidedata_computer(
3471 self, kind, category, keys, computer, flags, replace=False
3472 self, kind, category, keys, computer, flags, replace=False
3472 ):
3473 ):
3473 if kind not in revlogconst.ALL_KINDS:
3474 if kind not in revlogconst.ALL_KINDS:
3474 msg = _(b"unexpected revlog kind '%s'.")
3475 msg = _(b"unexpected revlog kind '%s'.")
3475 raise error.ProgrammingError(msg % kind)
3476 raise error.ProgrammingError(msg % kind)
3476 category = pycompat.bytestr(category)
3477 category = pycompat.bytestr(category)
3477 already_registered = category in self._sidedata_computers.get(kind, [])
3478 already_registered = category in self._sidedata_computers.get(kind, [])
3478 if already_registered and not replace:
3479 if already_registered and not replace:
3479 msg = _(
3480 msg = _(
3480 b"cannot register a sidedata computer twice for category '%s'."
3481 b"cannot register a sidedata computer twice for category '%s'."
3481 )
3482 )
3482 raise error.ProgrammingError(msg % category)
3483 raise error.ProgrammingError(msg % category)
3483 if replace and not already_registered:
3484 if replace and not already_registered:
3484 msg = _(
3485 msg = _(
3485 b"cannot replace a sidedata computer that isn't registered "
3486 b"cannot replace a sidedata computer that isn't registered "
3486 b"for category '%s'."
3487 b"for category '%s'."
3487 )
3488 )
3488 raise error.ProgrammingError(msg % category)
3489 raise error.ProgrammingError(msg % category)
3489 self._sidedata_computers.setdefault(kind, {})
3490 self._sidedata_computers.setdefault(kind, {})
3490 self._sidedata_computers[kind][category] = (keys, computer, flags)
3491 self._sidedata_computers[kind][category] = (keys, computer, flags)
3491
3492
3492
3493
3493 # used to avoid circular references so destructors work
3494 # used to avoid circular references so destructors work
3494 def aftertrans(files):
3495 def aftertrans(files):
3495 renamefiles = [tuple(t) for t in files]
3496 renamefiles = [tuple(t) for t in files]
3496
3497
3497 def a():
3498 def a():
3498 for vfs, src, dest in renamefiles:
3499 for vfs, src, dest in renamefiles:
3499 # if src and dest refer to a same file, vfs.rename is a no-op,
3500 # if src and dest refer to a same file, vfs.rename is a no-op,
3500 # leaving both src and dest on disk. delete dest to make sure
3501 # leaving both src and dest on disk. delete dest to make sure
3501 # the rename couldn't be such a no-op.
3502 # the rename couldn't be such a no-op.
3502 vfs.tryunlink(dest)
3503 vfs.tryunlink(dest)
3503 try:
3504 try:
3504 vfs.rename(src, dest)
3505 vfs.rename(src, dest)
3505 except OSError as exc: # journal file does not yet exist
3506 except OSError as exc: # journal file does not yet exist
3506 if exc.errno != errno.ENOENT:
3507 if exc.errno != errno.ENOENT:
3507 raise
3508 raise
3508
3509
3509 return a
3510 return a
3510
3511
3511
3512
3512 def undoname(fn):
3513 def undoname(fn):
3513 base, name = os.path.split(fn)
3514 base, name = os.path.split(fn)
3514 assert name.startswith(b'journal')
3515 assert name.startswith(b'journal')
3515 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3516 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3516
3517
3517
3518
3518 def instance(ui, path, create, intents=None, createopts=None):
3519 def instance(ui, path, create, intents=None, createopts=None):
3519 localpath = urlutil.urllocalpath(path)
3520 localpath = urlutil.urllocalpath(path)
3520 if create:
3521 if create:
3521 createrepository(ui, localpath, createopts=createopts)
3522 createrepository(ui, localpath, createopts=createopts)
3522
3523
3523 return makelocalrepository(ui, localpath, intents=intents)
3524 return makelocalrepository(ui, localpath, intents=intents)
3524
3525
3525
3526
3526 def islocal(path):
3527 def islocal(path):
3527 return True
3528 return True
3528
3529
3529
3530
3530 def defaultcreateopts(ui, createopts=None):
3531 def defaultcreateopts(ui, createopts=None):
3531 """Populate the default creation options for a repository.
3532 """Populate the default creation options for a repository.
3532
3533
3533 A dictionary of explicitly requested creation options can be passed
3534 A dictionary of explicitly requested creation options can be passed
3534 in. Missing keys will be populated.
3535 in. Missing keys will be populated.
3535 """
3536 """
3536 createopts = dict(createopts or {})
3537 createopts = dict(createopts or {})
3537
3538
3538 if b'backend' not in createopts:
3539 if b'backend' not in createopts:
3539 # experimental config: storage.new-repo-backend
3540 # experimental config: storage.new-repo-backend
3540 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3541 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3541
3542
3542 return createopts
3543 return createopts
3543
3544
3544
3545
3545 def clone_requirements(ui, createopts, srcrepo):
3546 def clone_requirements(ui, createopts, srcrepo):
3546 """clone the requirements of a local repo for a local clone
3547 """clone the requirements of a local repo for a local clone
3547
3548
3548 The store requirements are unchanged while the working copy requirements
3549 The store requirements are unchanged while the working copy requirements
3549 depends on the configuration
3550 depends on the configuration
3550 """
3551 """
3551 target_requirements = set()
3552 target_requirements = set()
3552 if not srcrepo.requirements:
3553 if not srcrepo.requirements:
3553 # this is a legacy revlog "v0" repository, we cannot do anything fancy
3554 # this is a legacy revlog "v0" repository, we cannot do anything fancy
3554 # with it.
3555 # with it.
3555 return target_requirements
3556 return target_requirements
3556 createopts = defaultcreateopts(ui, createopts=createopts)
3557 createopts = defaultcreateopts(ui, createopts=createopts)
3557 for r in newreporequirements(ui, createopts):
3558 for r in newreporequirements(ui, createopts):
3558 if r in requirementsmod.WORKING_DIR_REQUIREMENTS:
3559 if r in requirementsmod.WORKING_DIR_REQUIREMENTS:
3559 target_requirements.add(r)
3560 target_requirements.add(r)
3560
3561
3561 for r in srcrepo.requirements:
3562 for r in srcrepo.requirements:
3562 if r not in requirementsmod.WORKING_DIR_REQUIREMENTS:
3563 if r not in requirementsmod.WORKING_DIR_REQUIREMENTS:
3563 target_requirements.add(r)
3564 target_requirements.add(r)
3564 return target_requirements
3565 return target_requirements
3565
3566
3566
3567
3567 def newreporequirements(ui, createopts):
3568 def newreporequirements(ui, createopts):
3568 """Determine the set of requirements for a new local repository.
3569 """Determine the set of requirements for a new local repository.
3569
3570
3570 Extensions can wrap this function to specify custom requirements for
3571 Extensions can wrap this function to specify custom requirements for
3571 new repositories.
3572 new repositories.
3572 """
3573 """
3573
3574
3574 if b'backend' not in createopts:
3575 if b'backend' not in createopts:
3575 raise error.ProgrammingError(
3576 raise error.ProgrammingError(
3576 b'backend key not present in createopts; '
3577 b'backend key not present in createopts; '
3577 b'was defaultcreateopts() called?'
3578 b'was defaultcreateopts() called?'
3578 )
3579 )
3579
3580
3580 if createopts[b'backend'] != b'revlogv1':
3581 if createopts[b'backend'] != b'revlogv1':
3581 raise error.Abort(
3582 raise error.Abort(
3582 _(
3583 _(
3583 b'unable to determine repository requirements for '
3584 b'unable to determine repository requirements for '
3584 b'storage backend: %s'
3585 b'storage backend: %s'
3585 )
3586 )
3586 % createopts[b'backend']
3587 % createopts[b'backend']
3587 )
3588 )
3588
3589
3589 requirements = {requirementsmod.REVLOGV1_REQUIREMENT}
3590 requirements = {requirementsmod.REVLOGV1_REQUIREMENT}
3590 if ui.configbool(b'format', b'usestore'):
3591 if ui.configbool(b'format', b'usestore'):
3591 requirements.add(requirementsmod.STORE_REQUIREMENT)
3592 requirements.add(requirementsmod.STORE_REQUIREMENT)
3592 if ui.configbool(b'format', b'usefncache'):
3593 if ui.configbool(b'format', b'usefncache'):
3593 requirements.add(requirementsmod.FNCACHE_REQUIREMENT)
3594 requirements.add(requirementsmod.FNCACHE_REQUIREMENT)
3594 if ui.configbool(b'format', b'dotencode'):
3595 if ui.configbool(b'format', b'dotencode'):
3595 requirements.add(requirementsmod.DOTENCODE_REQUIREMENT)
3596 requirements.add(requirementsmod.DOTENCODE_REQUIREMENT)
3596
3597
3597 compengines = ui.configlist(b'format', b'revlog-compression')
3598 compengines = ui.configlist(b'format', b'revlog-compression')
3598 for compengine in compengines:
3599 for compengine in compengines:
3599 if compengine in util.compengines:
3600 if compengine in util.compengines:
3600 engine = util.compengines[compengine]
3601 engine = util.compengines[compengine]
3601 if engine.available() and engine.revlogheader():
3602 if engine.available() and engine.revlogheader():
3602 break
3603 break
3603 else:
3604 else:
3604 raise error.Abort(
3605 raise error.Abort(
3605 _(
3606 _(
3606 b'compression engines %s defined by '
3607 b'compression engines %s defined by '
3607 b'format.revlog-compression not available'
3608 b'format.revlog-compression not available'
3608 )
3609 )
3609 % b', '.join(b'"%s"' % e for e in compengines),
3610 % b', '.join(b'"%s"' % e for e in compengines),
3610 hint=_(
3611 hint=_(
3611 b'run "hg debuginstall" to list available '
3612 b'run "hg debuginstall" to list available '
3612 b'compression engines'
3613 b'compression engines'
3613 ),
3614 ),
3614 )
3615 )
3615
3616
3616 # zlib is the historical default and doesn't need an explicit requirement.
3617 # zlib is the historical default and doesn't need an explicit requirement.
3617 if compengine == b'zstd':
3618 if compengine == b'zstd':
3618 requirements.add(b'revlog-compression-zstd')
3619 requirements.add(b'revlog-compression-zstd')
3619 elif compengine != b'zlib':
3620 elif compengine != b'zlib':
3620 requirements.add(b'exp-compression-%s' % compengine)
3621 requirements.add(b'exp-compression-%s' % compengine)
3621
3622
3622 if scmutil.gdinitconfig(ui):
3623 if scmutil.gdinitconfig(ui):
3623 requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
3624 requirements.add(requirementsmod.GENERALDELTA_REQUIREMENT)
3624 if ui.configbool(b'format', b'sparse-revlog'):
3625 if ui.configbool(b'format', b'sparse-revlog'):
3625 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
3626 requirements.add(requirementsmod.SPARSEREVLOG_REQUIREMENT)
3626
3627
3627 # experimental config: format.use-dirstate-v2
3628 # experimental config: format.use-dirstate-v2
3628 # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py`
3629 # Keep this logic in sync with `has_dirstate_v2()` in `tests/hghave.py`
3629 if ui.configbool(b'format', b'use-dirstate-v2'):
3630 if ui.configbool(b'format', b'use-dirstate-v2'):
3630 requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT)
3631 requirements.add(requirementsmod.DIRSTATE_V2_REQUIREMENT)
3631
3632
3632 # experimental config: format.exp-use-copies-side-data-changeset
3633 # experimental config: format.exp-use-copies-side-data-changeset
3633 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3634 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3634 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
3635 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
3635 requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
3636 requirements.add(requirementsmod.COPIESSDC_REQUIREMENT)
3636 if ui.configbool(b'experimental', b'treemanifest'):
3637 if ui.configbool(b'experimental', b'treemanifest'):
3637 requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
3638 requirements.add(requirementsmod.TREEMANIFEST_REQUIREMENT)
3638
3639
3639 changelogv2 = ui.config(b'format', b'exp-use-changelog-v2')
3640 changelogv2 = ui.config(b'format', b'exp-use-changelog-v2')
3640 if changelogv2 == b'enable-unstable-format-and-corrupt-my-data':
3641 if changelogv2 == b'enable-unstable-format-and-corrupt-my-data':
3641 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
3642 requirements.add(requirementsmod.CHANGELOGV2_REQUIREMENT)
3642
3643
3643 revlogv2 = ui.config(b'experimental', b'revlogv2')
3644 revlogv2 = ui.config(b'experimental', b'revlogv2')
3644 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3645 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3645 requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
3646 requirements.discard(requirementsmod.REVLOGV1_REQUIREMENT)
3646 requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
3647 requirements.add(requirementsmod.REVLOGV2_REQUIREMENT)
3647 # experimental config: format.internal-phase
3648 # experimental config: format.internal-phase
3648 if ui.configbool(b'format', b'internal-phase'):
3649 if ui.configbool(b'format', b'internal-phase'):
3649 requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
3650 requirements.add(requirementsmod.INTERNAL_PHASE_REQUIREMENT)
3650
3651
3651 if createopts.get(b'narrowfiles'):
3652 if createopts.get(b'narrowfiles'):
3652 requirements.add(requirementsmod.NARROW_REQUIREMENT)
3653 requirements.add(requirementsmod.NARROW_REQUIREMENT)
3653
3654
3654 if createopts.get(b'lfs'):
3655 if createopts.get(b'lfs'):
3655 requirements.add(b'lfs')
3656 requirements.add(b'lfs')
3656
3657
3657 if ui.configbool(b'format', b'bookmarks-in-store'):
3658 if ui.configbool(b'format', b'bookmarks-in-store'):
3658 requirements.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
3659 requirements.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
3659
3660
3660 if ui.configbool(b'format', b'use-persistent-nodemap'):
3661 if ui.configbool(b'format', b'use-persistent-nodemap'):
3661 requirements.add(requirementsmod.NODEMAP_REQUIREMENT)
3662 requirements.add(requirementsmod.NODEMAP_REQUIREMENT)
3662
3663
3663 # if share-safe is enabled, let's create the new repository with the new
3664 # if share-safe is enabled, let's create the new repository with the new
3664 # requirement
3665 # requirement
3665 if ui.configbool(b'format', b'use-share-safe'):
3666 if ui.configbool(b'format', b'use-share-safe'):
3666 requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
3667 requirements.add(requirementsmod.SHARESAFE_REQUIREMENT)
3667
3668
3668 # if we are creating a share-repoΒΉ we have to handle requirement
3669 # if we are creating a share-repoΒΉ we have to handle requirement
3669 # differently.
3670 # differently.
3670 #
3671 #
3671 # [1] (i.e. reusing the store from another repository, just having a
3672 # [1] (i.e. reusing the store from another repository, just having a
3672 # working copy)
3673 # working copy)
3673 if b'sharedrepo' in createopts:
3674 if b'sharedrepo' in createopts:
3674 source_requirements = set(createopts[b'sharedrepo'].requirements)
3675 source_requirements = set(createopts[b'sharedrepo'].requirements)
3675
3676
3676 if requirementsmod.SHARESAFE_REQUIREMENT not in source_requirements:
3677 if requirementsmod.SHARESAFE_REQUIREMENT not in source_requirements:
3677 # share to an old school repository, we have to copy the
3678 # share to an old school repository, we have to copy the
3678 # requirements and hope for the best.
3679 # requirements and hope for the best.
3679 requirements = source_requirements
3680 requirements = source_requirements
3680 else:
3681 else:
3681 # We have control on the working copy only, so "copy" the non
3682 # We have control on the working copy only, so "copy" the non
3682 # working copy part over, ignoring previous logic.
3683 # working copy part over, ignoring previous logic.
3683 to_drop = set()
3684 to_drop = set()
3684 for req in requirements:
3685 for req in requirements:
3685 if req in requirementsmod.WORKING_DIR_REQUIREMENTS:
3686 if req in requirementsmod.WORKING_DIR_REQUIREMENTS:
3686 continue
3687 continue
3687 if req in source_requirements:
3688 if req in source_requirements:
3688 continue
3689 continue
3689 to_drop.add(req)
3690 to_drop.add(req)
3690 requirements -= to_drop
3691 requirements -= to_drop
3691 requirements |= source_requirements
3692 requirements |= source_requirements
3692
3693
3693 if createopts.get(b'sharedrelative'):
3694 if createopts.get(b'sharedrelative'):
3694 requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT)
3695 requirements.add(requirementsmod.RELATIVE_SHARED_REQUIREMENT)
3695 else:
3696 else:
3696 requirements.add(requirementsmod.SHARED_REQUIREMENT)
3697 requirements.add(requirementsmod.SHARED_REQUIREMENT)
3697
3698
3698 if ui.configbool(b'format', b'use-dirstate-tracked-hint'):
3699 if ui.configbool(b'format', b'use-dirstate-tracked-hint'):
3699 version = ui.configint(b'format', b'use-dirstate-tracked-hint.version')
3700 version = ui.configint(b'format', b'use-dirstate-tracked-hint.version')
3700 msg = _("ignoring unknown tracked key version: %d\n")
3701 msg = _("ignoring unknown tracked key version: %d\n")
3701 hint = _("see `hg help config.format.use-dirstate-tracked-hint-version")
3702 hint = _("see `hg help config.format.use-dirstate-tracked-hint-version")
3702 if version != 1:
3703 if version != 1:
3703 ui.warn(msg % version, hint=hint)
3704 ui.warn(msg % version, hint=hint)
3704 else:
3705 else:
3705 requirements.add(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
3706 requirements.add(requirementsmod.DIRSTATE_TRACKED_HINT_V1)
3706
3707
3707 return requirements
3708 return requirements
3708
3709
3709
3710
3710 def checkrequirementscompat(ui, requirements):
3711 def checkrequirementscompat(ui, requirements):
3711 """Checks compatibility of repository requirements enabled and disabled.
3712 """Checks compatibility of repository requirements enabled and disabled.
3712
3713
3713 Returns a set of requirements which needs to be dropped because dependend
3714 Returns a set of requirements which needs to be dropped because dependend
3714 requirements are not enabled. Also warns users about it"""
3715 requirements are not enabled. Also warns users about it"""
3715
3716
3716 dropped = set()
3717 dropped = set()
3717
3718
3718 if requirementsmod.STORE_REQUIREMENT not in requirements:
3719 if requirementsmod.STORE_REQUIREMENT not in requirements:
3719 if requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3720 if requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT in requirements:
3720 ui.warn(
3721 ui.warn(
3721 _(
3722 _(
3722 b'ignoring enabled \'format.bookmarks-in-store\' config '
3723 b'ignoring enabled \'format.bookmarks-in-store\' config '
3723 b'beacuse it is incompatible with disabled '
3724 b'beacuse it is incompatible with disabled '
3724 b'\'format.usestore\' config\n'
3725 b'\'format.usestore\' config\n'
3725 )
3726 )
3726 )
3727 )
3727 dropped.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
3728 dropped.add(requirementsmod.BOOKMARKS_IN_STORE_REQUIREMENT)
3728
3729
3729 if (
3730 if (
3730 requirementsmod.SHARED_REQUIREMENT in requirements
3731 requirementsmod.SHARED_REQUIREMENT in requirements
3731 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
3732 or requirementsmod.RELATIVE_SHARED_REQUIREMENT in requirements
3732 ):
3733 ):
3733 raise error.Abort(
3734 raise error.Abort(
3734 _(
3735 _(
3735 b"cannot create shared repository as source was created"
3736 b"cannot create shared repository as source was created"
3736 b" with 'format.usestore' config disabled"
3737 b" with 'format.usestore' config disabled"
3737 )
3738 )
3738 )
3739 )
3739
3740
3740 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
3741 if requirementsmod.SHARESAFE_REQUIREMENT in requirements:
3741 if ui.hasconfig(b'format', b'use-share-safe'):
3742 if ui.hasconfig(b'format', b'use-share-safe'):
3742 msg = _(
3743 msg = _(
3743 b"ignoring enabled 'format.use-share-safe' config because "
3744 b"ignoring enabled 'format.use-share-safe' config because "
3744 b"it is incompatible with disabled 'format.usestore'"
3745 b"it is incompatible with disabled 'format.usestore'"
3745 b" config\n"
3746 b" config\n"
3746 )
3747 )
3747 ui.warn(msg)
3748 ui.warn(msg)
3748 dropped.add(requirementsmod.SHARESAFE_REQUIREMENT)
3749 dropped.add(requirementsmod.SHARESAFE_REQUIREMENT)
3749
3750
3750 return dropped
3751 return dropped
3751
3752
3752
3753
3753 def filterknowncreateopts(ui, createopts):
3754 def filterknowncreateopts(ui, createopts):
3754 """Filters a dict of repo creation options against options that are known.
3755 """Filters a dict of repo creation options against options that are known.
3755
3756
3756 Receives a dict of repo creation options and returns a dict of those
3757 Receives a dict of repo creation options and returns a dict of those
3757 options that we don't know how to handle.
3758 options that we don't know how to handle.
3758
3759
3759 This function is called as part of repository creation. If the
3760 This function is called as part of repository creation. If the
3760 returned dict contains any items, repository creation will not
3761 returned dict contains any items, repository creation will not
3761 be allowed, as it means there was a request to create a repository
3762 be allowed, as it means there was a request to create a repository
3762 with options not recognized by loaded code.
3763 with options not recognized by loaded code.
3763
3764
3764 Extensions can wrap this function to filter out creation options
3765 Extensions can wrap this function to filter out creation options
3765 they know how to handle.
3766 they know how to handle.
3766 """
3767 """
3767 known = {
3768 known = {
3768 b'backend',
3769 b'backend',
3769 b'lfs',
3770 b'lfs',
3770 b'narrowfiles',
3771 b'narrowfiles',
3771 b'sharedrepo',
3772 b'sharedrepo',
3772 b'sharedrelative',
3773 b'sharedrelative',
3773 b'shareditems',
3774 b'shareditems',
3774 b'shallowfilestore',
3775 b'shallowfilestore',
3775 }
3776 }
3776
3777
3777 return {k: v for k, v in createopts.items() if k not in known}
3778 return {k: v for k, v in createopts.items() if k not in known}
3778
3779
3779
3780
3780 def createrepository(ui, path, createopts=None, requirements=None):
3781 def createrepository(ui, path, createopts=None, requirements=None):
3781 """Create a new repository in a vfs.
3782 """Create a new repository in a vfs.
3782
3783
3783 ``path`` path to the new repo's working directory.
3784 ``path`` path to the new repo's working directory.
3784 ``createopts`` options for the new repository.
3785 ``createopts`` options for the new repository.
3785 ``requirement`` predefined set of requirements.
3786 ``requirement`` predefined set of requirements.
3786 (incompatible with ``createopts``)
3787 (incompatible with ``createopts``)
3787
3788
3788 The following keys for ``createopts`` are recognized:
3789 The following keys for ``createopts`` are recognized:
3789
3790
3790 backend
3791 backend
3791 The storage backend to use.
3792 The storage backend to use.
3792 lfs
3793 lfs
3793 Repository will be created with ``lfs`` requirement. The lfs extension
3794 Repository will be created with ``lfs`` requirement. The lfs extension
3794 will automatically be loaded when the repository is accessed.
3795 will automatically be loaded when the repository is accessed.
3795 narrowfiles
3796 narrowfiles
3796 Set up repository to support narrow file storage.
3797 Set up repository to support narrow file storage.
3797 sharedrepo
3798 sharedrepo
3798 Repository object from which storage should be shared.
3799 Repository object from which storage should be shared.
3799 sharedrelative
3800 sharedrelative
3800 Boolean indicating if the path to the shared repo should be
3801 Boolean indicating if the path to the shared repo should be
3801 stored as relative. By default, the pointer to the "parent" repo
3802 stored as relative. By default, the pointer to the "parent" repo
3802 is stored as an absolute path.
3803 is stored as an absolute path.
3803 shareditems
3804 shareditems
3804 Set of items to share to the new repository (in addition to storage).
3805 Set of items to share to the new repository (in addition to storage).
3805 shallowfilestore
3806 shallowfilestore
3806 Indicates that storage for files should be shallow (not all ancestor
3807 Indicates that storage for files should be shallow (not all ancestor
3807 revisions are known).
3808 revisions are known).
3808 """
3809 """
3809
3810
3810 if requirements is not None:
3811 if requirements is not None:
3811 if createopts is not None:
3812 if createopts is not None:
3812 msg = b'cannot specify both createopts and requirements'
3813 msg = b'cannot specify both createopts and requirements'
3813 raise error.ProgrammingError(msg)
3814 raise error.ProgrammingError(msg)
3814 createopts = {}
3815 createopts = {}
3815 else:
3816 else:
3816 createopts = defaultcreateopts(ui, createopts=createopts)
3817 createopts = defaultcreateopts(ui, createopts=createopts)
3817
3818
3818 unknownopts = filterknowncreateopts(ui, createopts)
3819 unknownopts = filterknowncreateopts(ui, createopts)
3819
3820
3820 if not isinstance(unknownopts, dict):
3821 if not isinstance(unknownopts, dict):
3821 raise error.ProgrammingError(
3822 raise error.ProgrammingError(
3822 b'filterknowncreateopts() did not return a dict'
3823 b'filterknowncreateopts() did not return a dict'
3823 )
3824 )
3824
3825
3825 if unknownopts:
3826 if unknownopts:
3826 raise error.Abort(
3827 raise error.Abort(
3827 _(
3828 _(
3828 b'unable to create repository because of unknown '
3829 b'unable to create repository because of unknown '
3829 b'creation option: %s'
3830 b'creation option: %s'
3830 )
3831 )
3831 % b', '.join(sorted(unknownopts)),
3832 % b', '.join(sorted(unknownopts)),
3832 hint=_(b'is a required extension not loaded?'),
3833 hint=_(b'is a required extension not loaded?'),
3833 )
3834 )
3834
3835
3835 requirements = newreporequirements(ui, createopts=createopts)
3836 requirements = newreporequirements(ui, createopts=createopts)
3836 requirements -= checkrequirementscompat(ui, requirements)
3837 requirements -= checkrequirementscompat(ui, requirements)
3837
3838
3838 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3839 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3839
3840
3840 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3841 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3841 if hgvfs.exists():
3842 if hgvfs.exists():
3842 raise error.RepoError(_(b'repository %s already exists') % path)
3843 raise error.RepoError(_(b'repository %s already exists') % path)
3843
3844
3844 if b'sharedrepo' in createopts:
3845 if b'sharedrepo' in createopts:
3845 sharedpath = createopts[b'sharedrepo'].sharedpath
3846 sharedpath = createopts[b'sharedrepo'].sharedpath
3846
3847
3847 if createopts.get(b'sharedrelative'):
3848 if createopts.get(b'sharedrelative'):
3848 try:
3849 try:
3849 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3850 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3850 sharedpath = util.pconvert(sharedpath)
3851 sharedpath = util.pconvert(sharedpath)
3851 except (IOError, ValueError) as e:
3852 except (IOError, ValueError) as e:
3852 # ValueError is raised on Windows if the drive letters differ
3853 # ValueError is raised on Windows if the drive letters differ
3853 # on each path.
3854 # on each path.
3854 raise error.Abort(
3855 raise error.Abort(
3855 _(b'cannot calculate relative path'),
3856 _(b'cannot calculate relative path'),
3856 hint=stringutil.forcebytestr(e),
3857 hint=stringutil.forcebytestr(e),
3857 )
3858 )
3858
3859
3859 if not wdirvfs.exists():
3860 if not wdirvfs.exists():
3860 wdirvfs.makedirs()
3861 wdirvfs.makedirs()
3861
3862
3862 hgvfs.makedir(notindexed=True)
3863 hgvfs.makedir(notindexed=True)
3863 if b'sharedrepo' not in createopts:
3864 if b'sharedrepo' not in createopts:
3864 hgvfs.mkdir(b'cache')
3865 hgvfs.mkdir(b'cache')
3865 hgvfs.mkdir(b'wcache')
3866 hgvfs.mkdir(b'wcache')
3866
3867
3867 has_store = requirementsmod.STORE_REQUIREMENT in requirements
3868 has_store = requirementsmod.STORE_REQUIREMENT in requirements
3868 if has_store and b'sharedrepo' not in createopts:
3869 if has_store and b'sharedrepo' not in createopts:
3869 hgvfs.mkdir(b'store')
3870 hgvfs.mkdir(b'store')
3870
3871
3871 # We create an invalid changelog outside the store so very old
3872 # We create an invalid changelog outside the store so very old
3872 # Mercurial versions (which didn't know about the requirements
3873 # Mercurial versions (which didn't know about the requirements
3873 # file) encounter an error on reading the changelog. This
3874 # file) encounter an error on reading the changelog. This
3874 # effectively locks out old clients and prevents them from
3875 # effectively locks out old clients and prevents them from
3875 # mucking with a repo in an unknown format.
3876 # mucking with a repo in an unknown format.
3876 #
3877 #
3877 # The revlog header has version 65535, which won't be recognized by
3878 # The revlog header has version 65535, which won't be recognized by
3878 # such old clients.
3879 # such old clients.
3879 hgvfs.append(
3880 hgvfs.append(
3880 b'00changelog.i',
3881 b'00changelog.i',
3881 b'\0\0\xFF\xFF dummy changelog to prevent using the old repo '
3882 b'\0\0\xFF\xFF dummy changelog to prevent using the old repo '
3882 b'layout',
3883 b'layout',
3883 )
3884 )
3884
3885
3885 # Filter the requirements into working copy and store ones
3886 # Filter the requirements into working copy and store ones
3886 wcreq, storereq = scmutil.filterrequirements(requirements)
3887 wcreq, storereq = scmutil.filterrequirements(requirements)
3887 # write working copy ones
3888 # write working copy ones
3888 scmutil.writerequires(hgvfs, wcreq)
3889 scmutil.writerequires(hgvfs, wcreq)
3889 # If there are store requirements and the current repository
3890 # If there are store requirements and the current repository
3890 # is not a shared one, write stored requirements
3891 # is not a shared one, write stored requirements
3891 # For new shared repository, we don't need to write the store
3892 # For new shared repository, we don't need to write the store
3892 # requirements as they are already present in store requires
3893 # requirements as they are already present in store requires
3893 if storereq and b'sharedrepo' not in createopts:
3894 if storereq and b'sharedrepo' not in createopts:
3894 storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
3895 storevfs = vfsmod.vfs(hgvfs.join(b'store'), cacheaudited=True)
3895 scmutil.writerequires(storevfs, storereq)
3896 scmutil.writerequires(storevfs, storereq)
3896
3897
3897 # Write out file telling readers where to find the shared store.
3898 # Write out file telling readers where to find the shared store.
3898 if b'sharedrepo' in createopts:
3899 if b'sharedrepo' in createopts:
3899 hgvfs.write(b'sharedpath', sharedpath)
3900 hgvfs.write(b'sharedpath', sharedpath)
3900
3901
3901 if createopts.get(b'shareditems'):
3902 if createopts.get(b'shareditems'):
3902 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3903 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3903 hgvfs.write(b'shared', shared)
3904 hgvfs.write(b'shared', shared)
3904
3905
3905
3906
3906 def poisonrepository(repo):
3907 def poisonrepository(repo):
3907 """Poison a repository instance so it can no longer be used."""
3908 """Poison a repository instance so it can no longer be used."""
3908 # Perform any cleanup on the instance.
3909 # Perform any cleanup on the instance.
3909 repo.close()
3910 repo.close()
3910
3911
3911 # Our strategy is to replace the type of the object with one that
3912 # Our strategy is to replace the type of the object with one that
3912 # has all attribute lookups result in error.
3913 # has all attribute lookups result in error.
3913 #
3914 #
3914 # But we have to allow the close() method because some constructors
3915 # But we have to allow the close() method because some constructors
3915 # of repos call close() on repo references.
3916 # of repos call close() on repo references.
3916 class poisonedrepository(object):
3917 class poisonedrepository(object):
3917 def __getattribute__(self, item):
3918 def __getattribute__(self, item):
3918 if item == 'close':
3919 if item == 'close':
3919 return object.__getattribute__(self, item)
3920 return object.__getattribute__(self, item)
3920
3921
3921 raise error.ProgrammingError(
3922 raise error.ProgrammingError(
3922 b'repo instances should not be used after unshare'
3923 b'repo instances should not be used after unshare'
3923 )
3924 )
3924
3925
3925 def close(self):
3926 def close(self):
3926 pass
3927 pass
3927
3928
3928 # We may have a repoview, which intercepts __setattr__. So be sure
3929 # We may have a repoview, which intercepts __setattr__. So be sure
3929 # we operate at the lowest level possible.
3930 # we operate at the lowest level possible.
3930 object.__setattr__(repo, '__class__', poisonedrepository)
3931 object.__setattr__(repo, '__class__', poisonedrepository)
@@ -1,543 +1,540 b''
1 # pycompat.py - portability shim for python 3
1 # pycompat.py - portability shim for python 3
2 #
2 #
3 # This software may be used and distributed according to the terms of the
3 # This software may be used and distributed according to the terms of the
4 # GNU General Public License version 2 or any later version.
4 # GNU General Public License version 2 or any later version.
5
5
6 """Mercurial portability shim for python 3.
6 """Mercurial portability shim for python 3.
7
7
8 This contains aliases to hide python version-specific details from the core.
8 This contains aliases to hide python version-specific details from the core.
9 """
9 """
10
10
11 from __future__ import absolute_import
11 from __future__ import absolute_import
12
12
13 import getopt
13 import getopt
14 import inspect
14 import inspect
15 import json
15 import json
16 import os
16 import os
17 import shlex
17 import shlex
18 import sys
18 import sys
19 import tempfile
19 import tempfile
20
20
21 ispy3 = sys.version_info[0] >= 3
21 ispy3 = sys.version_info[0] >= 3
22 ispypy = '__pypy__' in sys.builtin_module_names
22 ispypy = '__pypy__' in sys.builtin_module_names
23 TYPE_CHECKING = False
23 TYPE_CHECKING = False
24
24
25 if not globals(): # hide this from non-pytype users
25 if not globals(): # hide this from non-pytype users
26 import typing
26 import typing
27
27
28 TYPE_CHECKING = typing.TYPE_CHECKING
28 TYPE_CHECKING = typing.TYPE_CHECKING
29
29
30 if not ispy3:
30 if not ispy3:
31 import cookielib
31 import cookielib
32 import cPickle as pickle
32 import cPickle as pickle
33 import httplib
33 import httplib
34 import Queue as queue
34 import Queue as queue
35 import SocketServer as socketserver
35 import SocketServer as socketserver
36 import xmlrpclib
36 import xmlrpclib
37
37
38 from .thirdparty.concurrent import futures
39
40 def future_set_exception_info(f, exc_info):
38 def future_set_exception_info(f, exc_info):
41 f.set_exception_info(*exc_info)
39 f.set_exception_info(*exc_info)
42
40
43 # this is close enough for our usage
41 # this is close enough for our usage
44 FileNotFoundError = OSError
42 FileNotFoundError = OSError
45
43
46 else:
44 else:
47 import builtins
45 import builtins
48 import concurrent.futures as futures
49 import http.cookiejar as cookielib
46 import http.cookiejar as cookielib
50 import http.client as httplib
47 import http.client as httplib
51 import pickle
48 import pickle
52 import queue as queue
49 import queue as queue
53 import socketserver
50 import socketserver
54 import xmlrpc.client as xmlrpclib
51 import xmlrpc.client as xmlrpclib
55
52
56 def future_set_exception_info(f, exc_info):
53 def future_set_exception_info(f, exc_info):
57 f.set_exception(exc_info[0])
54 f.set_exception(exc_info[0])
58
55
59 FileNotFoundError = builtins.FileNotFoundError
56 FileNotFoundError = builtins.FileNotFoundError
60
57
61
58
62 def identity(a):
59 def identity(a):
63 return a
60 return a
64
61
65
62
66 def _rapply(f, xs):
63 def _rapply(f, xs):
67 if xs is None:
64 if xs is None:
68 # assume None means non-value of optional data
65 # assume None means non-value of optional data
69 return xs
66 return xs
70 if isinstance(xs, (list, set, tuple)):
67 if isinstance(xs, (list, set, tuple)):
71 return type(xs)(_rapply(f, x) for x in xs)
68 return type(xs)(_rapply(f, x) for x in xs)
72 if isinstance(xs, dict):
69 if isinstance(xs, dict):
73 return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
70 return type(xs)((_rapply(f, k), _rapply(f, v)) for k, v in xs.items())
74 return f(xs)
71 return f(xs)
75
72
76
73
77 def rapply(f, xs):
74 def rapply(f, xs):
78 """Apply function recursively to every item preserving the data structure
75 """Apply function recursively to every item preserving the data structure
79
76
80 >>> def f(x):
77 >>> def f(x):
81 ... return 'f(%s)' % x
78 ... return 'f(%s)' % x
82 >>> rapply(f, None) is None
79 >>> rapply(f, None) is None
83 True
80 True
84 >>> rapply(f, 'a')
81 >>> rapply(f, 'a')
85 'f(a)'
82 'f(a)'
86 >>> rapply(f, {'a'}) == {'f(a)'}
83 >>> rapply(f, {'a'}) == {'f(a)'}
87 True
84 True
88 >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
85 >>> rapply(f, ['a', 'b', None, {'c': 'd'}, []])
89 ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
86 ['f(a)', 'f(b)', None, {'f(c)': 'f(d)'}, []]
90
87
91 >>> xs = [object()]
88 >>> xs = [object()]
92 >>> rapply(identity, xs) is xs
89 >>> rapply(identity, xs) is xs
93 True
90 True
94 """
91 """
95 if f is identity:
92 if f is identity:
96 # fast path mainly for py2
93 # fast path mainly for py2
97 return xs
94 return xs
98 return _rapply(f, xs)
95 return _rapply(f, xs)
99
96
100
97
101 if ispy3:
98 if ispy3:
102 import builtins
99 import builtins
103 import codecs
100 import codecs
104 import functools
101 import functools
105 import io
102 import io
106 import struct
103 import struct
107
104
108 if os.name == r'nt' and sys.version_info >= (3, 6):
105 if os.name == r'nt' and sys.version_info >= (3, 6):
109 # MBCS (or ANSI) filesystem encoding must be used as before.
106 # MBCS (or ANSI) filesystem encoding must be used as before.
110 # Otherwise non-ASCII filenames in existing repositories would be
107 # Otherwise non-ASCII filenames in existing repositories would be
111 # corrupted.
108 # corrupted.
112 # This must be set once prior to any fsencode/fsdecode calls.
109 # This must be set once prior to any fsencode/fsdecode calls.
113 sys._enablelegacywindowsfsencoding() # pytype: disable=module-attr
110 sys._enablelegacywindowsfsencoding() # pytype: disable=module-attr
114
111
115 fsencode = os.fsencode
112 fsencode = os.fsencode
116 fsdecode = os.fsdecode
113 fsdecode = os.fsdecode
117 oscurdir = os.curdir.encode('ascii')
114 oscurdir = os.curdir.encode('ascii')
118 oslinesep = os.linesep.encode('ascii')
115 oslinesep = os.linesep.encode('ascii')
119 osname = os.name.encode('ascii')
116 osname = os.name.encode('ascii')
120 ospathsep = os.pathsep.encode('ascii')
117 ospathsep = os.pathsep.encode('ascii')
121 ospardir = os.pardir.encode('ascii')
118 ospardir = os.pardir.encode('ascii')
122 ossep = os.sep.encode('ascii')
119 ossep = os.sep.encode('ascii')
123 osaltsep = os.altsep
120 osaltsep = os.altsep
124 if osaltsep:
121 if osaltsep:
125 osaltsep = osaltsep.encode('ascii')
122 osaltsep = osaltsep.encode('ascii')
126 osdevnull = os.devnull.encode('ascii')
123 osdevnull = os.devnull.encode('ascii')
127
124
128 sysplatform = sys.platform.encode('ascii')
125 sysplatform = sys.platform.encode('ascii')
129 sysexecutable = sys.executable
126 sysexecutable = sys.executable
130 if sysexecutable:
127 if sysexecutable:
131 sysexecutable = os.fsencode(sysexecutable)
128 sysexecutable = os.fsencode(sysexecutable)
132 bytesio = io.BytesIO
129 bytesio = io.BytesIO
133 # TODO deprecate stringio name, as it is a lie on Python 3.
130 # TODO deprecate stringio name, as it is a lie on Python 3.
134 stringio = bytesio
131 stringio = bytesio
135
132
136 def maplist(*args):
133 def maplist(*args):
137 return list(map(*args))
134 return list(map(*args))
138
135
139 def rangelist(*args):
136 def rangelist(*args):
140 return list(range(*args))
137 return list(range(*args))
141
138
142 def ziplist(*args):
139 def ziplist(*args):
143 return list(zip(*args))
140 return list(zip(*args))
144
141
145 rawinput = input
142 rawinput = input
146 getargspec = inspect.getfullargspec
143 getargspec = inspect.getfullargspec
147
144
148 long = int
145 long = int
149
146
150 if getattr(sys, 'argv', None) is not None:
147 if getattr(sys, 'argv', None) is not None:
151 # On POSIX, the char** argv array is converted to Python str using
148 # On POSIX, the char** argv array is converted to Python str using
152 # Py_DecodeLocale(). The inverse of this is Py_EncodeLocale(), which
149 # Py_DecodeLocale(). The inverse of this is Py_EncodeLocale(), which
153 # isn't directly callable from Python code. In practice, os.fsencode()
150 # isn't directly callable from Python code. In practice, os.fsencode()
154 # can be used instead (this is recommended by Python's documentation
151 # can be used instead (this is recommended by Python's documentation
155 # for sys.argv).
152 # for sys.argv).
156 #
153 #
157 # On Windows, the wchar_t **argv is passed into the interpreter as-is.
154 # On Windows, the wchar_t **argv is passed into the interpreter as-is.
158 # Like POSIX, we need to emulate what Py_EncodeLocale() would do. But
155 # Like POSIX, we need to emulate what Py_EncodeLocale() would do. But
159 # there's an additional wrinkle. What we really want to access is the
156 # there's an additional wrinkle. What we really want to access is the
160 # ANSI codepage representation of the arguments, as this is what
157 # ANSI codepage representation of the arguments, as this is what
161 # `int main()` would receive if Python 3 didn't define `int wmain()`
158 # `int main()` would receive if Python 3 didn't define `int wmain()`
162 # (this is how Python 2 worked). To get that, we encode with the mbcs
159 # (this is how Python 2 worked). To get that, we encode with the mbcs
163 # encoding, which will pass CP_ACP to the underlying Windows API to
160 # encoding, which will pass CP_ACP to the underlying Windows API to
164 # produce bytes.
161 # produce bytes.
165 if os.name == r'nt':
162 if os.name == r'nt':
166 sysargv = [a.encode("mbcs", "ignore") for a in sys.argv]
163 sysargv = [a.encode("mbcs", "ignore") for a in sys.argv]
167 else:
164 else:
168 sysargv = [fsencode(a) for a in sys.argv]
165 sysargv = [fsencode(a) for a in sys.argv]
169
166
170 bytechr = struct.Struct('>B').pack
167 bytechr = struct.Struct('>B').pack
171 byterepr = b'%r'.__mod__
168 byterepr = b'%r'.__mod__
172
169
173 class bytestr(bytes):
170 class bytestr(bytes):
174 """A bytes which mostly acts as a Python 2 str
171 """A bytes which mostly acts as a Python 2 str
175
172
176 >>> bytestr(), bytestr(bytearray(b'foo')), bytestr(u'ascii'), bytestr(1)
173 >>> bytestr(), bytestr(bytearray(b'foo')), bytestr(u'ascii'), bytestr(1)
177 ('', 'foo', 'ascii', '1')
174 ('', 'foo', 'ascii', '1')
178 >>> s = bytestr(b'foo')
175 >>> s = bytestr(b'foo')
179 >>> assert s is bytestr(s)
176 >>> assert s is bytestr(s)
180
177
181 __bytes__() should be called if provided:
178 __bytes__() should be called if provided:
182
179
183 >>> class bytesable(object):
180 >>> class bytesable(object):
184 ... def __bytes__(self):
181 ... def __bytes__(self):
185 ... return b'bytes'
182 ... return b'bytes'
186 >>> bytestr(bytesable())
183 >>> bytestr(bytesable())
187 'bytes'
184 'bytes'
188
185
189 There's no implicit conversion from non-ascii str as its encoding is
186 There's no implicit conversion from non-ascii str as its encoding is
190 unknown:
187 unknown:
191
188
192 >>> bytestr(chr(0x80)) # doctest: +ELLIPSIS
189 >>> bytestr(chr(0x80)) # doctest: +ELLIPSIS
193 Traceback (most recent call last):
190 Traceback (most recent call last):
194 ...
191 ...
195 UnicodeEncodeError: ...
192 UnicodeEncodeError: ...
196
193
197 Comparison between bytestr and bytes should work:
194 Comparison between bytestr and bytes should work:
198
195
199 >>> assert bytestr(b'foo') == b'foo'
196 >>> assert bytestr(b'foo') == b'foo'
200 >>> assert b'foo' == bytestr(b'foo')
197 >>> assert b'foo' == bytestr(b'foo')
201 >>> assert b'f' in bytestr(b'foo')
198 >>> assert b'f' in bytestr(b'foo')
202 >>> assert bytestr(b'f') in b'foo'
199 >>> assert bytestr(b'f') in b'foo'
203
200
204 Sliced elements should be bytes, not integer:
201 Sliced elements should be bytes, not integer:
205
202
206 >>> s[1], s[:2]
203 >>> s[1], s[:2]
207 (b'o', b'fo')
204 (b'o', b'fo')
208 >>> list(s), list(reversed(s))
205 >>> list(s), list(reversed(s))
209 ([b'f', b'o', b'o'], [b'o', b'o', b'f'])
206 ([b'f', b'o', b'o'], [b'o', b'o', b'f'])
210
207
211 As bytestr type isn't propagated across operations, you need to cast
208 As bytestr type isn't propagated across operations, you need to cast
212 bytes to bytestr explicitly:
209 bytes to bytestr explicitly:
213
210
214 >>> s = bytestr(b'foo').upper()
211 >>> s = bytestr(b'foo').upper()
215 >>> t = bytestr(s)
212 >>> t = bytestr(s)
216 >>> s[0], t[0]
213 >>> s[0], t[0]
217 (70, b'F')
214 (70, b'F')
218
215
219 Be careful to not pass a bytestr object to a function which expects
216 Be careful to not pass a bytestr object to a function which expects
220 bytearray-like behavior.
217 bytearray-like behavior.
221
218
222 >>> t = bytes(t) # cast to bytes
219 >>> t = bytes(t) # cast to bytes
223 >>> assert type(t) is bytes
220 >>> assert type(t) is bytes
224 """
221 """
225
222
226 # Trick pytype into not demanding Iterable[int] be passed to __new__(),
223 # Trick pytype into not demanding Iterable[int] be passed to __new__(),
227 # since the appropriate bytes format is done internally.
224 # since the appropriate bytes format is done internally.
228 #
225 #
229 # https://github.com/google/pytype/issues/500
226 # https://github.com/google/pytype/issues/500
230 if TYPE_CHECKING:
227 if TYPE_CHECKING:
231
228
232 def __init__(self, s=b''):
229 def __init__(self, s=b''):
233 pass
230 pass
234
231
235 def __new__(cls, s=b''):
232 def __new__(cls, s=b''):
236 if isinstance(s, bytestr):
233 if isinstance(s, bytestr):
237 return s
234 return s
238 if not isinstance(
235 if not isinstance(
239 s, (bytes, bytearray)
236 s, (bytes, bytearray)
240 ) and not hasattr( # hasattr-py3-only
237 ) and not hasattr( # hasattr-py3-only
241 s, u'__bytes__'
238 s, u'__bytes__'
242 ):
239 ):
243 s = str(s).encode('ascii')
240 s = str(s).encode('ascii')
244 return bytes.__new__(cls, s)
241 return bytes.__new__(cls, s)
245
242
246 def __getitem__(self, key):
243 def __getitem__(self, key):
247 s = bytes.__getitem__(self, key)
244 s = bytes.__getitem__(self, key)
248 if not isinstance(s, bytes):
245 if not isinstance(s, bytes):
249 s = bytechr(s)
246 s = bytechr(s)
250 return s
247 return s
251
248
252 def __iter__(self):
249 def __iter__(self):
253 return iterbytestr(bytes.__iter__(self))
250 return iterbytestr(bytes.__iter__(self))
254
251
255 def __repr__(self):
252 def __repr__(self):
256 return bytes.__repr__(self)[1:] # drop b''
253 return bytes.__repr__(self)[1:] # drop b''
257
254
258 def iterbytestr(s):
255 def iterbytestr(s):
259 """Iterate bytes as if it were a str object of Python 2"""
256 """Iterate bytes as if it were a str object of Python 2"""
260 return map(bytechr, s)
257 return map(bytechr, s)
261
258
262 def maybebytestr(s):
259 def maybebytestr(s):
263 """Promote bytes to bytestr"""
260 """Promote bytes to bytestr"""
264 if isinstance(s, bytes):
261 if isinstance(s, bytes):
265 return bytestr(s)
262 return bytestr(s)
266 return s
263 return s
267
264
268 def sysbytes(s):
265 def sysbytes(s):
269 """Convert an internal str (e.g. keyword, __doc__) back to bytes
266 """Convert an internal str (e.g. keyword, __doc__) back to bytes
270
267
271 This never raises UnicodeEncodeError, but only ASCII characters
268 This never raises UnicodeEncodeError, but only ASCII characters
272 can be round-trip by sysstr(sysbytes(s)).
269 can be round-trip by sysstr(sysbytes(s)).
273 """
270 """
274 if isinstance(s, bytes):
271 if isinstance(s, bytes):
275 return s
272 return s
276 return s.encode('utf-8')
273 return s.encode('utf-8')
277
274
278 def sysstr(s):
275 def sysstr(s):
279 """Return a keyword str to be passed to Python functions such as
276 """Return a keyword str to be passed to Python functions such as
280 getattr() and str.encode()
277 getattr() and str.encode()
281
278
282 This never raises UnicodeDecodeError. Non-ascii characters are
279 This never raises UnicodeDecodeError. Non-ascii characters are
283 considered invalid and mapped to arbitrary but unique code points
280 considered invalid and mapped to arbitrary but unique code points
284 such that 'sysstr(a) != sysstr(b)' for all 'a != b'.
281 such that 'sysstr(a) != sysstr(b)' for all 'a != b'.
285 """
282 """
286 if isinstance(s, builtins.str):
283 if isinstance(s, builtins.str):
287 return s
284 return s
288 return s.decode('latin-1')
285 return s.decode('latin-1')
289
286
290 def strurl(url):
287 def strurl(url):
291 """Converts a bytes url back to str"""
288 """Converts a bytes url back to str"""
292 if isinstance(url, bytes):
289 if isinstance(url, bytes):
293 return url.decode('ascii')
290 return url.decode('ascii')
294 return url
291 return url
295
292
296 def bytesurl(url):
293 def bytesurl(url):
297 """Converts a str url to bytes by encoding in ascii"""
294 """Converts a str url to bytes by encoding in ascii"""
298 if isinstance(url, str):
295 if isinstance(url, str):
299 return url.encode('ascii')
296 return url.encode('ascii')
300 return url
297 return url
301
298
302 def raisewithtb(exc, tb):
299 def raisewithtb(exc, tb):
303 """Raise exception with the given traceback"""
300 """Raise exception with the given traceback"""
304 raise exc.with_traceback(tb)
301 raise exc.with_traceback(tb)
305
302
306 def getdoc(obj):
303 def getdoc(obj):
307 """Get docstring as bytes; may be None so gettext() won't confuse it
304 """Get docstring as bytes; may be None so gettext() won't confuse it
308 with _('')"""
305 with _('')"""
309 doc = getattr(obj, '__doc__', None)
306 doc = getattr(obj, '__doc__', None)
310 if doc is None:
307 if doc is None:
311 return doc
308 return doc
312 return sysbytes(doc)
309 return sysbytes(doc)
313
310
314 def _wrapattrfunc(f):
311 def _wrapattrfunc(f):
315 @functools.wraps(f)
312 @functools.wraps(f)
316 def w(object, name, *args):
313 def w(object, name, *args):
317 return f(object, sysstr(name), *args)
314 return f(object, sysstr(name), *args)
318
315
319 return w
316 return w
320
317
321 # these wrappers are automagically imported by hgloader
318 # these wrappers are automagically imported by hgloader
322 delattr = _wrapattrfunc(builtins.delattr)
319 delattr = _wrapattrfunc(builtins.delattr)
323 getattr = _wrapattrfunc(builtins.getattr)
320 getattr = _wrapattrfunc(builtins.getattr)
324 hasattr = _wrapattrfunc(builtins.hasattr)
321 hasattr = _wrapattrfunc(builtins.hasattr)
325 setattr = _wrapattrfunc(builtins.setattr)
322 setattr = _wrapattrfunc(builtins.setattr)
326 xrange = builtins.range
323 xrange = builtins.range
327 unicode = str
324 unicode = str
328
325
329 def open(name, mode=b'r', buffering=-1, encoding=None):
326 def open(name, mode=b'r', buffering=-1, encoding=None):
330 return builtins.open(name, sysstr(mode), buffering, encoding)
327 return builtins.open(name, sysstr(mode), buffering, encoding)
331
328
332 safehasattr = _wrapattrfunc(builtins.hasattr)
329 safehasattr = _wrapattrfunc(builtins.hasattr)
333
330
334 def _getoptbwrapper(orig, args, shortlist, namelist):
331 def _getoptbwrapper(orig, args, shortlist, namelist):
335 """
332 """
336 Takes bytes arguments, converts them to unicode, pass them to
333 Takes bytes arguments, converts them to unicode, pass them to
337 getopt.getopt(), convert the returned values back to bytes and then
334 getopt.getopt(), convert the returned values back to bytes and then
338 return them for Python 3 compatibility as getopt.getopt() don't accepts
335 return them for Python 3 compatibility as getopt.getopt() don't accepts
339 bytes on Python 3.
336 bytes on Python 3.
340 """
337 """
341 args = [a.decode('latin-1') for a in args]
338 args = [a.decode('latin-1') for a in args]
342 shortlist = shortlist.decode('latin-1')
339 shortlist = shortlist.decode('latin-1')
343 namelist = [a.decode('latin-1') for a in namelist]
340 namelist = [a.decode('latin-1') for a in namelist]
344 opts, args = orig(args, shortlist, namelist)
341 opts, args = orig(args, shortlist, namelist)
345 opts = [(a[0].encode('latin-1'), a[1].encode('latin-1')) for a in opts]
342 opts = [(a[0].encode('latin-1'), a[1].encode('latin-1')) for a in opts]
346 args = [a.encode('latin-1') for a in args]
343 args = [a.encode('latin-1') for a in args]
347 return opts, args
344 return opts, args
348
345
349 def strkwargs(dic):
346 def strkwargs(dic):
350 """
347 """
351 Converts the keys of a python dictonary to str i.e. unicodes so that
348 Converts the keys of a python dictonary to str i.e. unicodes so that
352 they can be passed as keyword arguments as dictionaries with bytes keys
349 they can be passed as keyword arguments as dictionaries with bytes keys
353 can't be passed as keyword arguments to functions on Python 3.
350 can't be passed as keyword arguments to functions on Python 3.
354 """
351 """
355 dic = {k.decode('latin-1'): v for k, v in dic.items()}
352 dic = {k.decode('latin-1'): v for k, v in dic.items()}
356 return dic
353 return dic
357
354
358 def byteskwargs(dic):
355 def byteskwargs(dic):
359 """
356 """
360 Converts keys of python dictionaries to bytes as they were converted to
357 Converts keys of python dictionaries to bytes as they were converted to
361 str to pass that dictonary as a keyword argument on Python 3.
358 str to pass that dictonary as a keyword argument on Python 3.
362 """
359 """
363 dic = {k.encode('latin-1'): v for k, v in dic.items()}
360 dic = {k.encode('latin-1'): v for k, v in dic.items()}
364 return dic
361 return dic
365
362
366 # TODO: handle shlex.shlex().
363 # TODO: handle shlex.shlex().
367 def shlexsplit(s, comments=False, posix=True):
364 def shlexsplit(s, comments=False, posix=True):
368 """
365 """
369 Takes bytes argument, convert it to str i.e. unicodes, pass that into
366 Takes bytes argument, convert it to str i.e. unicodes, pass that into
370 shlex.split(), convert the returned value to bytes and return that for
367 shlex.split(), convert the returned value to bytes and return that for
371 Python 3 compatibility as shelx.split() don't accept bytes on Python 3.
368 Python 3 compatibility as shelx.split() don't accept bytes on Python 3.
372 """
369 """
373 ret = shlex.split(s.decode('latin-1'), comments, posix)
370 ret = shlex.split(s.decode('latin-1'), comments, posix)
374 return [a.encode('latin-1') for a in ret]
371 return [a.encode('latin-1') for a in ret]
375
372
376 iteritems = lambda x: x.items()
373 iteritems = lambda x: x.items()
377 itervalues = lambda x: x.values()
374 itervalues = lambda x: x.values()
378
375
379 # Python 3.5's json.load and json.loads require str. We polyfill its
376 # Python 3.5's json.load and json.loads require str. We polyfill its
380 # code for detecting encoding from bytes.
377 # code for detecting encoding from bytes.
381 if sys.version_info[0:2] < (3, 6):
378 if sys.version_info[0:2] < (3, 6):
382
379
383 def _detect_encoding(b):
380 def _detect_encoding(b):
384 bstartswith = b.startswith
381 bstartswith = b.startswith
385 if bstartswith((codecs.BOM_UTF32_BE, codecs.BOM_UTF32_LE)):
382 if bstartswith((codecs.BOM_UTF32_BE, codecs.BOM_UTF32_LE)):
386 return 'utf-32'
383 return 'utf-32'
387 if bstartswith((codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE)):
384 if bstartswith((codecs.BOM_UTF16_BE, codecs.BOM_UTF16_LE)):
388 return 'utf-16'
385 return 'utf-16'
389 if bstartswith(codecs.BOM_UTF8):
386 if bstartswith(codecs.BOM_UTF8):
390 return 'utf-8-sig'
387 return 'utf-8-sig'
391
388
392 if len(b) >= 4:
389 if len(b) >= 4:
393 if not b[0]:
390 if not b[0]:
394 # 00 00 -- -- - utf-32-be
391 # 00 00 -- -- - utf-32-be
395 # 00 XX -- -- - utf-16-be
392 # 00 XX -- -- - utf-16-be
396 return 'utf-16-be' if b[1] else 'utf-32-be'
393 return 'utf-16-be' if b[1] else 'utf-32-be'
397 if not b[1]:
394 if not b[1]:
398 # XX 00 00 00 - utf-32-le
395 # XX 00 00 00 - utf-32-le
399 # XX 00 00 XX - utf-16-le
396 # XX 00 00 XX - utf-16-le
400 # XX 00 XX -- - utf-16-le
397 # XX 00 XX -- - utf-16-le
401 return 'utf-16-le' if b[2] or b[3] else 'utf-32-le'
398 return 'utf-16-le' if b[2] or b[3] else 'utf-32-le'
402 elif len(b) == 2:
399 elif len(b) == 2:
403 if not b[0]:
400 if not b[0]:
404 # 00 XX - utf-16-be
401 # 00 XX - utf-16-be
405 return 'utf-16-be'
402 return 'utf-16-be'
406 if not b[1]:
403 if not b[1]:
407 # XX 00 - utf-16-le
404 # XX 00 - utf-16-le
408 return 'utf-16-le'
405 return 'utf-16-le'
409 # default
406 # default
410 return 'utf-8'
407 return 'utf-8'
411
408
412 def json_loads(s, *args, **kwargs):
409 def json_loads(s, *args, **kwargs):
413 if isinstance(s, (bytes, bytearray)):
410 if isinstance(s, (bytes, bytearray)):
414 s = s.decode(_detect_encoding(s), 'surrogatepass')
411 s = s.decode(_detect_encoding(s), 'surrogatepass')
415
412
416 return json.loads(s, *args, **kwargs)
413 return json.loads(s, *args, **kwargs)
417
414
418 else:
415 else:
419 json_loads = json.loads
416 json_loads = json.loads
420
417
421 else:
418 else:
422 import cStringIO
419 import cStringIO
423
420
424 xrange = xrange
421 xrange = xrange
425 unicode = unicode
422 unicode = unicode
426 bytechr = chr
423 bytechr = chr
427 byterepr = repr
424 byterepr = repr
428 bytestr = str
425 bytestr = str
429 iterbytestr = iter
426 iterbytestr = iter
430 maybebytestr = identity
427 maybebytestr = identity
431 sysbytes = identity
428 sysbytes = identity
432 sysstr = identity
429 sysstr = identity
433 strurl = identity
430 strurl = identity
434 bytesurl = identity
431 bytesurl = identity
435 open = open
432 open = open
436 delattr = delattr
433 delattr = delattr
437 getattr = getattr
434 getattr = getattr
438 hasattr = hasattr
435 hasattr = hasattr
439 setattr = setattr
436 setattr = setattr
440
437
441 # this can't be parsed on Python 3
438 # this can't be parsed on Python 3
442 exec(b'def raisewithtb(exc, tb):\n raise exc, None, tb\n')
439 exec(b'def raisewithtb(exc, tb):\n raise exc, None, tb\n')
443
440
444 def fsencode(filename):
441 def fsencode(filename):
445 """
442 """
446 Partial backport from os.py in Python 3, which only accepts bytes.
443 Partial backport from os.py in Python 3, which only accepts bytes.
447 In Python 2, our paths should only ever be bytes, a unicode path
444 In Python 2, our paths should only ever be bytes, a unicode path
448 indicates a bug.
445 indicates a bug.
449 """
446 """
450 if isinstance(filename, str):
447 if isinstance(filename, str):
451 return filename
448 return filename
452 else:
449 else:
453 raise TypeError("expect str, not %s" % type(filename).__name__)
450 raise TypeError("expect str, not %s" % type(filename).__name__)
454
451
455 # In Python 2, fsdecode() has a very chance to receive bytes. So it's
452 # In Python 2, fsdecode() has a very chance to receive bytes. So it's
456 # better not to touch Python 2 part as it's already working fine.
453 # better not to touch Python 2 part as it's already working fine.
457 fsdecode = identity
454 fsdecode = identity
458
455
459 def getdoc(obj):
456 def getdoc(obj):
460 return getattr(obj, '__doc__', None)
457 return getattr(obj, '__doc__', None)
461
458
462 _notset = object()
459 _notset = object()
463
460
464 def safehasattr(thing, attr):
461 def safehasattr(thing, attr):
465 return getattr(thing, attr, _notset) is not _notset
462 return getattr(thing, attr, _notset) is not _notset
466
463
467 def _getoptbwrapper(orig, args, shortlist, namelist):
464 def _getoptbwrapper(orig, args, shortlist, namelist):
468 return orig(args, shortlist, namelist)
465 return orig(args, shortlist, namelist)
469
466
470 strkwargs = identity
467 strkwargs = identity
471 byteskwargs = identity
468 byteskwargs = identity
472
469
473 oscurdir = os.curdir
470 oscurdir = os.curdir
474 oslinesep = os.linesep
471 oslinesep = os.linesep
475 osname = os.name
472 osname = os.name
476 ospathsep = os.pathsep
473 ospathsep = os.pathsep
477 ospardir = os.pardir
474 ospardir = os.pardir
478 ossep = os.sep
475 ossep = os.sep
479 osaltsep = os.altsep
476 osaltsep = os.altsep
480 osdevnull = os.devnull
477 osdevnull = os.devnull
481 long = long
478 long = long
482 if getattr(sys, 'argv', None) is not None:
479 if getattr(sys, 'argv', None) is not None:
483 sysargv = sys.argv
480 sysargv = sys.argv
484 sysplatform = sys.platform
481 sysplatform = sys.platform
485 sysexecutable = sys.executable
482 sysexecutable = sys.executable
486 shlexsplit = shlex.split
483 shlexsplit = shlex.split
487 bytesio = cStringIO.StringIO
484 bytesio = cStringIO.StringIO
488 stringio = bytesio
485 stringio = bytesio
489 maplist = map
486 maplist = map
490 rangelist = range
487 rangelist = range
491 ziplist = zip
488 ziplist = zip
492 rawinput = raw_input
489 rawinput = raw_input
493 getargspec = inspect.getargspec
490 getargspec = inspect.getargspec
494 iteritems = lambda x: x.iteritems()
491 iteritems = lambda x: x.iteritems()
495 itervalues = lambda x: x.itervalues()
492 itervalues = lambda x: x.itervalues()
496 json_loads = json.loads
493 json_loads = json.loads
497
494
498 isjython = sysplatform.startswith(b'java')
495 isjython = sysplatform.startswith(b'java')
499
496
500 isdarwin = sysplatform.startswith(b'darwin')
497 isdarwin = sysplatform.startswith(b'darwin')
501 islinux = sysplatform.startswith(b'linux')
498 islinux = sysplatform.startswith(b'linux')
502 isposix = osname == b'posix'
499 isposix = osname == b'posix'
503 iswindows = osname == b'nt'
500 iswindows = osname == b'nt'
504
501
505
502
506 def getoptb(args, shortlist, namelist):
503 def getoptb(args, shortlist, namelist):
507 return _getoptbwrapper(getopt.getopt, args, shortlist, namelist)
504 return _getoptbwrapper(getopt.getopt, args, shortlist, namelist)
508
505
509
506
510 def gnugetoptb(args, shortlist, namelist):
507 def gnugetoptb(args, shortlist, namelist):
511 return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist)
508 return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist)
512
509
513
510
514 def mkdtemp(suffix=b'', prefix=b'tmp', dir=None):
511 def mkdtemp(suffix=b'', prefix=b'tmp', dir=None):
515 return tempfile.mkdtemp(suffix, prefix, dir)
512 return tempfile.mkdtemp(suffix, prefix, dir)
516
513
517
514
518 # text=True is not supported; use util.from/tonativeeol() instead
515 # text=True is not supported; use util.from/tonativeeol() instead
519 def mkstemp(suffix=b'', prefix=b'tmp', dir=None):
516 def mkstemp(suffix=b'', prefix=b'tmp', dir=None):
520 return tempfile.mkstemp(suffix, prefix, dir)
517 return tempfile.mkstemp(suffix, prefix, dir)
521
518
522
519
523 # TemporaryFile does not support an "encoding=" argument on python2.
520 # TemporaryFile does not support an "encoding=" argument on python2.
524 # This wrapper file are always open in byte mode.
521 # This wrapper file are always open in byte mode.
525 def unnamedtempfile(mode=None, *args, **kwargs):
522 def unnamedtempfile(mode=None, *args, **kwargs):
526 if mode is None:
523 if mode is None:
527 mode = 'w+b'
524 mode = 'w+b'
528 else:
525 else:
529 mode = sysstr(mode)
526 mode = sysstr(mode)
530 assert 'b' in mode
527 assert 'b' in mode
531 return tempfile.TemporaryFile(mode, *args, **kwargs)
528 return tempfile.TemporaryFile(mode, *args, **kwargs)
532
529
533
530
534 # NamedTemporaryFile does not support an "encoding=" argument on python2.
531 # NamedTemporaryFile does not support an "encoding=" argument on python2.
535 # This wrapper file are always open in byte mode.
532 # This wrapper file are always open in byte mode.
536 def namedtempfile(
533 def namedtempfile(
537 mode=b'w+b', bufsize=-1, suffix=b'', prefix=b'tmp', dir=None, delete=True
534 mode=b'w+b', bufsize=-1, suffix=b'', prefix=b'tmp', dir=None, delete=True
538 ):
535 ):
539 mode = sysstr(mode)
536 mode = sysstr(mode)
540 assert 'b' in mode
537 assert 'b' in mode
541 return tempfile.NamedTemporaryFile(
538 return tempfile.NamedTemporaryFile(
542 mode, bufsize, suffix=suffix, prefix=prefix, dir=dir, delete=delete
539 mode, bufsize, suffix=suffix, prefix=prefix, dir=dir, delete=delete
543 )
540 )
@@ -1,649 +1,650 b''
1 # wireprotov1peer.py - Client-side functionality for wire protocol version 1.
1 # wireprotov1peer.py - Client-side functionality for wire protocol version 1.
2 #
2 #
3 # Copyright 2005-2010 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2010 Olivia Mackall <olivia@selenic.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 sys
10 import sys
11 import weakref
11 import weakref
12
12
13 from concurrent import futures
13 from .i18n import _
14 from .i18n import _
14 from .node import bin
15 from .node import bin
15 from .pycompat import (
16 from .pycompat import (
16 getattr,
17 getattr,
17 setattr,
18 setattr,
18 )
19 )
19 from . import (
20 from . import (
20 bundle2,
21 bundle2,
21 changegroup as changegroupmod,
22 changegroup as changegroupmod,
22 encoding,
23 encoding,
23 error,
24 error,
24 pushkey as pushkeymod,
25 pushkey as pushkeymod,
25 pycompat,
26 pycompat,
26 util,
27 util,
27 wireprototypes,
28 wireprototypes,
28 )
29 )
29 from .interfaces import (
30 from .interfaces import (
30 repository,
31 repository,
31 util as interfaceutil,
32 util as interfaceutil,
32 )
33 )
33 from .utils import hashutil
34 from .utils import hashutil
34
35
35 urlreq = util.urlreq
36 urlreq = util.urlreq
36
37
37
38
38 def batchable(f):
39 def batchable(f):
39 """annotation for batchable methods
40 """annotation for batchable methods
40
41
41 Such methods must implement a coroutine as follows:
42 Such methods must implement a coroutine as follows:
42
43
43 @batchable
44 @batchable
44 def sample(self, one, two=None):
45 def sample(self, one, two=None):
45 # Build list of encoded arguments suitable for your wire protocol:
46 # Build list of encoded arguments suitable for your wire protocol:
46 encoded_args = [('one', encode(one),), ('two', encode(two),)]
47 encoded_args = [('one', encode(one),), ('two', encode(two),)]
47 # Return it, along with a function that will receive the result
48 # Return it, along with a function that will receive the result
48 # from the batched request.
49 # from the batched request.
49 return encoded_args, decode
50 return encoded_args, decode
50
51
51 The decorator returns a function which wraps this coroutine as a plain
52 The decorator returns a function which wraps this coroutine as a plain
52 method, but adds the original method as an attribute called "batchable",
53 method, but adds the original method as an attribute called "batchable",
53 which is used by remotebatch to split the call into separate encoding and
54 which is used by remotebatch to split the call into separate encoding and
54 decoding phases.
55 decoding phases.
55 """
56 """
56
57
57 def plain(*args, **opts):
58 def plain(*args, **opts):
58 encoded_args_or_res, decode = f(*args, **opts)
59 encoded_args_or_res, decode = f(*args, **opts)
59 if not decode:
60 if not decode:
60 return encoded_args_or_res # a local result in this case
61 return encoded_args_or_res # a local result in this case
61 self = args[0]
62 self = args[0]
62 cmd = pycompat.bytesurl(f.__name__) # ensure cmd is ascii bytestr
63 cmd = pycompat.bytesurl(f.__name__) # ensure cmd is ascii bytestr
63 encoded_res = self._submitone(cmd, encoded_args_or_res)
64 encoded_res = self._submitone(cmd, encoded_args_or_res)
64 return decode(encoded_res)
65 return decode(encoded_res)
65
66
66 setattr(plain, 'batchable', f)
67 setattr(plain, 'batchable', f)
67 setattr(plain, '__name__', f.__name__)
68 setattr(plain, '__name__', f.__name__)
68 return plain
69 return plain
69
70
70
71
71 def encodebatchcmds(req):
72 def encodebatchcmds(req):
72 """Return a ``cmds`` argument value for the ``batch`` command."""
73 """Return a ``cmds`` argument value for the ``batch`` command."""
73 escapearg = wireprototypes.escapebatcharg
74 escapearg = wireprototypes.escapebatcharg
74
75
75 cmds = []
76 cmds = []
76 for op, argsdict in req:
77 for op, argsdict in req:
77 # Old servers didn't properly unescape argument names. So prevent
78 # Old servers didn't properly unescape argument names. So prevent
78 # the sending of argument names that may not be decoded properly by
79 # the sending of argument names that may not be decoded properly by
79 # servers.
80 # servers.
80 assert all(escapearg(k) == k for k in argsdict)
81 assert all(escapearg(k) == k for k in argsdict)
81
82
82 args = b','.join(
83 args = b','.join(
83 b'%s=%s' % (escapearg(k), escapearg(v))
84 b'%s=%s' % (escapearg(k), escapearg(v))
84 for k, v in pycompat.iteritems(argsdict)
85 for k, v in pycompat.iteritems(argsdict)
85 )
86 )
86 cmds.append(b'%s %s' % (op, args))
87 cmds.append(b'%s %s' % (op, args))
87
88
88 return b';'.join(cmds)
89 return b';'.join(cmds)
89
90
90
91
91 class unsentfuture(pycompat.futures.Future):
92 class unsentfuture(futures.Future):
92 """A Future variation to represent an unsent command.
93 """A Future variation to represent an unsent command.
93
94
94 Because we buffer commands and don't submit them immediately, calling
95 Because we buffer commands and don't submit them immediately, calling
95 ``result()`` on an unsent future could deadlock. Futures for buffered
96 ``result()`` on an unsent future could deadlock. Futures for buffered
96 commands are represented by this type, which wraps ``result()`` to
97 commands are represented by this type, which wraps ``result()`` to
97 call ``sendcommands()``.
98 call ``sendcommands()``.
98 """
99 """
99
100
100 def result(self, timeout=None):
101 def result(self, timeout=None):
101 if self.done():
102 if self.done():
102 return pycompat.futures.Future.result(self, timeout)
103 return futures.Future.result(self, timeout)
103
104
104 self._peerexecutor.sendcommands()
105 self._peerexecutor.sendcommands()
105
106
106 # This looks like it will infinitely recurse. However,
107 # This looks like it will infinitely recurse. However,
107 # sendcommands() should modify __class__. This call serves as a check
108 # sendcommands() should modify __class__. This call serves as a check
108 # on that.
109 # on that.
109 return self.result(timeout)
110 return self.result(timeout)
110
111
111
112
112 @interfaceutil.implementer(repository.ipeercommandexecutor)
113 @interfaceutil.implementer(repository.ipeercommandexecutor)
113 class peerexecutor(object):
114 class peerexecutor(object):
114 def __init__(self, peer):
115 def __init__(self, peer):
115 self._peer = peer
116 self._peer = peer
116 self._sent = False
117 self._sent = False
117 self._closed = False
118 self._closed = False
118 self._calls = []
119 self._calls = []
119 self._futures = weakref.WeakSet()
120 self._futures = weakref.WeakSet()
120 self._responseexecutor = None
121 self._responseexecutor = None
121 self._responsef = None
122 self._responsef = None
122
123
123 def __enter__(self):
124 def __enter__(self):
124 return self
125 return self
125
126
126 def __exit__(self, exctype, excvalee, exctb):
127 def __exit__(self, exctype, excvalee, exctb):
127 self.close()
128 self.close()
128
129
129 def callcommand(self, command, args):
130 def callcommand(self, command, args):
130 if self._sent:
131 if self._sent:
131 raise error.ProgrammingError(
132 raise error.ProgrammingError(
132 b'callcommand() cannot be used after commands are sent'
133 b'callcommand() cannot be used after commands are sent'
133 )
134 )
134
135
135 if self._closed:
136 if self._closed:
136 raise error.ProgrammingError(
137 raise error.ProgrammingError(
137 b'callcommand() cannot be used after close()'
138 b'callcommand() cannot be used after close()'
138 )
139 )
139
140
140 # Commands are dispatched through methods on the peer.
141 # Commands are dispatched through methods on the peer.
141 fn = getattr(self._peer, pycompat.sysstr(command), None)
142 fn = getattr(self._peer, pycompat.sysstr(command), None)
142
143
143 if not fn:
144 if not fn:
144 raise error.ProgrammingError(
145 raise error.ProgrammingError(
145 b'cannot call command %s: method of same name not available '
146 b'cannot call command %s: method of same name not available '
146 b'on peer' % command
147 b'on peer' % command
147 )
148 )
148
149
149 # Commands are either batchable or they aren't. If a command
150 # Commands are either batchable or they aren't. If a command
150 # isn't batchable, we send it immediately because the executor
151 # isn't batchable, we send it immediately because the executor
151 # can no longer accept new commands after a non-batchable command.
152 # can no longer accept new commands after a non-batchable command.
152 # If a command is batchable, we queue it for later. But we have
153 # If a command is batchable, we queue it for later. But we have
153 # to account for the case of a non-batchable command arriving after
154 # to account for the case of a non-batchable command arriving after
154 # a batchable one and refuse to service it.
155 # a batchable one and refuse to service it.
155
156
156 def addcall():
157 def addcall():
157 f = pycompat.futures.Future()
158 f = futures.Future()
158 self._futures.add(f)
159 self._futures.add(f)
159 self._calls.append((command, args, fn, f))
160 self._calls.append((command, args, fn, f))
160 return f
161 return f
161
162
162 if getattr(fn, 'batchable', False):
163 if getattr(fn, 'batchable', False):
163 f = addcall()
164 f = addcall()
164
165
165 # But since we don't issue it immediately, we wrap its result()
166 # But since we don't issue it immediately, we wrap its result()
166 # to trigger sending so we avoid deadlocks.
167 # to trigger sending so we avoid deadlocks.
167 f.__class__ = unsentfuture
168 f.__class__ = unsentfuture
168 f._peerexecutor = self
169 f._peerexecutor = self
169 else:
170 else:
170 if self._calls:
171 if self._calls:
171 raise error.ProgrammingError(
172 raise error.ProgrammingError(
172 b'%s is not batchable and cannot be called on a command '
173 b'%s is not batchable and cannot be called on a command '
173 b'executor along with other commands' % command
174 b'executor along with other commands' % command
174 )
175 )
175
176
176 f = addcall()
177 f = addcall()
177
178
178 # Non-batchable commands can never coexist with another command
179 # Non-batchable commands can never coexist with another command
179 # in this executor. So send the command immediately.
180 # in this executor. So send the command immediately.
180 self.sendcommands()
181 self.sendcommands()
181
182
182 return f
183 return f
183
184
184 def sendcommands(self):
185 def sendcommands(self):
185 if self._sent:
186 if self._sent:
186 return
187 return
187
188
188 if not self._calls:
189 if not self._calls:
189 return
190 return
190
191
191 self._sent = True
192 self._sent = True
192
193
193 # Unhack any future types so caller seens a clean type and to break
194 # Unhack any future types so caller seens a clean type and to break
194 # cycle between us and futures.
195 # cycle between us and futures.
195 for f in self._futures:
196 for f in self._futures:
196 if isinstance(f, unsentfuture):
197 if isinstance(f, unsentfuture):
197 f.__class__ = pycompat.futures.Future
198 f.__class__ = futures.Future
198 f._peerexecutor = None
199 f._peerexecutor = None
199
200
200 calls = self._calls
201 calls = self._calls
201 # Mainly to destroy references to futures.
202 # Mainly to destroy references to futures.
202 self._calls = None
203 self._calls = None
203
204
204 # Simple case of a single command. We call it synchronously.
205 # Simple case of a single command. We call it synchronously.
205 if len(calls) == 1:
206 if len(calls) == 1:
206 command, args, fn, f = calls[0]
207 command, args, fn, f = calls[0]
207
208
208 # Future was cancelled. Ignore it.
209 # Future was cancelled. Ignore it.
209 if not f.set_running_or_notify_cancel():
210 if not f.set_running_or_notify_cancel():
210 return
211 return
211
212
212 try:
213 try:
213 result = fn(**pycompat.strkwargs(args))
214 result = fn(**pycompat.strkwargs(args))
214 except Exception:
215 except Exception:
215 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
216 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
216 else:
217 else:
217 f.set_result(result)
218 f.set_result(result)
218
219
219 return
220 return
220
221
221 # Batch commands are a bit harder. First, we have to deal with the
222 # Batch commands are a bit harder. First, we have to deal with the
222 # @batchable coroutine. That's a bit annoying. Furthermore, we also
223 # @batchable coroutine. That's a bit annoying. Furthermore, we also
223 # need to preserve streaming. i.e. it should be possible for the
224 # need to preserve streaming. i.e. it should be possible for the
224 # futures to resolve as data is coming in off the wire without having
225 # futures to resolve as data is coming in off the wire without having
225 # to wait for the final byte of the final response. We do this by
226 # to wait for the final byte of the final response. We do this by
226 # spinning up a thread to read the responses.
227 # spinning up a thread to read the responses.
227
228
228 requests = []
229 requests = []
229 states = []
230 states = []
230
231
231 for command, args, fn, f in calls:
232 for command, args, fn, f in calls:
232 # Future was cancelled. Ignore it.
233 # Future was cancelled. Ignore it.
233 if not f.set_running_or_notify_cancel():
234 if not f.set_running_or_notify_cancel():
234 continue
235 continue
235
236
236 try:
237 try:
237 encoded_args_or_res, decode = fn.batchable(
238 encoded_args_or_res, decode = fn.batchable(
238 fn.__self__, **pycompat.strkwargs(args)
239 fn.__self__, **pycompat.strkwargs(args)
239 )
240 )
240 except Exception:
241 except Exception:
241 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
242 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
242 return
243 return
243
244
244 if not decode:
245 if not decode:
245 f.set_result(encoded_args_or_res)
246 f.set_result(encoded_args_or_res)
246 else:
247 else:
247 requests.append((command, encoded_args_or_res))
248 requests.append((command, encoded_args_or_res))
248 states.append((command, f, batchable, decode))
249 states.append((command, f, batchable, decode))
249
250
250 if not requests:
251 if not requests:
251 return
252 return
252
253
253 # This will emit responses in order they were executed.
254 # This will emit responses in order they were executed.
254 wireresults = self._peer._submitbatch(requests)
255 wireresults = self._peer._submitbatch(requests)
255
256
256 # The use of a thread pool executor here is a bit weird for something
257 # The use of a thread pool executor here is a bit weird for something
257 # that only spins up a single thread. However, thread management is
258 # that only spins up a single thread. However, thread management is
258 # hard and it is easy to encounter race conditions, deadlocks, etc.
259 # hard and it is easy to encounter race conditions, deadlocks, etc.
259 # concurrent.futures already solves these problems and its thread pool
260 # concurrent.futures already solves these problems and its thread pool
260 # executor has minimal overhead. So we use it.
261 # executor has minimal overhead. So we use it.
261 self._responseexecutor = pycompat.futures.ThreadPoolExecutor(1)
262 self._responseexecutor = futures.ThreadPoolExecutor(1)
262 self._responsef = self._responseexecutor.submit(
263 self._responsef = self._responseexecutor.submit(
263 self._readbatchresponse, states, wireresults
264 self._readbatchresponse, states, wireresults
264 )
265 )
265
266
266 def close(self):
267 def close(self):
267 self.sendcommands()
268 self.sendcommands()
268
269
269 if self._closed:
270 if self._closed:
270 return
271 return
271
272
272 self._closed = True
273 self._closed = True
273
274
274 if not self._responsef:
275 if not self._responsef:
275 return
276 return
276
277
277 # We need to wait on our in-flight response and then shut down the
278 # We need to wait on our in-flight response and then shut down the
278 # executor once we have a result.
279 # executor once we have a result.
279 try:
280 try:
280 self._responsef.result()
281 self._responsef.result()
281 finally:
282 finally:
282 self._responseexecutor.shutdown(wait=True)
283 self._responseexecutor.shutdown(wait=True)
283 self._responsef = None
284 self._responsef = None
284 self._responseexecutor = None
285 self._responseexecutor = None
285
286
286 # If any of our futures are still in progress, mark them as
287 # If any of our futures are still in progress, mark them as
287 # errored. Otherwise a result() could wait indefinitely.
288 # errored. Otherwise a result() could wait indefinitely.
288 for f in self._futures:
289 for f in self._futures:
289 if not f.done():
290 if not f.done():
290 f.set_exception(
291 f.set_exception(
291 error.ResponseError(
292 error.ResponseError(
292 _(b'unfulfilled batch command response'), None
293 _(b'unfulfilled batch command response'), None
293 )
294 )
294 )
295 )
295
296
296 self._futures = None
297 self._futures = None
297
298
298 def _readbatchresponse(self, states, wireresults):
299 def _readbatchresponse(self, states, wireresults):
299 # Executes in a thread to read data off the wire.
300 # Executes in a thread to read data off the wire.
300
301
301 for command, f, batchable, decode in states:
302 for command, f, batchable, decode in states:
302 # Grab raw result off the wire and teach the internal future
303 # Grab raw result off the wire and teach the internal future
303 # about it.
304 # about it.
304 try:
305 try:
305 remoteresult = next(wireresults)
306 remoteresult = next(wireresults)
306 except StopIteration:
307 except StopIteration:
307 # This can happen in particular because next(batchable)
308 # This can happen in particular because next(batchable)
308 # in the previous iteration can call peer._abort, which
309 # in the previous iteration can call peer._abort, which
309 # may close the peer.
310 # may close the peer.
310 f.set_exception(
311 f.set_exception(
311 error.ResponseError(
312 error.ResponseError(
312 _(b'unfulfilled batch command response'), None
313 _(b'unfulfilled batch command response'), None
313 )
314 )
314 )
315 )
315 else:
316 else:
316 try:
317 try:
317 result = decode(remoteresult)
318 result = decode(remoteresult)
318 except Exception:
319 except Exception:
319 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
320 pycompat.future_set_exception_info(f, sys.exc_info()[1:])
320 else:
321 else:
321 f.set_result(result)
322 f.set_result(result)
322
323
323
324
324 @interfaceutil.implementer(
325 @interfaceutil.implementer(
325 repository.ipeercommands, repository.ipeerlegacycommands
326 repository.ipeercommands, repository.ipeerlegacycommands
326 )
327 )
327 class wirepeer(repository.peer):
328 class wirepeer(repository.peer):
328 """Client-side interface for communicating with a peer repository.
329 """Client-side interface for communicating with a peer repository.
329
330
330 Methods commonly call wire protocol commands of the same name.
331 Methods commonly call wire protocol commands of the same name.
331
332
332 See also httppeer.py and sshpeer.py for protocol-specific
333 See also httppeer.py and sshpeer.py for protocol-specific
333 implementations of this interface.
334 implementations of this interface.
334 """
335 """
335
336
336 def commandexecutor(self):
337 def commandexecutor(self):
337 return peerexecutor(self)
338 return peerexecutor(self)
338
339
339 # Begin of ipeercommands interface.
340 # Begin of ipeercommands interface.
340
341
341 def clonebundles(self):
342 def clonebundles(self):
342 self.requirecap(b'clonebundles', _(b'clone bundles'))
343 self.requirecap(b'clonebundles', _(b'clone bundles'))
343 return self._call(b'clonebundles')
344 return self._call(b'clonebundles')
344
345
345 @batchable
346 @batchable
346 def lookup(self, key):
347 def lookup(self, key):
347 self.requirecap(b'lookup', _(b'look up remote revision'))
348 self.requirecap(b'lookup', _(b'look up remote revision'))
348
349
349 def decode(d):
350 def decode(d):
350 success, data = d[:-1].split(b" ", 1)
351 success, data = d[:-1].split(b" ", 1)
351 if int(success):
352 if int(success):
352 return bin(data)
353 return bin(data)
353 else:
354 else:
354 self._abort(error.RepoError(data))
355 self._abort(error.RepoError(data))
355
356
356 return {b'key': encoding.fromlocal(key)}, decode
357 return {b'key': encoding.fromlocal(key)}, decode
357
358
358 @batchable
359 @batchable
359 def heads(self):
360 def heads(self):
360 def decode(d):
361 def decode(d):
361 try:
362 try:
362 return wireprototypes.decodelist(d[:-1])
363 return wireprototypes.decodelist(d[:-1])
363 except ValueError:
364 except ValueError:
364 self._abort(error.ResponseError(_(b"unexpected response:"), d))
365 self._abort(error.ResponseError(_(b"unexpected response:"), d))
365
366
366 return {}, decode
367 return {}, decode
367
368
368 @batchable
369 @batchable
369 def known(self, nodes):
370 def known(self, nodes):
370 def decode(d):
371 def decode(d):
371 try:
372 try:
372 return [bool(int(b)) for b in pycompat.iterbytestr(d)]
373 return [bool(int(b)) for b in pycompat.iterbytestr(d)]
373 except ValueError:
374 except ValueError:
374 self._abort(error.ResponseError(_(b"unexpected response:"), d))
375 self._abort(error.ResponseError(_(b"unexpected response:"), d))
375
376
376 return {b'nodes': wireprototypes.encodelist(nodes)}, decode
377 return {b'nodes': wireprototypes.encodelist(nodes)}, decode
377
378
378 @batchable
379 @batchable
379 def branchmap(self):
380 def branchmap(self):
380 def decode(d):
381 def decode(d):
381 try:
382 try:
382 branchmap = {}
383 branchmap = {}
383 for branchpart in d.splitlines():
384 for branchpart in d.splitlines():
384 branchname, branchheads = branchpart.split(b' ', 1)
385 branchname, branchheads = branchpart.split(b' ', 1)
385 branchname = encoding.tolocal(urlreq.unquote(branchname))
386 branchname = encoding.tolocal(urlreq.unquote(branchname))
386 branchheads = wireprototypes.decodelist(branchheads)
387 branchheads = wireprototypes.decodelist(branchheads)
387 branchmap[branchname] = branchheads
388 branchmap[branchname] = branchheads
388 return branchmap
389 return branchmap
389 except TypeError:
390 except TypeError:
390 self._abort(error.ResponseError(_(b"unexpected response:"), d))
391 self._abort(error.ResponseError(_(b"unexpected response:"), d))
391
392
392 return {}, decode
393 return {}, decode
393
394
394 @batchable
395 @batchable
395 def listkeys(self, namespace):
396 def listkeys(self, namespace):
396 if not self.capable(b'pushkey'):
397 if not self.capable(b'pushkey'):
397 return {}, None
398 return {}, None
398 self.ui.debug(b'preparing listkeys for "%s"\n' % namespace)
399 self.ui.debug(b'preparing listkeys for "%s"\n' % namespace)
399
400
400 def decode(d):
401 def decode(d):
401 self.ui.debug(
402 self.ui.debug(
402 b'received listkey for "%s": %i bytes\n' % (namespace, len(d))
403 b'received listkey for "%s": %i bytes\n' % (namespace, len(d))
403 )
404 )
404 return pushkeymod.decodekeys(d)
405 return pushkeymod.decodekeys(d)
405
406
406 return {b'namespace': encoding.fromlocal(namespace)}, decode
407 return {b'namespace': encoding.fromlocal(namespace)}, decode
407
408
408 @batchable
409 @batchable
409 def pushkey(self, namespace, key, old, new):
410 def pushkey(self, namespace, key, old, new):
410 if not self.capable(b'pushkey'):
411 if not self.capable(b'pushkey'):
411 return False, None
412 return False, None
412 self.ui.debug(b'preparing pushkey for "%s:%s"\n' % (namespace, key))
413 self.ui.debug(b'preparing pushkey for "%s:%s"\n' % (namespace, key))
413
414
414 def decode(d):
415 def decode(d):
415 d, output = d.split(b'\n', 1)
416 d, output = d.split(b'\n', 1)
416 try:
417 try:
417 d = bool(int(d))
418 d = bool(int(d))
418 except ValueError:
419 except ValueError:
419 raise error.ResponseError(
420 raise error.ResponseError(
420 _(b'push failed (unexpected response):'), d
421 _(b'push failed (unexpected response):'), d
421 )
422 )
422 for l in output.splitlines(True):
423 for l in output.splitlines(True):
423 self.ui.status(_(b'remote: '), l)
424 self.ui.status(_(b'remote: '), l)
424 return d
425 return d
425
426
426 return {
427 return {
427 b'namespace': encoding.fromlocal(namespace),
428 b'namespace': encoding.fromlocal(namespace),
428 b'key': encoding.fromlocal(key),
429 b'key': encoding.fromlocal(key),
429 b'old': encoding.fromlocal(old),
430 b'old': encoding.fromlocal(old),
430 b'new': encoding.fromlocal(new),
431 b'new': encoding.fromlocal(new),
431 }, decode
432 }, decode
432
433
433 def stream_out(self):
434 def stream_out(self):
434 return self._callstream(b'stream_out')
435 return self._callstream(b'stream_out')
435
436
436 def getbundle(self, source, **kwargs):
437 def getbundle(self, source, **kwargs):
437 kwargs = pycompat.byteskwargs(kwargs)
438 kwargs = pycompat.byteskwargs(kwargs)
438 self.requirecap(b'getbundle', _(b'look up remote changes'))
439 self.requirecap(b'getbundle', _(b'look up remote changes'))
439 opts = {}
440 opts = {}
440 bundlecaps = kwargs.get(b'bundlecaps') or set()
441 bundlecaps = kwargs.get(b'bundlecaps') or set()
441 for key, value in pycompat.iteritems(kwargs):
442 for key, value in pycompat.iteritems(kwargs):
442 if value is None:
443 if value is None:
443 continue
444 continue
444 keytype = wireprototypes.GETBUNDLE_ARGUMENTS.get(key)
445 keytype = wireprototypes.GETBUNDLE_ARGUMENTS.get(key)
445 if keytype is None:
446 if keytype is None:
446 raise error.ProgrammingError(
447 raise error.ProgrammingError(
447 b'Unexpectedly None keytype for key %s' % key
448 b'Unexpectedly None keytype for key %s' % key
448 )
449 )
449 elif keytype == b'nodes':
450 elif keytype == b'nodes':
450 value = wireprototypes.encodelist(value)
451 value = wireprototypes.encodelist(value)
451 elif keytype == b'csv':
452 elif keytype == b'csv':
452 value = b','.join(value)
453 value = b','.join(value)
453 elif keytype == b'scsv':
454 elif keytype == b'scsv':
454 value = b','.join(sorted(value))
455 value = b','.join(sorted(value))
455 elif keytype == b'boolean':
456 elif keytype == b'boolean':
456 value = b'%i' % bool(value)
457 value = b'%i' % bool(value)
457 elif keytype != b'plain':
458 elif keytype != b'plain':
458 raise KeyError(b'unknown getbundle option type %s' % keytype)
459 raise KeyError(b'unknown getbundle option type %s' % keytype)
459 opts[key] = value
460 opts[key] = value
460 f = self._callcompressable(b"getbundle", **pycompat.strkwargs(opts))
461 f = self._callcompressable(b"getbundle", **pycompat.strkwargs(opts))
461 if any((cap.startswith(b'HG2') for cap in bundlecaps)):
462 if any((cap.startswith(b'HG2') for cap in bundlecaps)):
462 return bundle2.getunbundler(self.ui, f)
463 return bundle2.getunbundler(self.ui, f)
463 else:
464 else:
464 return changegroupmod.cg1unpacker(f, b'UN')
465 return changegroupmod.cg1unpacker(f, b'UN')
465
466
466 def unbundle(self, bundle, heads, url):
467 def unbundle(self, bundle, heads, url):
467 """Send cg (a readable file-like object representing the
468 """Send cg (a readable file-like object representing the
468 changegroup to push, typically a chunkbuffer object) to the
469 changegroup to push, typically a chunkbuffer object) to the
469 remote server as a bundle.
470 remote server as a bundle.
470
471
471 When pushing a bundle10 stream, return an integer indicating the
472 When pushing a bundle10 stream, return an integer indicating the
472 result of the push (see changegroup.apply()).
473 result of the push (see changegroup.apply()).
473
474
474 When pushing a bundle20 stream, return a bundle20 stream.
475 When pushing a bundle20 stream, return a bundle20 stream.
475
476
476 `url` is the url the client thinks it's pushing to, which is
477 `url` is the url the client thinks it's pushing to, which is
477 visible to hooks.
478 visible to hooks.
478 """
479 """
479
480
480 if heads != [b'force'] and self.capable(b'unbundlehash'):
481 if heads != [b'force'] and self.capable(b'unbundlehash'):
481 heads = wireprototypes.encodelist(
482 heads = wireprototypes.encodelist(
482 [b'hashed', hashutil.sha1(b''.join(sorted(heads))).digest()]
483 [b'hashed', hashutil.sha1(b''.join(sorted(heads))).digest()]
483 )
484 )
484 else:
485 else:
485 heads = wireprototypes.encodelist(heads)
486 heads = wireprototypes.encodelist(heads)
486
487
487 if util.safehasattr(bundle, b'deltaheader'):
488 if util.safehasattr(bundle, b'deltaheader'):
488 # this a bundle10, do the old style call sequence
489 # this a bundle10, do the old style call sequence
489 ret, output = self._callpush(b"unbundle", bundle, heads=heads)
490 ret, output = self._callpush(b"unbundle", bundle, heads=heads)
490 if ret == b"":
491 if ret == b"":
491 raise error.ResponseError(_(b'push failed:'), output)
492 raise error.ResponseError(_(b'push failed:'), output)
492 try:
493 try:
493 ret = int(ret)
494 ret = int(ret)
494 except ValueError:
495 except ValueError:
495 raise error.ResponseError(
496 raise error.ResponseError(
496 _(b'push failed (unexpected response):'), ret
497 _(b'push failed (unexpected response):'), ret
497 )
498 )
498
499
499 for l in output.splitlines(True):
500 for l in output.splitlines(True):
500 self.ui.status(_(b'remote: '), l)
501 self.ui.status(_(b'remote: '), l)
501 else:
502 else:
502 # bundle2 push. Send a stream, fetch a stream.
503 # bundle2 push. Send a stream, fetch a stream.
503 stream = self._calltwowaystream(b'unbundle', bundle, heads=heads)
504 stream = self._calltwowaystream(b'unbundle', bundle, heads=heads)
504 ret = bundle2.getunbundler(self.ui, stream)
505 ret = bundle2.getunbundler(self.ui, stream)
505 return ret
506 return ret
506
507
507 # End of ipeercommands interface.
508 # End of ipeercommands interface.
508
509
509 # Begin of ipeerlegacycommands interface.
510 # Begin of ipeerlegacycommands interface.
510
511
511 def branches(self, nodes):
512 def branches(self, nodes):
512 n = wireprototypes.encodelist(nodes)
513 n = wireprototypes.encodelist(nodes)
513 d = self._call(b"branches", nodes=n)
514 d = self._call(b"branches", nodes=n)
514 try:
515 try:
515 br = [tuple(wireprototypes.decodelist(b)) for b in d.splitlines()]
516 br = [tuple(wireprototypes.decodelist(b)) for b in d.splitlines()]
516 return br
517 return br
517 except ValueError:
518 except ValueError:
518 self._abort(error.ResponseError(_(b"unexpected response:"), d))
519 self._abort(error.ResponseError(_(b"unexpected response:"), d))
519
520
520 def between(self, pairs):
521 def between(self, pairs):
521 batch = 8 # avoid giant requests
522 batch = 8 # avoid giant requests
522 r = []
523 r = []
523 for i in pycompat.xrange(0, len(pairs), batch):
524 for i in pycompat.xrange(0, len(pairs), batch):
524 n = b" ".join(
525 n = b" ".join(
525 [
526 [
526 wireprototypes.encodelist(p, b'-')
527 wireprototypes.encodelist(p, b'-')
527 for p in pairs[i : i + batch]
528 for p in pairs[i : i + batch]
528 ]
529 ]
529 )
530 )
530 d = self._call(b"between", pairs=n)
531 d = self._call(b"between", pairs=n)
531 try:
532 try:
532 r.extend(
533 r.extend(
533 l and wireprototypes.decodelist(l) or []
534 l and wireprototypes.decodelist(l) or []
534 for l in d.splitlines()
535 for l in d.splitlines()
535 )
536 )
536 except ValueError:
537 except ValueError:
537 self._abort(error.ResponseError(_(b"unexpected response:"), d))
538 self._abort(error.ResponseError(_(b"unexpected response:"), d))
538 return r
539 return r
539
540
540 def changegroup(self, nodes, source):
541 def changegroup(self, nodes, source):
541 n = wireprototypes.encodelist(nodes)
542 n = wireprototypes.encodelist(nodes)
542 f = self._callcompressable(b"changegroup", roots=n)
543 f = self._callcompressable(b"changegroup", roots=n)
543 return changegroupmod.cg1unpacker(f, b'UN')
544 return changegroupmod.cg1unpacker(f, b'UN')
544
545
545 def changegroupsubset(self, bases, heads, source):
546 def changegroupsubset(self, bases, heads, source):
546 self.requirecap(b'changegroupsubset', _(b'look up remote changes'))
547 self.requirecap(b'changegroupsubset', _(b'look up remote changes'))
547 bases = wireprototypes.encodelist(bases)
548 bases = wireprototypes.encodelist(bases)
548 heads = wireprototypes.encodelist(heads)
549 heads = wireprototypes.encodelist(heads)
549 f = self._callcompressable(
550 f = self._callcompressable(
550 b"changegroupsubset", bases=bases, heads=heads
551 b"changegroupsubset", bases=bases, heads=heads
551 )
552 )
552 return changegroupmod.cg1unpacker(f, b'UN')
553 return changegroupmod.cg1unpacker(f, b'UN')
553
554
554 # End of ipeerlegacycommands interface.
555 # End of ipeerlegacycommands interface.
555
556
556 def _submitbatch(self, req):
557 def _submitbatch(self, req):
557 """run batch request <req> on the server
558 """run batch request <req> on the server
558
559
559 Returns an iterator of the raw responses from the server.
560 Returns an iterator of the raw responses from the server.
560 """
561 """
561 ui = self.ui
562 ui = self.ui
562 if ui.debugflag and ui.configbool(b'devel', b'debug.peer-request'):
563 if ui.debugflag and ui.configbool(b'devel', b'debug.peer-request'):
563 ui.debug(b'devel-peer-request: batched-content\n')
564 ui.debug(b'devel-peer-request: batched-content\n')
564 for op, args in req:
565 for op, args in req:
565 msg = b'devel-peer-request: - %s (%d arguments)\n'
566 msg = b'devel-peer-request: - %s (%d arguments)\n'
566 ui.debug(msg % (op, len(args)))
567 ui.debug(msg % (op, len(args)))
567
568
568 unescapearg = wireprototypes.unescapebatcharg
569 unescapearg = wireprototypes.unescapebatcharg
569
570
570 rsp = self._callstream(b"batch", cmds=encodebatchcmds(req))
571 rsp = self._callstream(b"batch", cmds=encodebatchcmds(req))
571 chunk = rsp.read(1024)
572 chunk = rsp.read(1024)
572 work = [chunk]
573 work = [chunk]
573 while chunk:
574 while chunk:
574 while b';' not in chunk and chunk:
575 while b';' not in chunk and chunk:
575 chunk = rsp.read(1024)
576 chunk = rsp.read(1024)
576 work.append(chunk)
577 work.append(chunk)
577 merged = b''.join(work)
578 merged = b''.join(work)
578 while b';' in merged:
579 while b';' in merged:
579 one, merged = merged.split(b';', 1)
580 one, merged = merged.split(b';', 1)
580 yield unescapearg(one)
581 yield unescapearg(one)
581 chunk = rsp.read(1024)
582 chunk = rsp.read(1024)
582 work = [merged, chunk]
583 work = [merged, chunk]
583 yield unescapearg(b''.join(work))
584 yield unescapearg(b''.join(work))
584
585
585 def _submitone(self, op, args):
586 def _submitone(self, op, args):
586 return self._call(op, **pycompat.strkwargs(args))
587 return self._call(op, **pycompat.strkwargs(args))
587
588
588 def debugwireargs(self, one, two, three=None, four=None, five=None):
589 def debugwireargs(self, one, two, three=None, four=None, five=None):
589 # don't pass optional arguments left at their default value
590 # don't pass optional arguments left at their default value
590 opts = {}
591 opts = {}
591 if three is not None:
592 if three is not None:
592 opts['three'] = three
593 opts['three'] = three
593 if four is not None:
594 if four is not None:
594 opts['four'] = four
595 opts['four'] = four
595 return self._call(b'debugwireargs', one=one, two=two, **opts)
596 return self._call(b'debugwireargs', one=one, two=two, **opts)
596
597
597 def _call(self, cmd, **args):
598 def _call(self, cmd, **args):
598 """execute <cmd> on the server
599 """execute <cmd> on the server
599
600
600 The command is expected to return a simple string.
601 The command is expected to return a simple string.
601
602
602 returns the server reply as a string."""
603 returns the server reply as a string."""
603 raise NotImplementedError()
604 raise NotImplementedError()
604
605
605 def _callstream(self, cmd, **args):
606 def _callstream(self, cmd, **args):
606 """execute <cmd> on the server
607 """execute <cmd> on the server
607
608
608 The command is expected to return a stream. Note that if the
609 The command is expected to return a stream. Note that if the
609 command doesn't return a stream, _callstream behaves
610 command doesn't return a stream, _callstream behaves
610 differently for ssh and http peers.
611 differently for ssh and http peers.
611
612
612 returns the server reply as a file like object.
613 returns the server reply as a file like object.
613 """
614 """
614 raise NotImplementedError()
615 raise NotImplementedError()
615
616
616 def _callcompressable(self, cmd, **args):
617 def _callcompressable(self, cmd, **args):
617 """execute <cmd> on the server
618 """execute <cmd> on the server
618
619
619 The command is expected to return a stream.
620 The command is expected to return a stream.
620
621
621 The stream may have been compressed in some implementations. This
622 The stream may have been compressed in some implementations. This
622 function takes care of the decompression. This is the only difference
623 function takes care of the decompression. This is the only difference
623 with _callstream.
624 with _callstream.
624
625
625 returns the server reply as a file like object.
626 returns the server reply as a file like object.
626 """
627 """
627 raise NotImplementedError()
628 raise NotImplementedError()
628
629
629 def _callpush(self, cmd, fp, **args):
630 def _callpush(self, cmd, fp, **args):
630 """execute a <cmd> on server
631 """execute a <cmd> on server
631
632
632 The command is expected to be related to a push. Push has a special
633 The command is expected to be related to a push. Push has a special
633 return method.
634 return method.
634
635
635 returns the server reply as a (ret, output) tuple. ret is either
636 returns the server reply as a (ret, output) tuple. ret is either
636 empty (error) or a stringified int.
637 empty (error) or a stringified int.
637 """
638 """
638 raise NotImplementedError()
639 raise NotImplementedError()
639
640
640 def _calltwowaystream(self, cmd, fp, **args):
641 def _calltwowaystream(self, cmd, fp, **args):
641 """execute <cmd> on server
642 """execute <cmd> on server
642
643
643 The command will send a stream to the server and get a stream in reply.
644 The command will send a stream to the server and get a stream in reply.
644 """
645 """
645 raise NotImplementedError()
646 raise NotImplementedError()
646
647
647 def _abort(self, exception):
648 def _abort(self, exception):
648 """clearly abort the wire protocol connection and raise the exception"""
649 """clearly abort the wire protocol connection and raise the exception"""
649 raise NotImplementedError()
650 raise NotImplementedError()
General Comments 0
You need to be logged in to leave comments. Login now