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