##// END OF EJS Templates
index: use `index.get_rev` in `localrepo.known`...
marmoute -
r43955:ded3d545 default
parent child Browse files
Show More
@@ -1,3722 +1,3722 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 if changeid is None:
1518 if changeid is None:
1519 return context.workingctx(self)
1519 return context.workingctx(self)
1520 if isinstance(changeid, context.basectx):
1520 if isinstance(changeid, context.basectx):
1521 return changeid
1521 return changeid
1522 if isinstance(changeid, slice):
1522 if isinstance(changeid, slice):
1523 # wdirrev isn't contiguous so the slice shouldn't include it
1523 # wdirrev isn't contiguous so the slice shouldn't include it
1524 return [
1524 return [
1525 self[i]
1525 self[i]
1526 for i in pycompat.xrange(*changeid.indices(len(self)))
1526 for i in pycompat.xrange(*changeid.indices(len(self)))
1527 if i not in self.changelog.filteredrevs
1527 if i not in self.changelog.filteredrevs
1528 ]
1528 ]
1529 try:
1529 try:
1530 if isinstance(changeid, int):
1530 if isinstance(changeid, int):
1531 node = self.changelog.node(changeid)
1531 node = self.changelog.node(changeid)
1532 rev = changeid
1532 rev = changeid
1533 elif changeid == b'null':
1533 elif changeid == b'null':
1534 node = nullid
1534 node = nullid
1535 rev = nullrev
1535 rev = nullrev
1536 elif changeid == b'tip':
1536 elif changeid == b'tip':
1537 node = self.changelog.tip()
1537 node = self.changelog.tip()
1538 rev = self.changelog.rev(node)
1538 rev = self.changelog.rev(node)
1539 elif changeid == b'.':
1539 elif changeid == b'.':
1540 # this is a hack to delay/avoid loading obsmarkers
1540 # this is a hack to delay/avoid loading obsmarkers
1541 # when we know that '.' won't be hidden
1541 # when we know that '.' won't be hidden
1542 node = self.dirstate.p1()
1542 node = self.dirstate.p1()
1543 rev = self.unfiltered().changelog.rev(node)
1543 rev = self.unfiltered().changelog.rev(node)
1544 elif len(changeid) == 20:
1544 elif len(changeid) == 20:
1545 try:
1545 try:
1546 node = changeid
1546 node = changeid
1547 rev = self.changelog.rev(changeid)
1547 rev = self.changelog.rev(changeid)
1548 except error.FilteredLookupError:
1548 except error.FilteredLookupError:
1549 changeid = hex(changeid) # for the error message
1549 changeid = hex(changeid) # for the error message
1550 raise
1550 raise
1551 except LookupError:
1551 except LookupError:
1552 # check if it might have come from damaged dirstate
1552 # check if it might have come from damaged dirstate
1553 #
1553 #
1554 # XXX we could avoid the unfiltered if we had a recognizable
1554 # XXX we could avoid the unfiltered if we had a recognizable
1555 # exception for filtered changeset access
1555 # exception for filtered changeset access
1556 if (
1556 if (
1557 self.local()
1557 self.local()
1558 and changeid in self.unfiltered().dirstate.parents()
1558 and changeid in self.unfiltered().dirstate.parents()
1559 ):
1559 ):
1560 msg = _(b"working directory has unknown parent '%s'!")
1560 msg = _(b"working directory has unknown parent '%s'!")
1561 raise error.Abort(msg % short(changeid))
1561 raise error.Abort(msg % short(changeid))
1562 changeid = hex(changeid) # for the error message
1562 changeid = hex(changeid) # for the error message
1563 raise
1563 raise
1564
1564
1565 elif len(changeid) == 40:
1565 elif len(changeid) == 40:
1566 node = bin(changeid)
1566 node = bin(changeid)
1567 rev = self.changelog.rev(node)
1567 rev = self.changelog.rev(node)
1568 else:
1568 else:
1569 raise error.ProgrammingError(
1569 raise error.ProgrammingError(
1570 b"unsupported changeid '%s' of type %s"
1570 b"unsupported changeid '%s' of type %s"
1571 % (changeid, type(changeid))
1571 % (changeid, type(changeid))
1572 )
1572 )
1573
1573
1574 return context.changectx(self, rev, node)
1574 return context.changectx(self, rev, node)
1575
1575
1576 except (error.FilteredIndexError, error.FilteredLookupError):
1576 except (error.FilteredIndexError, error.FilteredLookupError):
1577 raise error.FilteredRepoLookupError(
1577 raise error.FilteredRepoLookupError(
1578 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1578 _(b"filtered revision '%s'") % pycompat.bytestr(changeid)
1579 )
1579 )
1580 except (IndexError, LookupError):
1580 except (IndexError, LookupError):
1581 raise error.RepoLookupError(
1581 raise error.RepoLookupError(
1582 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1582 _(b"unknown revision '%s'") % pycompat.bytestr(changeid)
1583 )
1583 )
1584 except error.WdirUnsupported:
1584 except error.WdirUnsupported:
1585 return context.workingctx(self)
1585 return context.workingctx(self)
1586
1586
1587 def __contains__(self, changeid):
1587 def __contains__(self, changeid):
1588 """True if the given changeid exists
1588 """True if the given changeid exists
1589
1589
1590 error.AmbiguousPrefixLookupError is raised if an ambiguous node
1590 error.AmbiguousPrefixLookupError is raised if an ambiguous node
1591 specified.
1591 specified.
1592 """
1592 """
1593 try:
1593 try:
1594 self[changeid]
1594 self[changeid]
1595 return True
1595 return True
1596 except error.RepoLookupError:
1596 except error.RepoLookupError:
1597 return False
1597 return False
1598
1598
1599 def __nonzero__(self):
1599 def __nonzero__(self):
1600 return True
1600 return True
1601
1601
1602 __bool__ = __nonzero__
1602 __bool__ = __nonzero__
1603
1603
1604 def __len__(self):
1604 def __len__(self):
1605 # no need to pay the cost of repoview.changelog
1605 # no need to pay the cost of repoview.changelog
1606 unfi = self.unfiltered()
1606 unfi = self.unfiltered()
1607 return len(unfi.changelog)
1607 return len(unfi.changelog)
1608
1608
1609 def __iter__(self):
1609 def __iter__(self):
1610 return iter(self.changelog)
1610 return iter(self.changelog)
1611
1611
1612 def revs(self, expr, *args):
1612 def revs(self, expr, *args):
1613 '''Find revisions matching a revset.
1613 '''Find revisions matching a revset.
1614
1614
1615 The revset is specified as a string ``expr`` that may contain
1615 The revset is specified as a string ``expr`` that may contain
1616 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1616 %-formatting to escape certain types. See ``revsetlang.formatspec``.
1617
1617
1618 Revset aliases from the configuration are not expanded. To expand
1618 Revset aliases from the configuration are not expanded. To expand
1619 user aliases, consider calling ``scmutil.revrange()`` or
1619 user aliases, consider calling ``scmutil.revrange()`` or
1620 ``repo.anyrevs([expr], user=True)``.
1620 ``repo.anyrevs([expr], user=True)``.
1621
1621
1622 Returns a revset.abstractsmartset, which is a list-like interface
1622 Returns a revset.abstractsmartset, which is a list-like interface
1623 that contains integer revisions.
1623 that contains integer revisions.
1624 '''
1624 '''
1625 tree = revsetlang.spectree(expr, *args)
1625 tree = revsetlang.spectree(expr, *args)
1626 return revset.makematcher(tree)(self)
1626 return revset.makematcher(tree)(self)
1627
1627
1628 def set(self, expr, *args):
1628 def set(self, expr, *args):
1629 '''Find revisions matching a revset and emit changectx instances.
1629 '''Find revisions matching a revset and emit changectx instances.
1630
1630
1631 This is a convenience wrapper around ``revs()`` that iterates the
1631 This is a convenience wrapper around ``revs()`` that iterates the
1632 result and is a generator of changectx instances.
1632 result and is a generator of changectx instances.
1633
1633
1634 Revset aliases from the configuration are not expanded. To expand
1634 Revset aliases from the configuration are not expanded. To expand
1635 user aliases, consider calling ``scmutil.revrange()``.
1635 user aliases, consider calling ``scmutil.revrange()``.
1636 '''
1636 '''
1637 for r in self.revs(expr, *args):
1637 for r in self.revs(expr, *args):
1638 yield self[r]
1638 yield self[r]
1639
1639
1640 def anyrevs(self, specs, user=False, localalias=None):
1640 def anyrevs(self, specs, user=False, localalias=None):
1641 '''Find revisions matching one of the given revsets.
1641 '''Find revisions matching one of the given revsets.
1642
1642
1643 Revset aliases from the configuration are not expanded by default. To
1643 Revset aliases from the configuration are not expanded by default. To
1644 expand user aliases, specify ``user=True``. To provide some local
1644 expand user aliases, specify ``user=True``. To provide some local
1645 definitions overriding user aliases, set ``localalias`` to
1645 definitions overriding user aliases, set ``localalias`` to
1646 ``{name: definitionstring}``.
1646 ``{name: definitionstring}``.
1647 '''
1647 '''
1648 if user:
1648 if user:
1649 m = revset.matchany(
1649 m = revset.matchany(
1650 self.ui,
1650 self.ui,
1651 specs,
1651 specs,
1652 lookup=revset.lookupfn(self),
1652 lookup=revset.lookupfn(self),
1653 localalias=localalias,
1653 localalias=localalias,
1654 )
1654 )
1655 else:
1655 else:
1656 m = revset.matchany(None, specs, localalias=localalias)
1656 m = revset.matchany(None, specs, localalias=localalias)
1657 return m(self)
1657 return m(self)
1658
1658
1659 def url(self):
1659 def url(self):
1660 return b'file:' + self.root
1660 return b'file:' + self.root
1661
1661
1662 def hook(self, name, throw=False, **args):
1662 def hook(self, name, throw=False, **args):
1663 """Call a hook, passing this repo instance.
1663 """Call a hook, passing this repo instance.
1664
1664
1665 This a convenience method to aid invoking hooks. Extensions likely
1665 This a convenience method to aid invoking hooks. Extensions likely
1666 won't call this unless they have registered a custom hook or are
1666 won't call this unless they have registered a custom hook or are
1667 replacing code that is expected to call a hook.
1667 replacing code that is expected to call a hook.
1668 """
1668 """
1669 return hook.hook(self.ui, self, name, throw, **args)
1669 return hook.hook(self.ui, self, name, throw, **args)
1670
1670
1671 @filteredpropertycache
1671 @filteredpropertycache
1672 def _tagscache(self):
1672 def _tagscache(self):
1673 '''Returns a tagscache object that contains various tags related
1673 '''Returns a tagscache object that contains various tags related
1674 caches.'''
1674 caches.'''
1675
1675
1676 # This simplifies its cache management by having one decorated
1676 # This simplifies its cache management by having one decorated
1677 # function (this one) and the rest simply fetch things from it.
1677 # function (this one) and the rest simply fetch things from it.
1678 class tagscache(object):
1678 class tagscache(object):
1679 def __init__(self):
1679 def __init__(self):
1680 # These two define the set of tags for this repository. tags
1680 # These two define the set of tags for this repository. tags
1681 # maps tag name to node; tagtypes maps tag name to 'global' or
1681 # maps tag name to node; tagtypes maps tag name to 'global' or
1682 # 'local'. (Global tags are defined by .hgtags across all
1682 # 'local'. (Global tags are defined by .hgtags across all
1683 # heads, and local tags are defined in .hg/localtags.)
1683 # heads, and local tags are defined in .hg/localtags.)
1684 # They constitute the in-memory cache of tags.
1684 # They constitute the in-memory cache of tags.
1685 self.tags = self.tagtypes = None
1685 self.tags = self.tagtypes = None
1686
1686
1687 self.nodetagscache = self.tagslist = None
1687 self.nodetagscache = self.tagslist = None
1688
1688
1689 cache = tagscache()
1689 cache = tagscache()
1690 cache.tags, cache.tagtypes = self._findtags()
1690 cache.tags, cache.tagtypes = self._findtags()
1691
1691
1692 return cache
1692 return cache
1693
1693
1694 def tags(self):
1694 def tags(self):
1695 '''return a mapping of tag to node'''
1695 '''return a mapping of tag to node'''
1696 t = {}
1696 t = {}
1697 if self.changelog.filteredrevs:
1697 if self.changelog.filteredrevs:
1698 tags, tt = self._findtags()
1698 tags, tt = self._findtags()
1699 else:
1699 else:
1700 tags = self._tagscache.tags
1700 tags = self._tagscache.tags
1701 rev = self.changelog.rev
1701 rev = self.changelog.rev
1702 for k, v in pycompat.iteritems(tags):
1702 for k, v in pycompat.iteritems(tags):
1703 try:
1703 try:
1704 # ignore tags to unknown nodes
1704 # ignore tags to unknown nodes
1705 rev(v)
1705 rev(v)
1706 t[k] = v
1706 t[k] = v
1707 except (error.LookupError, ValueError):
1707 except (error.LookupError, ValueError):
1708 pass
1708 pass
1709 return t
1709 return t
1710
1710
1711 def _findtags(self):
1711 def _findtags(self):
1712 '''Do the hard work of finding tags. Return a pair of dicts
1712 '''Do the hard work of finding tags. Return a pair of dicts
1713 (tags, tagtypes) where tags maps tag name to node, and tagtypes
1713 (tags, tagtypes) where tags maps tag name to node, and tagtypes
1714 maps tag name to a string like \'global\' or \'local\'.
1714 maps tag name to a string like \'global\' or \'local\'.
1715 Subclasses or extensions are free to add their own tags, but
1715 Subclasses or extensions are free to add their own tags, but
1716 should be aware that the returned dicts will be retained for the
1716 should be aware that the returned dicts will be retained for the
1717 duration of the localrepo object.'''
1717 duration of the localrepo object.'''
1718
1718
1719 # XXX what tagtype should subclasses/extensions use? Currently
1719 # XXX what tagtype should subclasses/extensions use? Currently
1720 # mq and bookmarks add tags, but do not set the tagtype at all.
1720 # mq and bookmarks add tags, but do not set the tagtype at all.
1721 # Should each extension invent its own tag type? Should there
1721 # Should each extension invent its own tag type? Should there
1722 # be one tagtype for all such "virtual" tags? Or is the status
1722 # be one tagtype for all such "virtual" tags? Or is the status
1723 # quo fine?
1723 # quo fine?
1724
1724
1725 # map tag name to (node, hist)
1725 # map tag name to (node, hist)
1726 alltags = tagsmod.findglobaltags(self.ui, self)
1726 alltags = tagsmod.findglobaltags(self.ui, self)
1727 # map tag name to tag type
1727 # map tag name to tag type
1728 tagtypes = dict((tag, b'global') for tag in alltags)
1728 tagtypes = dict((tag, b'global') for tag in alltags)
1729
1729
1730 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
1730 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
1731
1731
1732 # Build the return dicts. Have to re-encode tag names because
1732 # Build the return dicts. Have to re-encode tag names because
1733 # the tags module always uses UTF-8 (in order not to lose info
1733 # the tags module always uses UTF-8 (in order not to lose info
1734 # writing to the cache), but the rest of Mercurial wants them in
1734 # writing to the cache), but the rest of Mercurial wants them in
1735 # local encoding.
1735 # local encoding.
1736 tags = {}
1736 tags = {}
1737 for (name, (node, hist)) in pycompat.iteritems(alltags):
1737 for (name, (node, hist)) in pycompat.iteritems(alltags):
1738 if node != nullid:
1738 if node != nullid:
1739 tags[encoding.tolocal(name)] = node
1739 tags[encoding.tolocal(name)] = node
1740 tags[b'tip'] = self.changelog.tip()
1740 tags[b'tip'] = self.changelog.tip()
1741 tagtypes = dict(
1741 tagtypes = dict(
1742 [
1742 [
1743 (encoding.tolocal(name), value)
1743 (encoding.tolocal(name), value)
1744 for (name, value) in pycompat.iteritems(tagtypes)
1744 for (name, value) in pycompat.iteritems(tagtypes)
1745 ]
1745 ]
1746 )
1746 )
1747 return (tags, tagtypes)
1747 return (tags, tagtypes)
1748
1748
1749 def tagtype(self, tagname):
1749 def tagtype(self, tagname):
1750 '''
1750 '''
1751 return the type of the given tag. result can be:
1751 return the type of the given tag. result can be:
1752
1752
1753 'local' : a local tag
1753 'local' : a local tag
1754 'global' : a global tag
1754 'global' : a global tag
1755 None : tag does not exist
1755 None : tag does not exist
1756 '''
1756 '''
1757
1757
1758 return self._tagscache.tagtypes.get(tagname)
1758 return self._tagscache.tagtypes.get(tagname)
1759
1759
1760 def tagslist(self):
1760 def tagslist(self):
1761 '''return a list of tags ordered by revision'''
1761 '''return a list of tags ordered by revision'''
1762 if not self._tagscache.tagslist:
1762 if not self._tagscache.tagslist:
1763 l = []
1763 l = []
1764 for t, n in pycompat.iteritems(self.tags()):
1764 for t, n in pycompat.iteritems(self.tags()):
1765 l.append((self.changelog.rev(n), t, n))
1765 l.append((self.changelog.rev(n), t, n))
1766 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
1766 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
1767
1767
1768 return self._tagscache.tagslist
1768 return self._tagscache.tagslist
1769
1769
1770 def nodetags(self, node):
1770 def nodetags(self, node):
1771 '''return the tags associated with a node'''
1771 '''return the tags associated with a node'''
1772 if not self._tagscache.nodetagscache:
1772 if not self._tagscache.nodetagscache:
1773 nodetagscache = {}
1773 nodetagscache = {}
1774 for t, n in pycompat.iteritems(self._tagscache.tags):
1774 for t, n in pycompat.iteritems(self._tagscache.tags):
1775 nodetagscache.setdefault(n, []).append(t)
1775 nodetagscache.setdefault(n, []).append(t)
1776 for tags in pycompat.itervalues(nodetagscache):
1776 for tags in pycompat.itervalues(nodetagscache):
1777 tags.sort()
1777 tags.sort()
1778 self._tagscache.nodetagscache = nodetagscache
1778 self._tagscache.nodetagscache = nodetagscache
1779 return self._tagscache.nodetagscache.get(node, [])
1779 return self._tagscache.nodetagscache.get(node, [])
1780
1780
1781 def nodebookmarks(self, node):
1781 def nodebookmarks(self, node):
1782 """return the list of bookmarks pointing to the specified node"""
1782 """return the list of bookmarks pointing to the specified node"""
1783 return self._bookmarks.names(node)
1783 return self._bookmarks.names(node)
1784
1784
1785 def branchmap(self):
1785 def branchmap(self):
1786 '''returns a dictionary {branch: [branchheads]} with branchheads
1786 '''returns a dictionary {branch: [branchheads]} with branchheads
1787 ordered by increasing revision number'''
1787 ordered by increasing revision number'''
1788 return self._branchcaches[self]
1788 return self._branchcaches[self]
1789
1789
1790 @unfilteredmethod
1790 @unfilteredmethod
1791 def revbranchcache(self):
1791 def revbranchcache(self):
1792 if not self._revbranchcache:
1792 if not self._revbranchcache:
1793 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
1793 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
1794 return self._revbranchcache
1794 return self._revbranchcache
1795
1795
1796 def branchtip(self, branch, ignoremissing=False):
1796 def branchtip(self, branch, ignoremissing=False):
1797 '''return the tip node for a given branch
1797 '''return the tip node for a given branch
1798
1798
1799 If ignoremissing is True, then this method will not raise an error.
1799 If ignoremissing is True, then this method will not raise an error.
1800 This is helpful for callers that only expect None for a missing branch
1800 This is helpful for callers that only expect None for a missing branch
1801 (e.g. namespace).
1801 (e.g. namespace).
1802
1802
1803 '''
1803 '''
1804 try:
1804 try:
1805 return self.branchmap().branchtip(branch)
1805 return self.branchmap().branchtip(branch)
1806 except KeyError:
1806 except KeyError:
1807 if not ignoremissing:
1807 if not ignoremissing:
1808 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
1808 raise error.RepoLookupError(_(b"unknown branch '%s'") % branch)
1809 else:
1809 else:
1810 pass
1810 pass
1811
1811
1812 def lookup(self, key):
1812 def lookup(self, key):
1813 node = scmutil.revsymbol(self, key).node()
1813 node = scmutil.revsymbol(self, key).node()
1814 if node is None:
1814 if node is None:
1815 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
1815 raise error.RepoLookupError(_(b"unknown revision '%s'") % key)
1816 return node
1816 return node
1817
1817
1818 def lookupbranch(self, key):
1818 def lookupbranch(self, key):
1819 if self.branchmap().hasbranch(key):
1819 if self.branchmap().hasbranch(key):
1820 return key
1820 return key
1821
1821
1822 return scmutil.revsymbol(self, key).branch()
1822 return scmutil.revsymbol(self, key).branch()
1823
1823
1824 def known(self, nodes):
1824 def known(self, nodes):
1825 cl = self.changelog
1825 cl = self.changelog
1826 nm = cl.nodemap
1826 get_rev = cl.index.get_rev
1827 filtered = cl.filteredrevs
1827 filtered = cl.filteredrevs
1828 result = []
1828 result = []
1829 for n in nodes:
1829 for n in nodes:
1830 r = nm.get(n)
1830 r = get_rev(n)
1831 resp = not (r is None or r in filtered)
1831 resp = not (r is None or r in filtered)
1832 result.append(resp)
1832 result.append(resp)
1833 return result
1833 return result
1834
1834
1835 def local(self):
1835 def local(self):
1836 return self
1836 return self
1837
1837
1838 def publishing(self):
1838 def publishing(self):
1839 # it's safe (and desirable) to trust the publish flag unconditionally
1839 # it's safe (and desirable) to trust the publish flag unconditionally
1840 # so that we don't finalize changes shared between users via ssh or nfs
1840 # so that we don't finalize changes shared between users via ssh or nfs
1841 return self.ui.configbool(b'phases', b'publish', untrusted=True)
1841 return self.ui.configbool(b'phases', b'publish', untrusted=True)
1842
1842
1843 def cancopy(self):
1843 def cancopy(self):
1844 # so statichttprepo's override of local() works
1844 # so statichttprepo's override of local() works
1845 if not self.local():
1845 if not self.local():
1846 return False
1846 return False
1847 if not self.publishing():
1847 if not self.publishing():
1848 return True
1848 return True
1849 # if publishing we can't copy if there is filtered content
1849 # if publishing we can't copy if there is filtered content
1850 return not self.filtered(b'visible').changelog.filteredrevs
1850 return not self.filtered(b'visible').changelog.filteredrevs
1851
1851
1852 def shared(self):
1852 def shared(self):
1853 '''the type of shared repository (None if not shared)'''
1853 '''the type of shared repository (None if not shared)'''
1854 if self.sharedpath != self.path:
1854 if self.sharedpath != self.path:
1855 return b'store'
1855 return b'store'
1856 return None
1856 return None
1857
1857
1858 def wjoin(self, f, *insidef):
1858 def wjoin(self, f, *insidef):
1859 return self.vfs.reljoin(self.root, f, *insidef)
1859 return self.vfs.reljoin(self.root, f, *insidef)
1860
1860
1861 def setparents(self, p1, p2=nullid):
1861 def setparents(self, p1, p2=nullid):
1862 with self.dirstate.parentchange():
1862 with self.dirstate.parentchange():
1863 copies = self.dirstate.setparents(p1, p2)
1863 copies = self.dirstate.setparents(p1, p2)
1864 pctx = self[p1]
1864 pctx = self[p1]
1865 if copies:
1865 if copies:
1866 # Adjust copy records, the dirstate cannot do it, it
1866 # Adjust copy records, the dirstate cannot do it, it
1867 # requires access to parents manifests. Preserve them
1867 # requires access to parents manifests. Preserve them
1868 # only for entries added to first parent.
1868 # only for entries added to first parent.
1869 for f in copies:
1869 for f in copies:
1870 if f not in pctx and copies[f] in pctx:
1870 if f not in pctx and copies[f] in pctx:
1871 self.dirstate.copy(copies[f], f)
1871 self.dirstate.copy(copies[f], f)
1872 if p2 == nullid:
1872 if p2 == nullid:
1873 for f, s in sorted(self.dirstate.copies().items()):
1873 for f, s in sorted(self.dirstate.copies().items()):
1874 if f not in pctx and s not in pctx:
1874 if f not in pctx and s not in pctx:
1875 self.dirstate.copy(None, f)
1875 self.dirstate.copy(None, f)
1876
1876
1877 def filectx(self, path, changeid=None, fileid=None, changectx=None):
1877 def filectx(self, path, changeid=None, fileid=None, changectx=None):
1878 """changeid must be a changeset revision, if specified.
1878 """changeid must be a changeset revision, if specified.
1879 fileid can be a file revision or node."""
1879 fileid can be a file revision or node."""
1880 return context.filectx(
1880 return context.filectx(
1881 self, path, changeid, fileid, changectx=changectx
1881 self, path, changeid, fileid, changectx=changectx
1882 )
1882 )
1883
1883
1884 def getcwd(self):
1884 def getcwd(self):
1885 return self.dirstate.getcwd()
1885 return self.dirstate.getcwd()
1886
1886
1887 def pathto(self, f, cwd=None):
1887 def pathto(self, f, cwd=None):
1888 return self.dirstate.pathto(f, cwd)
1888 return self.dirstate.pathto(f, cwd)
1889
1889
1890 def _loadfilter(self, filter):
1890 def _loadfilter(self, filter):
1891 if filter not in self._filterpats:
1891 if filter not in self._filterpats:
1892 l = []
1892 l = []
1893 for pat, cmd in self.ui.configitems(filter):
1893 for pat, cmd in self.ui.configitems(filter):
1894 if cmd == b'!':
1894 if cmd == b'!':
1895 continue
1895 continue
1896 mf = matchmod.match(self.root, b'', [pat])
1896 mf = matchmod.match(self.root, b'', [pat])
1897 fn = None
1897 fn = None
1898 params = cmd
1898 params = cmd
1899 for name, filterfn in pycompat.iteritems(self._datafilters):
1899 for name, filterfn in pycompat.iteritems(self._datafilters):
1900 if cmd.startswith(name):
1900 if cmd.startswith(name):
1901 fn = filterfn
1901 fn = filterfn
1902 params = cmd[len(name) :].lstrip()
1902 params = cmd[len(name) :].lstrip()
1903 break
1903 break
1904 if not fn:
1904 if not fn:
1905 fn = lambda s, c, **kwargs: procutil.filter(s, c)
1905 fn = lambda s, c, **kwargs: procutil.filter(s, c)
1906 fn.__name__ = 'commandfilter'
1906 fn.__name__ = 'commandfilter'
1907 # Wrap old filters not supporting keyword arguments
1907 # Wrap old filters not supporting keyword arguments
1908 if not pycompat.getargspec(fn)[2]:
1908 if not pycompat.getargspec(fn)[2]:
1909 oldfn = fn
1909 oldfn = fn
1910 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
1910 fn = lambda s, c, oldfn=oldfn, **kwargs: oldfn(s, c)
1911 fn.__name__ = 'compat-' + oldfn.__name__
1911 fn.__name__ = 'compat-' + oldfn.__name__
1912 l.append((mf, fn, params))
1912 l.append((mf, fn, params))
1913 self._filterpats[filter] = l
1913 self._filterpats[filter] = l
1914 return self._filterpats[filter]
1914 return self._filterpats[filter]
1915
1915
1916 def _filter(self, filterpats, filename, data):
1916 def _filter(self, filterpats, filename, data):
1917 for mf, fn, cmd in filterpats:
1917 for mf, fn, cmd in filterpats:
1918 if mf(filename):
1918 if mf(filename):
1919 self.ui.debug(
1919 self.ui.debug(
1920 b"filtering %s through %s\n"
1920 b"filtering %s through %s\n"
1921 % (filename, cmd or pycompat.sysbytes(fn.__name__))
1921 % (filename, cmd or pycompat.sysbytes(fn.__name__))
1922 )
1922 )
1923 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
1923 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
1924 break
1924 break
1925
1925
1926 return data
1926 return data
1927
1927
1928 @unfilteredpropertycache
1928 @unfilteredpropertycache
1929 def _encodefilterpats(self):
1929 def _encodefilterpats(self):
1930 return self._loadfilter(b'encode')
1930 return self._loadfilter(b'encode')
1931
1931
1932 @unfilteredpropertycache
1932 @unfilteredpropertycache
1933 def _decodefilterpats(self):
1933 def _decodefilterpats(self):
1934 return self._loadfilter(b'decode')
1934 return self._loadfilter(b'decode')
1935
1935
1936 def adddatafilter(self, name, filter):
1936 def adddatafilter(self, name, filter):
1937 self._datafilters[name] = filter
1937 self._datafilters[name] = filter
1938
1938
1939 def wread(self, filename):
1939 def wread(self, filename):
1940 if self.wvfs.islink(filename):
1940 if self.wvfs.islink(filename):
1941 data = self.wvfs.readlink(filename)
1941 data = self.wvfs.readlink(filename)
1942 else:
1942 else:
1943 data = self.wvfs.read(filename)
1943 data = self.wvfs.read(filename)
1944 return self._filter(self._encodefilterpats, filename, data)
1944 return self._filter(self._encodefilterpats, filename, data)
1945
1945
1946 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
1946 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
1947 """write ``data`` into ``filename`` in the working directory
1947 """write ``data`` into ``filename`` in the working directory
1948
1948
1949 This returns length of written (maybe decoded) data.
1949 This returns length of written (maybe decoded) data.
1950 """
1950 """
1951 data = self._filter(self._decodefilterpats, filename, data)
1951 data = self._filter(self._decodefilterpats, filename, data)
1952 if b'l' in flags:
1952 if b'l' in flags:
1953 self.wvfs.symlink(data, filename)
1953 self.wvfs.symlink(data, filename)
1954 else:
1954 else:
1955 self.wvfs.write(
1955 self.wvfs.write(
1956 filename, data, backgroundclose=backgroundclose, **kwargs
1956 filename, data, backgroundclose=backgroundclose, **kwargs
1957 )
1957 )
1958 if b'x' in flags:
1958 if b'x' in flags:
1959 self.wvfs.setflags(filename, False, True)
1959 self.wvfs.setflags(filename, False, True)
1960 else:
1960 else:
1961 self.wvfs.setflags(filename, False, False)
1961 self.wvfs.setflags(filename, False, False)
1962 return len(data)
1962 return len(data)
1963
1963
1964 def wwritedata(self, filename, data):
1964 def wwritedata(self, filename, data):
1965 return self._filter(self._decodefilterpats, filename, data)
1965 return self._filter(self._decodefilterpats, filename, data)
1966
1966
1967 def currenttransaction(self):
1967 def currenttransaction(self):
1968 """return the current transaction or None if non exists"""
1968 """return the current transaction or None if non exists"""
1969 if self._transref:
1969 if self._transref:
1970 tr = self._transref()
1970 tr = self._transref()
1971 else:
1971 else:
1972 tr = None
1972 tr = None
1973
1973
1974 if tr and tr.running():
1974 if tr and tr.running():
1975 return tr
1975 return tr
1976 return None
1976 return None
1977
1977
1978 def transaction(self, desc, report=None):
1978 def transaction(self, desc, report=None):
1979 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1979 if self.ui.configbool(b'devel', b'all-warnings') or self.ui.configbool(
1980 b'devel', b'check-locks'
1980 b'devel', b'check-locks'
1981 ):
1981 ):
1982 if self._currentlock(self._lockref) is None:
1982 if self._currentlock(self._lockref) is None:
1983 raise error.ProgrammingError(b'transaction requires locking')
1983 raise error.ProgrammingError(b'transaction requires locking')
1984 tr = self.currenttransaction()
1984 tr = self.currenttransaction()
1985 if tr is not None:
1985 if tr is not None:
1986 return tr.nest(name=desc)
1986 return tr.nest(name=desc)
1987
1987
1988 # abort here if the journal already exists
1988 # abort here if the journal already exists
1989 if self.svfs.exists(b"journal"):
1989 if self.svfs.exists(b"journal"):
1990 raise error.RepoError(
1990 raise error.RepoError(
1991 _(b"abandoned transaction found"),
1991 _(b"abandoned transaction found"),
1992 hint=_(b"run 'hg recover' to clean up transaction"),
1992 hint=_(b"run 'hg recover' to clean up transaction"),
1993 )
1993 )
1994
1994
1995 idbase = b"%.40f#%f" % (random.random(), time.time())
1995 idbase = b"%.40f#%f" % (random.random(), time.time())
1996 ha = hex(hashlib.sha1(idbase).digest())
1996 ha = hex(hashlib.sha1(idbase).digest())
1997 txnid = b'TXN:' + ha
1997 txnid = b'TXN:' + ha
1998 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
1998 self.hook(b'pretxnopen', throw=True, txnname=desc, txnid=txnid)
1999
1999
2000 self._writejournal(desc)
2000 self._writejournal(desc)
2001 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2001 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
2002 if report:
2002 if report:
2003 rp = report
2003 rp = report
2004 else:
2004 else:
2005 rp = self.ui.warn
2005 rp = self.ui.warn
2006 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2006 vfsmap = {b'plain': self.vfs, b'store': self.svfs} # root of .hg/
2007 # we must avoid cyclic reference between repo and transaction.
2007 # we must avoid cyclic reference between repo and transaction.
2008 reporef = weakref.ref(self)
2008 reporef = weakref.ref(self)
2009 # Code to track tag movement
2009 # Code to track tag movement
2010 #
2010 #
2011 # Since tags are all handled as file content, it is actually quite hard
2011 # Since tags are all handled as file content, it is actually quite hard
2012 # to track these movement from a code perspective. So we fallback to a
2012 # to track these movement from a code perspective. So we fallback to a
2013 # tracking at the repository level. One could envision to track changes
2013 # tracking at the repository level. One could envision to track changes
2014 # to the '.hgtags' file through changegroup apply but that fails to
2014 # to the '.hgtags' file through changegroup apply but that fails to
2015 # cope with case where transaction expose new heads without changegroup
2015 # cope with case where transaction expose new heads without changegroup
2016 # being involved (eg: phase movement).
2016 # being involved (eg: phase movement).
2017 #
2017 #
2018 # For now, We gate the feature behind a flag since this likely comes
2018 # For now, We gate the feature behind a flag since this likely comes
2019 # with performance impacts. The current code run more often than needed
2019 # with performance impacts. The current code run more often than needed
2020 # and do not use caches as much as it could. The current focus is on
2020 # and do not use caches as much as it could. The current focus is on
2021 # the behavior of the feature so we disable it by default. The flag
2021 # the behavior of the feature so we disable it by default. The flag
2022 # will be removed when we are happy with the performance impact.
2022 # will be removed when we are happy with the performance impact.
2023 #
2023 #
2024 # Once this feature is no longer experimental move the following
2024 # Once this feature is no longer experimental move the following
2025 # documentation to the appropriate help section:
2025 # documentation to the appropriate help section:
2026 #
2026 #
2027 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2027 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
2028 # tags (new or changed or deleted tags). In addition the details of
2028 # tags (new or changed or deleted tags). In addition the details of
2029 # these changes are made available in a file at:
2029 # these changes are made available in a file at:
2030 # ``REPOROOT/.hg/changes/tags.changes``.
2030 # ``REPOROOT/.hg/changes/tags.changes``.
2031 # Make sure you check for HG_TAG_MOVED before reading that file as it
2031 # Make sure you check for HG_TAG_MOVED before reading that file as it
2032 # might exist from a previous transaction even if no tag were touched
2032 # might exist from a previous transaction even if no tag were touched
2033 # in this one. Changes are recorded in a line base format::
2033 # in this one. Changes are recorded in a line base format::
2034 #
2034 #
2035 # <action> <hex-node> <tag-name>\n
2035 # <action> <hex-node> <tag-name>\n
2036 #
2036 #
2037 # Actions are defined as follow:
2037 # Actions are defined as follow:
2038 # "-R": tag is removed,
2038 # "-R": tag is removed,
2039 # "+A": tag is added,
2039 # "+A": tag is added,
2040 # "-M": tag is moved (old value),
2040 # "-M": tag is moved (old value),
2041 # "+M": tag is moved (new value),
2041 # "+M": tag is moved (new value),
2042 tracktags = lambda x: None
2042 tracktags = lambda x: None
2043 # experimental config: experimental.hook-track-tags
2043 # experimental config: experimental.hook-track-tags
2044 shouldtracktags = self.ui.configbool(
2044 shouldtracktags = self.ui.configbool(
2045 b'experimental', b'hook-track-tags'
2045 b'experimental', b'hook-track-tags'
2046 )
2046 )
2047 if desc != b'strip' and shouldtracktags:
2047 if desc != b'strip' and shouldtracktags:
2048 oldheads = self.changelog.headrevs()
2048 oldheads = self.changelog.headrevs()
2049
2049
2050 def tracktags(tr2):
2050 def tracktags(tr2):
2051 repo = reporef()
2051 repo = reporef()
2052 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2052 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
2053 newheads = repo.changelog.headrevs()
2053 newheads = repo.changelog.headrevs()
2054 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2054 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
2055 # notes: we compare lists here.
2055 # notes: we compare lists here.
2056 # As we do it only once buiding set would not be cheaper
2056 # As we do it only once buiding set would not be cheaper
2057 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2057 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
2058 if changes:
2058 if changes:
2059 tr2.hookargs[b'tag_moved'] = b'1'
2059 tr2.hookargs[b'tag_moved'] = b'1'
2060 with repo.vfs(
2060 with repo.vfs(
2061 b'changes/tags.changes', b'w', atomictemp=True
2061 b'changes/tags.changes', b'w', atomictemp=True
2062 ) as changesfile:
2062 ) as changesfile:
2063 # note: we do not register the file to the transaction
2063 # note: we do not register the file to the transaction
2064 # because we needs it to still exist on the transaction
2064 # because we needs it to still exist on the transaction
2065 # is close (for txnclose hooks)
2065 # is close (for txnclose hooks)
2066 tagsmod.writediff(changesfile, changes)
2066 tagsmod.writediff(changesfile, changes)
2067
2067
2068 def validate(tr2):
2068 def validate(tr2):
2069 """will run pre-closing hooks"""
2069 """will run pre-closing hooks"""
2070 # XXX the transaction API is a bit lacking here so we take a hacky
2070 # XXX the transaction API is a bit lacking here so we take a hacky
2071 # path for now
2071 # path for now
2072 #
2072 #
2073 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2073 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
2074 # dict is copied before these run. In addition we needs the data
2074 # dict is copied before these run. In addition we needs the data
2075 # available to in memory hooks too.
2075 # available to in memory hooks too.
2076 #
2076 #
2077 # Moreover, we also need to make sure this runs before txnclose
2077 # Moreover, we also need to make sure this runs before txnclose
2078 # hooks and there is no "pending" mechanism that would execute
2078 # hooks and there is no "pending" mechanism that would execute
2079 # logic only if hooks are about to run.
2079 # logic only if hooks are about to run.
2080 #
2080 #
2081 # Fixing this limitation of the transaction is also needed to track
2081 # Fixing this limitation of the transaction is also needed to track
2082 # other families of changes (bookmarks, phases, obsolescence).
2082 # other families of changes (bookmarks, phases, obsolescence).
2083 #
2083 #
2084 # This will have to be fixed before we remove the experimental
2084 # This will have to be fixed before we remove the experimental
2085 # gating.
2085 # gating.
2086 tracktags(tr2)
2086 tracktags(tr2)
2087 repo = reporef()
2087 repo = reporef()
2088
2088
2089 r = repo.ui.configsuboptions(
2089 r = repo.ui.configsuboptions(
2090 b'experimental', b'single-head-per-branch'
2090 b'experimental', b'single-head-per-branch'
2091 )
2091 )
2092 singlehead, singleheadsub = r
2092 singlehead, singleheadsub = r
2093 if singlehead:
2093 if singlehead:
2094 accountclosed = singleheadsub.get(
2094 accountclosed = singleheadsub.get(
2095 b"account-closed-heads", False
2095 b"account-closed-heads", False
2096 )
2096 )
2097 scmutil.enforcesinglehead(repo, tr2, desc, accountclosed)
2097 scmutil.enforcesinglehead(repo, tr2, desc, accountclosed)
2098 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2098 if hook.hashook(repo.ui, b'pretxnclose-bookmark'):
2099 for name, (old, new) in sorted(
2099 for name, (old, new) in sorted(
2100 tr.changes[b'bookmarks'].items()
2100 tr.changes[b'bookmarks'].items()
2101 ):
2101 ):
2102 args = tr.hookargs.copy()
2102 args = tr.hookargs.copy()
2103 args.update(bookmarks.preparehookargs(name, old, new))
2103 args.update(bookmarks.preparehookargs(name, old, new))
2104 repo.hook(
2104 repo.hook(
2105 b'pretxnclose-bookmark',
2105 b'pretxnclose-bookmark',
2106 throw=True,
2106 throw=True,
2107 **pycompat.strkwargs(args)
2107 **pycompat.strkwargs(args)
2108 )
2108 )
2109 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2109 if hook.hashook(repo.ui, b'pretxnclose-phase'):
2110 cl = repo.unfiltered().changelog
2110 cl = repo.unfiltered().changelog
2111 for rev, (old, new) in tr.changes[b'phases'].items():
2111 for rev, (old, new) in tr.changes[b'phases'].items():
2112 args = tr.hookargs.copy()
2112 args = tr.hookargs.copy()
2113 node = hex(cl.node(rev))
2113 node = hex(cl.node(rev))
2114 args.update(phases.preparehookargs(node, old, new))
2114 args.update(phases.preparehookargs(node, old, new))
2115 repo.hook(
2115 repo.hook(
2116 b'pretxnclose-phase',
2116 b'pretxnclose-phase',
2117 throw=True,
2117 throw=True,
2118 **pycompat.strkwargs(args)
2118 **pycompat.strkwargs(args)
2119 )
2119 )
2120
2120
2121 repo.hook(
2121 repo.hook(
2122 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2122 b'pretxnclose', throw=True, **pycompat.strkwargs(tr.hookargs)
2123 )
2123 )
2124
2124
2125 def releasefn(tr, success):
2125 def releasefn(tr, success):
2126 repo = reporef()
2126 repo = reporef()
2127 if repo is None:
2127 if repo is None:
2128 # If the repo has been GC'd (and this release function is being
2128 # If the repo has been GC'd (and this release function is being
2129 # called from transaction.__del__), there's not much we can do,
2129 # called from transaction.__del__), there's not much we can do,
2130 # so just leave the unfinished transaction there and let the
2130 # so just leave the unfinished transaction there and let the
2131 # user run `hg recover`.
2131 # user run `hg recover`.
2132 return
2132 return
2133 if success:
2133 if success:
2134 # this should be explicitly invoked here, because
2134 # this should be explicitly invoked here, because
2135 # in-memory changes aren't written out at closing
2135 # in-memory changes aren't written out at closing
2136 # transaction, if tr.addfilegenerator (via
2136 # transaction, if tr.addfilegenerator (via
2137 # dirstate.write or so) isn't invoked while
2137 # dirstate.write or so) isn't invoked while
2138 # transaction running
2138 # transaction running
2139 repo.dirstate.write(None)
2139 repo.dirstate.write(None)
2140 else:
2140 else:
2141 # discard all changes (including ones already written
2141 # discard all changes (including ones already written
2142 # out) in this transaction
2142 # out) in this transaction
2143 narrowspec.restorebackup(self, b'journal.narrowspec')
2143 narrowspec.restorebackup(self, b'journal.narrowspec')
2144 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2144 narrowspec.restorewcbackup(self, b'journal.narrowspec.dirstate')
2145 repo.dirstate.restorebackup(None, b'journal.dirstate')
2145 repo.dirstate.restorebackup(None, b'journal.dirstate')
2146
2146
2147 repo.invalidate(clearfilecache=True)
2147 repo.invalidate(clearfilecache=True)
2148
2148
2149 tr = transaction.transaction(
2149 tr = transaction.transaction(
2150 rp,
2150 rp,
2151 self.svfs,
2151 self.svfs,
2152 vfsmap,
2152 vfsmap,
2153 b"journal",
2153 b"journal",
2154 b"undo",
2154 b"undo",
2155 aftertrans(renames),
2155 aftertrans(renames),
2156 self.store.createmode,
2156 self.store.createmode,
2157 validator=validate,
2157 validator=validate,
2158 releasefn=releasefn,
2158 releasefn=releasefn,
2159 checkambigfiles=_cachedfiles,
2159 checkambigfiles=_cachedfiles,
2160 name=desc,
2160 name=desc,
2161 )
2161 )
2162 tr.changes[b'origrepolen'] = len(self)
2162 tr.changes[b'origrepolen'] = len(self)
2163 tr.changes[b'obsmarkers'] = set()
2163 tr.changes[b'obsmarkers'] = set()
2164 tr.changes[b'phases'] = {}
2164 tr.changes[b'phases'] = {}
2165 tr.changes[b'bookmarks'] = {}
2165 tr.changes[b'bookmarks'] = {}
2166
2166
2167 tr.hookargs[b'txnid'] = txnid
2167 tr.hookargs[b'txnid'] = txnid
2168 tr.hookargs[b'txnname'] = desc
2168 tr.hookargs[b'txnname'] = desc
2169 # note: writing the fncache only during finalize mean that the file is
2169 # note: writing the fncache only during finalize mean that the file is
2170 # outdated when running hooks. As fncache is used for streaming clone,
2170 # outdated when running hooks. As fncache is used for streaming clone,
2171 # this is not expected to break anything that happen during the hooks.
2171 # this is not expected to break anything that happen during the hooks.
2172 tr.addfinalize(b'flush-fncache', self.store.write)
2172 tr.addfinalize(b'flush-fncache', self.store.write)
2173
2173
2174 def txnclosehook(tr2):
2174 def txnclosehook(tr2):
2175 """To be run if transaction is successful, will schedule a hook run
2175 """To be run if transaction is successful, will schedule a hook run
2176 """
2176 """
2177 # Don't reference tr2 in hook() so we don't hold a reference.
2177 # Don't reference tr2 in hook() so we don't hold a reference.
2178 # This reduces memory consumption when there are multiple
2178 # This reduces memory consumption when there are multiple
2179 # transactions per lock. This can likely go away if issue5045
2179 # transactions per lock. This can likely go away if issue5045
2180 # fixes the function accumulation.
2180 # fixes the function accumulation.
2181 hookargs = tr2.hookargs
2181 hookargs = tr2.hookargs
2182
2182
2183 def hookfunc():
2183 def hookfunc():
2184 repo = reporef()
2184 repo = reporef()
2185 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2185 if hook.hashook(repo.ui, b'txnclose-bookmark'):
2186 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2186 bmchanges = sorted(tr.changes[b'bookmarks'].items())
2187 for name, (old, new) in bmchanges:
2187 for name, (old, new) in bmchanges:
2188 args = tr.hookargs.copy()
2188 args = tr.hookargs.copy()
2189 args.update(bookmarks.preparehookargs(name, old, new))
2189 args.update(bookmarks.preparehookargs(name, old, new))
2190 repo.hook(
2190 repo.hook(
2191 b'txnclose-bookmark',
2191 b'txnclose-bookmark',
2192 throw=False,
2192 throw=False,
2193 **pycompat.strkwargs(args)
2193 **pycompat.strkwargs(args)
2194 )
2194 )
2195
2195
2196 if hook.hashook(repo.ui, b'txnclose-phase'):
2196 if hook.hashook(repo.ui, b'txnclose-phase'):
2197 cl = repo.unfiltered().changelog
2197 cl = repo.unfiltered().changelog
2198 phasemv = sorted(tr.changes[b'phases'].items())
2198 phasemv = sorted(tr.changes[b'phases'].items())
2199 for rev, (old, new) in phasemv:
2199 for rev, (old, new) in phasemv:
2200 args = tr.hookargs.copy()
2200 args = tr.hookargs.copy()
2201 node = hex(cl.node(rev))
2201 node = hex(cl.node(rev))
2202 args.update(phases.preparehookargs(node, old, new))
2202 args.update(phases.preparehookargs(node, old, new))
2203 repo.hook(
2203 repo.hook(
2204 b'txnclose-phase',
2204 b'txnclose-phase',
2205 throw=False,
2205 throw=False,
2206 **pycompat.strkwargs(args)
2206 **pycompat.strkwargs(args)
2207 )
2207 )
2208
2208
2209 repo.hook(
2209 repo.hook(
2210 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2210 b'txnclose', throw=False, **pycompat.strkwargs(hookargs)
2211 )
2211 )
2212
2212
2213 reporef()._afterlock(hookfunc)
2213 reporef()._afterlock(hookfunc)
2214
2214
2215 tr.addfinalize(b'txnclose-hook', txnclosehook)
2215 tr.addfinalize(b'txnclose-hook', txnclosehook)
2216 # Include a leading "-" to make it happen before the transaction summary
2216 # Include a leading "-" to make it happen before the transaction summary
2217 # reports registered via scmutil.registersummarycallback() whose names
2217 # reports registered via scmutil.registersummarycallback() whose names
2218 # are 00-txnreport etc. That way, the caches will be warm when the
2218 # are 00-txnreport etc. That way, the caches will be warm when the
2219 # callbacks run.
2219 # callbacks run.
2220 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2220 tr.addpostclose(b'-warm-cache', self._buildcacheupdater(tr))
2221
2221
2222 def txnaborthook(tr2):
2222 def txnaborthook(tr2):
2223 """To be run if transaction is aborted
2223 """To be run if transaction is aborted
2224 """
2224 """
2225 reporef().hook(
2225 reporef().hook(
2226 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2226 b'txnabort', throw=False, **pycompat.strkwargs(tr2.hookargs)
2227 )
2227 )
2228
2228
2229 tr.addabort(b'txnabort-hook', txnaborthook)
2229 tr.addabort(b'txnabort-hook', txnaborthook)
2230 # avoid eager cache invalidation. in-memory data should be identical
2230 # avoid eager cache invalidation. in-memory data should be identical
2231 # to stored data if transaction has no error.
2231 # to stored data if transaction has no error.
2232 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2232 tr.addpostclose(b'refresh-filecachestats', self._refreshfilecachestats)
2233 self._transref = weakref.ref(tr)
2233 self._transref = weakref.ref(tr)
2234 scmutil.registersummarycallback(self, tr, desc)
2234 scmutil.registersummarycallback(self, tr, desc)
2235 return tr
2235 return tr
2236
2236
2237 def _journalfiles(self):
2237 def _journalfiles(self):
2238 return (
2238 return (
2239 (self.svfs, b'journal'),
2239 (self.svfs, b'journal'),
2240 (self.svfs, b'journal.narrowspec'),
2240 (self.svfs, b'journal.narrowspec'),
2241 (self.vfs, b'journal.narrowspec.dirstate'),
2241 (self.vfs, b'journal.narrowspec.dirstate'),
2242 (self.vfs, b'journal.dirstate'),
2242 (self.vfs, b'journal.dirstate'),
2243 (self.vfs, b'journal.branch'),
2243 (self.vfs, b'journal.branch'),
2244 (self.vfs, b'journal.desc'),
2244 (self.vfs, b'journal.desc'),
2245 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2245 (bookmarks.bookmarksvfs(self), b'journal.bookmarks'),
2246 (self.svfs, b'journal.phaseroots'),
2246 (self.svfs, b'journal.phaseroots'),
2247 )
2247 )
2248
2248
2249 def undofiles(self):
2249 def undofiles(self):
2250 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2250 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
2251
2251
2252 @unfilteredmethod
2252 @unfilteredmethod
2253 def _writejournal(self, desc):
2253 def _writejournal(self, desc):
2254 self.dirstate.savebackup(None, b'journal.dirstate')
2254 self.dirstate.savebackup(None, b'journal.dirstate')
2255 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2255 narrowspec.savewcbackup(self, b'journal.narrowspec.dirstate')
2256 narrowspec.savebackup(self, b'journal.narrowspec')
2256 narrowspec.savebackup(self, b'journal.narrowspec')
2257 self.vfs.write(
2257 self.vfs.write(
2258 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2258 b"journal.branch", encoding.fromlocal(self.dirstate.branch())
2259 )
2259 )
2260 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2260 self.vfs.write(b"journal.desc", b"%d\n%s\n" % (len(self), desc))
2261 bookmarksvfs = bookmarks.bookmarksvfs(self)
2261 bookmarksvfs = bookmarks.bookmarksvfs(self)
2262 bookmarksvfs.write(
2262 bookmarksvfs.write(
2263 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2263 b"journal.bookmarks", bookmarksvfs.tryread(b"bookmarks")
2264 )
2264 )
2265 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2265 self.svfs.write(b"journal.phaseroots", self.svfs.tryread(b"phaseroots"))
2266
2266
2267 def recover(self):
2267 def recover(self):
2268 with self.lock():
2268 with self.lock():
2269 if self.svfs.exists(b"journal"):
2269 if self.svfs.exists(b"journal"):
2270 self.ui.status(_(b"rolling back interrupted transaction\n"))
2270 self.ui.status(_(b"rolling back interrupted transaction\n"))
2271 vfsmap = {
2271 vfsmap = {
2272 b'': self.svfs,
2272 b'': self.svfs,
2273 b'plain': self.vfs,
2273 b'plain': self.vfs,
2274 }
2274 }
2275 transaction.rollback(
2275 transaction.rollback(
2276 self.svfs,
2276 self.svfs,
2277 vfsmap,
2277 vfsmap,
2278 b"journal",
2278 b"journal",
2279 self.ui.warn,
2279 self.ui.warn,
2280 checkambigfiles=_cachedfiles,
2280 checkambigfiles=_cachedfiles,
2281 )
2281 )
2282 self.invalidate()
2282 self.invalidate()
2283 return True
2283 return True
2284 else:
2284 else:
2285 self.ui.warn(_(b"no interrupted transaction available\n"))
2285 self.ui.warn(_(b"no interrupted transaction available\n"))
2286 return False
2286 return False
2287
2287
2288 def rollback(self, dryrun=False, force=False):
2288 def rollback(self, dryrun=False, force=False):
2289 wlock = lock = dsguard = None
2289 wlock = lock = dsguard = None
2290 try:
2290 try:
2291 wlock = self.wlock()
2291 wlock = self.wlock()
2292 lock = self.lock()
2292 lock = self.lock()
2293 if self.svfs.exists(b"undo"):
2293 if self.svfs.exists(b"undo"):
2294 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2294 dsguard = dirstateguard.dirstateguard(self, b'rollback')
2295
2295
2296 return self._rollback(dryrun, force, dsguard)
2296 return self._rollback(dryrun, force, dsguard)
2297 else:
2297 else:
2298 self.ui.warn(_(b"no rollback information available\n"))
2298 self.ui.warn(_(b"no rollback information available\n"))
2299 return 1
2299 return 1
2300 finally:
2300 finally:
2301 release(dsguard, lock, wlock)
2301 release(dsguard, lock, wlock)
2302
2302
2303 @unfilteredmethod # Until we get smarter cache management
2303 @unfilteredmethod # Until we get smarter cache management
2304 def _rollback(self, dryrun, force, dsguard):
2304 def _rollback(self, dryrun, force, dsguard):
2305 ui = self.ui
2305 ui = self.ui
2306 try:
2306 try:
2307 args = self.vfs.read(b'undo.desc').splitlines()
2307 args = self.vfs.read(b'undo.desc').splitlines()
2308 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2308 (oldlen, desc, detail) = (int(args[0]), args[1], None)
2309 if len(args) >= 3:
2309 if len(args) >= 3:
2310 detail = args[2]
2310 detail = args[2]
2311 oldtip = oldlen - 1
2311 oldtip = oldlen - 1
2312
2312
2313 if detail and ui.verbose:
2313 if detail and ui.verbose:
2314 msg = _(
2314 msg = _(
2315 b'repository tip rolled back to revision %d'
2315 b'repository tip rolled back to revision %d'
2316 b' (undo %s: %s)\n'
2316 b' (undo %s: %s)\n'
2317 ) % (oldtip, desc, detail)
2317 ) % (oldtip, desc, detail)
2318 else:
2318 else:
2319 msg = _(
2319 msg = _(
2320 b'repository tip rolled back to revision %d (undo %s)\n'
2320 b'repository tip rolled back to revision %d (undo %s)\n'
2321 ) % (oldtip, desc)
2321 ) % (oldtip, desc)
2322 except IOError:
2322 except IOError:
2323 msg = _(b'rolling back unknown transaction\n')
2323 msg = _(b'rolling back unknown transaction\n')
2324 desc = None
2324 desc = None
2325
2325
2326 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2326 if not force and self[b'.'] != self[b'tip'] and desc == b'commit':
2327 raise error.Abort(
2327 raise error.Abort(
2328 _(
2328 _(
2329 b'rollback of last commit while not checked out '
2329 b'rollback of last commit while not checked out '
2330 b'may lose data'
2330 b'may lose data'
2331 ),
2331 ),
2332 hint=_(b'use -f to force'),
2332 hint=_(b'use -f to force'),
2333 )
2333 )
2334
2334
2335 ui.status(msg)
2335 ui.status(msg)
2336 if dryrun:
2336 if dryrun:
2337 return 0
2337 return 0
2338
2338
2339 parents = self.dirstate.parents()
2339 parents = self.dirstate.parents()
2340 self.destroying()
2340 self.destroying()
2341 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2341 vfsmap = {b'plain': self.vfs, b'': self.svfs}
2342 transaction.rollback(
2342 transaction.rollback(
2343 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2343 self.svfs, vfsmap, b'undo', ui.warn, checkambigfiles=_cachedfiles
2344 )
2344 )
2345 bookmarksvfs = bookmarks.bookmarksvfs(self)
2345 bookmarksvfs = bookmarks.bookmarksvfs(self)
2346 if bookmarksvfs.exists(b'undo.bookmarks'):
2346 if bookmarksvfs.exists(b'undo.bookmarks'):
2347 bookmarksvfs.rename(
2347 bookmarksvfs.rename(
2348 b'undo.bookmarks', b'bookmarks', checkambig=True
2348 b'undo.bookmarks', b'bookmarks', checkambig=True
2349 )
2349 )
2350 if self.svfs.exists(b'undo.phaseroots'):
2350 if self.svfs.exists(b'undo.phaseroots'):
2351 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2351 self.svfs.rename(b'undo.phaseroots', b'phaseroots', checkambig=True)
2352 self.invalidate()
2352 self.invalidate()
2353
2353
2354 has_node = self.changelog.index.has_node
2354 has_node = self.changelog.index.has_node
2355 parentgone = any(not has_node(p) for p in parents)
2355 parentgone = any(not has_node(p) for p in parents)
2356 if parentgone:
2356 if parentgone:
2357 # prevent dirstateguard from overwriting already restored one
2357 # prevent dirstateguard from overwriting already restored one
2358 dsguard.close()
2358 dsguard.close()
2359
2359
2360 narrowspec.restorebackup(self, b'undo.narrowspec')
2360 narrowspec.restorebackup(self, b'undo.narrowspec')
2361 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2361 narrowspec.restorewcbackup(self, b'undo.narrowspec.dirstate')
2362 self.dirstate.restorebackup(None, b'undo.dirstate')
2362 self.dirstate.restorebackup(None, b'undo.dirstate')
2363 try:
2363 try:
2364 branch = self.vfs.read(b'undo.branch')
2364 branch = self.vfs.read(b'undo.branch')
2365 self.dirstate.setbranch(encoding.tolocal(branch))
2365 self.dirstate.setbranch(encoding.tolocal(branch))
2366 except IOError:
2366 except IOError:
2367 ui.warn(
2367 ui.warn(
2368 _(
2368 _(
2369 b'named branch could not be reset: '
2369 b'named branch could not be reset: '
2370 b'current branch is still \'%s\'\n'
2370 b'current branch is still \'%s\'\n'
2371 )
2371 )
2372 % self.dirstate.branch()
2372 % self.dirstate.branch()
2373 )
2373 )
2374
2374
2375 parents = tuple([p.rev() for p in self[None].parents()])
2375 parents = tuple([p.rev() for p in self[None].parents()])
2376 if len(parents) > 1:
2376 if len(parents) > 1:
2377 ui.status(
2377 ui.status(
2378 _(
2378 _(
2379 b'working directory now based on '
2379 b'working directory now based on '
2380 b'revisions %d and %d\n'
2380 b'revisions %d and %d\n'
2381 )
2381 )
2382 % parents
2382 % parents
2383 )
2383 )
2384 else:
2384 else:
2385 ui.status(
2385 ui.status(
2386 _(b'working directory now based on revision %d\n') % parents
2386 _(b'working directory now based on revision %d\n') % parents
2387 )
2387 )
2388 mergemod.mergestate.clean(self, self[b'.'].node())
2388 mergemod.mergestate.clean(self, self[b'.'].node())
2389
2389
2390 # TODO: if we know which new heads may result from this rollback, pass
2390 # TODO: if we know which new heads may result from this rollback, pass
2391 # them to destroy(), which will prevent the branchhead cache from being
2391 # them to destroy(), which will prevent the branchhead cache from being
2392 # invalidated.
2392 # invalidated.
2393 self.destroyed()
2393 self.destroyed()
2394 return 0
2394 return 0
2395
2395
2396 def _buildcacheupdater(self, newtransaction):
2396 def _buildcacheupdater(self, newtransaction):
2397 """called during transaction to build the callback updating cache
2397 """called during transaction to build the callback updating cache
2398
2398
2399 Lives on the repository to help extension who might want to augment
2399 Lives on the repository to help extension who might want to augment
2400 this logic. For this purpose, the created transaction is passed to the
2400 this logic. For this purpose, the created transaction is passed to the
2401 method.
2401 method.
2402 """
2402 """
2403 # we must avoid cyclic reference between repo and transaction.
2403 # we must avoid cyclic reference between repo and transaction.
2404 reporef = weakref.ref(self)
2404 reporef = weakref.ref(self)
2405
2405
2406 def updater(tr):
2406 def updater(tr):
2407 repo = reporef()
2407 repo = reporef()
2408 repo.updatecaches(tr)
2408 repo.updatecaches(tr)
2409
2409
2410 return updater
2410 return updater
2411
2411
2412 @unfilteredmethod
2412 @unfilteredmethod
2413 def updatecaches(self, tr=None, full=False):
2413 def updatecaches(self, tr=None, full=False):
2414 """warm appropriate caches
2414 """warm appropriate caches
2415
2415
2416 If this function is called after a transaction closed. The transaction
2416 If this function is called after a transaction closed. The transaction
2417 will be available in the 'tr' argument. This can be used to selectively
2417 will be available in the 'tr' argument. This can be used to selectively
2418 update caches relevant to the changes in that transaction.
2418 update caches relevant to the changes in that transaction.
2419
2419
2420 If 'full' is set, make sure all caches the function knows about have
2420 If 'full' is set, make sure all caches the function knows about have
2421 up-to-date data. Even the ones usually loaded more lazily.
2421 up-to-date data. Even the ones usually loaded more lazily.
2422 """
2422 """
2423 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2423 if tr is not None and tr.hookargs.get(b'source') == b'strip':
2424 # During strip, many caches are invalid but
2424 # During strip, many caches are invalid but
2425 # later call to `destroyed` will refresh them.
2425 # later call to `destroyed` will refresh them.
2426 return
2426 return
2427
2427
2428 if tr is None or tr.changes[b'origrepolen'] < len(self):
2428 if tr is None or tr.changes[b'origrepolen'] < len(self):
2429 # accessing the 'ser ved' branchmap should refresh all the others,
2429 # accessing the 'ser ved' branchmap should refresh all the others,
2430 self.ui.debug(b'updating the branch cache\n')
2430 self.ui.debug(b'updating the branch cache\n')
2431 self.filtered(b'served').branchmap()
2431 self.filtered(b'served').branchmap()
2432 self.filtered(b'served.hidden').branchmap()
2432 self.filtered(b'served.hidden').branchmap()
2433
2433
2434 if full:
2434 if full:
2435 unfi = self.unfiltered()
2435 unfi = self.unfiltered()
2436 rbc = unfi.revbranchcache()
2436 rbc = unfi.revbranchcache()
2437 for r in unfi.changelog:
2437 for r in unfi.changelog:
2438 rbc.branchinfo(r)
2438 rbc.branchinfo(r)
2439 rbc.write()
2439 rbc.write()
2440
2440
2441 # ensure the working copy parents are in the manifestfulltextcache
2441 # ensure the working copy parents are in the manifestfulltextcache
2442 for ctx in self[b'.'].parents():
2442 for ctx in self[b'.'].parents():
2443 ctx.manifest() # accessing the manifest is enough
2443 ctx.manifest() # accessing the manifest is enough
2444
2444
2445 # accessing fnode cache warms the cache
2445 # accessing fnode cache warms the cache
2446 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2446 tagsmod.fnoderevs(self.ui, unfi, unfi.changelog.revs())
2447 # accessing tags warm the cache
2447 # accessing tags warm the cache
2448 self.tags()
2448 self.tags()
2449 self.filtered(b'served').tags()
2449 self.filtered(b'served').tags()
2450
2450
2451 # The `full` arg is documented as updating even the lazily-loaded
2451 # The `full` arg is documented as updating even the lazily-loaded
2452 # caches immediately, so we're forcing a write to cause these caches
2452 # caches immediately, so we're forcing a write to cause these caches
2453 # to be warmed up even if they haven't explicitly been requested
2453 # to be warmed up even if they haven't explicitly been requested
2454 # yet (if they've never been used by hg, they won't ever have been
2454 # yet (if they've never been used by hg, they won't ever have been
2455 # written, even if they're a subset of another kind of cache that
2455 # written, even if they're a subset of another kind of cache that
2456 # *has* been used).
2456 # *has* been used).
2457 for filt in repoview.filtertable.keys():
2457 for filt in repoview.filtertable.keys():
2458 filtered = self.filtered(filt)
2458 filtered = self.filtered(filt)
2459 filtered.branchmap().write(filtered)
2459 filtered.branchmap().write(filtered)
2460
2460
2461 def invalidatecaches(self):
2461 def invalidatecaches(self):
2462
2462
2463 if '_tagscache' in vars(self):
2463 if '_tagscache' in vars(self):
2464 # can't use delattr on proxy
2464 # can't use delattr on proxy
2465 del self.__dict__['_tagscache']
2465 del self.__dict__['_tagscache']
2466
2466
2467 self._branchcaches.clear()
2467 self._branchcaches.clear()
2468 self.invalidatevolatilesets()
2468 self.invalidatevolatilesets()
2469 self._sparsesignaturecache.clear()
2469 self._sparsesignaturecache.clear()
2470
2470
2471 def invalidatevolatilesets(self):
2471 def invalidatevolatilesets(self):
2472 self.filteredrevcache.clear()
2472 self.filteredrevcache.clear()
2473 obsolete.clearobscaches(self)
2473 obsolete.clearobscaches(self)
2474
2474
2475 def invalidatedirstate(self):
2475 def invalidatedirstate(self):
2476 '''Invalidates the dirstate, causing the next call to dirstate
2476 '''Invalidates the dirstate, causing the next call to dirstate
2477 to check if it was modified since the last time it was read,
2477 to check if it was modified since the last time it was read,
2478 rereading it if it has.
2478 rereading it if it has.
2479
2479
2480 This is different to dirstate.invalidate() that it doesn't always
2480 This is different to dirstate.invalidate() that it doesn't always
2481 rereads the dirstate. Use dirstate.invalidate() if you want to
2481 rereads the dirstate. Use dirstate.invalidate() if you want to
2482 explicitly read the dirstate again (i.e. restoring it to a previous
2482 explicitly read the dirstate again (i.e. restoring it to a previous
2483 known good state).'''
2483 known good state).'''
2484 if hasunfilteredcache(self, 'dirstate'):
2484 if hasunfilteredcache(self, 'dirstate'):
2485 for k in self.dirstate._filecache:
2485 for k in self.dirstate._filecache:
2486 try:
2486 try:
2487 delattr(self.dirstate, k)
2487 delattr(self.dirstate, k)
2488 except AttributeError:
2488 except AttributeError:
2489 pass
2489 pass
2490 delattr(self.unfiltered(), 'dirstate')
2490 delattr(self.unfiltered(), 'dirstate')
2491
2491
2492 def invalidate(self, clearfilecache=False):
2492 def invalidate(self, clearfilecache=False):
2493 '''Invalidates both store and non-store parts other than dirstate
2493 '''Invalidates both store and non-store parts other than dirstate
2494
2494
2495 If a transaction is running, invalidation of store is omitted,
2495 If a transaction is running, invalidation of store is omitted,
2496 because discarding in-memory changes might cause inconsistency
2496 because discarding in-memory changes might cause inconsistency
2497 (e.g. incomplete fncache causes unintentional failure, but
2497 (e.g. incomplete fncache causes unintentional failure, but
2498 redundant one doesn't).
2498 redundant one doesn't).
2499 '''
2499 '''
2500 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2500 unfiltered = self.unfiltered() # all file caches are stored unfiltered
2501 for k in list(self._filecache.keys()):
2501 for k in list(self._filecache.keys()):
2502 # dirstate is invalidated separately in invalidatedirstate()
2502 # dirstate is invalidated separately in invalidatedirstate()
2503 if k == b'dirstate':
2503 if k == b'dirstate':
2504 continue
2504 continue
2505 if (
2505 if (
2506 k == b'changelog'
2506 k == b'changelog'
2507 and self.currenttransaction()
2507 and self.currenttransaction()
2508 and self.changelog._delayed
2508 and self.changelog._delayed
2509 ):
2509 ):
2510 # The changelog object may store unwritten revisions. We don't
2510 # The changelog object may store unwritten revisions. We don't
2511 # want to lose them.
2511 # want to lose them.
2512 # TODO: Solve the problem instead of working around it.
2512 # TODO: Solve the problem instead of working around it.
2513 continue
2513 continue
2514
2514
2515 if clearfilecache:
2515 if clearfilecache:
2516 del self._filecache[k]
2516 del self._filecache[k]
2517 try:
2517 try:
2518 delattr(unfiltered, k)
2518 delattr(unfiltered, k)
2519 except AttributeError:
2519 except AttributeError:
2520 pass
2520 pass
2521 self.invalidatecaches()
2521 self.invalidatecaches()
2522 if not self.currenttransaction():
2522 if not self.currenttransaction():
2523 # TODO: Changing contents of store outside transaction
2523 # TODO: Changing contents of store outside transaction
2524 # causes inconsistency. We should make in-memory store
2524 # causes inconsistency. We should make in-memory store
2525 # changes detectable, and abort if changed.
2525 # changes detectable, and abort if changed.
2526 self.store.invalidatecaches()
2526 self.store.invalidatecaches()
2527
2527
2528 def invalidateall(self):
2528 def invalidateall(self):
2529 '''Fully invalidates both store and non-store parts, causing the
2529 '''Fully invalidates both store and non-store parts, causing the
2530 subsequent operation to reread any outside changes.'''
2530 subsequent operation to reread any outside changes.'''
2531 # extension should hook this to invalidate its caches
2531 # extension should hook this to invalidate its caches
2532 self.invalidate()
2532 self.invalidate()
2533 self.invalidatedirstate()
2533 self.invalidatedirstate()
2534
2534
2535 @unfilteredmethod
2535 @unfilteredmethod
2536 def _refreshfilecachestats(self, tr):
2536 def _refreshfilecachestats(self, tr):
2537 """Reload stats of cached files so that they are flagged as valid"""
2537 """Reload stats of cached files so that they are flagged as valid"""
2538 for k, ce in self._filecache.items():
2538 for k, ce in self._filecache.items():
2539 k = pycompat.sysstr(k)
2539 k = pycompat.sysstr(k)
2540 if k == 'dirstate' or k not in self.__dict__:
2540 if k == 'dirstate' or k not in self.__dict__:
2541 continue
2541 continue
2542 ce.refresh()
2542 ce.refresh()
2543
2543
2544 def _lock(
2544 def _lock(
2545 self,
2545 self,
2546 vfs,
2546 vfs,
2547 lockname,
2547 lockname,
2548 wait,
2548 wait,
2549 releasefn,
2549 releasefn,
2550 acquirefn,
2550 acquirefn,
2551 desc,
2551 desc,
2552 inheritchecker=None,
2552 inheritchecker=None,
2553 parentenvvar=None,
2553 parentenvvar=None,
2554 ):
2554 ):
2555 parentlock = None
2555 parentlock = None
2556 # the contents of parentenvvar are used by the underlying lock to
2556 # the contents of parentenvvar are used by the underlying lock to
2557 # determine whether it can be inherited
2557 # determine whether it can be inherited
2558 if parentenvvar is not None:
2558 if parentenvvar is not None:
2559 parentlock = encoding.environ.get(parentenvvar)
2559 parentlock = encoding.environ.get(parentenvvar)
2560
2560
2561 timeout = 0
2561 timeout = 0
2562 warntimeout = 0
2562 warntimeout = 0
2563 if wait:
2563 if wait:
2564 timeout = self.ui.configint(b"ui", b"timeout")
2564 timeout = self.ui.configint(b"ui", b"timeout")
2565 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2565 warntimeout = self.ui.configint(b"ui", b"timeout.warn")
2566 # internal config: ui.signal-safe-lock
2566 # internal config: ui.signal-safe-lock
2567 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2567 signalsafe = self.ui.configbool(b'ui', b'signal-safe-lock')
2568
2568
2569 l = lockmod.trylock(
2569 l = lockmod.trylock(
2570 self.ui,
2570 self.ui,
2571 vfs,
2571 vfs,
2572 lockname,
2572 lockname,
2573 timeout,
2573 timeout,
2574 warntimeout,
2574 warntimeout,
2575 releasefn=releasefn,
2575 releasefn=releasefn,
2576 acquirefn=acquirefn,
2576 acquirefn=acquirefn,
2577 desc=desc,
2577 desc=desc,
2578 inheritchecker=inheritchecker,
2578 inheritchecker=inheritchecker,
2579 parentlock=parentlock,
2579 parentlock=parentlock,
2580 signalsafe=signalsafe,
2580 signalsafe=signalsafe,
2581 )
2581 )
2582 return l
2582 return l
2583
2583
2584 def _afterlock(self, callback):
2584 def _afterlock(self, callback):
2585 """add a callback to be run when the repository is fully unlocked
2585 """add a callback to be run when the repository is fully unlocked
2586
2586
2587 The callback will be executed when the outermost lock is released
2587 The callback will be executed when the outermost lock is released
2588 (with wlock being higher level than 'lock')."""
2588 (with wlock being higher level than 'lock')."""
2589 for ref in (self._wlockref, self._lockref):
2589 for ref in (self._wlockref, self._lockref):
2590 l = ref and ref()
2590 l = ref and ref()
2591 if l and l.held:
2591 if l and l.held:
2592 l.postrelease.append(callback)
2592 l.postrelease.append(callback)
2593 break
2593 break
2594 else: # no lock have been found.
2594 else: # no lock have been found.
2595 callback()
2595 callback()
2596
2596
2597 def lock(self, wait=True):
2597 def lock(self, wait=True):
2598 '''Lock the repository store (.hg/store) and return a weak reference
2598 '''Lock the repository store (.hg/store) and return a weak reference
2599 to the lock. Use this before modifying the store (e.g. committing or
2599 to the lock. Use this before modifying the store (e.g. committing or
2600 stripping). If you are opening a transaction, get a lock as well.)
2600 stripping). If you are opening a transaction, get a lock as well.)
2601
2601
2602 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2602 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2603 'wlock' first to avoid a dead-lock hazard.'''
2603 'wlock' first to avoid a dead-lock hazard.'''
2604 l = self._currentlock(self._lockref)
2604 l = self._currentlock(self._lockref)
2605 if l is not None:
2605 if l is not None:
2606 l.lock()
2606 l.lock()
2607 return l
2607 return l
2608
2608
2609 l = self._lock(
2609 l = self._lock(
2610 vfs=self.svfs,
2610 vfs=self.svfs,
2611 lockname=b"lock",
2611 lockname=b"lock",
2612 wait=wait,
2612 wait=wait,
2613 releasefn=None,
2613 releasefn=None,
2614 acquirefn=self.invalidate,
2614 acquirefn=self.invalidate,
2615 desc=_(b'repository %s') % self.origroot,
2615 desc=_(b'repository %s') % self.origroot,
2616 )
2616 )
2617 self._lockref = weakref.ref(l)
2617 self._lockref = weakref.ref(l)
2618 return l
2618 return l
2619
2619
2620 def _wlockchecktransaction(self):
2620 def _wlockchecktransaction(self):
2621 if self.currenttransaction() is not None:
2621 if self.currenttransaction() is not None:
2622 raise error.LockInheritanceContractViolation(
2622 raise error.LockInheritanceContractViolation(
2623 b'wlock cannot be inherited in the middle of a transaction'
2623 b'wlock cannot be inherited in the middle of a transaction'
2624 )
2624 )
2625
2625
2626 def wlock(self, wait=True):
2626 def wlock(self, wait=True):
2627 '''Lock the non-store parts of the repository (everything under
2627 '''Lock the non-store parts of the repository (everything under
2628 .hg except .hg/store) and return a weak reference to the lock.
2628 .hg except .hg/store) and return a weak reference to the lock.
2629
2629
2630 Use this before modifying files in .hg.
2630 Use this before modifying files in .hg.
2631
2631
2632 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2632 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
2633 'wlock' first to avoid a dead-lock hazard.'''
2633 'wlock' first to avoid a dead-lock hazard.'''
2634 l = self._wlockref and self._wlockref()
2634 l = self._wlockref and self._wlockref()
2635 if l is not None and l.held:
2635 if l is not None and l.held:
2636 l.lock()
2636 l.lock()
2637 return l
2637 return l
2638
2638
2639 # We do not need to check for non-waiting lock acquisition. Such
2639 # We do not need to check for non-waiting lock acquisition. Such
2640 # acquisition would not cause dead-lock as they would just fail.
2640 # acquisition would not cause dead-lock as they would just fail.
2641 if wait and (
2641 if wait and (
2642 self.ui.configbool(b'devel', b'all-warnings')
2642 self.ui.configbool(b'devel', b'all-warnings')
2643 or self.ui.configbool(b'devel', b'check-locks')
2643 or self.ui.configbool(b'devel', b'check-locks')
2644 ):
2644 ):
2645 if self._currentlock(self._lockref) is not None:
2645 if self._currentlock(self._lockref) is not None:
2646 self.ui.develwarn(b'"wlock" acquired after "lock"')
2646 self.ui.develwarn(b'"wlock" acquired after "lock"')
2647
2647
2648 def unlock():
2648 def unlock():
2649 if self.dirstate.pendingparentchange():
2649 if self.dirstate.pendingparentchange():
2650 self.dirstate.invalidate()
2650 self.dirstate.invalidate()
2651 else:
2651 else:
2652 self.dirstate.write(None)
2652 self.dirstate.write(None)
2653
2653
2654 self._filecache[b'dirstate'].refresh()
2654 self._filecache[b'dirstate'].refresh()
2655
2655
2656 l = self._lock(
2656 l = self._lock(
2657 self.vfs,
2657 self.vfs,
2658 b"wlock",
2658 b"wlock",
2659 wait,
2659 wait,
2660 unlock,
2660 unlock,
2661 self.invalidatedirstate,
2661 self.invalidatedirstate,
2662 _(b'working directory of %s') % self.origroot,
2662 _(b'working directory of %s') % self.origroot,
2663 inheritchecker=self._wlockchecktransaction,
2663 inheritchecker=self._wlockchecktransaction,
2664 parentenvvar=b'HG_WLOCK_LOCKER',
2664 parentenvvar=b'HG_WLOCK_LOCKER',
2665 )
2665 )
2666 self._wlockref = weakref.ref(l)
2666 self._wlockref = weakref.ref(l)
2667 return l
2667 return l
2668
2668
2669 def _currentlock(self, lockref):
2669 def _currentlock(self, lockref):
2670 """Returns the lock if it's held, or None if it's not."""
2670 """Returns the lock if it's held, or None if it's not."""
2671 if lockref is None:
2671 if lockref is None:
2672 return None
2672 return None
2673 l = lockref()
2673 l = lockref()
2674 if l is None or not l.held:
2674 if l is None or not l.held:
2675 return None
2675 return None
2676 return l
2676 return l
2677
2677
2678 def currentwlock(self):
2678 def currentwlock(self):
2679 """Returns the wlock if it's held, or None if it's not."""
2679 """Returns the wlock if it's held, or None if it's not."""
2680 return self._currentlock(self._wlockref)
2680 return self._currentlock(self._wlockref)
2681
2681
2682 def _filecommit(
2682 def _filecommit(
2683 self,
2683 self,
2684 fctx,
2684 fctx,
2685 manifest1,
2685 manifest1,
2686 manifest2,
2686 manifest2,
2687 linkrev,
2687 linkrev,
2688 tr,
2688 tr,
2689 changelist,
2689 changelist,
2690 includecopymeta,
2690 includecopymeta,
2691 ):
2691 ):
2692 """
2692 """
2693 commit an individual file as part of a larger transaction
2693 commit an individual file as part of a larger transaction
2694 """
2694 """
2695
2695
2696 fname = fctx.path()
2696 fname = fctx.path()
2697 fparent1 = manifest1.get(fname, nullid)
2697 fparent1 = manifest1.get(fname, nullid)
2698 fparent2 = manifest2.get(fname, nullid)
2698 fparent2 = manifest2.get(fname, nullid)
2699 if isinstance(fctx, context.filectx):
2699 if isinstance(fctx, context.filectx):
2700 node = fctx.filenode()
2700 node = fctx.filenode()
2701 if node in [fparent1, fparent2]:
2701 if node in [fparent1, fparent2]:
2702 self.ui.debug(b'reusing %s filelog entry\n' % fname)
2702 self.ui.debug(b'reusing %s filelog entry\n' % fname)
2703 if (
2703 if (
2704 fparent1 != nullid
2704 fparent1 != nullid
2705 and manifest1.flags(fname) != fctx.flags()
2705 and manifest1.flags(fname) != fctx.flags()
2706 ) or (
2706 ) or (
2707 fparent2 != nullid
2707 fparent2 != nullid
2708 and manifest2.flags(fname) != fctx.flags()
2708 and manifest2.flags(fname) != fctx.flags()
2709 ):
2709 ):
2710 changelist.append(fname)
2710 changelist.append(fname)
2711 return node
2711 return node
2712
2712
2713 flog = self.file(fname)
2713 flog = self.file(fname)
2714 meta = {}
2714 meta = {}
2715 cfname = fctx.copysource()
2715 cfname = fctx.copysource()
2716 if cfname and cfname != fname:
2716 if cfname and cfname != fname:
2717 # Mark the new revision of this file as a copy of another
2717 # Mark the new revision of this file as a copy of another
2718 # file. This copy data will effectively act as a parent
2718 # file. This copy data will effectively act as a parent
2719 # of this new revision. If this is a merge, the first
2719 # of this new revision. If this is a merge, the first
2720 # parent will be the nullid (meaning "look up the copy data")
2720 # parent will be the nullid (meaning "look up the copy data")
2721 # and the second one will be the other parent. For example:
2721 # and the second one will be the other parent. For example:
2722 #
2722 #
2723 # 0 --- 1 --- 3 rev1 changes file foo
2723 # 0 --- 1 --- 3 rev1 changes file foo
2724 # \ / rev2 renames foo to bar and changes it
2724 # \ / rev2 renames foo to bar and changes it
2725 # \- 2 -/ rev3 should have bar with all changes and
2725 # \- 2 -/ rev3 should have bar with all changes and
2726 # should record that bar descends from
2726 # should record that bar descends from
2727 # bar in rev2 and foo in rev1
2727 # bar in rev2 and foo in rev1
2728 #
2728 #
2729 # this allows this merge to succeed:
2729 # this allows this merge to succeed:
2730 #
2730 #
2731 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
2731 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
2732 # \ / merging rev3 and rev4 should use bar@rev2
2732 # \ / merging rev3 and rev4 should use bar@rev2
2733 # \- 2 --- 4 as the merge base
2733 # \- 2 --- 4 as the merge base
2734 #
2734 #
2735
2735
2736 cnode = manifest1.get(cfname)
2736 cnode = manifest1.get(cfname)
2737 newfparent = fparent2
2737 newfparent = fparent2
2738
2738
2739 if manifest2: # branch merge
2739 if manifest2: # branch merge
2740 if fparent2 == nullid or cnode is None: # copied on remote side
2740 if fparent2 == nullid or cnode is None: # copied on remote side
2741 if cfname in manifest2:
2741 if cfname in manifest2:
2742 cnode = manifest2[cfname]
2742 cnode = manifest2[cfname]
2743 newfparent = fparent1
2743 newfparent = fparent1
2744
2744
2745 # Here, we used to search backwards through history to try to find
2745 # Here, we used to search backwards through history to try to find
2746 # where the file copy came from if the source of a copy was not in
2746 # where the file copy came from if the source of a copy was not in
2747 # the parent directory. However, this doesn't actually make sense to
2747 # the parent directory. However, this doesn't actually make sense to
2748 # do (what does a copy from something not in your working copy even
2748 # do (what does a copy from something not in your working copy even
2749 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
2749 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
2750 # the user that copy information was dropped, so if they didn't
2750 # the user that copy information was dropped, so if they didn't
2751 # expect this outcome it can be fixed, but this is the correct
2751 # expect this outcome it can be fixed, but this is the correct
2752 # behavior in this circumstance.
2752 # behavior in this circumstance.
2753
2753
2754 if cnode:
2754 if cnode:
2755 self.ui.debug(
2755 self.ui.debug(
2756 b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode))
2756 b" %s: copy %s:%s\n" % (fname, cfname, hex(cnode))
2757 )
2757 )
2758 if includecopymeta:
2758 if includecopymeta:
2759 meta[b"copy"] = cfname
2759 meta[b"copy"] = cfname
2760 meta[b"copyrev"] = hex(cnode)
2760 meta[b"copyrev"] = hex(cnode)
2761 fparent1, fparent2 = nullid, newfparent
2761 fparent1, fparent2 = nullid, newfparent
2762 else:
2762 else:
2763 self.ui.warn(
2763 self.ui.warn(
2764 _(
2764 _(
2765 b"warning: can't find ancestor for '%s' "
2765 b"warning: can't find ancestor for '%s' "
2766 b"copied from '%s'!\n"
2766 b"copied from '%s'!\n"
2767 )
2767 )
2768 % (fname, cfname)
2768 % (fname, cfname)
2769 )
2769 )
2770
2770
2771 elif fparent1 == nullid:
2771 elif fparent1 == nullid:
2772 fparent1, fparent2 = fparent2, nullid
2772 fparent1, fparent2 = fparent2, nullid
2773 elif fparent2 != nullid:
2773 elif fparent2 != nullid:
2774 # is one parent an ancestor of the other?
2774 # is one parent an ancestor of the other?
2775 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
2775 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
2776 if fparent1 in fparentancestors:
2776 if fparent1 in fparentancestors:
2777 fparent1, fparent2 = fparent2, nullid
2777 fparent1, fparent2 = fparent2, nullid
2778 elif fparent2 in fparentancestors:
2778 elif fparent2 in fparentancestors:
2779 fparent2 = nullid
2779 fparent2 = nullid
2780
2780
2781 # is the file changed?
2781 # is the file changed?
2782 text = fctx.data()
2782 text = fctx.data()
2783 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
2783 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
2784 changelist.append(fname)
2784 changelist.append(fname)
2785 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
2785 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
2786 # are just the flags changed during merge?
2786 # are just the flags changed during merge?
2787 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
2787 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
2788 changelist.append(fname)
2788 changelist.append(fname)
2789
2789
2790 return fparent1
2790 return fparent1
2791
2791
2792 def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
2792 def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
2793 """check for commit arguments that aren't committable"""
2793 """check for commit arguments that aren't committable"""
2794 if match.isexact() or match.prefix():
2794 if match.isexact() or match.prefix():
2795 matched = set(status.modified + status.added + status.removed)
2795 matched = set(status.modified + status.added + status.removed)
2796
2796
2797 for f in match.files():
2797 for f in match.files():
2798 f = self.dirstate.normalize(f)
2798 f = self.dirstate.normalize(f)
2799 if f == b'.' or f in matched or f in wctx.substate:
2799 if f == b'.' or f in matched or f in wctx.substate:
2800 continue
2800 continue
2801 if f in status.deleted:
2801 if f in status.deleted:
2802 fail(f, _(b'file not found!'))
2802 fail(f, _(b'file not found!'))
2803 if f in vdirs: # visited directory
2803 if f in vdirs: # visited directory
2804 d = f + b'/'
2804 d = f + b'/'
2805 for mf in matched:
2805 for mf in matched:
2806 if mf.startswith(d):
2806 if mf.startswith(d):
2807 break
2807 break
2808 else:
2808 else:
2809 fail(f, _(b"no match under directory!"))
2809 fail(f, _(b"no match under directory!"))
2810 elif f not in self.dirstate:
2810 elif f not in self.dirstate:
2811 fail(f, _(b"file not tracked!"))
2811 fail(f, _(b"file not tracked!"))
2812
2812
2813 @unfilteredmethod
2813 @unfilteredmethod
2814 def commit(
2814 def commit(
2815 self,
2815 self,
2816 text=b"",
2816 text=b"",
2817 user=None,
2817 user=None,
2818 date=None,
2818 date=None,
2819 match=None,
2819 match=None,
2820 force=False,
2820 force=False,
2821 editor=False,
2821 editor=False,
2822 extra=None,
2822 extra=None,
2823 ):
2823 ):
2824 """Add a new revision to current repository.
2824 """Add a new revision to current repository.
2825
2825
2826 Revision information is gathered from the working directory,
2826 Revision information is gathered from the working directory,
2827 match can be used to filter the committed files. If editor is
2827 match can be used to filter the committed files. If editor is
2828 supplied, it is called to get a commit message.
2828 supplied, it is called to get a commit message.
2829 """
2829 """
2830 if extra is None:
2830 if extra is None:
2831 extra = {}
2831 extra = {}
2832
2832
2833 def fail(f, msg):
2833 def fail(f, msg):
2834 raise error.Abort(b'%s: %s' % (f, msg))
2834 raise error.Abort(b'%s: %s' % (f, msg))
2835
2835
2836 if not match:
2836 if not match:
2837 match = matchmod.always()
2837 match = matchmod.always()
2838
2838
2839 if not force:
2839 if not force:
2840 vdirs = []
2840 vdirs = []
2841 match.explicitdir = vdirs.append
2841 match.explicitdir = vdirs.append
2842 match.bad = fail
2842 match.bad = fail
2843
2843
2844 # lock() for recent changelog (see issue4368)
2844 # lock() for recent changelog (see issue4368)
2845 with self.wlock(), self.lock():
2845 with self.wlock(), self.lock():
2846 wctx = self[None]
2846 wctx = self[None]
2847 merge = len(wctx.parents()) > 1
2847 merge = len(wctx.parents()) > 1
2848
2848
2849 if not force and merge and not match.always():
2849 if not force and merge and not match.always():
2850 raise error.Abort(
2850 raise error.Abort(
2851 _(
2851 _(
2852 b'cannot partially commit a merge '
2852 b'cannot partially commit a merge '
2853 b'(do not specify files or patterns)'
2853 b'(do not specify files or patterns)'
2854 )
2854 )
2855 )
2855 )
2856
2856
2857 status = self.status(match=match, clean=force)
2857 status = self.status(match=match, clean=force)
2858 if force:
2858 if force:
2859 status.modified.extend(
2859 status.modified.extend(
2860 status.clean
2860 status.clean
2861 ) # mq may commit clean files
2861 ) # mq may commit clean files
2862
2862
2863 # check subrepos
2863 # check subrepos
2864 subs, commitsubs, newstate = subrepoutil.precommit(
2864 subs, commitsubs, newstate = subrepoutil.precommit(
2865 self.ui, wctx, status, match, force=force
2865 self.ui, wctx, status, match, force=force
2866 )
2866 )
2867
2867
2868 # make sure all explicit patterns are matched
2868 # make sure all explicit patterns are matched
2869 if not force:
2869 if not force:
2870 self.checkcommitpatterns(wctx, vdirs, match, status, fail)
2870 self.checkcommitpatterns(wctx, vdirs, match, status, fail)
2871
2871
2872 cctx = context.workingcommitctx(
2872 cctx = context.workingcommitctx(
2873 self, status, text, user, date, extra
2873 self, status, text, user, date, extra
2874 )
2874 )
2875
2875
2876 # internal config: ui.allowemptycommit
2876 # internal config: ui.allowemptycommit
2877 allowemptycommit = (
2877 allowemptycommit = (
2878 wctx.branch() != wctx.p1().branch()
2878 wctx.branch() != wctx.p1().branch()
2879 or extra.get(b'close')
2879 or extra.get(b'close')
2880 or merge
2880 or merge
2881 or cctx.files()
2881 or cctx.files()
2882 or self.ui.configbool(b'ui', b'allowemptycommit')
2882 or self.ui.configbool(b'ui', b'allowemptycommit')
2883 )
2883 )
2884 if not allowemptycommit:
2884 if not allowemptycommit:
2885 return None
2885 return None
2886
2886
2887 if merge and cctx.deleted():
2887 if merge and cctx.deleted():
2888 raise error.Abort(_(b"cannot commit merge with missing files"))
2888 raise error.Abort(_(b"cannot commit merge with missing files"))
2889
2889
2890 ms = mergemod.mergestate.read(self)
2890 ms = mergemod.mergestate.read(self)
2891 mergeutil.checkunresolved(ms)
2891 mergeutil.checkunresolved(ms)
2892
2892
2893 if editor:
2893 if editor:
2894 cctx._text = editor(self, cctx, subs)
2894 cctx._text = editor(self, cctx, subs)
2895 edited = text != cctx._text
2895 edited = text != cctx._text
2896
2896
2897 # Save commit message in case this transaction gets rolled back
2897 # Save commit message in case this transaction gets rolled back
2898 # (e.g. by a pretxncommit hook). Leave the content alone on
2898 # (e.g. by a pretxncommit hook). Leave the content alone on
2899 # the assumption that the user will use the same editor again.
2899 # the assumption that the user will use the same editor again.
2900 msgfn = self.savecommitmessage(cctx._text)
2900 msgfn = self.savecommitmessage(cctx._text)
2901
2901
2902 # commit subs and write new state
2902 # commit subs and write new state
2903 if subs:
2903 if subs:
2904 uipathfn = scmutil.getuipathfn(self)
2904 uipathfn = scmutil.getuipathfn(self)
2905 for s in sorted(commitsubs):
2905 for s in sorted(commitsubs):
2906 sub = wctx.sub(s)
2906 sub = wctx.sub(s)
2907 self.ui.status(
2907 self.ui.status(
2908 _(b'committing subrepository %s\n')
2908 _(b'committing subrepository %s\n')
2909 % uipathfn(subrepoutil.subrelpath(sub))
2909 % uipathfn(subrepoutil.subrelpath(sub))
2910 )
2910 )
2911 sr = sub.commit(cctx._text, user, date)
2911 sr = sub.commit(cctx._text, user, date)
2912 newstate[s] = (newstate[s][0], sr)
2912 newstate[s] = (newstate[s][0], sr)
2913 subrepoutil.writestate(self, newstate)
2913 subrepoutil.writestate(self, newstate)
2914
2914
2915 p1, p2 = self.dirstate.parents()
2915 p1, p2 = self.dirstate.parents()
2916 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'')
2916 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or b'')
2917 try:
2917 try:
2918 self.hook(
2918 self.hook(
2919 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
2919 b"precommit", throw=True, parent1=hookp1, parent2=hookp2
2920 )
2920 )
2921 with self.transaction(b'commit'):
2921 with self.transaction(b'commit'):
2922 ret = self.commitctx(cctx, True)
2922 ret = self.commitctx(cctx, True)
2923 # update bookmarks, dirstate and mergestate
2923 # update bookmarks, dirstate and mergestate
2924 bookmarks.update(self, [p1, p2], ret)
2924 bookmarks.update(self, [p1, p2], ret)
2925 cctx.markcommitted(ret)
2925 cctx.markcommitted(ret)
2926 ms.reset()
2926 ms.reset()
2927 except: # re-raises
2927 except: # re-raises
2928 if edited:
2928 if edited:
2929 self.ui.write(
2929 self.ui.write(
2930 _(b'note: commit message saved in %s\n') % msgfn
2930 _(b'note: commit message saved in %s\n') % msgfn
2931 )
2931 )
2932 raise
2932 raise
2933
2933
2934 def commithook():
2934 def commithook():
2935 # hack for command that use a temporary commit (eg: histedit)
2935 # hack for command that use a temporary commit (eg: histedit)
2936 # temporary commit got stripped before hook release
2936 # temporary commit got stripped before hook release
2937 if self.changelog.hasnode(ret):
2937 if self.changelog.hasnode(ret):
2938 self.hook(
2938 self.hook(
2939 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
2939 b"commit", node=hex(ret), parent1=hookp1, parent2=hookp2
2940 )
2940 )
2941
2941
2942 self._afterlock(commithook)
2942 self._afterlock(commithook)
2943 return ret
2943 return ret
2944
2944
2945 @unfilteredmethod
2945 @unfilteredmethod
2946 def commitctx(self, ctx, error=False, origctx=None):
2946 def commitctx(self, ctx, error=False, origctx=None):
2947 """Add a new revision to current repository.
2947 """Add a new revision to current repository.
2948 Revision information is passed via the context argument.
2948 Revision information is passed via the context argument.
2949
2949
2950 ctx.files() should list all files involved in this commit, i.e.
2950 ctx.files() should list all files involved in this commit, i.e.
2951 modified/added/removed files. On merge, it may be wider than the
2951 modified/added/removed files. On merge, it may be wider than the
2952 ctx.files() to be committed, since any file nodes derived directly
2952 ctx.files() to be committed, since any file nodes derived directly
2953 from p1 or p2 are excluded from the committed ctx.files().
2953 from p1 or p2 are excluded from the committed ctx.files().
2954
2954
2955 origctx is for convert to work around the problem that bug
2955 origctx is for convert to work around the problem that bug
2956 fixes to the files list in changesets change hashes. For
2956 fixes to the files list in changesets change hashes. For
2957 convert to be the identity, it can pass an origctx and this
2957 convert to be the identity, it can pass an origctx and this
2958 function will use the same files list when it makes sense to
2958 function will use the same files list when it makes sense to
2959 do so.
2959 do so.
2960 """
2960 """
2961
2961
2962 p1, p2 = ctx.p1(), ctx.p2()
2962 p1, p2 = ctx.p1(), ctx.p2()
2963 user = ctx.user()
2963 user = ctx.user()
2964
2964
2965 if self.filecopiesmode == b'changeset-sidedata':
2965 if self.filecopiesmode == b'changeset-sidedata':
2966 writechangesetcopy = True
2966 writechangesetcopy = True
2967 writefilecopymeta = True
2967 writefilecopymeta = True
2968 writecopiesto = None
2968 writecopiesto = None
2969 else:
2969 else:
2970 writecopiesto = self.ui.config(b'experimental', b'copies.write-to')
2970 writecopiesto = self.ui.config(b'experimental', b'copies.write-to')
2971 writefilecopymeta = writecopiesto != b'changeset-only'
2971 writefilecopymeta = writecopiesto != b'changeset-only'
2972 writechangesetcopy = writecopiesto in (
2972 writechangesetcopy = writecopiesto in (
2973 b'changeset-only',
2973 b'changeset-only',
2974 b'compatibility',
2974 b'compatibility',
2975 )
2975 )
2976 p1copies, p2copies = None, None
2976 p1copies, p2copies = None, None
2977 if writechangesetcopy:
2977 if writechangesetcopy:
2978 p1copies = ctx.p1copies()
2978 p1copies = ctx.p1copies()
2979 p2copies = ctx.p2copies()
2979 p2copies = ctx.p2copies()
2980 filesadded, filesremoved = None, None
2980 filesadded, filesremoved = None, None
2981 with self.lock(), self.transaction(b"commit") as tr:
2981 with self.lock(), self.transaction(b"commit") as tr:
2982 trp = weakref.proxy(tr)
2982 trp = weakref.proxy(tr)
2983
2983
2984 if ctx.manifestnode():
2984 if ctx.manifestnode():
2985 # reuse an existing manifest revision
2985 # reuse an existing manifest revision
2986 self.ui.debug(b'reusing known manifest\n')
2986 self.ui.debug(b'reusing known manifest\n')
2987 mn = ctx.manifestnode()
2987 mn = ctx.manifestnode()
2988 files = ctx.files()
2988 files = ctx.files()
2989 if writechangesetcopy:
2989 if writechangesetcopy:
2990 filesadded = ctx.filesadded()
2990 filesadded = ctx.filesadded()
2991 filesremoved = ctx.filesremoved()
2991 filesremoved = ctx.filesremoved()
2992 elif ctx.files():
2992 elif ctx.files():
2993 m1ctx = p1.manifestctx()
2993 m1ctx = p1.manifestctx()
2994 m2ctx = p2.manifestctx()
2994 m2ctx = p2.manifestctx()
2995 mctx = m1ctx.copy()
2995 mctx = m1ctx.copy()
2996
2996
2997 m = mctx.read()
2997 m = mctx.read()
2998 m1 = m1ctx.read()
2998 m1 = m1ctx.read()
2999 m2 = m2ctx.read()
2999 m2 = m2ctx.read()
3000
3000
3001 # check in files
3001 # check in files
3002 added = []
3002 added = []
3003 changed = []
3003 changed = []
3004 removed = list(ctx.removed())
3004 removed = list(ctx.removed())
3005 linkrev = len(self)
3005 linkrev = len(self)
3006 self.ui.note(_(b"committing files:\n"))
3006 self.ui.note(_(b"committing files:\n"))
3007 uipathfn = scmutil.getuipathfn(self)
3007 uipathfn = scmutil.getuipathfn(self)
3008 for f in sorted(ctx.modified() + ctx.added()):
3008 for f in sorted(ctx.modified() + ctx.added()):
3009 self.ui.note(uipathfn(f) + b"\n")
3009 self.ui.note(uipathfn(f) + b"\n")
3010 try:
3010 try:
3011 fctx = ctx[f]
3011 fctx = ctx[f]
3012 if fctx is None:
3012 if fctx is None:
3013 removed.append(f)
3013 removed.append(f)
3014 else:
3014 else:
3015 added.append(f)
3015 added.append(f)
3016 m[f] = self._filecommit(
3016 m[f] = self._filecommit(
3017 fctx,
3017 fctx,
3018 m1,
3018 m1,
3019 m2,
3019 m2,
3020 linkrev,
3020 linkrev,
3021 trp,
3021 trp,
3022 changed,
3022 changed,
3023 writefilecopymeta,
3023 writefilecopymeta,
3024 )
3024 )
3025 m.setflag(f, fctx.flags())
3025 m.setflag(f, fctx.flags())
3026 except OSError:
3026 except OSError:
3027 self.ui.warn(
3027 self.ui.warn(
3028 _(b"trouble committing %s!\n") % uipathfn(f)
3028 _(b"trouble committing %s!\n") % uipathfn(f)
3029 )
3029 )
3030 raise
3030 raise
3031 except IOError as inst:
3031 except IOError as inst:
3032 errcode = getattr(inst, 'errno', errno.ENOENT)
3032 errcode = getattr(inst, 'errno', errno.ENOENT)
3033 if error or errcode and errcode != errno.ENOENT:
3033 if error or errcode and errcode != errno.ENOENT:
3034 self.ui.warn(
3034 self.ui.warn(
3035 _(b"trouble committing %s!\n") % uipathfn(f)
3035 _(b"trouble committing %s!\n") % uipathfn(f)
3036 )
3036 )
3037 raise
3037 raise
3038
3038
3039 # update manifest
3039 # update manifest
3040 removed = [f for f in removed if f in m1 or f in m2]
3040 removed = [f for f in removed if f in m1 or f in m2]
3041 drop = sorted([f for f in removed if f in m])
3041 drop = sorted([f for f in removed if f in m])
3042 for f in drop:
3042 for f in drop:
3043 del m[f]
3043 del m[f]
3044 if p2.rev() != nullrev:
3044 if p2.rev() != nullrev:
3045
3045
3046 @util.cachefunc
3046 @util.cachefunc
3047 def mas():
3047 def mas():
3048 p1n = p1.node()
3048 p1n = p1.node()
3049 p2n = p2.node()
3049 p2n = p2.node()
3050 cahs = self.changelog.commonancestorsheads(p1n, p2n)
3050 cahs = self.changelog.commonancestorsheads(p1n, p2n)
3051 if not cahs:
3051 if not cahs:
3052 cahs = [nullrev]
3052 cahs = [nullrev]
3053 return [self[r].manifest() for r in cahs]
3053 return [self[r].manifest() for r in cahs]
3054
3054
3055 def deletionfromparent(f):
3055 def deletionfromparent(f):
3056 # When a file is removed relative to p1 in a merge, this
3056 # When a file is removed relative to p1 in a merge, this
3057 # function determines whether the absence is due to a
3057 # function determines whether the absence is due to a
3058 # deletion from a parent, or whether the merge commit
3058 # deletion from a parent, or whether the merge commit
3059 # itself deletes the file. We decide this by doing a
3059 # itself deletes the file. We decide this by doing a
3060 # simplified three way merge of the manifest entry for
3060 # simplified three way merge of the manifest entry for
3061 # the file. There are two ways we decide the merge
3061 # the file. There are two ways we decide the merge
3062 # itself didn't delete a file:
3062 # itself didn't delete a file:
3063 # - neither parent (nor the merge) contain the file
3063 # - neither parent (nor the merge) contain the file
3064 # - exactly one parent contains the file, and that
3064 # - exactly one parent contains the file, and that
3065 # parent has the same filelog entry as the merge
3065 # parent has the same filelog entry as the merge
3066 # ancestor (or all of them if there two). In other
3066 # ancestor (or all of them if there two). In other
3067 # words, that parent left the file unchanged while the
3067 # words, that parent left the file unchanged while the
3068 # other one deleted it.
3068 # other one deleted it.
3069 # One way to think about this is that deleting a file is
3069 # One way to think about this is that deleting a file is
3070 # similar to emptying it, so the list of changed files
3070 # similar to emptying it, so the list of changed files
3071 # should be similar either way. The computation
3071 # should be similar either way. The computation
3072 # described above is not done directly in _filecommit
3072 # described above is not done directly in _filecommit
3073 # when creating the list of changed files, however
3073 # when creating the list of changed files, however
3074 # it does something very similar by comparing filelog
3074 # it does something very similar by comparing filelog
3075 # nodes.
3075 # nodes.
3076 if f in m1:
3076 if f in m1:
3077 return f not in m2 and all(
3077 return f not in m2 and all(
3078 f in ma and ma.find(f) == m1.find(f)
3078 f in ma and ma.find(f) == m1.find(f)
3079 for ma in mas()
3079 for ma in mas()
3080 )
3080 )
3081 elif f in m2:
3081 elif f in m2:
3082 return all(
3082 return all(
3083 f in ma and ma.find(f) == m2.find(f)
3083 f in ma and ma.find(f) == m2.find(f)
3084 for ma in mas()
3084 for ma in mas()
3085 )
3085 )
3086 else:
3086 else:
3087 return True
3087 return True
3088
3088
3089 removed = [f for f in removed if not deletionfromparent(f)]
3089 removed = [f for f in removed if not deletionfromparent(f)]
3090
3090
3091 files = changed + removed
3091 files = changed + removed
3092 md = None
3092 md = None
3093 if not files:
3093 if not files:
3094 # if no "files" actually changed in terms of the changelog,
3094 # if no "files" actually changed in terms of the changelog,
3095 # try hard to detect unmodified manifest entry so that the
3095 # try hard to detect unmodified manifest entry so that the
3096 # exact same commit can be reproduced later on convert.
3096 # exact same commit can be reproduced later on convert.
3097 md = m1.diff(m, scmutil.matchfiles(self, ctx.files()))
3097 md = m1.diff(m, scmutil.matchfiles(self, ctx.files()))
3098 if not files and md:
3098 if not files and md:
3099 self.ui.debug(
3099 self.ui.debug(
3100 b'not reusing manifest (no file change in '
3100 b'not reusing manifest (no file change in '
3101 b'changelog, but manifest differs)\n'
3101 b'changelog, but manifest differs)\n'
3102 )
3102 )
3103 if files or md:
3103 if files or md:
3104 self.ui.note(_(b"committing manifest\n"))
3104 self.ui.note(_(b"committing manifest\n"))
3105 # we're using narrowmatch here since it's already applied at
3105 # we're using narrowmatch here since it's already applied at
3106 # other stages (such as dirstate.walk), so we're already
3106 # other stages (such as dirstate.walk), so we're already
3107 # ignoring things outside of narrowspec in most cases. The
3107 # ignoring things outside of narrowspec in most cases. The
3108 # one case where we might have files outside the narrowspec
3108 # one case where we might have files outside the narrowspec
3109 # at this point is merges, and we already error out in the
3109 # at this point is merges, and we already error out in the
3110 # case where the merge has files outside of the narrowspec,
3110 # case where the merge has files outside of the narrowspec,
3111 # so this is safe.
3111 # so this is safe.
3112 mn = mctx.write(
3112 mn = mctx.write(
3113 trp,
3113 trp,
3114 linkrev,
3114 linkrev,
3115 p1.manifestnode(),
3115 p1.manifestnode(),
3116 p2.manifestnode(),
3116 p2.manifestnode(),
3117 added,
3117 added,
3118 drop,
3118 drop,
3119 match=self.narrowmatch(),
3119 match=self.narrowmatch(),
3120 )
3120 )
3121
3121
3122 if writechangesetcopy:
3122 if writechangesetcopy:
3123 filesadded = [
3123 filesadded = [
3124 f for f in changed if not (f in m1 or f in m2)
3124 f for f in changed if not (f in m1 or f in m2)
3125 ]
3125 ]
3126 filesremoved = removed
3126 filesremoved = removed
3127 else:
3127 else:
3128 self.ui.debug(
3128 self.ui.debug(
3129 b'reusing manifest from p1 (listed files '
3129 b'reusing manifest from p1 (listed files '
3130 b'actually unchanged)\n'
3130 b'actually unchanged)\n'
3131 )
3131 )
3132 mn = p1.manifestnode()
3132 mn = p1.manifestnode()
3133 else:
3133 else:
3134 self.ui.debug(b'reusing manifest from p1 (no file change)\n')
3134 self.ui.debug(b'reusing manifest from p1 (no file change)\n')
3135 mn = p1.manifestnode()
3135 mn = p1.manifestnode()
3136 files = []
3136 files = []
3137
3137
3138 if writecopiesto == b'changeset-only':
3138 if writecopiesto == b'changeset-only':
3139 # If writing only to changeset extras, use None to indicate that
3139 # If writing only to changeset extras, use None to indicate that
3140 # no entry should be written. If writing to both, write an empty
3140 # no entry should be written. If writing to both, write an empty
3141 # entry to prevent the reader from falling back to reading
3141 # entry to prevent the reader from falling back to reading
3142 # filelogs.
3142 # filelogs.
3143 p1copies = p1copies or None
3143 p1copies = p1copies or None
3144 p2copies = p2copies or None
3144 p2copies = p2copies or None
3145 filesadded = filesadded or None
3145 filesadded = filesadded or None
3146 filesremoved = filesremoved or None
3146 filesremoved = filesremoved or None
3147
3147
3148 if origctx and origctx.manifestnode() == mn:
3148 if origctx and origctx.manifestnode() == mn:
3149 files = origctx.files()
3149 files = origctx.files()
3150
3150
3151 # update changelog
3151 # update changelog
3152 self.ui.note(_(b"committing changelog\n"))
3152 self.ui.note(_(b"committing changelog\n"))
3153 self.changelog.delayupdate(tr)
3153 self.changelog.delayupdate(tr)
3154 n = self.changelog.add(
3154 n = self.changelog.add(
3155 mn,
3155 mn,
3156 files,
3156 files,
3157 ctx.description(),
3157 ctx.description(),
3158 trp,
3158 trp,
3159 p1.node(),
3159 p1.node(),
3160 p2.node(),
3160 p2.node(),
3161 user,
3161 user,
3162 ctx.date(),
3162 ctx.date(),
3163 ctx.extra().copy(),
3163 ctx.extra().copy(),
3164 p1copies,
3164 p1copies,
3165 p2copies,
3165 p2copies,
3166 filesadded,
3166 filesadded,
3167 filesremoved,
3167 filesremoved,
3168 )
3168 )
3169 xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
3169 xp1, xp2 = p1.hex(), p2 and p2.hex() or b''
3170 self.hook(
3170 self.hook(
3171 b'pretxncommit',
3171 b'pretxncommit',
3172 throw=True,
3172 throw=True,
3173 node=hex(n),
3173 node=hex(n),
3174 parent1=xp1,
3174 parent1=xp1,
3175 parent2=xp2,
3175 parent2=xp2,
3176 )
3176 )
3177 # set the new commit is proper phase
3177 # set the new commit is proper phase
3178 targetphase = subrepoutil.newcommitphase(self.ui, ctx)
3178 targetphase = subrepoutil.newcommitphase(self.ui, ctx)
3179 if targetphase:
3179 if targetphase:
3180 # retract boundary do not alter parent changeset.
3180 # retract boundary do not alter parent changeset.
3181 # if a parent have higher the resulting phase will
3181 # if a parent have higher the resulting phase will
3182 # be compliant anyway
3182 # be compliant anyway
3183 #
3183 #
3184 # if minimal phase was 0 we don't need to retract anything
3184 # if minimal phase was 0 we don't need to retract anything
3185 phases.registernew(self, tr, targetphase, [n])
3185 phases.registernew(self, tr, targetphase, [n])
3186 return n
3186 return n
3187
3187
3188 @unfilteredmethod
3188 @unfilteredmethod
3189 def destroying(self):
3189 def destroying(self):
3190 '''Inform the repository that nodes are about to be destroyed.
3190 '''Inform the repository that nodes are about to be destroyed.
3191 Intended for use by strip and rollback, so there's a common
3191 Intended for use by strip and rollback, so there's a common
3192 place for anything that has to be done before destroying history.
3192 place for anything that has to be done before destroying history.
3193
3193
3194 This is mostly useful for saving state that is in memory and waiting
3194 This is mostly useful for saving state that is in memory and waiting
3195 to be flushed when the current lock is released. Because a call to
3195 to be flushed when the current lock is released. Because a call to
3196 destroyed is imminent, the repo will be invalidated causing those
3196 destroyed is imminent, the repo will be invalidated causing those
3197 changes to stay in memory (waiting for the next unlock), or vanish
3197 changes to stay in memory (waiting for the next unlock), or vanish
3198 completely.
3198 completely.
3199 '''
3199 '''
3200 # When using the same lock to commit and strip, the phasecache is left
3200 # When using the same lock to commit and strip, the phasecache is left
3201 # dirty after committing. Then when we strip, the repo is invalidated,
3201 # dirty after committing. Then when we strip, the repo is invalidated,
3202 # causing those changes to disappear.
3202 # causing those changes to disappear.
3203 if '_phasecache' in vars(self):
3203 if '_phasecache' in vars(self):
3204 self._phasecache.write()
3204 self._phasecache.write()
3205
3205
3206 @unfilteredmethod
3206 @unfilteredmethod
3207 def destroyed(self):
3207 def destroyed(self):
3208 '''Inform the repository that nodes have been destroyed.
3208 '''Inform the repository that nodes have been destroyed.
3209 Intended for use by strip and rollback, so there's a common
3209 Intended for use by strip and rollback, so there's a common
3210 place for anything that has to be done after destroying history.
3210 place for anything that has to be done after destroying history.
3211 '''
3211 '''
3212 # When one tries to:
3212 # When one tries to:
3213 # 1) destroy nodes thus calling this method (e.g. strip)
3213 # 1) destroy nodes thus calling this method (e.g. strip)
3214 # 2) use phasecache somewhere (e.g. commit)
3214 # 2) use phasecache somewhere (e.g. commit)
3215 #
3215 #
3216 # then 2) will fail because the phasecache contains nodes that were
3216 # then 2) will fail because the phasecache contains nodes that were
3217 # removed. We can either remove phasecache from the filecache,
3217 # removed. We can either remove phasecache from the filecache,
3218 # causing it to reload next time it is accessed, or simply filter
3218 # causing it to reload next time it is accessed, or simply filter
3219 # the removed nodes now and write the updated cache.
3219 # the removed nodes now and write the updated cache.
3220 self._phasecache.filterunknown(self)
3220 self._phasecache.filterunknown(self)
3221 self._phasecache.write()
3221 self._phasecache.write()
3222
3222
3223 # refresh all repository caches
3223 # refresh all repository caches
3224 self.updatecaches()
3224 self.updatecaches()
3225
3225
3226 # Ensure the persistent tag cache is updated. Doing it now
3226 # Ensure the persistent tag cache is updated. Doing it now
3227 # means that the tag cache only has to worry about destroyed
3227 # means that the tag cache only has to worry about destroyed
3228 # heads immediately after a strip/rollback. That in turn
3228 # heads immediately after a strip/rollback. That in turn
3229 # guarantees that "cachetip == currenttip" (comparing both rev
3229 # guarantees that "cachetip == currenttip" (comparing both rev
3230 # and node) always means no nodes have been added or destroyed.
3230 # and node) always means no nodes have been added or destroyed.
3231
3231
3232 # XXX this is suboptimal when qrefresh'ing: we strip the current
3232 # XXX this is suboptimal when qrefresh'ing: we strip the current
3233 # head, refresh the tag cache, then immediately add a new head.
3233 # head, refresh the tag cache, then immediately add a new head.
3234 # But I think doing it this way is necessary for the "instant
3234 # But I think doing it this way is necessary for the "instant
3235 # tag cache retrieval" case to work.
3235 # tag cache retrieval" case to work.
3236 self.invalidate()
3236 self.invalidate()
3237
3237
3238 def status(
3238 def status(
3239 self,
3239 self,
3240 node1=b'.',
3240 node1=b'.',
3241 node2=None,
3241 node2=None,
3242 match=None,
3242 match=None,
3243 ignored=False,
3243 ignored=False,
3244 clean=False,
3244 clean=False,
3245 unknown=False,
3245 unknown=False,
3246 listsubrepos=False,
3246 listsubrepos=False,
3247 ):
3247 ):
3248 '''a convenience method that calls node1.status(node2)'''
3248 '''a convenience method that calls node1.status(node2)'''
3249 return self[node1].status(
3249 return self[node1].status(
3250 node2, match, ignored, clean, unknown, listsubrepos
3250 node2, match, ignored, clean, unknown, listsubrepos
3251 )
3251 )
3252
3252
3253 def addpostdsstatus(self, ps):
3253 def addpostdsstatus(self, ps):
3254 """Add a callback to run within the wlock, at the point at which status
3254 """Add a callback to run within the wlock, at the point at which status
3255 fixups happen.
3255 fixups happen.
3256
3256
3257 On status completion, callback(wctx, status) will be called with the
3257 On status completion, callback(wctx, status) will be called with the
3258 wlock held, unless the dirstate has changed from underneath or the wlock
3258 wlock held, unless the dirstate has changed from underneath or the wlock
3259 couldn't be grabbed.
3259 couldn't be grabbed.
3260
3260
3261 Callbacks should not capture and use a cached copy of the dirstate --
3261 Callbacks should not capture and use a cached copy of the dirstate --
3262 it might change in the meanwhile. Instead, they should access the
3262 it might change in the meanwhile. Instead, they should access the
3263 dirstate via wctx.repo().dirstate.
3263 dirstate via wctx.repo().dirstate.
3264
3264
3265 This list is emptied out after each status run -- extensions should
3265 This list is emptied out after each status run -- extensions should
3266 make sure it adds to this list each time dirstate.status is called.
3266 make sure it adds to this list each time dirstate.status is called.
3267 Extensions should also make sure they don't call this for statuses
3267 Extensions should also make sure they don't call this for statuses
3268 that don't involve the dirstate.
3268 that don't involve the dirstate.
3269 """
3269 """
3270
3270
3271 # The list is located here for uniqueness reasons -- it is actually
3271 # The list is located here for uniqueness reasons -- it is actually
3272 # managed by the workingctx, but that isn't unique per-repo.
3272 # managed by the workingctx, but that isn't unique per-repo.
3273 self._postdsstatus.append(ps)
3273 self._postdsstatus.append(ps)
3274
3274
3275 def postdsstatus(self):
3275 def postdsstatus(self):
3276 """Used by workingctx to get the list of post-dirstate-status hooks."""
3276 """Used by workingctx to get the list of post-dirstate-status hooks."""
3277 return self._postdsstatus
3277 return self._postdsstatus
3278
3278
3279 def clearpostdsstatus(self):
3279 def clearpostdsstatus(self):
3280 """Used by workingctx to clear post-dirstate-status hooks."""
3280 """Used by workingctx to clear post-dirstate-status hooks."""
3281 del self._postdsstatus[:]
3281 del self._postdsstatus[:]
3282
3282
3283 def heads(self, start=None):
3283 def heads(self, start=None):
3284 if start is None:
3284 if start is None:
3285 cl = self.changelog
3285 cl = self.changelog
3286 headrevs = reversed(cl.headrevs())
3286 headrevs = reversed(cl.headrevs())
3287 return [cl.node(rev) for rev in headrevs]
3287 return [cl.node(rev) for rev in headrevs]
3288
3288
3289 heads = self.changelog.heads(start)
3289 heads = self.changelog.heads(start)
3290 # sort the output in rev descending order
3290 # sort the output in rev descending order
3291 return sorted(heads, key=self.changelog.rev, reverse=True)
3291 return sorted(heads, key=self.changelog.rev, reverse=True)
3292
3292
3293 def branchheads(self, branch=None, start=None, closed=False):
3293 def branchheads(self, branch=None, start=None, closed=False):
3294 '''return a (possibly filtered) list of heads for the given branch
3294 '''return a (possibly filtered) list of heads for the given branch
3295
3295
3296 Heads are returned in topological order, from newest to oldest.
3296 Heads are returned in topological order, from newest to oldest.
3297 If branch is None, use the dirstate branch.
3297 If branch is None, use the dirstate branch.
3298 If start is not None, return only heads reachable from start.
3298 If start is not None, return only heads reachable from start.
3299 If closed is True, return heads that are marked as closed as well.
3299 If closed is True, return heads that are marked as closed as well.
3300 '''
3300 '''
3301 if branch is None:
3301 if branch is None:
3302 branch = self[None].branch()
3302 branch = self[None].branch()
3303 branches = self.branchmap()
3303 branches = self.branchmap()
3304 if not branches.hasbranch(branch):
3304 if not branches.hasbranch(branch):
3305 return []
3305 return []
3306 # the cache returns heads ordered lowest to highest
3306 # the cache returns heads ordered lowest to highest
3307 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3307 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
3308 if start is not None:
3308 if start is not None:
3309 # filter out the heads that cannot be reached from startrev
3309 # filter out the heads that cannot be reached from startrev
3310 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3310 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
3311 bheads = [h for h in bheads if h in fbheads]
3311 bheads = [h for h in bheads if h in fbheads]
3312 return bheads
3312 return bheads
3313
3313
3314 def branches(self, nodes):
3314 def branches(self, nodes):
3315 if not nodes:
3315 if not nodes:
3316 nodes = [self.changelog.tip()]
3316 nodes = [self.changelog.tip()]
3317 b = []
3317 b = []
3318 for n in nodes:
3318 for n in nodes:
3319 t = n
3319 t = n
3320 while True:
3320 while True:
3321 p = self.changelog.parents(n)
3321 p = self.changelog.parents(n)
3322 if p[1] != nullid or p[0] == nullid:
3322 if p[1] != nullid or p[0] == nullid:
3323 b.append((t, n, p[0], p[1]))
3323 b.append((t, n, p[0], p[1]))
3324 break
3324 break
3325 n = p[0]
3325 n = p[0]
3326 return b
3326 return b
3327
3327
3328 def between(self, pairs):
3328 def between(self, pairs):
3329 r = []
3329 r = []
3330
3330
3331 for top, bottom in pairs:
3331 for top, bottom in pairs:
3332 n, l, i = top, [], 0
3332 n, l, i = top, [], 0
3333 f = 1
3333 f = 1
3334
3334
3335 while n != bottom and n != nullid:
3335 while n != bottom and n != nullid:
3336 p = self.changelog.parents(n)[0]
3336 p = self.changelog.parents(n)[0]
3337 if i == f:
3337 if i == f:
3338 l.append(n)
3338 l.append(n)
3339 f = f * 2
3339 f = f * 2
3340 n = p
3340 n = p
3341 i += 1
3341 i += 1
3342
3342
3343 r.append(l)
3343 r.append(l)
3344
3344
3345 return r
3345 return r
3346
3346
3347 def checkpush(self, pushop):
3347 def checkpush(self, pushop):
3348 """Extensions can override this function if additional checks have
3348 """Extensions can override this function if additional checks have
3349 to be performed before pushing, or call it if they override push
3349 to be performed before pushing, or call it if they override push
3350 command.
3350 command.
3351 """
3351 """
3352
3352
3353 @unfilteredpropertycache
3353 @unfilteredpropertycache
3354 def prepushoutgoinghooks(self):
3354 def prepushoutgoinghooks(self):
3355 """Return util.hooks consists of a pushop with repo, remote, outgoing
3355 """Return util.hooks consists of a pushop with repo, remote, outgoing
3356 methods, which are called before pushing changesets.
3356 methods, which are called before pushing changesets.
3357 """
3357 """
3358 return util.hooks()
3358 return util.hooks()
3359
3359
3360 def pushkey(self, namespace, key, old, new):
3360 def pushkey(self, namespace, key, old, new):
3361 try:
3361 try:
3362 tr = self.currenttransaction()
3362 tr = self.currenttransaction()
3363 hookargs = {}
3363 hookargs = {}
3364 if tr is not None:
3364 if tr is not None:
3365 hookargs.update(tr.hookargs)
3365 hookargs.update(tr.hookargs)
3366 hookargs = pycompat.strkwargs(hookargs)
3366 hookargs = pycompat.strkwargs(hookargs)
3367 hookargs['namespace'] = namespace
3367 hookargs['namespace'] = namespace
3368 hookargs['key'] = key
3368 hookargs['key'] = key
3369 hookargs['old'] = old
3369 hookargs['old'] = old
3370 hookargs['new'] = new
3370 hookargs['new'] = new
3371 self.hook(b'prepushkey', throw=True, **hookargs)
3371 self.hook(b'prepushkey', throw=True, **hookargs)
3372 except error.HookAbort as exc:
3372 except error.HookAbort as exc:
3373 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3373 self.ui.write_err(_(b"pushkey-abort: %s\n") % exc)
3374 if exc.hint:
3374 if exc.hint:
3375 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3375 self.ui.write_err(_(b"(%s)\n") % exc.hint)
3376 return False
3376 return False
3377 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3377 self.ui.debug(b'pushing key for "%s:%s"\n' % (namespace, key))
3378 ret = pushkey.push(self, namespace, key, old, new)
3378 ret = pushkey.push(self, namespace, key, old, new)
3379
3379
3380 def runhook():
3380 def runhook():
3381 self.hook(
3381 self.hook(
3382 b'pushkey',
3382 b'pushkey',
3383 namespace=namespace,
3383 namespace=namespace,
3384 key=key,
3384 key=key,
3385 old=old,
3385 old=old,
3386 new=new,
3386 new=new,
3387 ret=ret,
3387 ret=ret,
3388 )
3388 )
3389
3389
3390 self._afterlock(runhook)
3390 self._afterlock(runhook)
3391 return ret
3391 return ret
3392
3392
3393 def listkeys(self, namespace):
3393 def listkeys(self, namespace):
3394 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3394 self.hook(b'prelistkeys', throw=True, namespace=namespace)
3395 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3395 self.ui.debug(b'listing keys for "%s"\n' % namespace)
3396 values = pushkey.list(self, namespace)
3396 values = pushkey.list(self, namespace)
3397 self.hook(b'listkeys', namespace=namespace, values=values)
3397 self.hook(b'listkeys', namespace=namespace, values=values)
3398 return values
3398 return values
3399
3399
3400 def debugwireargs(self, one, two, three=None, four=None, five=None):
3400 def debugwireargs(self, one, two, three=None, four=None, five=None):
3401 '''used to test argument passing over the wire'''
3401 '''used to test argument passing over the wire'''
3402 return b"%s %s %s %s %s" % (
3402 return b"%s %s %s %s %s" % (
3403 one,
3403 one,
3404 two,
3404 two,
3405 pycompat.bytestr(three),
3405 pycompat.bytestr(three),
3406 pycompat.bytestr(four),
3406 pycompat.bytestr(four),
3407 pycompat.bytestr(five),
3407 pycompat.bytestr(five),
3408 )
3408 )
3409
3409
3410 def savecommitmessage(self, text):
3410 def savecommitmessage(self, text):
3411 fp = self.vfs(b'last-message.txt', b'wb')
3411 fp = self.vfs(b'last-message.txt', b'wb')
3412 try:
3412 try:
3413 fp.write(text)
3413 fp.write(text)
3414 finally:
3414 finally:
3415 fp.close()
3415 fp.close()
3416 return self.pathto(fp.name[len(self.root) + 1 :])
3416 return self.pathto(fp.name[len(self.root) + 1 :])
3417
3417
3418
3418
3419 # used to avoid circular references so destructors work
3419 # used to avoid circular references so destructors work
3420 def aftertrans(files):
3420 def aftertrans(files):
3421 renamefiles = [tuple(t) for t in files]
3421 renamefiles = [tuple(t) for t in files]
3422
3422
3423 def a():
3423 def a():
3424 for vfs, src, dest in renamefiles:
3424 for vfs, src, dest in renamefiles:
3425 # if src and dest refer to a same file, vfs.rename is a no-op,
3425 # if src and dest refer to a same file, vfs.rename is a no-op,
3426 # leaving both src and dest on disk. delete dest to make sure
3426 # leaving both src and dest on disk. delete dest to make sure
3427 # the rename couldn't be such a no-op.
3427 # the rename couldn't be such a no-op.
3428 vfs.tryunlink(dest)
3428 vfs.tryunlink(dest)
3429 try:
3429 try:
3430 vfs.rename(src, dest)
3430 vfs.rename(src, dest)
3431 except OSError: # journal file does not yet exist
3431 except OSError: # journal file does not yet exist
3432 pass
3432 pass
3433
3433
3434 return a
3434 return a
3435
3435
3436
3436
3437 def undoname(fn):
3437 def undoname(fn):
3438 base, name = os.path.split(fn)
3438 base, name = os.path.split(fn)
3439 assert name.startswith(b'journal')
3439 assert name.startswith(b'journal')
3440 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3440 return os.path.join(base, name.replace(b'journal', b'undo', 1))
3441
3441
3442
3442
3443 def instance(ui, path, create, intents=None, createopts=None):
3443 def instance(ui, path, create, intents=None, createopts=None):
3444 localpath = util.urllocalpath(path)
3444 localpath = util.urllocalpath(path)
3445 if create:
3445 if create:
3446 createrepository(ui, localpath, createopts=createopts)
3446 createrepository(ui, localpath, createopts=createopts)
3447
3447
3448 return makelocalrepository(ui, localpath, intents=intents)
3448 return makelocalrepository(ui, localpath, intents=intents)
3449
3449
3450
3450
3451 def islocal(path):
3451 def islocal(path):
3452 return True
3452 return True
3453
3453
3454
3454
3455 def defaultcreateopts(ui, createopts=None):
3455 def defaultcreateopts(ui, createopts=None):
3456 """Populate the default creation options for a repository.
3456 """Populate the default creation options for a repository.
3457
3457
3458 A dictionary of explicitly requested creation options can be passed
3458 A dictionary of explicitly requested creation options can be passed
3459 in. Missing keys will be populated.
3459 in. Missing keys will be populated.
3460 """
3460 """
3461 createopts = dict(createopts or {})
3461 createopts = dict(createopts or {})
3462
3462
3463 if b'backend' not in createopts:
3463 if b'backend' not in createopts:
3464 # experimental config: storage.new-repo-backend
3464 # experimental config: storage.new-repo-backend
3465 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3465 createopts[b'backend'] = ui.config(b'storage', b'new-repo-backend')
3466
3466
3467 return createopts
3467 return createopts
3468
3468
3469
3469
3470 def newreporequirements(ui, createopts):
3470 def newreporequirements(ui, createopts):
3471 """Determine the set of requirements for a new local repository.
3471 """Determine the set of requirements for a new local repository.
3472
3472
3473 Extensions can wrap this function to specify custom requirements for
3473 Extensions can wrap this function to specify custom requirements for
3474 new repositories.
3474 new repositories.
3475 """
3475 """
3476 # If the repo is being created from a shared repository, we copy
3476 # If the repo is being created from a shared repository, we copy
3477 # its requirements.
3477 # its requirements.
3478 if b'sharedrepo' in createopts:
3478 if b'sharedrepo' in createopts:
3479 requirements = set(createopts[b'sharedrepo'].requirements)
3479 requirements = set(createopts[b'sharedrepo'].requirements)
3480 if createopts.get(b'sharedrelative'):
3480 if createopts.get(b'sharedrelative'):
3481 requirements.add(b'relshared')
3481 requirements.add(b'relshared')
3482 else:
3482 else:
3483 requirements.add(b'shared')
3483 requirements.add(b'shared')
3484
3484
3485 return requirements
3485 return requirements
3486
3486
3487 if b'backend' not in createopts:
3487 if b'backend' not in createopts:
3488 raise error.ProgrammingError(
3488 raise error.ProgrammingError(
3489 b'backend key not present in createopts; '
3489 b'backend key not present in createopts; '
3490 b'was defaultcreateopts() called?'
3490 b'was defaultcreateopts() called?'
3491 )
3491 )
3492
3492
3493 if createopts[b'backend'] != b'revlogv1':
3493 if createopts[b'backend'] != b'revlogv1':
3494 raise error.Abort(
3494 raise error.Abort(
3495 _(
3495 _(
3496 b'unable to determine repository requirements for '
3496 b'unable to determine repository requirements for '
3497 b'storage backend: %s'
3497 b'storage backend: %s'
3498 )
3498 )
3499 % createopts[b'backend']
3499 % createopts[b'backend']
3500 )
3500 )
3501
3501
3502 requirements = {b'revlogv1'}
3502 requirements = {b'revlogv1'}
3503 if ui.configbool(b'format', b'usestore'):
3503 if ui.configbool(b'format', b'usestore'):
3504 requirements.add(b'store')
3504 requirements.add(b'store')
3505 if ui.configbool(b'format', b'usefncache'):
3505 if ui.configbool(b'format', b'usefncache'):
3506 requirements.add(b'fncache')
3506 requirements.add(b'fncache')
3507 if ui.configbool(b'format', b'dotencode'):
3507 if ui.configbool(b'format', b'dotencode'):
3508 requirements.add(b'dotencode')
3508 requirements.add(b'dotencode')
3509
3509
3510 compengine = ui.config(b'format', b'revlog-compression')
3510 compengine = ui.config(b'format', b'revlog-compression')
3511 if compengine not in util.compengines:
3511 if compengine not in util.compengines:
3512 raise error.Abort(
3512 raise error.Abort(
3513 _(
3513 _(
3514 b'compression engine %s defined by '
3514 b'compression engine %s defined by '
3515 b'format.revlog-compression not available'
3515 b'format.revlog-compression not available'
3516 )
3516 )
3517 % compengine,
3517 % compengine,
3518 hint=_(
3518 hint=_(
3519 b'run "hg debuginstall" to list available '
3519 b'run "hg debuginstall" to list available '
3520 b'compression engines'
3520 b'compression engines'
3521 ),
3521 ),
3522 )
3522 )
3523
3523
3524 # zlib is the historical default and doesn't need an explicit requirement.
3524 # zlib is the historical default and doesn't need an explicit requirement.
3525 elif compengine == b'zstd':
3525 elif compengine == b'zstd':
3526 requirements.add(b'revlog-compression-zstd')
3526 requirements.add(b'revlog-compression-zstd')
3527 elif compengine != b'zlib':
3527 elif compengine != b'zlib':
3528 requirements.add(b'exp-compression-%s' % compengine)
3528 requirements.add(b'exp-compression-%s' % compengine)
3529
3529
3530 if scmutil.gdinitconfig(ui):
3530 if scmutil.gdinitconfig(ui):
3531 requirements.add(b'generaldelta')
3531 requirements.add(b'generaldelta')
3532 if ui.configbool(b'format', b'sparse-revlog'):
3532 if ui.configbool(b'format', b'sparse-revlog'):
3533 requirements.add(SPARSEREVLOG_REQUIREMENT)
3533 requirements.add(SPARSEREVLOG_REQUIREMENT)
3534
3534
3535 # experimental config: format.exp-use-side-data
3535 # experimental config: format.exp-use-side-data
3536 if ui.configbool(b'format', b'exp-use-side-data'):
3536 if ui.configbool(b'format', b'exp-use-side-data'):
3537 requirements.add(SIDEDATA_REQUIREMENT)
3537 requirements.add(SIDEDATA_REQUIREMENT)
3538 # experimental config: format.exp-use-copies-side-data-changeset
3538 # experimental config: format.exp-use-copies-side-data-changeset
3539 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3539 if ui.configbool(b'format', b'exp-use-copies-side-data-changeset'):
3540 requirements.add(SIDEDATA_REQUIREMENT)
3540 requirements.add(SIDEDATA_REQUIREMENT)
3541 requirements.add(COPIESSDC_REQUIREMENT)
3541 requirements.add(COPIESSDC_REQUIREMENT)
3542 if ui.configbool(b'experimental', b'treemanifest'):
3542 if ui.configbool(b'experimental', b'treemanifest'):
3543 requirements.add(b'treemanifest')
3543 requirements.add(b'treemanifest')
3544
3544
3545 revlogv2 = ui.config(b'experimental', b'revlogv2')
3545 revlogv2 = ui.config(b'experimental', b'revlogv2')
3546 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3546 if revlogv2 == b'enable-unstable-format-and-corrupt-my-data':
3547 requirements.remove(b'revlogv1')
3547 requirements.remove(b'revlogv1')
3548 # generaldelta is implied by revlogv2.
3548 # generaldelta is implied by revlogv2.
3549 requirements.discard(b'generaldelta')
3549 requirements.discard(b'generaldelta')
3550 requirements.add(REVLOGV2_REQUIREMENT)
3550 requirements.add(REVLOGV2_REQUIREMENT)
3551 # experimental config: format.internal-phase
3551 # experimental config: format.internal-phase
3552 if ui.configbool(b'format', b'internal-phase'):
3552 if ui.configbool(b'format', b'internal-phase'):
3553 requirements.add(b'internal-phase')
3553 requirements.add(b'internal-phase')
3554
3554
3555 if createopts.get(b'narrowfiles'):
3555 if createopts.get(b'narrowfiles'):
3556 requirements.add(repository.NARROW_REQUIREMENT)
3556 requirements.add(repository.NARROW_REQUIREMENT)
3557
3557
3558 if createopts.get(b'lfs'):
3558 if createopts.get(b'lfs'):
3559 requirements.add(b'lfs')
3559 requirements.add(b'lfs')
3560
3560
3561 if ui.configbool(b'format', b'bookmarks-in-store'):
3561 if ui.configbool(b'format', b'bookmarks-in-store'):
3562 requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
3562 requirements.add(bookmarks.BOOKMARKS_IN_STORE_REQUIREMENT)
3563
3563
3564 return requirements
3564 return requirements
3565
3565
3566
3566
3567 def filterknowncreateopts(ui, createopts):
3567 def filterknowncreateopts(ui, createopts):
3568 """Filters a dict of repo creation options against options that are known.
3568 """Filters a dict of repo creation options against options that are known.
3569
3569
3570 Receives a dict of repo creation options and returns a dict of those
3570 Receives a dict of repo creation options and returns a dict of those
3571 options that we don't know how to handle.
3571 options that we don't know how to handle.
3572
3572
3573 This function is called as part of repository creation. If the
3573 This function is called as part of repository creation. If the
3574 returned dict contains any items, repository creation will not
3574 returned dict contains any items, repository creation will not
3575 be allowed, as it means there was a request to create a repository
3575 be allowed, as it means there was a request to create a repository
3576 with options not recognized by loaded code.
3576 with options not recognized by loaded code.
3577
3577
3578 Extensions can wrap this function to filter out creation options
3578 Extensions can wrap this function to filter out creation options
3579 they know how to handle.
3579 they know how to handle.
3580 """
3580 """
3581 known = {
3581 known = {
3582 b'backend',
3582 b'backend',
3583 b'lfs',
3583 b'lfs',
3584 b'narrowfiles',
3584 b'narrowfiles',
3585 b'sharedrepo',
3585 b'sharedrepo',
3586 b'sharedrelative',
3586 b'sharedrelative',
3587 b'shareditems',
3587 b'shareditems',
3588 b'shallowfilestore',
3588 b'shallowfilestore',
3589 }
3589 }
3590
3590
3591 return {k: v for k, v in createopts.items() if k not in known}
3591 return {k: v for k, v in createopts.items() if k not in known}
3592
3592
3593
3593
3594 def createrepository(ui, path, createopts=None):
3594 def createrepository(ui, path, createopts=None):
3595 """Create a new repository in a vfs.
3595 """Create a new repository in a vfs.
3596
3596
3597 ``path`` path to the new repo's working directory.
3597 ``path`` path to the new repo's working directory.
3598 ``createopts`` options for the new repository.
3598 ``createopts`` options for the new repository.
3599
3599
3600 The following keys for ``createopts`` are recognized:
3600 The following keys for ``createopts`` are recognized:
3601
3601
3602 backend
3602 backend
3603 The storage backend to use.
3603 The storage backend to use.
3604 lfs
3604 lfs
3605 Repository will be created with ``lfs`` requirement. The lfs extension
3605 Repository will be created with ``lfs`` requirement. The lfs extension
3606 will automatically be loaded when the repository is accessed.
3606 will automatically be loaded when the repository is accessed.
3607 narrowfiles
3607 narrowfiles
3608 Set up repository to support narrow file storage.
3608 Set up repository to support narrow file storage.
3609 sharedrepo
3609 sharedrepo
3610 Repository object from which storage should be shared.
3610 Repository object from which storage should be shared.
3611 sharedrelative
3611 sharedrelative
3612 Boolean indicating if the path to the shared repo should be
3612 Boolean indicating if the path to the shared repo should be
3613 stored as relative. By default, the pointer to the "parent" repo
3613 stored as relative. By default, the pointer to the "parent" repo
3614 is stored as an absolute path.
3614 is stored as an absolute path.
3615 shareditems
3615 shareditems
3616 Set of items to share to the new repository (in addition to storage).
3616 Set of items to share to the new repository (in addition to storage).
3617 shallowfilestore
3617 shallowfilestore
3618 Indicates that storage for files should be shallow (not all ancestor
3618 Indicates that storage for files should be shallow (not all ancestor
3619 revisions are known).
3619 revisions are known).
3620 """
3620 """
3621 createopts = defaultcreateopts(ui, createopts=createopts)
3621 createopts = defaultcreateopts(ui, createopts=createopts)
3622
3622
3623 unknownopts = filterknowncreateopts(ui, createopts)
3623 unknownopts = filterknowncreateopts(ui, createopts)
3624
3624
3625 if not isinstance(unknownopts, dict):
3625 if not isinstance(unknownopts, dict):
3626 raise error.ProgrammingError(
3626 raise error.ProgrammingError(
3627 b'filterknowncreateopts() did not return a dict'
3627 b'filterknowncreateopts() did not return a dict'
3628 )
3628 )
3629
3629
3630 if unknownopts:
3630 if unknownopts:
3631 raise error.Abort(
3631 raise error.Abort(
3632 _(
3632 _(
3633 b'unable to create repository because of unknown '
3633 b'unable to create repository because of unknown '
3634 b'creation option: %s'
3634 b'creation option: %s'
3635 )
3635 )
3636 % b', '.join(sorted(unknownopts)),
3636 % b', '.join(sorted(unknownopts)),
3637 hint=_(b'is a required extension not loaded?'),
3637 hint=_(b'is a required extension not loaded?'),
3638 )
3638 )
3639
3639
3640 requirements = newreporequirements(ui, createopts=createopts)
3640 requirements = newreporequirements(ui, createopts=createopts)
3641
3641
3642 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3642 wdirvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
3643
3643
3644 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3644 hgvfs = vfsmod.vfs(wdirvfs.join(b'.hg'))
3645 if hgvfs.exists():
3645 if hgvfs.exists():
3646 raise error.RepoError(_(b'repository %s already exists') % path)
3646 raise error.RepoError(_(b'repository %s already exists') % path)
3647
3647
3648 if b'sharedrepo' in createopts:
3648 if b'sharedrepo' in createopts:
3649 sharedpath = createopts[b'sharedrepo'].sharedpath
3649 sharedpath = createopts[b'sharedrepo'].sharedpath
3650
3650
3651 if createopts.get(b'sharedrelative'):
3651 if createopts.get(b'sharedrelative'):
3652 try:
3652 try:
3653 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3653 sharedpath = os.path.relpath(sharedpath, hgvfs.base)
3654 except (IOError, ValueError) as e:
3654 except (IOError, ValueError) as e:
3655 # ValueError is raised on Windows if the drive letters differ
3655 # ValueError is raised on Windows if the drive letters differ
3656 # on each path.
3656 # on each path.
3657 raise error.Abort(
3657 raise error.Abort(
3658 _(b'cannot calculate relative path'),
3658 _(b'cannot calculate relative path'),
3659 hint=stringutil.forcebytestr(e),
3659 hint=stringutil.forcebytestr(e),
3660 )
3660 )
3661
3661
3662 if not wdirvfs.exists():
3662 if not wdirvfs.exists():
3663 wdirvfs.makedirs()
3663 wdirvfs.makedirs()
3664
3664
3665 hgvfs.makedir(notindexed=True)
3665 hgvfs.makedir(notindexed=True)
3666 if b'sharedrepo' not in createopts:
3666 if b'sharedrepo' not in createopts:
3667 hgvfs.mkdir(b'cache')
3667 hgvfs.mkdir(b'cache')
3668 hgvfs.mkdir(b'wcache')
3668 hgvfs.mkdir(b'wcache')
3669
3669
3670 if b'store' in requirements and b'sharedrepo' not in createopts:
3670 if b'store' in requirements and b'sharedrepo' not in createopts:
3671 hgvfs.mkdir(b'store')
3671 hgvfs.mkdir(b'store')
3672
3672
3673 # We create an invalid changelog outside the store so very old
3673 # We create an invalid changelog outside the store so very old
3674 # Mercurial versions (which didn't know about the requirements
3674 # Mercurial versions (which didn't know about the requirements
3675 # file) encounter an error on reading the changelog. This
3675 # file) encounter an error on reading the changelog. This
3676 # effectively locks out old clients and prevents them from
3676 # effectively locks out old clients and prevents them from
3677 # mucking with a repo in an unknown format.
3677 # mucking with a repo in an unknown format.
3678 #
3678 #
3679 # The revlog header has version 2, which won't be recognized by
3679 # The revlog header has version 2, which won't be recognized by
3680 # such old clients.
3680 # such old clients.
3681 hgvfs.append(
3681 hgvfs.append(
3682 b'00changelog.i',
3682 b'00changelog.i',
3683 b'\0\0\0\2 dummy changelog to prevent using the old repo '
3683 b'\0\0\0\2 dummy changelog to prevent using the old repo '
3684 b'layout',
3684 b'layout',
3685 )
3685 )
3686
3686
3687 scmutil.writerequires(hgvfs, requirements)
3687 scmutil.writerequires(hgvfs, requirements)
3688
3688
3689 # Write out file telling readers where to find the shared store.
3689 # Write out file telling readers where to find the shared store.
3690 if b'sharedrepo' in createopts:
3690 if b'sharedrepo' in createopts:
3691 hgvfs.write(b'sharedpath', sharedpath)
3691 hgvfs.write(b'sharedpath', sharedpath)
3692
3692
3693 if createopts.get(b'shareditems'):
3693 if createopts.get(b'shareditems'):
3694 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3694 shared = b'\n'.join(sorted(createopts[b'shareditems'])) + b'\n'
3695 hgvfs.write(b'shared', shared)
3695 hgvfs.write(b'shared', shared)
3696
3696
3697
3697
3698 def poisonrepository(repo):
3698 def poisonrepository(repo):
3699 """Poison a repository instance so it can no longer be used."""
3699 """Poison a repository instance so it can no longer be used."""
3700 # Perform any cleanup on the instance.
3700 # Perform any cleanup on the instance.
3701 repo.close()
3701 repo.close()
3702
3702
3703 # Our strategy is to replace the type of the object with one that
3703 # Our strategy is to replace the type of the object with one that
3704 # has all attribute lookups result in error.
3704 # has all attribute lookups result in error.
3705 #
3705 #
3706 # But we have to allow the close() method because some constructors
3706 # But we have to allow the close() method because some constructors
3707 # of repos call close() on repo references.
3707 # of repos call close() on repo references.
3708 class poisonedrepository(object):
3708 class poisonedrepository(object):
3709 def __getattribute__(self, item):
3709 def __getattribute__(self, item):
3710 if item == 'close':
3710 if item == 'close':
3711 return object.__getattribute__(self, item)
3711 return object.__getattribute__(self, item)
3712
3712
3713 raise error.ProgrammingError(
3713 raise error.ProgrammingError(
3714 b'repo instances should not be used after unshare'
3714 b'repo instances should not be used after unshare'
3715 )
3715 )
3716
3716
3717 def close(self):
3717 def close(self):
3718 pass
3718 pass
3719
3719
3720 # We may have a repoview, which intercepts __setattr__. So be sure
3720 # We may have a repoview, which intercepts __setattr__. So be sure
3721 # we operate at the lowest level possible.
3721 # we operate at the lowest level possible.
3722 object.__setattr__(repo, '__class__', poisonedrepository)
3722 object.__setattr__(repo, '__class__', poisonedrepository)
General Comments 0
You need to be logged in to leave comments. Login now