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