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