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