##// END OF EJS Templates
localrepo: use revsymbol() in lookup()...
Martin von Zweigbergk -
r37331:0a1fb171 default
parent child Browse files
Show More
@@ -1,2339 +1,2339 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 time
14 import time
15 import weakref
15 import weakref
16
16
17 from .i18n import _
17 from .i18n import _
18 from .node import (
18 from .node import (
19 hex,
19 hex,
20 nullid,
20 nullid,
21 short,
21 short,
22 )
22 )
23 from .thirdparty.zope import (
23 from .thirdparty.zope import (
24 interface as zi,
24 interface as zi,
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 peer,
52 peer,
53 phases,
53 phases,
54 pushkey,
54 pushkey,
55 pycompat,
55 pycompat,
56 repository,
56 repository,
57 repoview,
57 repoview,
58 revset,
58 revset,
59 revsetlang,
59 revsetlang,
60 scmutil,
60 scmutil,
61 sparse,
61 sparse,
62 store,
62 store,
63 subrepoutil,
63 subrepoutil,
64 tags as tagsmod,
64 tags as tagsmod,
65 transaction,
65 transaction,
66 txnutil,
66 txnutil,
67 util,
67 util,
68 vfs as vfsmod,
68 vfs as vfsmod,
69 )
69 )
70 from .utils import (
70 from .utils import (
71 procutil,
71 procutil,
72 stringutil,
72 stringutil,
73 )
73 )
74
74
75 release = lockmod.release
75 release = lockmod.release
76 urlerr = util.urlerr
76 urlerr = util.urlerr
77 urlreq = util.urlreq
77 urlreq = util.urlreq
78
78
79 # set of (path, vfs-location) tuples. vfs-location is:
79 # set of (path, vfs-location) tuples. vfs-location is:
80 # - 'plain for vfs relative paths
80 # - 'plain for vfs relative paths
81 # - '' for svfs relative paths
81 # - '' for svfs relative paths
82 _cachedfiles = set()
82 _cachedfiles = set()
83
83
84 class _basefilecache(scmutil.filecache):
84 class _basefilecache(scmutil.filecache):
85 """All filecache usage on repo are done for logic that should be unfiltered
85 """All filecache usage on repo are done for logic that should be unfiltered
86 """
86 """
87 def __get__(self, repo, type=None):
87 def __get__(self, repo, type=None):
88 if repo is None:
88 if repo is None:
89 return self
89 return self
90 return super(_basefilecache, self).__get__(repo.unfiltered(), type)
90 return super(_basefilecache, self).__get__(repo.unfiltered(), type)
91 def __set__(self, repo, value):
91 def __set__(self, repo, value):
92 return super(_basefilecache, self).__set__(repo.unfiltered(), value)
92 return super(_basefilecache, self).__set__(repo.unfiltered(), value)
93 def __delete__(self, repo):
93 def __delete__(self, repo):
94 return super(_basefilecache, self).__delete__(repo.unfiltered())
94 return super(_basefilecache, self).__delete__(repo.unfiltered())
95
95
96 class repofilecache(_basefilecache):
96 class repofilecache(_basefilecache):
97 """filecache for files in .hg but outside of .hg/store"""
97 """filecache for files in .hg but outside of .hg/store"""
98 def __init__(self, *paths):
98 def __init__(self, *paths):
99 super(repofilecache, self).__init__(*paths)
99 super(repofilecache, self).__init__(*paths)
100 for path in paths:
100 for path in paths:
101 _cachedfiles.add((path, 'plain'))
101 _cachedfiles.add((path, 'plain'))
102
102
103 def join(self, obj, fname):
103 def join(self, obj, fname):
104 return obj.vfs.join(fname)
104 return obj.vfs.join(fname)
105
105
106 class storecache(_basefilecache):
106 class storecache(_basefilecache):
107 """filecache for files in the store"""
107 """filecache for files in the store"""
108 def __init__(self, *paths):
108 def __init__(self, *paths):
109 super(storecache, self).__init__(*paths)
109 super(storecache, self).__init__(*paths)
110 for path in paths:
110 for path in paths:
111 _cachedfiles.add((path, ''))
111 _cachedfiles.add((path, ''))
112
112
113 def join(self, obj, fname):
113 def join(self, obj, fname):
114 return obj.sjoin(fname)
114 return obj.sjoin(fname)
115
115
116 def isfilecached(repo, name):
116 def isfilecached(repo, name):
117 """check if a repo has already cached "name" filecache-ed property
117 """check if a repo has already cached "name" filecache-ed property
118
118
119 This returns (cachedobj-or-None, iscached) tuple.
119 This returns (cachedobj-or-None, iscached) tuple.
120 """
120 """
121 cacheentry = repo.unfiltered()._filecache.get(name, None)
121 cacheentry = repo.unfiltered()._filecache.get(name, None)
122 if not cacheentry:
122 if not cacheentry:
123 return None, False
123 return None, False
124 return cacheentry.obj, True
124 return cacheentry.obj, True
125
125
126 class unfilteredpropertycache(util.propertycache):
126 class unfilteredpropertycache(util.propertycache):
127 """propertycache that apply to unfiltered repo only"""
127 """propertycache that apply to unfiltered repo only"""
128
128
129 def __get__(self, repo, type=None):
129 def __get__(self, repo, type=None):
130 unfi = repo.unfiltered()
130 unfi = repo.unfiltered()
131 if unfi is repo:
131 if unfi is repo:
132 return super(unfilteredpropertycache, self).__get__(unfi)
132 return super(unfilteredpropertycache, self).__get__(unfi)
133 return getattr(unfi, self.name)
133 return getattr(unfi, self.name)
134
134
135 class filteredpropertycache(util.propertycache):
135 class filteredpropertycache(util.propertycache):
136 """propertycache that must take filtering in account"""
136 """propertycache that must take filtering in account"""
137
137
138 def cachevalue(self, obj, value):
138 def cachevalue(self, obj, value):
139 object.__setattr__(obj, self.name, value)
139 object.__setattr__(obj, self.name, value)
140
140
141
141
142 def hasunfilteredcache(repo, name):
142 def hasunfilteredcache(repo, name):
143 """check if a repo has an unfilteredpropertycache value for <name>"""
143 """check if a repo has an unfilteredpropertycache value for <name>"""
144 return name in vars(repo.unfiltered())
144 return name in vars(repo.unfiltered())
145
145
146 def unfilteredmethod(orig):
146 def unfilteredmethod(orig):
147 """decorate method that always need to be run on unfiltered version"""
147 """decorate method that always need to be run on unfiltered version"""
148 def wrapper(repo, *args, **kwargs):
148 def wrapper(repo, *args, **kwargs):
149 return orig(repo.unfiltered(), *args, **kwargs)
149 return orig(repo.unfiltered(), *args, **kwargs)
150 return wrapper
150 return wrapper
151
151
152 moderncaps = {'lookup', 'branchmap', 'pushkey', 'known', 'getbundle',
152 moderncaps = {'lookup', 'branchmap', 'pushkey', 'known', 'getbundle',
153 'unbundle'}
153 'unbundle'}
154 legacycaps = moderncaps.union({'changegroupsubset'})
154 legacycaps = moderncaps.union({'changegroupsubset'})
155
155
156 class localpeer(repository.peer):
156 class localpeer(repository.peer):
157 '''peer for a local repo; reflects only the most recent API'''
157 '''peer for a local repo; reflects only the most recent API'''
158
158
159 def __init__(self, repo, caps=None):
159 def __init__(self, repo, caps=None):
160 super(localpeer, self).__init__()
160 super(localpeer, self).__init__()
161
161
162 if caps is None:
162 if caps is None:
163 caps = moderncaps.copy()
163 caps = moderncaps.copy()
164 self._repo = repo.filtered('served')
164 self._repo = repo.filtered('served')
165 self._ui = repo.ui
165 self._ui = repo.ui
166 self._caps = repo._restrictcapabilities(caps)
166 self._caps = repo._restrictcapabilities(caps)
167
167
168 # Begin of _basepeer interface.
168 # Begin of _basepeer interface.
169
169
170 @util.propertycache
170 @util.propertycache
171 def ui(self):
171 def ui(self):
172 return self._ui
172 return self._ui
173
173
174 def url(self):
174 def url(self):
175 return self._repo.url()
175 return self._repo.url()
176
176
177 def local(self):
177 def local(self):
178 return self._repo
178 return self._repo
179
179
180 def peer(self):
180 def peer(self):
181 return self
181 return self
182
182
183 def canpush(self):
183 def canpush(self):
184 return True
184 return True
185
185
186 def close(self):
186 def close(self):
187 self._repo.close()
187 self._repo.close()
188
188
189 # End of _basepeer interface.
189 # End of _basepeer interface.
190
190
191 # Begin of _basewirecommands interface.
191 # Begin of _basewirecommands interface.
192
192
193 def branchmap(self):
193 def branchmap(self):
194 return self._repo.branchmap()
194 return self._repo.branchmap()
195
195
196 def capabilities(self):
196 def capabilities(self):
197 return self._caps
197 return self._caps
198
198
199 def debugwireargs(self, one, two, three=None, four=None, five=None):
199 def debugwireargs(self, one, two, three=None, four=None, five=None):
200 """Used to test argument passing over the wire"""
200 """Used to test argument passing over the wire"""
201 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
201 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
202 pycompat.bytestr(four),
202 pycompat.bytestr(four),
203 pycompat.bytestr(five))
203 pycompat.bytestr(five))
204
204
205 def getbundle(self, source, heads=None, common=None, bundlecaps=None,
205 def getbundle(self, source, heads=None, common=None, bundlecaps=None,
206 **kwargs):
206 **kwargs):
207 chunks = exchange.getbundlechunks(self._repo, source, heads=heads,
207 chunks = exchange.getbundlechunks(self._repo, source, heads=heads,
208 common=common, bundlecaps=bundlecaps,
208 common=common, bundlecaps=bundlecaps,
209 **kwargs)[1]
209 **kwargs)[1]
210 cb = util.chunkbuffer(chunks)
210 cb = util.chunkbuffer(chunks)
211
211
212 if exchange.bundle2requested(bundlecaps):
212 if exchange.bundle2requested(bundlecaps):
213 # When requesting a bundle2, getbundle returns a stream to make the
213 # When requesting a bundle2, getbundle returns a stream to make the
214 # wire level function happier. We need to build a proper object
214 # wire level function happier. We need to build a proper object
215 # from it in local peer.
215 # from it in local peer.
216 return bundle2.getunbundler(self.ui, cb)
216 return bundle2.getunbundler(self.ui, cb)
217 else:
217 else:
218 return changegroup.getunbundler('01', cb, None)
218 return changegroup.getunbundler('01', cb, None)
219
219
220 def heads(self):
220 def heads(self):
221 return self._repo.heads()
221 return self._repo.heads()
222
222
223 def known(self, nodes):
223 def known(self, nodes):
224 return self._repo.known(nodes)
224 return self._repo.known(nodes)
225
225
226 def listkeys(self, namespace):
226 def listkeys(self, namespace):
227 return self._repo.listkeys(namespace)
227 return self._repo.listkeys(namespace)
228
228
229 def lookup(self, key):
229 def lookup(self, key):
230 return self._repo.lookup(key)
230 return self._repo.lookup(key)
231
231
232 def pushkey(self, namespace, key, old, new):
232 def pushkey(self, namespace, key, old, new):
233 return self._repo.pushkey(namespace, key, old, new)
233 return self._repo.pushkey(namespace, key, old, new)
234
234
235 def stream_out(self):
235 def stream_out(self):
236 raise error.Abort(_('cannot perform stream clone against local '
236 raise error.Abort(_('cannot perform stream clone against local '
237 'peer'))
237 'peer'))
238
238
239 def unbundle(self, cg, heads, url):
239 def unbundle(self, cg, heads, url):
240 """apply a bundle on a repo
240 """apply a bundle on a repo
241
241
242 This function handles the repo locking itself."""
242 This function handles the repo locking itself."""
243 try:
243 try:
244 try:
244 try:
245 cg = exchange.readbundle(self.ui, cg, None)
245 cg = exchange.readbundle(self.ui, cg, None)
246 ret = exchange.unbundle(self._repo, cg, heads, 'push', url)
246 ret = exchange.unbundle(self._repo, cg, heads, 'push', url)
247 if util.safehasattr(ret, 'getchunks'):
247 if util.safehasattr(ret, 'getchunks'):
248 # This is a bundle20 object, turn it into an unbundler.
248 # This is a bundle20 object, turn it into an unbundler.
249 # This little dance should be dropped eventually when the
249 # This little dance should be dropped eventually when the
250 # API is finally improved.
250 # API is finally improved.
251 stream = util.chunkbuffer(ret.getchunks())
251 stream = util.chunkbuffer(ret.getchunks())
252 ret = bundle2.getunbundler(self.ui, stream)
252 ret = bundle2.getunbundler(self.ui, stream)
253 return ret
253 return ret
254 except Exception as exc:
254 except Exception as exc:
255 # If the exception contains output salvaged from a bundle2
255 # If the exception contains output salvaged from a bundle2
256 # reply, we need to make sure it is printed before continuing
256 # reply, we need to make sure it is printed before continuing
257 # to fail. So we build a bundle2 with such output and consume
257 # to fail. So we build a bundle2 with such output and consume
258 # it directly.
258 # it directly.
259 #
259 #
260 # This is not very elegant but allows a "simple" solution for
260 # This is not very elegant but allows a "simple" solution for
261 # issue4594
261 # issue4594
262 output = getattr(exc, '_bundle2salvagedoutput', ())
262 output = getattr(exc, '_bundle2salvagedoutput', ())
263 if output:
263 if output:
264 bundler = bundle2.bundle20(self._repo.ui)
264 bundler = bundle2.bundle20(self._repo.ui)
265 for out in output:
265 for out in output:
266 bundler.addpart(out)
266 bundler.addpart(out)
267 stream = util.chunkbuffer(bundler.getchunks())
267 stream = util.chunkbuffer(bundler.getchunks())
268 b = bundle2.getunbundler(self.ui, stream)
268 b = bundle2.getunbundler(self.ui, stream)
269 bundle2.processbundle(self._repo, b)
269 bundle2.processbundle(self._repo, b)
270 raise
270 raise
271 except error.PushRaced as exc:
271 except error.PushRaced as exc:
272 raise error.ResponseError(_('push failed:'),
272 raise error.ResponseError(_('push failed:'),
273 stringutil.forcebytestr(exc))
273 stringutil.forcebytestr(exc))
274
274
275 # End of _basewirecommands interface.
275 # End of _basewirecommands interface.
276
276
277 # Begin of peer interface.
277 # Begin of peer interface.
278
278
279 def iterbatch(self):
279 def iterbatch(self):
280 return peer.localiterbatcher(self)
280 return peer.localiterbatcher(self)
281
281
282 # End of peer interface.
282 # End of peer interface.
283
283
284 class locallegacypeer(repository.legacypeer, localpeer):
284 class locallegacypeer(repository.legacypeer, localpeer):
285 '''peer extension which implements legacy methods too; used for tests with
285 '''peer extension which implements legacy methods too; used for tests with
286 restricted capabilities'''
286 restricted capabilities'''
287
287
288 def __init__(self, repo):
288 def __init__(self, repo):
289 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
289 super(locallegacypeer, self).__init__(repo, caps=legacycaps)
290
290
291 # Begin of baselegacywirecommands interface.
291 # Begin of baselegacywirecommands interface.
292
292
293 def between(self, pairs):
293 def between(self, pairs):
294 return self._repo.between(pairs)
294 return self._repo.between(pairs)
295
295
296 def branches(self, nodes):
296 def branches(self, nodes):
297 return self._repo.branches(nodes)
297 return self._repo.branches(nodes)
298
298
299 def changegroup(self, basenodes, source):
299 def changegroup(self, basenodes, source):
300 outgoing = discovery.outgoing(self._repo, missingroots=basenodes,
300 outgoing = discovery.outgoing(self._repo, missingroots=basenodes,
301 missingheads=self._repo.heads())
301 missingheads=self._repo.heads())
302 return changegroup.makechangegroup(self._repo, outgoing, '01', source)
302 return changegroup.makechangegroup(self._repo, outgoing, '01', source)
303
303
304 def changegroupsubset(self, bases, heads, source):
304 def changegroupsubset(self, bases, heads, source):
305 outgoing = discovery.outgoing(self._repo, missingroots=bases,
305 outgoing = discovery.outgoing(self._repo, missingroots=bases,
306 missingheads=heads)
306 missingheads=heads)
307 return changegroup.makechangegroup(self._repo, outgoing, '01', source)
307 return changegroup.makechangegroup(self._repo, outgoing, '01', source)
308
308
309 # End of baselegacywirecommands interface.
309 # End of baselegacywirecommands interface.
310
310
311 # Increment the sub-version when the revlog v2 format changes to lock out old
311 # Increment the sub-version when the revlog v2 format changes to lock out old
312 # clients.
312 # clients.
313 REVLOGV2_REQUIREMENT = 'exp-revlogv2.0'
313 REVLOGV2_REQUIREMENT = 'exp-revlogv2.0'
314
314
315 # Functions receiving (ui, features) that extensions can register to impact
315 # Functions receiving (ui, features) that extensions can register to impact
316 # the ability to load repositories with custom requirements. Only
316 # the ability to load repositories with custom requirements. Only
317 # functions defined in loaded extensions are called.
317 # functions defined in loaded extensions are called.
318 #
318 #
319 # The function receives a set of requirement strings that the repository
319 # The function receives a set of requirement strings that the repository
320 # is capable of opening. Functions will typically add elements to the
320 # is capable of opening. Functions will typically add elements to the
321 # set to reflect that the extension knows how to handle that requirements.
321 # set to reflect that the extension knows how to handle that requirements.
322 featuresetupfuncs = set()
322 featuresetupfuncs = set()
323
323
324 @zi.implementer(repository.completelocalrepository)
324 @zi.implementer(repository.completelocalrepository)
325 class localrepository(object):
325 class localrepository(object):
326
326
327 # obsolete experimental requirements:
327 # obsolete experimental requirements:
328 # - manifestv2: An experimental new manifest format that allowed
328 # - manifestv2: An experimental new manifest format that allowed
329 # for stem compression of long paths. Experiment ended up not
329 # for stem compression of long paths. Experiment ended up not
330 # being successful (repository sizes went up due to worse delta
330 # being successful (repository sizes went up due to worse delta
331 # chains), and the code was deleted in 4.6.
331 # chains), and the code was deleted in 4.6.
332 supportedformats = {
332 supportedformats = {
333 'revlogv1',
333 'revlogv1',
334 'generaldelta',
334 'generaldelta',
335 'treemanifest',
335 'treemanifest',
336 REVLOGV2_REQUIREMENT,
336 REVLOGV2_REQUIREMENT,
337 }
337 }
338 _basesupported = supportedformats | {
338 _basesupported = supportedformats | {
339 'store',
339 'store',
340 'fncache',
340 'fncache',
341 'shared',
341 'shared',
342 'relshared',
342 'relshared',
343 'dotencode',
343 'dotencode',
344 'exp-sparse',
344 'exp-sparse',
345 }
345 }
346 openerreqs = {
346 openerreqs = {
347 'revlogv1',
347 'revlogv1',
348 'generaldelta',
348 'generaldelta',
349 'treemanifest',
349 'treemanifest',
350 }
350 }
351
351
352 # list of prefix for file which can be written without 'wlock'
352 # list of prefix for file which can be written without 'wlock'
353 # Extensions should extend this list when needed
353 # Extensions should extend this list when needed
354 _wlockfreeprefix = {
354 _wlockfreeprefix = {
355 # We migh consider requiring 'wlock' for the next
355 # We migh consider requiring 'wlock' for the next
356 # two, but pretty much all the existing code assume
356 # two, but pretty much all the existing code assume
357 # wlock is not needed so we keep them excluded for
357 # wlock is not needed so we keep them excluded for
358 # now.
358 # now.
359 'hgrc',
359 'hgrc',
360 'requires',
360 'requires',
361 # XXX cache is a complicatged business someone
361 # XXX cache is a complicatged business someone
362 # should investigate this in depth at some point
362 # should investigate this in depth at some point
363 'cache/',
363 'cache/',
364 # XXX shouldn't be dirstate covered by the wlock?
364 # XXX shouldn't be dirstate covered by the wlock?
365 'dirstate',
365 'dirstate',
366 # XXX bisect was still a bit too messy at the time
366 # XXX bisect was still a bit too messy at the time
367 # this changeset was introduced. Someone should fix
367 # this changeset was introduced. Someone should fix
368 # the remainig bit and drop this line
368 # the remainig bit and drop this line
369 'bisect.state',
369 'bisect.state',
370 }
370 }
371
371
372 def __init__(self, baseui, path, create=False):
372 def __init__(self, baseui, path, create=False):
373 self.requirements = set()
373 self.requirements = set()
374 self.filtername = None
374 self.filtername = None
375 # wvfs: rooted at the repository root, used to access the working copy
375 # wvfs: rooted at the repository root, used to access the working copy
376 self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
376 self.wvfs = vfsmod.vfs(path, expandpath=True, realpath=True)
377 # vfs: rooted at .hg, used to access repo files outside of .hg/store
377 # vfs: rooted at .hg, used to access repo files outside of .hg/store
378 self.vfs = None
378 self.vfs = None
379 # svfs: usually rooted at .hg/store, used to access repository history
379 # svfs: usually rooted at .hg/store, used to access repository history
380 # If this is a shared repository, this vfs may point to another
380 # If this is a shared repository, this vfs may point to another
381 # repository's .hg/store directory.
381 # repository's .hg/store directory.
382 self.svfs = None
382 self.svfs = None
383 self.root = self.wvfs.base
383 self.root = self.wvfs.base
384 self.path = self.wvfs.join(".hg")
384 self.path = self.wvfs.join(".hg")
385 self.origroot = path
385 self.origroot = path
386 # This is only used by context.workingctx.match in order to
386 # This is only used by context.workingctx.match in order to
387 # detect files in subrepos.
387 # detect files in subrepos.
388 self.auditor = pathutil.pathauditor(
388 self.auditor = pathutil.pathauditor(
389 self.root, callback=self._checknested)
389 self.root, callback=self._checknested)
390 # This is only used by context.basectx.match in order to detect
390 # This is only used by context.basectx.match in order to detect
391 # files in subrepos.
391 # files in subrepos.
392 self.nofsauditor = pathutil.pathauditor(
392 self.nofsauditor = pathutil.pathauditor(
393 self.root, callback=self._checknested, realfs=False, cached=True)
393 self.root, callback=self._checknested, realfs=False, cached=True)
394 self.baseui = baseui
394 self.baseui = baseui
395 self.ui = baseui.copy()
395 self.ui = baseui.copy()
396 self.ui.copy = baseui.copy # prevent copying repo configuration
396 self.ui.copy = baseui.copy # prevent copying repo configuration
397 self.vfs = vfsmod.vfs(self.path, cacheaudited=True)
397 self.vfs = vfsmod.vfs(self.path, cacheaudited=True)
398 if (self.ui.configbool('devel', 'all-warnings') or
398 if (self.ui.configbool('devel', 'all-warnings') or
399 self.ui.configbool('devel', 'check-locks')):
399 self.ui.configbool('devel', 'check-locks')):
400 self.vfs.audit = self._getvfsward(self.vfs.audit)
400 self.vfs.audit = self._getvfsward(self.vfs.audit)
401 # A list of callback to shape the phase if no data were found.
401 # A list of callback to shape the phase if no data were found.
402 # Callback are in the form: func(repo, roots) --> processed root.
402 # Callback are in the form: func(repo, roots) --> processed root.
403 # This list it to be filled by extension during repo setup
403 # This list it to be filled by extension during repo setup
404 self._phasedefaults = []
404 self._phasedefaults = []
405 try:
405 try:
406 self.ui.readconfig(self.vfs.join("hgrc"), self.root)
406 self.ui.readconfig(self.vfs.join("hgrc"), self.root)
407 self._loadextensions()
407 self._loadextensions()
408 except IOError:
408 except IOError:
409 pass
409 pass
410
410
411 if featuresetupfuncs:
411 if featuresetupfuncs:
412 self.supported = set(self._basesupported) # use private copy
412 self.supported = set(self._basesupported) # use private copy
413 extmods = set(m.__name__ for n, m
413 extmods = set(m.__name__ for n, m
414 in extensions.extensions(self.ui))
414 in extensions.extensions(self.ui))
415 for setupfunc in featuresetupfuncs:
415 for setupfunc in featuresetupfuncs:
416 if setupfunc.__module__ in extmods:
416 if setupfunc.__module__ in extmods:
417 setupfunc(self.ui, self.supported)
417 setupfunc(self.ui, self.supported)
418 else:
418 else:
419 self.supported = self._basesupported
419 self.supported = self._basesupported
420 color.setup(self.ui)
420 color.setup(self.ui)
421
421
422 # Add compression engines.
422 # Add compression engines.
423 for name in util.compengines:
423 for name in util.compengines:
424 engine = util.compengines[name]
424 engine = util.compengines[name]
425 if engine.revlogheader():
425 if engine.revlogheader():
426 self.supported.add('exp-compression-%s' % name)
426 self.supported.add('exp-compression-%s' % name)
427
427
428 if not self.vfs.isdir():
428 if not self.vfs.isdir():
429 if create:
429 if create:
430 self.requirements = newreporequirements(self)
430 self.requirements = newreporequirements(self)
431
431
432 if not self.wvfs.exists():
432 if not self.wvfs.exists():
433 self.wvfs.makedirs()
433 self.wvfs.makedirs()
434 self.vfs.makedir(notindexed=True)
434 self.vfs.makedir(notindexed=True)
435
435
436 if 'store' in self.requirements:
436 if 'store' in self.requirements:
437 self.vfs.mkdir("store")
437 self.vfs.mkdir("store")
438
438
439 # create an invalid changelog
439 # create an invalid changelog
440 self.vfs.append(
440 self.vfs.append(
441 "00changelog.i",
441 "00changelog.i",
442 '\0\0\0\2' # represents revlogv2
442 '\0\0\0\2' # represents revlogv2
443 ' dummy changelog to prevent using the old repo layout'
443 ' dummy changelog to prevent using the old repo layout'
444 )
444 )
445 else:
445 else:
446 raise error.RepoError(_("repository %s not found") % path)
446 raise error.RepoError(_("repository %s not found") % path)
447 elif create:
447 elif create:
448 raise error.RepoError(_("repository %s already exists") % path)
448 raise error.RepoError(_("repository %s already exists") % path)
449 else:
449 else:
450 try:
450 try:
451 self.requirements = scmutil.readrequires(
451 self.requirements = scmutil.readrequires(
452 self.vfs, self.supported)
452 self.vfs, self.supported)
453 except IOError as inst:
453 except IOError as inst:
454 if inst.errno != errno.ENOENT:
454 if inst.errno != errno.ENOENT:
455 raise
455 raise
456
456
457 cachepath = self.vfs.join('cache')
457 cachepath = self.vfs.join('cache')
458 self.sharedpath = self.path
458 self.sharedpath = self.path
459 try:
459 try:
460 sharedpath = self.vfs.read("sharedpath").rstrip('\n')
460 sharedpath = self.vfs.read("sharedpath").rstrip('\n')
461 if 'relshared' in self.requirements:
461 if 'relshared' in self.requirements:
462 sharedpath = self.vfs.join(sharedpath)
462 sharedpath = self.vfs.join(sharedpath)
463 vfs = vfsmod.vfs(sharedpath, realpath=True)
463 vfs = vfsmod.vfs(sharedpath, realpath=True)
464 cachepath = vfs.join('cache')
464 cachepath = vfs.join('cache')
465 s = vfs.base
465 s = vfs.base
466 if not vfs.exists():
466 if not vfs.exists():
467 raise error.RepoError(
467 raise error.RepoError(
468 _('.hg/sharedpath points to nonexistent directory %s') % s)
468 _('.hg/sharedpath points to nonexistent directory %s') % s)
469 self.sharedpath = s
469 self.sharedpath = s
470 except IOError as inst:
470 except IOError as inst:
471 if inst.errno != errno.ENOENT:
471 if inst.errno != errno.ENOENT:
472 raise
472 raise
473
473
474 if 'exp-sparse' in self.requirements and not sparse.enabled:
474 if 'exp-sparse' in self.requirements and not sparse.enabled:
475 raise error.RepoError(_('repository is using sparse feature but '
475 raise error.RepoError(_('repository is using sparse feature but '
476 'sparse is not enabled; enable the '
476 'sparse is not enabled; enable the '
477 '"sparse" extensions to access'))
477 '"sparse" extensions to access'))
478
478
479 self.store = store.store(
479 self.store = store.store(
480 self.requirements, self.sharedpath,
480 self.requirements, self.sharedpath,
481 lambda base: vfsmod.vfs(base, cacheaudited=True))
481 lambda base: vfsmod.vfs(base, cacheaudited=True))
482 self.spath = self.store.path
482 self.spath = self.store.path
483 self.svfs = self.store.vfs
483 self.svfs = self.store.vfs
484 self.sjoin = self.store.join
484 self.sjoin = self.store.join
485 self.vfs.createmode = self.store.createmode
485 self.vfs.createmode = self.store.createmode
486 self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
486 self.cachevfs = vfsmod.vfs(cachepath, cacheaudited=True)
487 self.cachevfs.createmode = self.store.createmode
487 self.cachevfs.createmode = self.store.createmode
488 if (self.ui.configbool('devel', 'all-warnings') or
488 if (self.ui.configbool('devel', 'all-warnings') or
489 self.ui.configbool('devel', 'check-locks')):
489 self.ui.configbool('devel', 'check-locks')):
490 if util.safehasattr(self.svfs, 'vfs'): # this is filtervfs
490 if util.safehasattr(self.svfs, 'vfs'): # this is filtervfs
491 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
491 self.svfs.vfs.audit = self._getsvfsward(self.svfs.vfs.audit)
492 else: # standard vfs
492 else: # standard vfs
493 self.svfs.audit = self._getsvfsward(self.svfs.audit)
493 self.svfs.audit = self._getsvfsward(self.svfs.audit)
494 self._applyopenerreqs()
494 self._applyopenerreqs()
495 if create:
495 if create:
496 self._writerequirements()
496 self._writerequirements()
497
497
498 self._dirstatevalidatewarned = False
498 self._dirstatevalidatewarned = False
499
499
500 self._branchcaches = {}
500 self._branchcaches = {}
501 self._revbranchcache = None
501 self._revbranchcache = None
502 self._filterpats = {}
502 self._filterpats = {}
503 self._datafilters = {}
503 self._datafilters = {}
504 self._transref = self._lockref = self._wlockref = None
504 self._transref = self._lockref = self._wlockref = None
505
505
506 # A cache for various files under .hg/ that tracks file changes,
506 # A cache for various files under .hg/ that tracks file changes,
507 # (used by the filecache decorator)
507 # (used by the filecache decorator)
508 #
508 #
509 # Maps a property name to its util.filecacheentry
509 # Maps a property name to its util.filecacheentry
510 self._filecache = {}
510 self._filecache = {}
511
511
512 # hold sets of revision to be filtered
512 # hold sets of revision to be filtered
513 # should be cleared when something might have changed the filter value:
513 # should be cleared when something might have changed the filter value:
514 # - new changesets,
514 # - new changesets,
515 # - phase change,
515 # - phase change,
516 # - new obsolescence marker,
516 # - new obsolescence marker,
517 # - working directory parent change,
517 # - working directory parent change,
518 # - bookmark changes
518 # - bookmark changes
519 self.filteredrevcache = {}
519 self.filteredrevcache = {}
520
520
521 # post-dirstate-status hooks
521 # post-dirstate-status hooks
522 self._postdsstatus = []
522 self._postdsstatus = []
523
523
524 # generic mapping between names and nodes
524 # generic mapping between names and nodes
525 self.names = namespaces.namespaces()
525 self.names = namespaces.namespaces()
526
526
527 # Key to signature value.
527 # Key to signature value.
528 self._sparsesignaturecache = {}
528 self._sparsesignaturecache = {}
529 # Signature to cached matcher instance.
529 # Signature to cached matcher instance.
530 self._sparsematchercache = {}
530 self._sparsematchercache = {}
531
531
532 def _getvfsward(self, origfunc):
532 def _getvfsward(self, origfunc):
533 """build a ward for self.vfs"""
533 """build a ward for self.vfs"""
534 rref = weakref.ref(self)
534 rref = weakref.ref(self)
535 def checkvfs(path, mode=None):
535 def checkvfs(path, mode=None):
536 ret = origfunc(path, mode=mode)
536 ret = origfunc(path, mode=mode)
537 repo = rref()
537 repo = rref()
538 if (repo is None
538 if (repo is None
539 or not util.safehasattr(repo, '_wlockref')
539 or not util.safehasattr(repo, '_wlockref')
540 or not util.safehasattr(repo, '_lockref')):
540 or not util.safehasattr(repo, '_lockref')):
541 return
541 return
542 if mode in (None, 'r', 'rb'):
542 if mode in (None, 'r', 'rb'):
543 return
543 return
544 if path.startswith(repo.path):
544 if path.startswith(repo.path):
545 # truncate name relative to the repository (.hg)
545 # truncate name relative to the repository (.hg)
546 path = path[len(repo.path) + 1:]
546 path = path[len(repo.path) + 1:]
547 if path.startswith('cache/'):
547 if path.startswith('cache/'):
548 msg = 'accessing cache with vfs instead of cachevfs: "%s"'
548 msg = 'accessing cache with vfs instead of cachevfs: "%s"'
549 repo.ui.develwarn(msg % path, stacklevel=2, config="cache-vfs")
549 repo.ui.develwarn(msg % path, stacklevel=2, config="cache-vfs")
550 if path.startswith('journal.'):
550 if path.startswith('journal.'):
551 # journal is covered by 'lock'
551 # journal is covered by 'lock'
552 if repo._currentlock(repo._lockref) is None:
552 if repo._currentlock(repo._lockref) is None:
553 repo.ui.develwarn('write with no lock: "%s"' % path,
553 repo.ui.develwarn('write with no lock: "%s"' % path,
554 stacklevel=2, config='check-locks')
554 stacklevel=2, config='check-locks')
555 elif repo._currentlock(repo._wlockref) is None:
555 elif repo._currentlock(repo._wlockref) is None:
556 # rest of vfs files are covered by 'wlock'
556 # rest of vfs files are covered by 'wlock'
557 #
557 #
558 # exclude special files
558 # exclude special files
559 for prefix in self._wlockfreeprefix:
559 for prefix in self._wlockfreeprefix:
560 if path.startswith(prefix):
560 if path.startswith(prefix):
561 return
561 return
562 repo.ui.develwarn('write with no wlock: "%s"' % path,
562 repo.ui.develwarn('write with no wlock: "%s"' % path,
563 stacklevel=2, config='check-locks')
563 stacklevel=2, config='check-locks')
564 return ret
564 return ret
565 return checkvfs
565 return checkvfs
566
566
567 def _getsvfsward(self, origfunc):
567 def _getsvfsward(self, origfunc):
568 """build a ward for self.svfs"""
568 """build a ward for self.svfs"""
569 rref = weakref.ref(self)
569 rref = weakref.ref(self)
570 def checksvfs(path, mode=None):
570 def checksvfs(path, mode=None):
571 ret = origfunc(path, mode=mode)
571 ret = origfunc(path, mode=mode)
572 repo = rref()
572 repo = rref()
573 if repo is None or not util.safehasattr(repo, '_lockref'):
573 if repo is None or not util.safehasattr(repo, '_lockref'):
574 return
574 return
575 if mode in (None, 'r', 'rb'):
575 if mode in (None, 'r', 'rb'):
576 return
576 return
577 if path.startswith(repo.sharedpath):
577 if path.startswith(repo.sharedpath):
578 # truncate name relative to the repository (.hg)
578 # truncate name relative to the repository (.hg)
579 path = path[len(repo.sharedpath) + 1:]
579 path = path[len(repo.sharedpath) + 1:]
580 if repo._currentlock(repo._lockref) is None:
580 if repo._currentlock(repo._lockref) is None:
581 repo.ui.develwarn('write with no lock: "%s"' % path,
581 repo.ui.develwarn('write with no lock: "%s"' % path,
582 stacklevel=3)
582 stacklevel=3)
583 return ret
583 return ret
584 return checksvfs
584 return checksvfs
585
585
586 def close(self):
586 def close(self):
587 self._writecaches()
587 self._writecaches()
588
588
589 def _loadextensions(self):
589 def _loadextensions(self):
590 extensions.loadall(self.ui)
590 extensions.loadall(self.ui)
591
591
592 def _writecaches(self):
592 def _writecaches(self):
593 if self._revbranchcache:
593 if self._revbranchcache:
594 self._revbranchcache.write()
594 self._revbranchcache.write()
595
595
596 def _restrictcapabilities(self, caps):
596 def _restrictcapabilities(self, caps):
597 if self.ui.configbool('experimental', 'bundle2-advertise'):
597 if self.ui.configbool('experimental', 'bundle2-advertise'):
598 caps = set(caps)
598 caps = set(caps)
599 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self,
599 capsblob = bundle2.encodecaps(bundle2.getrepocaps(self,
600 role='client'))
600 role='client'))
601 caps.add('bundle2=' + urlreq.quote(capsblob))
601 caps.add('bundle2=' + urlreq.quote(capsblob))
602 return caps
602 return caps
603
603
604 def _applyopenerreqs(self):
604 def _applyopenerreqs(self):
605 self.svfs.options = dict((r, 1) for r in self.requirements
605 self.svfs.options = dict((r, 1) for r in self.requirements
606 if r in self.openerreqs)
606 if r in self.openerreqs)
607 # experimental config: format.chunkcachesize
607 # experimental config: format.chunkcachesize
608 chunkcachesize = self.ui.configint('format', 'chunkcachesize')
608 chunkcachesize = self.ui.configint('format', 'chunkcachesize')
609 if chunkcachesize is not None:
609 if chunkcachesize is not None:
610 self.svfs.options['chunkcachesize'] = chunkcachesize
610 self.svfs.options['chunkcachesize'] = chunkcachesize
611 # experimental config: format.maxchainlen
611 # experimental config: format.maxchainlen
612 maxchainlen = self.ui.configint('format', 'maxchainlen')
612 maxchainlen = self.ui.configint('format', 'maxchainlen')
613 if maxchainlen is not None:
613 if maxchainlen is not None:
614 self.svfs.options['maxchainlen'] = maxchainlen
614 self.svfs.options['maxchainlen'] = maxchainlen
615 # experimental config: format.manifestcachesize
615 # experimental config: format.manifestcachesize
616 manifestcachesize = self.ui.configint('format', 'manifestcachesize')
616 manifestcachesize = self.ui.configint('format', 'manifestcachesize')
617 if manifestcachesize is not None:
617 if manifestcachesize is not None:
618 self.svfs.options['manifestcachesize'] = manifestcachesize
618 self.svfs.options['manifestcachesize'] = manifestcachesize
619 # experimental config: format.aggressivemergedeltas
619 # experimental config: format.aggressivemergedeltas
620 aggressivemergedeltas = self.ui.configbool('format',
620 aggressivemergedeltas = self.ui.configbool('format',
621 'aggressivemergedeltas')
621 'aggressivemergedeltas')
622 self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas
622 self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas
623 self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui)
623 self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui)
624 chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan')
624 chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan')
625 if 0 <= chainspan:
625 if 0 <= chainspan:
626 self.svfs.options['maxdeltachainspan'] = chainspan
626 self.svfs.options['maxdeltachainspan'] = chainspan
627 mmapindexthreshold = self.ui.configbytes('experimental',
627 mmapindexthreshold = self.ui.configbytes('experimental',
628 'mmapindexthreshold')
628 'mmapindexthreshold')
629 if mmapindexthreshold is not None:
629 if mmapindexthreshold is not None:
630 self.svfs.options['mmapindexthreshold'] = mmapindexthreshold
630 self.svfs.options['mmapindexthreshold'] = mmapindexthreshold
631 withsparseread = self.ui.configbool('experimental', 'sparse-read')
631 withsparseread = self.ui.configbool('experimental', 'sparse-read')
632 srdensitythres = float(self.ui.config('experimental',
632 srdensitythres = float(self.ui.config('experimental',
633 'sparse-read.density-threshold'))
633 'sparse-read.density-threshold'))
634 srmingapsize = self.ui.configbytes('experimental',
634 srmingapsize = self.ui.configbytes('experimental',
635 'sparse-read.min-gap-size')
635 'sparse-read.min-gap-size')
636 self.svfs.options['with-sparse-read'] = withsparseread
636 self.svfs.options['with-sparse-read'] = withsparseread
637 self.svfs.options['sparse-read-density-threshold'] = srdensitythres
637 self.svfs.options['sparse-read-density-threshold'] = srdensitythres
638 self.svfs.options['sparse-read-min-gap-size'] = srmingapsize
638 self.svfs.options['sparse-read-min-gap-size'] = srmingapsize
639
639
640 for r in self.requirements:
640 for r in self.requirements:
641 if r.startswith('exp-compression-'):
641 if r.startswith('exp-compression-'):
642 self.svfs.options['compengine'] = r[len('exp-compression-'):]
642 self.svfs.options['compengine'] = r[len('exp-compression-'):]
643
643
644 # TODO move "revlogv2" to openerreqs once finalized.
644 # TODO move "revlogv2" to openerreqs once finalized.
645 if REVLOGV2_REQUIREMENT in self.requirements:
645 if REVLOGV2_REQUIREMENT in self.requirements:
646 self.svfs.options['revlogv2'] = True
646 self.svfs.options['revlogv2'] = True
647
647
648 def _writerequirements(self):
648 def _writerequirements(self):
649 scmutil.writerequires(self.vfs, self.requirements)
649 scmutil.writerequires(self.vfs, self.requirements)
650
650
651 def _checknested(self, path):
651 def _checknested(self, path):
652 """Determine if path is a legal nested repository."""
652 """Determine if path is a legal nested repository."""
653 if not path.startswith(self.root):
653 if not path.startswith(self.root):
654 return False
654 return False
655 subpath = path[len(self.root) + 1:]
655 subpath = path[len(self.root) + 1:]
656 normsubpath = util.pconvert(subpath)
656 normsubpath = util.pconvert(subpath)
657
657
658 # XXX: Checking against the current working copy is wrong in
658 # XXX: Checking against the current working copy is wrong in
659 # the sense that it can reject things like
659 # the sense that it can reject things like
660 #
660 #
661 # $ hg cat -r 10 sub/x.txt
661 # $ hg cat -r 10 sub/x.txt
662 #
662 #
663 # if sub/ is no longer a subrepository in the working copy
663 # if sub/ is no longer a subrepository in the working copy
664 # parent revision.
664 # parent revision.
665 #
665 #
666 # However, it can of course also allow things that would have
666 # However, it can of course also allow things that would have
667 # been rejected before, such as the above cat command if sub/
667 # been rejected before, such as the above cat command if sub/
668 # is a subrepository now, but was a normal directory before.
668 # is a subrepository now, but was a normal directory before.
669 # The old path auditor would have rejected by mistake since it
669 # The old path auditor would have rejected by mistake since it
670 # panics when it sees sub/.hg/.
670 # panics when it sees sub/.hg/.
671 #
671 #
672 # All in all, checking against the working copy seems sensible
672 # All in all, checking against the working copy seems sensible
673 # since we want to prevent access to nested repositories on
673 # since we want to prevent access to nested repositories on
674 # the filesystem *now*.
674 # the filesystem *now*.
675 ctx = self[None]
675 ctx = self[None]
676 parts = util.splitpath(subpath)
676 parts = util.splitpath(subpath)
677 while parts:
677 while parts:
678 prefix = '/'.join(parts)
678 prefix = '/'.join(parts)
679 if prefix in ctx.substate:
679 if prefix in ctx.substate:
680 if prefix == normsubpath:
680 if prefix == normsubpath:
681 return True
681 return True
682 else:
682 else:
683 sub = ctx.sub(prefix)
683 sub = ctx.sub(prefix)
684 return sub.checknested(subpath[len(prefix) + 1:])
684 return sub.checknested(subpath[len(prefix) + 1:])
685 else:
685 else:
686 parts.pop()
686 parts.pop()
687 return False
687 return False
688
688
689 def peer(self):
689 def peer(self):
690 return localpeer(self) # not cached to avoid reference cycle
690 return localpeer(self) # not cached to avoid reference cycle
691
691
692 def unfiltered(self):
692 def unfiltered(self):
693 """Return unfiltered version of the repository
693 """Return unfiltered version of the repository
694
694
695 Intended to be overwritten by filtered repo."""
695 Intended to be overwritten by filtered repo."""
696 return self
696 return self
697
697
698 def filtered(self, name, visibilityexceptions=None):
698 def filtered(self, name, visibilityexceptions=None):
699 """Return a filtered version of a repository"""
699 """Return a filtered version of a repository"""
700 cls = repoview.newtype(self.unfiltered().__class__)
700 cls = repoview.newtype(self.unfiltered().__class__)
701 return cls(self, name, visibilityexceptions)
701 return cls(self, name, visibilityexceptions)
702
702
703 @repofilecache('bookmarks', 'bookmarks.current')
703 @repofilecache('bookmarks', 'bookmarks.current')
704 def _bookmarks(self):
704 def _bookmarks(self):
705 return bookmarks.bmstore(self)
705 return bookmarks.bmstore(self)
706
706
707 @property
707 @property
708 def _activebookmark(self):
708 def _activebookmark(self):
709 return self._bookmarks.active
709 return self._bookmarks.active
710
710
711 # _phasesets depend on changelog. what we need is to call
711 # _phasesets depend on changelog. what we need is to call
712 # _phasecache.invalidate() if '00changelog.i' was changed, but it
712 # _phasecache.invalidate() if '00changelog.i' was changed, but it
713 # can't be easily expressed in filecache mechanism.
713 # can't be easily expressed in filecache mechanism.
714 @storecache('phaseroots', '00changelog.i')
714 @storecache('phaseroots', '00changelog.i')
715 def _phasecache(self):
715 def _phasecache(self):
716 return phases.phasecache(self, self._phasedefaults)
716 return phases.phasecache(self, self._phasedefaults)
717
717
718 @storecache('obsstore')
718 @storecache('obsstore')
719 def obsstore(self):
719 def obsstore(self):
720 return obsolete.makestore(self.ui, self)
720 return obsolete.makestore(self.ui, self)
721
721
722 @storecache('00changelog.i')
722 @storecache('00changelog.i')
723 def changelog(self):
723 def changelog(self):
724 return changelog.changelog(self.svfs,
724 return changelog.changelog(self.svfs,
725 trypending=txnutil.mayhavepending(self.root))
725 trypending=txnutil.mayhavepending(self.root))
726
726
727 def _constructmanifest(self):
727 def _constructmanifest(self):
728 # This is a temporary function while we migrate from manifest to
728 # This is a temporary function while we migrate from manifest to
729 # manifestlog. It allows bundlerepo and unionrepo to intercept the
729 # manifestlog. It allows bundlerepo and unionrepo to intercept the
730 # manifest creation.
730 # manifest creation.
731 return manifest.manifestrevlog(self.svfs)
731 return manifest.manifestrevlog(self.svfs)
732
732
733 @storecache('00manifest.i')
733 @storecache('00manifest.i')
734 def manifestlog(self):
734 def manifestlog(self):
735 return manifest.manifestlog(self.svfs, self)
735 return manifest.manifestlog(self.svfs, self)
736
736
737 @repofilecache('dirstate')
737 @repofilecache('dirstate')
738 def dirstate(self):
738 def dirstate(self):
739 sparsematchfn = lambda: sparse.matcher(self)
739 sparsematchfn = lambda: sparse.matcher(self)
740
740
741 return dirstate.dirstate(self.vfs, self.ui, self.root,
741 return dirstate.dirstate(self.vfs, self.ui, self.root,
742 self._dirstatevalidate, sparsematchfn)
742 self._dirstatevalidate, sparsematchfn)
743
743
744 def _dirstatevalidate(self, node):
744 def _dirstatevalidate(self, node):
745 try:
745 try:
746 self.changelog.rev(node)
746 self.changelog.rev(node)
747 return node
747 return node
748 except error.LookupError:
748 except error.LookupError:
749 if not self._dirstatevalidatewarned:
749 if not self._dirstatevalidatewarned:
750 self._dirstatevalidatewarned = True
750 self._dirstatevalidatewarned = True
751 self.ui.warn(_("warning: ignoring unknown"
751 self.ui.warn(_("warning: ignoring unknown"
752 " working parent %s!\n") % short(node))
752 " working parent %s!\n") % short(node))
753 return nullid
753 return nullid
754
754
755 @repofilecache(narrowspec.FILENAME)
755 @repofilecache(narrowspec.FILENAME)
756 def narrowpats(self):
756 def narrowpats(self):
757 """matcher patterns for this repository's narrowspec
757 """matcher patterns for this repository's narrowspec
758
758
759 A tuple of (includes, excludes).
759 A tuple of (includes, excludes).
760 """
760 """
761 source = self
761 source = self
762 if self.shared():
762 if self.shared():
763 from . import hg
763 from . import hg
764 source = hg.sharedreposource(self)
764 source = hg.sharedreposource(self)
765 return narrowspec.load(source)
765 return narrowspec.load(source)
766
766
767 @repofilecache(narrowspec.FILENAME)
767 @repofilecache(narrowspec.FILENAME)
768 def _narrowmatch(self):
768 def _narrowmatch(self):
769 if changegroup.NARROW_REQUIREMENT not in self.requirements:
769 if changegroup.NARROW_REQUIREMENT not in self.requirements:
770 return matchmod.always(self.root, '')
770 return matchmod.always(self.root, '')
771 include, exclude = self.narrowpats
771 include, exclude = self.narrowpats
772 return narrowspec.match(self.root, include=include, exclude=exclude)
772 return narrowspec.match(self.root, include=include, exclude=exclude)
773
773
774 # TODO(martinvonz): make this property-like instead?
774 # TODO(martinvonz): make this property-like instead?
775 def narrowmatch(self):
775 def narrowmatch(self):
776 return self._narrowmatch
776 return self._narrowmatch
777
777
778 def setnarrowpats(self, newincludes, newexcludes):
778 def setnarrowpats(self, newincludes, newexcludes):
779 target = self
779 target = self
780 if self.shared():
780 if self.shared():
781 from . import hg
781 from . import hg
782 target = hg.sharedreposource(self)
782 target = hg.sharedreposource(self)
783 narrowspec.save(target, newincludes, newexcludes)
783 narrowspec.save(target, newincludes, newexcludes)
784 self.invalidate(clearfilecache=True)
784 self.invalidate(clearfilecache=True)
785
785
786 def __getitem__(self, changeid):
786 def __getitem__(self, changeid):
787 if changeid is None:
787 if changeid is None:
788 return context.workingctx(self)
788 return context.workingctx(self)
789 if isinstance(changeid, context.basectx):
789 if isinstance(changeid, context.basectx):
790 return changeid
790 return changeid
791 if isinstance(changeid, slice):
791 if isinstance(changeid, slice):
792 # wdirrev isn't contiguous so the slice shouldn't include it
792 # wdirrev isn't contiguous so the slice shouldn't include it
793 return [context.changectx(self, i)
793 return [context.changectx(self, i)
794 for i in xrange(*changeid.indices(len(self)))
794 for i in xrange(*changeid.indices(len(self)))
795 if i not in self.changelog.filteredrevs]
795 if i not in self.changelog.filteredrevs]
796 try:
796 try:
797 return context.changectx(self, changeid)
797 return context.changectx(self, changeid)
798 except error.WdirUnsupported:
798 except error.WdirUnsupported:
799 return context.workingctx(self)
799 return context.workingctx(self)
800
800
801 def __contains__(self, changeid):
801 def __contains__(self, changeid):
802 """True if the given changeid exists
802 """True if the given changeid exists
803
803
804 error.LookupError is raised if an ambiguous node specified.
804 error.LookupError is raised if an ambiguous node specified.
805 """
805 """
806 try:
806 try:
807 self[changeid]
807 self[changeid]
808 return True
808 return True
809 except error.RepoLookupError:
809 except error.RepoLookupError:
810 return False
810 return False
811
811
812 def __nonzero__(self):
812 def __nonzero__(self):
813 return True
813 return True
814
814
815 __bool__ = __nonzero__
815 __bool__ = __nonzero__
816
816
817 def __len__(self):
817 def __len__(self):
818 # no need to pay the cost of repoview.changelog
818 # no need to pay the cost of repoview.changelog
819 unfi = self.unfiltered()
819 unfi = self.unfiltered()
820 return len(unfi.changelog)
820 return len(unfi.changelog)
821
821
822 def __iter__(self):
822 def __iter__(self):
823 return iter(self.changelog)
823 return iter(self.changelog)
824
824
825 def revs(self, expr, *args):
825 def revs(self, expr, *args):
826 '''Find revisions matching a revset.
826 '''Find revisions matching a revset.
827
827
828 The revset is specified as a string ``expr`` that may contain
828 The revset is specified as a string ``expr`` that may contain
829 %-formatting to escape certain types. See ``revsetlang.formatspec``.
829 %-formatting to escape certain types. See ``revsetlang.formatspec``.
830
830
831 Revset aliases from the configuration are not expanded. To expand
831 Revset aliases from the configuration are not expanded. To expand
832 user aliases, consider calling ``scmutil.revrange()`` or
832 user aliases, consider calling ``scmutil.revrange()`` or
833 ``repo.anyrevs([expr], user=True)``.
833 ``repo.anyrevs([expr], user=True)``.
834
834
835 Returns a revset.abstractsmartset, which is a list-like interface
835 Returns a revset.abstractsmartset, which is a list-like interface
836 that contains integer revisions.
836 that contains integer revisions.
837 '''
837 '''
838 expr = revsetlang.formatspec(expr, *args)
838 expr = revsetlang.formatspec(expr, *args)
839 m = revset.match(None, expr)
839 m = revset.match(None, expr)
840 return m(self)
840 return m(self)
841
841
842 def set(self, expr, *args):
842 def set(self, expr, *args):
843 '''Find revisions matching a revset and emit changectx instances.
843 '''Find revisions matching a revset and emit changectx instances.
844
844
845 This is a convenience wrapper around ``revs()`` that iterates the
845 This is a convenience wrapper around ``revs()`` that iterates the
846 result and is a generator of changectx instances.
846 result and is a generator of changectx instances.
847
847
848 Revset aliases from the configuration are not expanded. To expand
848 Revset aliases from the configuration are not expanded. To expand
849 user aliases, consider calling ``scmutil.revrange()``.
849 user aliases, consider calling ``scmutil.revrange()``.
850 '''
850 '''
851 for r in self.revs(expr, *args):
851 for r in self.revs(expr, *args):
852 yield self[r]
852 yield self[r]
853
853
854 def anyrevs(self, specs, user=False, localalias=None):
854 def anyrevs(self, specs, user=False, localalias=None):
855 '''Find revisions matching one of the given revsets.
855 '''Find revisions matching one of the given revsets.
856
856
857 Revset aliases from the configuration are not expanded by default. To
857 Revset aliases from the configuration are not expanded by default. To
858 expand user aliases, specify ``user=True``. To provide some local
858 expand user aliases, specify ``user=True``. To provide some local
859 definitions overriding user aliases, set ``localalias`` to
859 definitions overriding user aliases, set ``localalias`` to
860 ``{name: definitionstring}``.
860 ``{name: definitionstring}``.
861 '''
861 '''
862 if user:
862 if user:
863 m = revset.matchany(self.ui, specs, repo=self,
863 m = revset.matchany(self.ui, specs, repo=self,
864 localalias=localalias)
864 localalias=localalias)
865 else:
865 else:
866 m = revset.matchany(None, specs, localalias=localalias)
866 m = revset.matchany(None, specs, localalias=localalias)
867 return m(self)
867 return m(self)
868
868
869 def url(self):
869 def url(self):
870 return 'file:' + self.root
870 return 'file:' + self.root
871
871
872 def hook(self, name, throw=False, **args):
872 def hook(self, name, throw=False, **args):
873 """Call a hook, passing this repo instance.
873 """Call a hook, passing this repo instance.
874
874
875 This a convenience method to aid invoking hooks. Extensions likely
875 This a convenience method to aid invoking hooks. Extensions likely
876 won't call this unless they have registered a custom hook or are
876 won't call this unless they have registered a custom hook or are
877 replacing code that is expected to call a hook.
877 replacing code that is expected to call a hook.
878 """
878 """
879 return hook.hook(self.ui, self, name, throw, **args)
879 return hook.hook(self.ui, self, name, throw, **args)
880
880
881 @filteredpropertycache
881 @filteredpropertycache
882 def _tagscache(self):
882 def _tagscache(self):
883 '''Returns a tagscache object that contains various tags related
883 '''Returns a tagscache object that contains various tags related
884 caches.'''
884 caches.'''
885
885
886 # This simplifies its cache management by having one decorated
886 # This simplifies its cache management by having one decorated
887 # function (this one) and the rest simply fetch things from it.
887 # function (this one) and the rest simply fetch things from it.
888 class tagscache(object):
888 class tagscache(object):
889 def __init__(self):
889 def __init__(self):
890 # These two define the set of tags for this repository. tags
890 # These two define the set of tags for this repository. tags
891 # maps tag name to node; tagtypes maps tag name to 'global' or
891 # maps tag name to node; tagtypes maps tag name to 'global' or
892 # 'local'. (Global tags are defined by .hgtags across all
892 # 'local'. (Global tags are defined by .hgtags across all
893 # heads, and local tags are defined in .hg/localtags.)
893 # heads, and local tags are defined in .hg/localtags.)
894 # They constitute the in-memory cache of tags.
894 # They constitute the in-memory cache of tags.
895 self.tags = self.tagtypes = None
895 self.tags = self.tagtypes = None
896
896
897 self.nodetagscache = self.tagslist = None
897 self.nodetagscache = self.tagslist = None
898
898
899 cache = tagscache()
899 cache = tagscache()
900 cache.tags, cache.tagtypes = self._findtags()
900 cache.tags, cache.tagtypes = self._findtags()
901
901
902 return cache
902 return cache
903
903
904 def tags(self):
904 def tags(self):
905 '''return a mapping of tag to node'''
905 '''return a mapping of tag to node'''
906 t = {}
906 t = {}
907 if self.changelog.filteredrevs:
907 if self.changelog.filteredrevs:
908 tags, tt = self._findtags()
908 tags, tt = self._findtags()
909 else:
909 else:
910 tags = self._tagscache.tags
910 tags = self._tagscache.tags
911 for k, v in tags.iteritems():
911 for k, v in tags.iteritems():
912 try:
912 try:
913 # ignore tags to unknown nodes
913 # ignore tags to unknown nodes
914 self.changelog.rev(v)
914 self.changelog.rev(v)
915 t[k] = v
915 t[k] = v
916 except (error.LookupError, ValueError):
916 except (error.LookupError, ValueError):
917 pass
917 pass
918 return t
918 return t
919
919
920 def _findtags(self):
920 def _findtags(self):
921 '''Do the hard work of finding tags. Return a pair of dicts
921 '''Do the hard work of finding tags. Return a pair of dicts
922 (tags, tagtypes) where tags maps tag name to node, and tagtypes
922 (tags, tagtypes) where tags maps tag name to node, and tagtypes
923 maps tag name to a string like \'global\' or \'local\'.
923 maps tag name to a string like \'global\' or \'local\'.
924 Subclasses or extensions are free to add their own tags, but
924 Subclasses or extensions are free to add their own tags, but
925 should be aware that the returned dicts will be retained for the
925 should be aware that the returned dicts will be retained for the
926 duration of the localrepo object.'''
926 duration of the localrepo object.'''
927
927
928 # XXX what tagtype should subclasses/extensions use? Currently
928 # XXX what tagtype should subclasses/extensions use? Currently
929 # mq and bookmarks add tags, but do not set the tagtype at all.
929 # mq and bookmarks add tags, but do not set the tagtype at all.
930 # Should each extension invent its own tag type? Should there
930 # Should each extension invent its own tag type? Should there
931 # be one tagtype for all such "virtual" tags? Or is the status
931 # be one tagtype for all such "virtual" tags? Or is the status
932 # quo fine?
932 # quo fine?
933
933
934
934
935 # map tag name to (node, hist)
935 # map tag name to (node, hist)
936 alltags = tagsmod.findglobaltags(self.ui, self)
936 alltags = tagsmod.findglobaltags(self.ui, self)
937 # map tag name to tag type
937 # map tag name to tag type
938 tagtypes = dict((tag, 'global') for tag in alltags)
938 tagtypes = dict((tag, 'global') for tag in alltags)
939
939
940 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
940 tagsmod.readlocaltags(self.ui, self, alltags, tagtypes)
941
941
942 # Build the return dicts. Have to re-encode tag names because
942 # Build the return dicts. Have to re-encode tag names because
943 # the tags module always uses UTF-8 (in order not to lose info
943 # the tags module always uses UTF-8 (in order not to lose info
944 # writing to the cache), but the rest of Mercurial wants them in
944 # writing to the cache), but the rest of Mercurial wants them in
945 # local encoding.
945 # local encoding.
946 tags = {}
946 tags = {}
947 for (name, (node, hist)) in alltags.iteritems():
947 for (name, (node, hist)) in alltags.iteritems():
948 if node != nullid:
948 if node != nullid:
949 tags[encoding.tolocal(name)] = node
949 tags[encoding.tolocal(name)] = node
950 tags['tip'] = self.changelog.tip()
950 tags['tip'] = self.changelog.tip()
951 tagtypes = dict([(encoding.tolocal(name), value)
951 tagtypes = dict([(encoding.tolocal(name), value)
952 for (name, value) in tagtypes.iteritems()])
952 for (name, value) in tagtypes.iteritems()])
953 return (tags, tagtypes)
953 return (tags, tagtypes)
954
954
955 def tagtype(self, tagname):
955 def tagtype(self, tagname):
956 '''
956 '''
957 return the type of the given tag. result can be:
957 return the type of the given tag. result can be:
958
958
959 'local' : a local tag
959 'local' : a local tag
960 'global' : a global tag
960 'global' : a global tag
961 None : tag does not exist
961 None : tag does not exist
962 '''
962 '''
963
963
964 return self._tagscache.tagtypes.get(tagname)
964 return self._tagscache.tagtypes.get(tagname)
965
965
966 def tagslist(self):
966 def tagslist(self):
967 '''return a list of tags ordered by revision'''
967 '''return a list of tags ordered by revision'''
968 if not self._tagscache.tagslist:
968 if not self._tagscache.tagslist:
969 l = []
969 l = []
970 for t, n in self.tags().iteritems():
970 for t, n in self.tags().iteritems():
971 l.append((self.changelog.rev(n), t, n))
971 l.append((self.changelog.rev(n), t, n))
972 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
972 self._tagscache.tagslist = [(t, n) for r, t, n in sorted(l)]
973
973
974 return self._tagscache.tagslist
974 return self._tagscache.tagslist
975
975
976 def nodetags(self, node):
976 def nodetags(self, node):
977 '''return the tags associated with a node'''
977 '''return the tags associated with a node'''
978 if not self._tagscache.nodetagscache:
978 if not self._tagscache.nodetagscache:
979 nodetagscache = {}
979 nodetagscache = {}
980 for t, n in self._tagscache.tags.iteritems():
980 for t, n in self._tagscache.tags.iteritems():
981 nodetagscache.setdefault(n, []).append(t)
981 nodetagscache.setdefault(n, []).append(t)
982 for tags in nodetagscache.itervalues():
982 for tags in nodetagscache.itervalues():
983 tags.sort()
983 tags.sort()
984 self._tagscache.nodetagscache = nodetagscache
984 self._tagscache.nodetagscache = nodetagscache
985 return self._tagscache.nodetagscache.get(node, [])
985 return self._tagscache.nodetagscache.get(node, [])
986
986
987 def nodebookmarks(self, node):
987 def nodebookmarks(self, node):
988 """return the list of bookmarks pointing to the specified node"""
988 """return the list of bookmarks pointing to the specified node"""
989 marks = []
989 marks = []
990 for bookmark, n in self._bookmarks.iteritems():
990 for bookmark, n in self._bookmarks.iteritems():
991 if n == node:
991 if n == node:
992 marks.append(bookmark)
992 marks.append(bookmark)
993 return sorted(marks)
993 return sorted(marks)
994
994
995 def branchmap(self):
995 def branchmap(self):
996 '''returns a dictionary {branch: [branchheads]} with branchheads
996 '''returns a dictionary {branch: [branchheads]} with branchheads
997 ordered by increasing revision number'''
997 ordered by increasing revision number'''
998 branchmap.updatecache(self)
998 branchmap.updatecache(self)
999 return self._branchcaches[self.filtername]
999 return self._branchcaches[self.filtername]
1000
1000
1001 @unfilteredmethod
1001 @unfilteredmethod
1002 def revbranchcache(self):
1002 def revbranchcache(self):
1003 if not self._revbranchcache:
1003 if not self._revbranchcache:
1004 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
1004 self._revbranchcache = branchmap.revbranchcache(self.unfiltered())
1005 return self._revbranchcache
1005 return self._revbranchcache
1006
1006
1007 def branchtip(self, branch, ignoremissing=False):
1007 def branchtip(self, branch, ignoremissing=False):
1008 '''return the tip node for a given branch
1008 '''return the tip node for a given branch
1009
1009
1010 If ignoremissing is True, then this method will not raise an error.
1010 If ignoremissing is True, then this method will not raise an error.
1011 This is helpful for callers that only expect None for a missing branch
1011 This is helpful for callers that only expect None for a missing branch
1012 (e.g. namespace).
1012 (e.g. namespace).
1013
1013
1014 '''
1014 '''
1015 try:
1015 try:
1016 return self.branchmap().branchtip(branch)
1016 return self.branchmap().branchtip(branch)
1017 except KeyError:
1017 except KeyError:
1018 if not ignoremissing:
1018 if not ignoremissing:
1019 raise error.RepoLookupError(_("unknown branch '%s'") % branch)
1019 raise error.RepoLookupError(_("unknown branch '%s'") % branch)
1020 else:
1020 else:
1021 pass
1021 pass
1022
1022
1023 def lookup(self, key):
1023 def lookup(self, key):
1024 return self[key].node()
1024 return scmutil.revsymbol(self, key).node()
1025
1025
1026 def lookupbranch(self, key, remote=None):
1026 def lookupbranch(self, key, remote=None):
1027 repo = remote or self
1027 repo = remote or self
1028 if key in repo.branchmap():
1028 if key in repo.branchmap():
1029 return key
1029 return key
1030
1030
1031 repo = (remote and remote.local()) and remote or self
1031 repo = (remote and remote.local()) and remote or self
1032 return repo[key].branch()
1032 return repo[key].branch()
1033
1033
1034 def known(self, nodes):
1034 def known(self, nodes):
1035 cl = self.changelog
1035 cl = self.changelog
1036 nm = cl.nodemap
1036 nm = cl.nodemap
1037 filtered = cl.filteredrevs
1037 filtered = cl.filteredrevs
1038 result = []
1038 result = []
1039 for n in nodes:
1039 for n in nodes:
1040 r = nm.get(n)
1040 r = nm.get(n)
1041 resp = not (r is None or r in filtered)
1041 resp = not (r is None or r in filtered)
1042 result.append(resp)
1042 result.append(resp)
1043 return result
1043 return result
1044
1044
1045 def local(self):
1045 def local(self):
1046 return self
1046 return self
1047
1047
1048 def publishing(self):
1048 def publishing(self):
1049 # it's safe (and desirable) to trust the publish flag unconditionally
1049 # it's safe (and desirable) to trust the publish flag unconditionally
1050 # so that we don't finalize changes shared between users via ssh or nfs
1050 # so that we don't finalize changes shared between users via ssh or nfs
1051 return self.ui.configbool('phases', 'publish', untrusted=True)
1051 return self.ui.configbool('phases', 'publish', untrusted=True)
1052
1052
1053 def cancopy(self):
1053 def cancopy(self):
1054 # so statichttprepo's override of local() works
1054 # so statichttprepo's override of local() works
1055 if not self.local():
1055 if not self.local():
1056 return False
1056 return False
1057 if not self.publishing():
1057 if not self.publishing():
1058 return True
1058 return True
1059 # if publishing we can't copy if there is filtered content
1059 # if publishing we can't copy if there is filtered content
1060 return not self.filtered('visible').changelog.filteredrevs
1060 return not self.filtered('visible').changelog.filteredrevs
1061
1061
1062 def shared(self):
1062 def shared(self):
1063 '''the type of shared repository (None if not shared)'''
1063 '''the type of shared repository (None if not shared)'''
1064 if self.sharedpath != self.path:
1064 if self.sharedpath != self.path:
1065 return 'store'
1065 return 'store'
1066 return None
1066 return None
1067
1067
1068 def wjoin(self, f, *insidef):
1068 def wjoin(self, f, *insidef):
1069 return self.vfs.reljoin(self.root, f, *insidef)
1069 return self.vfs.reljoin(self.root, f, *insidef)
1070
1070
1071 def file(self, f):
1071 def file(self, f):
1072 if f[0] == '/':
1072 if f[0] == '/':
1073 f = f[1:]
1073 f = f[1:]
1074 return filelog.filelog(self.svfs, f)
1074 return filelog.filelog(self.svfs, f)
1075
1075
1076 def changectx(self, changeid):
1076 def changectx(self, changeid):
1077 return self[changeid]
1077 return self[changeid]
1078
1078
1079 def setparents(self, p1, p2=nullid):
1079 def setparents(self, p1, p2=nullid):
1080 with self.dirstate.parentchange():
1080 with self.dirstate.parentchange():
1081 copies = self.dirstate.setparents(p1, p2)
1081 copies = self.dirstate.setparents(p1, p2)
1082 pctx = self[p1]
1082 pctx = self[p1]
1083 if copies:
1083 if copies:
1084 # Adjust copy records, the dirstate cannot do it, it
1084 # Adjust copy records, the dirstate cannot do it, it
1085 # requires access to parents manifests. Preserve them
1085 # requires access to parents manifests. Preserve them
1086 # only for entries added to first parent.
1086 # only for entries added to first parent.
1087 for f in copies:
1087 for f in copies:
1088 if f not in pctx and copies[f] in pctx:
1088 if f not in pctx and copies[f] in pctx:
1089 self.dirstate.copy(copies[f], f)
1089 self.dirstate.copy(copies[f], f)
1090 if p2 == nullid:
1090 if p2 == nullid:
1091 for f, s in sorted(self.dirstate.copies().items()):
1091 for f, s in sorted(self.dirstate.copies().items()):
1092 if f not in pctx and s not in pctx:
1092 if f not in pctx and s not in pctx:
1093 self.dirstate.copy(None, f)
1093 self.dirstate.copy(None, f)
1094
1094
1095 def filectx(self, path, changeid=None, fileid=None, changectx=None):
1095 def filectx(self, path, changeid=None, fileid=None, changectx=None):
1096 """changeid can be a changeset revision, node, or tag.
1096 """changeid can be a changeset revision, node, or tag.
1097 fileid can be a file revision or node."""
1097 fileid can be a file revision or node."""
1098 return context.filectx(self, path, changeid, fileid,
1098 return context.filectx(self, path, changeid, fileid,
1099 changectx=changectx)
1099 changectx=changectx)
1100
1100
1101 def getcwd(self):
1101 def getcwd(self):
1102 return self.dirstate.getcwd()
1102 return self.dirstate.getcwd()
1103
1103
1104 def pathto(self, f, cwd=None):
1104 def pathto(self, f, cwd=None):
1105 return self.dirstate.pathto(f, cwd)
1105 return self.dirstate.pathto(f, cwd)
1106
1106
1107 def _loadfilter(self, filter):
1107 def _loadfilter(self, filter):
1108 if filter not in self._filterpats:
1108 if filter not in self._filterpats:
1109 l = []
1109 l = []
1110 for pat, cmd in self.ui.configitems(filter):
1110 for pat, cmd in self.ui.configitems(filter):
1111 if cmd == '!':
1111 if cmd == '!':
1112 continue
1112 continue
1113 mf = matchmod.match(self.root, '', [pat])
1113 mf = matchmod.match(self.root, '', [pat])
1114 fn = None
1114 fn = None
1115 params = cmd
1115 params = cmd
1116 for name, filterfn in self._datafilters.iteritems():
1116 for name, filterfn in self._datafilters.iteritems():
1117 if cmd.startswith(name):
1117 if cmd.startswith(name):
1118 fn = filterfn
1118 fn = filterfn
1119 params = cmd[len(name):].lstrip()
1119 params = cmd[len(name):].lstrip()
1120 break
1120 break
1121 if not fn:
1121 if not fn:
1122 fn = lambda s, c, **kwargs: procutil.filter(s, c)
1122 fn = lambda s, c, **kwargs: procutil.filter(s, c)
1123 # Wrap old filters not supporting keyword arguments
1123 # Wrap old filters not supporting keyword arguments
1124 if not pycompat.getargspec(fn)[2]:
1124 if not pycompat.getargspec(fn)[2]:
1125 oldfn = fn
1125 oldfn = fn
1126 fn = lambda s, c, **kwargs: oldfn(s, c)
1126 fn = lambda s, c, **kwargs: oldfn(s, c)
1127 l.append((mf, fn, params))
1127 l.append((mf, fn, params))
1128 self._filterpats[filter] = l
1128 self._filterpats[filter] = l
1129 return self._filterpats[filter]
1129 return self._filterpats[filter]
1130
1130
1131 def _filter(self, filterpats, filename, data):
1131 def _filter(self, filterpats, filename, data):
1132 for mf, fn, cmd in filterpats:
1132 for mf, fn, cmd in filterpats:
1133 if mf(filename):
1133 if mf(filename):
1134 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
1134 self.ui.debug("filtering %s through %s\n" % (filename, cmd))
1135 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
1135 data = fn(data, cmd, ui=self.ui, repo=self, filename=filename)
1136 break
1136 break
1137
1137
1138 return data
1138 return data
1139
1139
1140 @unfilteredpropertycache
1140 @unfilteredpropertycache
1141 def _encodefilterpats(self):
1141 def _encodefilterpats(self):
1142 return self._loadfilter('encode')
1142 return self._loadfilter('encode')
1143
1143
1144 @unfilteredpropertycache
1144 @unfilteredpropertycache
1145 def _decodefilterpats(self):
1145 def _decodefilterpats(self):
1146 return self._loadfilter('decode')
1146 return self._loadfilter('decode')
1147
1147
1148 def adddatafilter(self, name, filter):
1148 def adddatafilter(self, name, filter):
1149 self._datafilters[name] = filter
1149 self._datafilters[name] = filter
1150
1150
1151 def wread(self, filename):
1151 def wread(self, filename):
1152 if self.wvfs.islink(filename):
1152 if self.wvfs.islink(filename):
1153 data = self.wvfs.readlink(filename)
1153 data = self.wvfs.readlink(filename)
1154 else:
1154 else:
1155 data = self.wvfs.read(filename)
1155 data = self.wvfs.read(filename)
1156 return self._filter(self._encodefilterpats, filename, data)
1156 return self._filter(self._encodefilterpats, filename, data)
1157
1157
1158 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
1158 def wwrite(self, filename, data, flags, backgroundclose=False, **kwargs):
1159 """write ``data`` into ``filename`` in the working directory
1159 """write ``data`` into ``filename`` in the working directory
1160
1160
1161 This returns length of written (maybe decoded) data.
1161 This returns length of written (maybe decoded) data.
1162 """
1162 """
1163 data = self._filter(self._decodefilterpats, filename, data)
1163 data = self._filter(self._decodefilterpats, filename, data)
1164 if 'l' in flags:
1164 if 'l' in flags:
1165 self.wvfs.symlink(data, filename)
1165 self.wvfs.symlink(data, filename)
1166 else:
1166 else:
1167 self.wvfs.write(filename, data, backgroundclose=backgroundclose,
1167 self.wvfs.write(filename, data, backgroundclose=backgroundclose,
1168 **kwargs)
1168 **kwargs)
1169 if 'x' in flags:
1169 if 'x' in flags:
1170 self.wvfs.setflags(filename, False, True)
1170 self.wvfs.setflags(filename, False, True)
1171 else:
1171 else:
1172 self.wvfs.setflags(filename, False, False)
1172 self.wvfs.setflags(filename, False, False)
1173 return len(data)
1173 return len(data)
1174
1174
1175 def wwritedata(self, filename, data):
1175 def wwritedata(self, filename, data):
1176 return self._filter(self._decodefilterpats, filename, data)
1176 return self._filter(self._decodefilterpats, filename, data)
1177
1177
1178 def currenttransaction(self):
1178 def currenttransaction(self):
1179 """return the current transaction or None if non exists"""
1179 """return the current transaction or None if non exists"""
1180 if self._transref:
1180 if self._transref:
1181 tr = self._transref()
1181 tr = self._transref()
1182 else:
1182 else:
1183 tr = None
1183 tr = None
1184
1184
1185 if tr and tr.running():
1185 if tr and tr.running():
1186 return tr
1186 return tr
1187 return None
1187 return None
1188
1188
1189 def transaction(self, desc, report=None):
1189 def transaction(self, desc, report=None):
1190 if (self.ui.configbool('devel', 'all-warnings')
1190 if (self.ui.configbool('devel', 'all-warnings')
1191 or self.ui.configbool('devel', 'check-locks')):
1191 or self.ui.configbool('devel', 'check-locks')):
1192 if self._currentlock(self._lockref) is None:
1192 if self._currentlock(self._lockref) is None:
1193 raise error.ProgrammingError('transaction requires locking')
1193 raise error.ProgrammingError('transaction requires locking')
1194 tr = self.currenttransaction()
1194 tr = self.currenttransaction()
1195 if tr is not None:
1195 if tr is not None:
1196 return tr.nest(name=desc)
1196 return tr.nest(name=desc)
1197
1197
1198 # abort here if the journal already exists
1198 # abort here if the journal already exists
1199 if self.svfs.exists("journal"):
1199 if self.svfs.exists("journal"):
1200 raise error.RepoError(
1200 raise error.RepoError(
1201 _("abandoned transaction found"),
1201 _("abandoned transaction found"),
1202 hint=_("run 'hg recover' to clean up transaction"))
1202 hint=_("run 'hg recover' to clean up transaction"))
1203
1203
1204 idbase = "%.40f#%f" % (random.random(), time.time())
1204 idbase = "%.40f#%f" % (random.random(), time.time())
1205 ha = hex(hashlib.sha1(idbase).digest())
1205 ha = hex(hashlib.sha1(idbase).digest())
1206 txnid = 'TXN:' + ha
1206 txnid = 'TXN:' + ha
1207 self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)
1207 self.hook('pretxnopen', throw=True, txnname=desc, txnid=txnid)
1208
1208
1209 self._writejournal(desc)
1209 self._writejournal(desc)
1210 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
1210 renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]
1211 if report:
1211 if report:
1212 rp = report
1212 rp = report
1213 else:
1213 else:
1214 rp = self.ui.warn
1214 rp = self.ui.warn
1215 vfsmap = {'plain': self.vfs} # root of .hg/
1215 vfsmap = {'plain': self.vfs} # root of .hg/
1216 # we must avoid cyclic reference between repo and transaction.
1216 # we must avoid cyclic reference between repo and transaction.
1217 reporef = weakref.ref(self)
1217 reporef = weakref.ref(self)
1218 # Code to track tag movement
1218 # Code to track tag movement
1219 #
1219 #
1220 # Since tags are all handled as file content, it is actually quite hard
1220 # Since tags are all handled as file content, it is actually quite hard
1221 # to track these movement from a code perspective. So we fallback to a
1221 # to track these movement from a code perspective. So we fallback to a
1222 # tracking at the repository level. One could envision to track changes
1222 # tracking at the repository level. One could envision to track changes
1223 # to the '.hgtags' file through changegroup apply but that fails to
1223 # to the '.hgtags' file through changegroup apply but that fails to
1224 # cope with case where transaction expose new heads without changegroup
1224 # cope with case where transaction expose new heads without changegroup
1225 # being involved (eg: phase movement).
1225 # being involved (eg: phase movement).
1226 #
1226 #
1227 # For now, We gate the feature behind a flag since this likely comes
1227 # For now, We gate the feature behind a flag since this likely comes
1228 # with performance impacts. The current code run more often than needed
1228 # with performance impacts. The current code run more often than needed
1229 # and do not use caches as much as it could. The current focus is on
1229 # and do not use caches as much as it could. The current focus is on
1230 # the behavior of the feature so we disable it by default. The flag
1230 # the behavior of the feature so we disable it by default. The flag
1231 # will be removed when we are happy with the performance impact.
1231 # will be removed when we are happy with the performance impact.
1232 #
1232 #
1233 # Once this feature is no longer experimental move the following
1233 # Once this feature is no longer experimental move the following
1234 # documentation to the appropriate help section:
1234 # documentation to the appropriate help section:
1235 #
1235 #
1236 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
1236 # The ``HG_TAG_MOVED`` variable will be set if the transaction touched
1237 # tags (new or changed or deleted tags). In addition the details of
1237 # tags (new or changed or deleted tags). In addition the details of
1238 # these changes are made available in a file at:
1238 # these changes are made available in a file at:
1239 # ``REPOROOT/.hg/changes/tags.changes``.
1239 # ``REPOROOT/.hg/changes/tags.changes``.
1240 # Make sure you check for HG_TAG_MOVED before reading that file as it
1240 # Make sure you check for HG_TAG_MOVED before reading that file as it
1241 # might exist from a previous transaction even if no tag were touched
1241 # might exist from a previous transaction even if no tag were touched
1242 # in this one. Changes are recorded in a line base format::
1242 # in this one. Changes are recorded in a line base format::
1243 #
1243 #
1244 # <action> <hex-node> <tag-name>\n
1244 # <action> <hex-node> <tag-name>\n
1245 #
1245 #
1246 # Actions are defined as follow:
1246 # Actions are defined as follow:
1247 # "-R": tag is removed,
1247 # "-R": tag is removed,
1248 # "+A": tag is added,
1248 # "+A": tag is added,
1249 # "-M": tag is moved (old value),
1249 # "-M": tag is moved (old value),
1250 # "+M": tag is moved (new value),
1250 # "+M": tag is moved (new value),
1251 tracktags = lambda x: None
1251 tracktags = lambda x: None
1252 # experimental config: experimental.hook-track-tags
1252 # experimental config: experimental.hook-track-tags
1253 shouldtracktags = self.ui.configbool('experimental', 'hook-track-tags')
1253 shouldtracktags = self.ui.configbool('experimental', 'hook-track-tags')
1254 if desc != 'strip' and shouldtracktags:
1254 if desc != 'strip' and shouldtracktags:
1255 oldheads = self.changelog.headrevs()
1255 oldheads = self.changelog.headrevs()
1256 def tracktags(tr2):
1256 def tracktags(tr2):
1257 repo = reporef()
1257 repo = reporef()
1258 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
1258 oldfnodes = tagsmod.fnoderevs(repo.ui, repo, oldheads)
1259 newheads = repo.changelog.headrevs()
1259 newheads = repo.changelog.headrevs()
1260 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
1260 newfnodes = tagsmod.fnoderevs(repo.ui, repo, newheads)
1261 # notes: we compare lists here.
1261 # notes: we compare lists here.
1262 # As we do it only once buiding set would not be cheaper
1262 # As we do it only once buiding set would not be cheaper
1263 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
1263 changes = tagsmod.difftags(repo.ui, repo, oldfnodes, newfnodes)
1264 if changes:
1264 if changes:
1265 tr2.hookargs['tag_moved'] = '1'
1265 tr2.hookargs['tag_moved'] = '1'
1266 with repo.vfs('changes/tags.changes', 'w',
1266 with repo.vfs('changes/tags.changes', 'w',
1267 atomictemp=True) as changesfile:
1267 atomictemp=True) as changesfile:
1268 # note: we do not register the file to the transaction
1268 # note: we do not register the file to the transaction
1269 # because we needs it to still exist on the transaction
1269 # because we needs it to still exist on the transaction
1270 # is close (for txnclose hooks)
1270 # is close (for txnclose hooks)
1271 tagsmod.writediff(changesfile, changes)
1271 tagsmod.writediff(changesfile, changes)
1272 def validate(tr2):
1272 def validate(tr2):
1273 """will run pre-closing hooks"""
1273 """will run pre-closing hooks"""
1274 # XXX the transaction API is a bit lacking here so we take a hacky
1274 # XXX the transaction API is a bit lacking here so we take a hacky
1275 # path for now
1275 # path for now
1276 #
1276 #
1277 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
1277 # We cannot add this as a "pending" hooks since the 'tr.hookargs'
1278 # dict is copied before these run. In addition we needs the data
1278 # dict is copied before these run. In addition we needs the data
1279 # available to in memory hooks too.
1279 # available to in memory hooks too.
1280 #
1280 #
1281 # Moreover, we also need to make sure this runs before txnclose
1281 # Moreover, we also need to make sure this runs before txnclose
1282 # hooks and there is no "pending" mechanism that would execute
1282 # hooks and there is no "pending" mechanism that would execute
1283 # logic only if hooks are about to run.
1283 # logic only if hooks are about to run.
1284 #
1284 #
1285 # Fixing this limitation of the transaction is also needed to track
1285 # Fixing this limitation of the transaction is also needed to track
1286 # other families of changes (bookmarks, phases, obsolescence).
1286 # other families of changes (bookmarks, phases, obsolescence).
1287 #
1287 #
1288 # This will have to be fixed before we remove the experimental
1288 # This will have to be fixed before we remove the experimental
1289 # gating.
1289 # gating.
1290 tracktags(tr2)
1290 tracktags(tr2)
1291 repo = reporef()
1291 repo = reporef()
1292 if repo.ui.configbool('experimental', 'single-head-per-branch'):
1292 if repo.ui.configbool('experimental', 'single-head-per-branch'):
1293 scmutil.enforcesinglehead(repo, tr2, desc)
1293 scmutil.enforcesinglehead(repo, tr2, desc)
1294 if hook.hashook(repo.ui, 'pretxnclose-bookmark'):
1294 if hook.hashook(repo.ui, 'pretxnclose-bookmark'):
1295 for name, (old, new) in sorted(tr.changes['bookmarks'].items()):
1295 for name, (old, new) in sorted(tr.changes['bookmarks'].items()):
1296 args = tr.hookargs.copy()
1296 args = tr.hookargs.copy()
1297 args.update(bookmarks.preparehookargs(name, old, new))
1297 args.update(bookmarks.preparehookargs(name, old, new))
1298 repo.hook('pretxnclose-bookmark', throw=True,
1298 repo.hook('pretxnclose-bookmark', throw=True,
1299 txnname=desc,
1299 txnname=desc,
1300 **pycompat.strkwargs(args))
1300 **pycompat.strkwargs(args))
1301 if hook.hashook(repo.ui, 'pretxnclose-phase'):
1301 if hook.hashook(repo.ui, 'pretxnclose-phase'):
1302 cl = repo.unfiltered().changelog
1302 cl = repo.unfiltered().changelog
1303 for rev, (old, new) in tr.changes['phases'].items():
1303 for rev, (old, new) in tr.changes['phases'].items():
1304 args = tr.hookargs.copy()
1304 args = tr.hookargs.copy()
1305 node = hex(cl.node(rev))
1305 node = hex(cl.node(rev))
1306 args.update(phases.preparehookargs(node, old, new))
1306 args.update(phases.preparehookargs(node, old, new))
1307 repo.hook('pretxnclose-phase', throw=True, txnname=desc,
1307 repo.hook('pretxnclose-phase', throw=True, txnname=desc,
1308 **pycompat.strkwargs(args))
1308 **pycompat.strkwargs(args))
1309
1309
1310 repo.hook('pretxnclose', throw=True,
1310 repo.hook('pretxnclose', throw=True,
1311 txnname=desc, **pycompat.strkwargs(tr.hookargs))
1311 txnname=desc, **pycompat.strkwargs(tr.hookargs))
1312 def releasefn(tr, success):
1312 def releasefn(tr, success):
1313 repo = reporef()
1313 repo = reporef()
1314 if success:
1314 if success:
1315 # this should be explicitly invoked here, because
1315 # this should be explicitly invoked here, because
1316 # in-memory changes aren't written out at closing
1316 # in-memory changes aren't written out at closing
1317 # transaction, if tr.addfilegenerator (via
1317 # transaction, if tr.addfilegenerator (via
1318 # dirstate.write or so) isn't invoked while
1318 # dirstate.write or so) isn't invoked while
1319 # transaction running
1319 # transaction running
1320 repo.dirstate.write(None)
1320 repo.dirstate.write(None)
1321 else:
1321 else:
1322 # discard all changes (including ones already written
1322 # discard all changes (including ones already written
1323 # out) in this transaction
1323 # out) in this transaction
1324 repo.dirstate.restorebackup(None, 'journal.dirstate')
1324 repo.dirstate.restorebackup(None, 'journal.dirstate')
1325
1325
1326 repo.invalidate(clearfilecache=True)
1326 repo.invalidate(clearfilecache=True)
1327
1327
1328 tr = transaction.transaction(rp, self.svfs, vfsmap,
1328 tr = transaction.transaction(rp, self.svfs, vfsmap,
1329 "journal",
1329 "journal",
1330 "undo",
1330 "undo",
1331 aftertrans(renames),
1331 aftertrans(renames),
1332 self.store.createmode,
1332 self.store.createmode,
1333 validator=validate,
1333 validator=validate,
1334 releasefn=releasefn,
1334 releasefn=releasefn,
1335 checkambigfiles=_cachedfiles,
1335 checkambigfiles=_cachedfiles,
1336 name=desc)
1336 name=desc)
1337 tr.changes['revs'] = xrange(0, 0)
1337 tr.changes['revs'] = xrange(0, 0)
1338 tr.changes['obsmarkers'] = set()
1338 tr.changes['obsmarkers'] = set()
1339 tr.changes['phases'] = {}
1339 tr.changes['phases'] = {}
1340 tr.changes['bookmarks'] = {}
1340 tr.changes['bookmarks'] = {}
1341
1341
1342 tr.hookargs['txnid'] = txnid
1342 tr.hookargs['txnid'] = txnid
1343 # note: writing the fncache only during finalize mean that the file is
1343 # note: writing the fncache only during finalize mean that the file is
1344 # outdated when running hooks. As fncache is used for streaming clone,
1344 # outdated when running hooks. As fncache is used for streaming clone,
1345 # this is not expected to break anything that happen during the hooks.
1345 # this is not expected to break anything that happen during the hooks.
1346 tr.addfinalize('flush-fncache', self.store.write)
1346 tr.addfinalize('flush-fncache', self.store.write)
1347 def txnclosehook(tr2):
1347 def txnclosehook(tr2):
1348 """To be run if transaction is successful, will schedule a hook run
1348 """To be run if transaction is successful, will schedule a hook run
1349 """
1349 """
1350 # Don't reference tr2 in hook() so we don't hold a reference.
1350 # Don't reference tr2 in hook() so we don't hold a reference.
1351 # This reduces memory consumption when there are multiple
1351 # This reduces memory consumption when there are multiple
1352 # transactions per lock. This can likely go away if issue5045
1352 # transactions per lock. This can likely go away if issue5045
1353 # fixes the function accumulation.
1353 # fixes the function accumulation.
1354 hookargs = tr2.hookargs
1354 hookargs = tr2.hookargs
1355
1355
1356 def hookfunc():
1356 def hookfunc():
1357 repo = reporef()
1357 repo = reporef()
1358 if hook.hashook(repo.ui, 'txnclose-bookmark'):
1358 if hook.hashook(repo.ui, 'txnclose-bookmark'):
1359 bmchanges = sorted(tr.changes['bookmarks'].items())
1359 bmchanges = sorted(tr.changes['bookmarks'].items())
1360 for name, (old, new) in bmchanges:
1360 for name, (old, new) in bmchanges:
1361 args = tr.hookargs.copy()
1361 args = tr.hookargs.copy()
1362 args.update(bookmarks.preparehookargs(name, old, new))
1362 args.update(bookmarks.preparehookargs(name, old, new))
1363 repo.hook('txnclose-bookmark', throw=False,
1363 repo.hook('txnclose-bookmark', throw=False,
1364 txnname=desc, **pycompat.strkwargs(args))
1364 txnname=desc, **pycompat.strkwargs(args))
1365
1365
1366 if hook.hashook(repo.ui, 'txnclose-phase'):
1366 if hook.hashook(repo.ui, 'txnclose-phase'):
1367 cl = repo.unfiltered().changelog
1367 cl = repo.unfiltered().changelog
1368 phasemv = sorted(tr.changes['phases'].items())
1368 phasemv = sorted(tr.changes['phases'].items())
1369 for rev, (old, new) in phasemv:
1369 for rev, (old, new) in phasemv:
1370 args = tr.hookargs.copy()
1370 args = tr.hookargs.copy()
1371 node = hex(cl.node(rev))
1371 node = hex(cl.node(rev))
1372 args.update(phases.preparehookargs(node, old, new))
1372 args.update(phases.preparehookargs(node, old, new))
1373 repo.hook('txnclose-phase', throw=False, txnname=desc,
1373 repo.hook('txnclose-phase', throw=False, txnname=desc,
1374 **pycompat.strkwargs(args))
1374 **pycompat.strkwargs(args))
1375
1375
1376 repo.hook('txnclose', throw=False, txnname=desc,
1376 repo.hook('txnclose', throw=False, txnname=desc,
1377 **pycompat.strkwargs(hookargs))
1377 **pycompat.strkwargs(hookargs))
1378 reporef()._afterlock(hookfunc)
1378 reporef()._afterlock(hookfunc)
1379 tr.addfinalize('txnclose-hook', txnclosehook)
1379 tr.addfinalize('txnclose-hook', txnclosehook)
1380 # Include a leading "-" to make it happen before the transaction summary
1380 # Include a leading "-" to make it happen before the transaction summary
1381 # reports registered via scmutil.registersummarycallback() whose names
1381 # reports registered via scmutil.registersummarycallback() whose names
1382 # are 00-txnreport etc. That way, the caches will be warm when the
1382 # are 00-txnreport etc. That way, the caches will be warm when the
1383 # callbacks run.
1383 # callbacks run.
1384 tr.addpostclose('-warm-cache', self._buildcacheupdater(tr))
1384 tr.addpostclose('-warm-cache', self._buildcacheupdater(tr))
1385 def txnaborthook(tr2):
1385 def txnaborthook(tr2):
1386 """To be run if transaction is aborted
1386 """To be run if transaction is aborted
1387 """
1387 """
1388 reporef().hook('txnabort', throw=False, txnname=desc,
1388 reporef().hook('txnabort', throw=False, txnname=desc,
1389 **pycompat.strkwargs(tr2.hookargs))
1389 **pycompat.strkwargs(tr2.hookargs))
1390 tr.addabort('txnabort-hook', txnaborthook)
1390 tr.addabort('txnabort-hook', txnaborthook)
1391 # avoid eager cache invalidation. in-memory data should be identical
1391 # avoid eager cache invalidation. in-memory data should be identical
1392 # to stored data if transaction has no error.
1392 # to stored data if transaction has no error.
1393 tr.addpostclose('refresh-filecachestats', self._refreshfilecachestats)
1393 tr.addpostclose('refresh-filecachestats', self._refreshfilecachestats)
1394 self._transref = weakref.ref(tr)
1394 self._transref = weakref.ref(tr)
1395 scmutil.registersummarycallback(self, tr, desc)
1395 scmutil.registersummarycallback(self, tr, desc)
1396 return tr
1396 return tr
1397
1397
1398 def _journalfiles(self):
1398 def _journalfiles(self):
1399 return ((self.svfs, 'journal'),
1399 return ((self.svfs, 'journal'),
1400 (self.vfs, 'journal.dirstate'),
1400 (self.vfs, 'journal.dirstate'),
1401 (self.vfs, 'journal.branch'),
1401 (self.vfs, 'journal.branch'),
1402 (self.vfs, 'journal.desc'),
1402 (self.vfs, 'journal.desc'),
1403 (self.vfs, 'journal.bookmarks'),
1403 (self.vfs, 'journal.bookmarks'),
1404 (self.svfs, 'journal.phaseroots'))
1404 (self.svfs, 'journal.phaseroots'))
1405
1405
1406 def undofiles(self):
1406 def undofiles(self):
1407 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
1407 return [(vfs, undoname(x)) for vfs, x in self._journalfiles()]
1408
1408
1409 @unfilteredmethod
1409 @unfilteredmethod
1410 def _writejournal(self, desc):
1410 def _writejournal(self, desc):
1411 self.dirstate.savebackup(None, 'journal.dirstate')
1411 self.dirstate.savebackup(None, 'journal.dirstate')
1412 self.vfs.write("journal.branch",
1412 self.vfs.write("journal.branch",
1413 encoding.fromlocal(self.dirstate.branch()))
1413 encoding.fromlocal(self.dirstate.branch()))
1414 self.vfs.write("journal.desc",
1414 self.vfs.write("journal.desc",
1415 "%d\n%s\n" % (len(self), desc))
1415 "%d\n%s\n" % (len(self), desc))
1416 self.vfs.write("journal.bookmarks",
1416 self.vfs.write("journal.bookmarks",
1417 self.vfs.tryread("bookmarks"))
1417 self.vfs.tryread("bookmarks"))
1418 self.svfs.write("journal.phaseroots",
1418 self.svfs.write("journal.phaseroots",
1419 self.svfs.tryread("phaseroots"))
1419 self.svfs.tryread("phaseroots"))
1420
1420
1421 def recover(self):
1421 def recover(self):
1422 with self.lock():
1422 with self.lock():
1423 if self.svfs.exists("journal"):
1423 if self.svfs.exists("journal"):
1424 self.ui.status(_("rolling back interrupted transaction\n"))
1424 self.ui.status(_("rolling back interrupted transaction\n"))
1425 vfsmap = {'': self.svfs,
1425 vfsmap = {'': self.svfs,
1426 'plain': self.vfs,}
1426 'plain': self.vfs,}
1427 transaction.rollback(self.svfs, vfsmap, "journal",
1427 transaction.rollback(self.svfs, vfsmap, "journal",
1428 self.ui.warn,
1428 self.ui.warn,
1429 checkambigfiles=_cachedfiles)
1429 checkambigfiles=_cachedfiles)
1430 self.invalidate()
1430 self.invalidate()
1431 return True
1431 return True
1432 else:
1432 else:
1433 self.ui.warn(_("no interrupted transaction available\n"))
1433 self.ui.warn(_("no interrupted transaction available\n"))
1434 return False
1434 return False
1435
1435
1436 def rollback(self, dryrun=False, force=False):
1436 def rollback(self, dryrun=False, force=False):
1437 wlock = lock = dsguard = None
1437 wlock = lock = dsguard = None
1438 try:
1438 try:
1439 wlock = self.wlock()
1439 wlock = self.wlock()
1440 lock = self.lock()
1440 lock = self.lock()
1441 if self.svfs.exists("undo"):
1441 if self.svfs.exists("undo"):
1442 dsguard = dirstateguard.dirstateguard(self, 'rollback')
1442 dsguard = dirstateguard.dirstateguard(self, 'rollback')
1443
1443
1444 return self._rollback(dryrun, force, dsguard)
1444 return self._rollback(dryrun, force, dsguard)
1445 else:
1445 else:
1446 self.ui.warn(_("no rollback information available\n"))
1446 self.ui.warn(_("no rollback information available\n"))
1447 return 1
1447 return 1
1448 finally:
1448 finally:
1449 release(dsguard, lock, wlock)
1449 release(dsguard, lock, wlock)
1450
1450
1451 @unfilteredmethod # Until we get smarter cache management
1451 @unfilteredmethod # Until we get smarter cache management
1452 def _rollback(self, dryrun, force, dsguard):
1452 def _rollback(self, dryrun, force, dsguard):
1453 ui = self.ui
1453 ui = self.ui
1454 try:
1454 try:
1455 args = self.vfs.read('undo.desc').splitlines()
1455 args = self.vfs.read('undo.desc').splitlines()
1456 (oldlen, desc, detail) = (int(args[0]), args[1], None)
1456 (oldlen, desc, detail) = (int(args[0]), args[1], None)
1457 if len(args) >= 3:
1457 if len(args) >= 3:
1458 detail = args[2]
1458 detail = args[2]
1459 oldtip = oldlen - 1
1459 oldtip = oldlen - 1
1460
1460
1461 if detail and ui.verbose:
1461 if detail and ui.verbose:
1462 msg = (_('repository tip rolled back to revision %d'
1462 msg = (_('repository tip rolled back to revision %d'
1463 ' (undo %s: %s)\n')
1463 ' (undo %s: %s)\n')
1464 % (oldtip, desc, detail))
1464 % (oldtip, desc, detail))
1465 else:
1465 else:
1466 msg = (_('repository tip rolled back to revision %d'
1466 msg = (_('repository tip rolled back to revision %d'
1467 ' (undo %s)\n')
1467 ' (undo %s)\n')
1468 % (oldtip, desc))
1468 % (oldtip, desc))
1469 except IOError:
1469 except IOError:
1470 msg = _('rolling back unknown transaction\n')
1470 msg = _('rolling back unknown transaction\n')
1471 desc = None
1471 desc = None
1472
1472
1473 if not force and self['.'] != self['tip'] and desc == 'commit':
1473 if not force and self['.'] != self['tip'] and desc == 'commit':
1474 raise error.Abort(
1474 raise error.Abort(
1475 _('rollback of last commit while not checked out '
1475 _('rollback of last commit while not checked out '
1476 'may lose data'), hint=_('use -f to force'))
1476 'may lose data'), hint=_('use -f to force'))
1477
1477
1478 ui.status(msg)
1478 ui.status(msg)
1479 if dryrun:
1479 if dryrun:
1480 return 0
1480 return 0
1481
1481
1482 parents = self.dirstate.parents()
1482 parents = self.dirstate.parents()
1483 self.destroying()
1483 self.destroying()
1484 vfsmap = {'plain': self.vfs, '': self.svfs}
1484 vfsmap = {'plain': self.vfs, '': self.svfs}
1485 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn,
1485 transaction.rollback(self.svfs, vfsmap, 'undo', ui.warn,
1486 checkambigfiles=_cachedfiles)
1486 checkambigfiles=_cachedfiles)
1487 if self.vfs.exists('undo.bookmarks'):
1487 if self.vfs.exists('undo.bookmarks'):
1488 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)
1488 self.vfs.rename('undo.bookmarks', 'bookmarks', checkambig=True)
1489 if self.svfs.exists('undo.phaseroots'):
1489 if self.svfs.exists('undo.phaseroots'):
1490 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
1490 self.svfs.rename('undo.phaseroots', 'phaseroots', checkambig=True)
1491 self.invalidate()
1491 self.invalidate()
1492
1492
1493 parentgone = (parents[0] not in self.changelog.nodemap or
1493 parentgone = (parents[0] not in self.changelog.nodemap or
1494 parents[1] not in self.changelog.nodemap)
1494 parents[1] not in self.changelog.nodemap)
1495 if parentgone:
1495 if parentgone:
1496 # prevent dirstateguard from overwriting already restored one
1496 # prevent dirstateguard from overwriting already restored one
1497 dsguard.close()
1497 dsguard.close()
1498
1498
1499 self.dirstate.restorebackup(None, 'undo.dirstate')
1499 self.dirstate.restorebackup(None, 'undo.dirstate')
1500 try:
1500 try:
1501 branch = self.vfs.read('undo.branch')
1501 branch = self.vfs.read('undo.branch')
1502 self.dirstate.setbranch(encoding.tolocal(branch))
1502 self.dirstate.setbranch(encoding.tolocal(branch))
1503 except IOError:
1503 except IOError:
1504 ui.warn(_('named branch could not be reset: '
1504 ui.warn(_('named branch could not be reset: '
1505 'current branch is still \'%s\'\n')
1505 'current branch is still \'%s\'\n')
1506 % self.dirstate.branch())
1506 % self.dirstate.branch())
1507
1507
1508 parents = tuple([p.rev() for p in self[None].parents()])
1508 parents = tuple([p.rev() for p in self[None].parents()])
1509 if len(parents) > 1:
1509 if len(parents) > 1:
1510 ui.status(_('working directory now based on '
1510 ui.status(_('working directory now based on '
1511 'revisions %d and %d\n') % parents)
1511 'revisions %d and %d\n') % parents)
1512 else:
1512 else:
1513 ui.status(_('working directory now based on '
1513 ui.status(_('working directory now based on '
1514 'revision %d\n') % parents)
1514 'revision %d\n') % parents)
1515 mergemod.mergestate.clean(self, self['.'].node())
1515 mergemod.mergestate.clean(self, self['.'].node())
1516
1516
1517 # TODO: if we know which new heads may result from this rollback, pass
1517 # TODO: if we know which new heads may result from this rollback, pass
1518 # them to destroy(), which will prevent the branchhead cache from being
1518 # them to destroy(), which will prevent the branchhead cache from being
1519 # invalidated.
1519 # invalidated.
1520 self.destroyed()
1520 self.destroyed()
1521 return 0
1521 return 0
1522
1522
1523 def _buildcacheupdater(self, newtransaction):
1523 def _buildcacheupdater(self, newtransaction):
1524 """called during transaction to build the callback updating cache
1524 """called during transaction to build the callback updating cache
1525
1525
1526 Lives on the repository to help extension who might want to augment
1526 Lives on the repository to help extension who might want to augment
1527 this logic. For this purpose, the created transaction is passed to the
1527 this logic. For this purpose, the created transaction is passed to the
1528 method.
1528 method.
1529 """
1529 """
1530 # we must avoid cyclic reference between repo and transaction.
1530 # we must avoid cyclic reference between repo and transaction.
1531 reporef = weakref.ref(self)
1531 reporef = weakref.ref(self)
1532 def updater(tr):
1532 def updater(tr):
1533 repo = reporef()
1533 repo = reporef()
1534 repo.updatecaches(tr)
1534 repo.updatecaches(tr)
1535 return updater
1535 return updater
1536
1536
1537 @unfilteredmethod
1537 @unfilteredmethod
1538 def updatecaches(self, tr=None, full=False):
1538 def updatecaches(self, tr=None, full=False):
1539 """warm appropriate caches
1539 """warm appropriate caches
1540
1540
1541 If this function is called after a transaction closed. The transaction
1541 If this function is called after a transaction closed. The transaction
1542 will be available in the 'tr' argument. This can be used to selectively
1542 will be available in the 'tr' argument. This can be used to selectively
1543 update caches relevant to the changes in that transaction.
1543 update caches relevant to the changes in that transaction.
1544
1544
1545 If 'full' is set, make sure all caches the function knows about have
1545 If 'full' is set, make sure all caches the function knows about have
1546 up-to-date data. Even the ones usually loaded more lazily.
1546 up-to-date data. Even the ones usually loaded more lazily.
1547 """
1547 """
1548 if tr is not None and tr.hookargs.get('source') == 'strip':
1548 if tr is not None and tr.hookargs.get('source') == 'strip':
1549 # During strip, many caches are invalid but
1549 # During strip, many caches are invalid but
1550 # later call to `destroyed` will refresh them.
1550 # later call to `destroyed` will refresh them.
1551 return
1551 return
1552
1552
1553 if tr is None or tr.changes['revs']:
1553 if tr is None or tr.changes['revs']:
1554 # updating the unfiltered branchmap should refresh all the others,
1554 # updating the unfiltered branchmap should refresh all the others,
1555 self.ui.debug('updating the branch cache\n')
1555 self.ui.debug('updating the branch cache\n')
1556 branchmap.updatecache(self.filtered('served'))
1556 branchmap.updatecache(self.filtered('served'))
1557
1557
1558 if full:
1558 if full:
1559 rbc = self.revbranchcache()
1559 rbc = self.revbranchcache()
1560 for r in self.changelog:
1560 for r in self.changelog:
1561 rbc.branchinfo(r)
1561 rbc.branchinfo(r)
1562 rbc.write()
1562 rbc.write()
1563
1563
1564 def invalidatecaches(self):
1564 def invalidatecaches(self):
1565
1565
1566 if '_tagscache' in vars(self):
1566 if '_tagscache' in vars(self):
1567 # can't use delattr on proxy
1567 # can't use delattr on proxy
1568 del self.__dict__['_tagscache']
1568 del self.__dict__['_tagscache']
1569
1569
1570 self.unfiltered()._branchcaches.clear()
1570 self.unfiltered()._branchcaches.clear()
1571 self.invalidatevolatilesets()
1571 self.invalidatevolatilesets()
1572 self._sparsesignaturecache.clear()
1572 self._sparsesignaturecache.clear()
1573
1573
1574 def invalidatevolatilesets(self):
1574 def invalidatevolatilesets(self):
1575 self.filteredrevcache.clear()
1575 self.filteredrevcache.clear()
1576 obsolete.clearobscaches(self)
1576 obsolete.clearobscaches(self)
1577
1577
1578 def invalidatedirstate(self):
1578 def invalidatedirstate(self):
1579 '''Invalidates the dirstate, causing the next call to dirstate
1579 '''Invalidates the dirstate, causing the next call to dirstate
1580 to check if it was modified since the last time it was read,
1580 to check if it was modified since the last time it was read,
1581 rereading it if it has.
1581 rereading it if it has.
1582
1582
1583 This is different to dirstate.invalidate() that it doesn't always
1583 This is different to dirstate.invalidate() that it doesn't always
1584 rereads the dirstate. Use dirstate.invalidate() if you want to
1584 rereads the dirstate. Use dirstate.invalidate() if you want to
1585 explicitly read the dirstate again (i.e. restoring it to a previous
1585 explicitly read the dirstate again (i.e. restoring it to a previous
1586 known good state).'''
1586 known good state).'''
1587 if hasunfilteredcache(self, 'dirstate'):
1587 if hasunfilteredcache(self, 'dirstate'):
1588 for k in self.dirstate._filecache:
1588 for k in self.dirstate._filecache:
1589 try:
1589 try:
1590 delattr(self.dirstate, k)
1590 delattr(self.dirstate, k)
1591 except AttributeError:
1591 except AttributeError:
1592 pass
1592 pass
1593 delattr(self.unfiltered(), 'dirstate')
1593 delattr(self.unfiltered(), 'dirstate')
1594
1594
1595 def invalidate(self, clearfilecache=False):
1595 def invalidate(self, clearfilecache=False):
1596 '''Invalidates both store and non-store parts other than dirstate
1596 '''Invalidates both store and non-store parts other than dirstate
1597
1597
1598 If a transaction is running, invalidation of store is omitted,
1598 If a transaction is running, invalidation of store is omitted,
1599 because discarding in-memory changes might cause inconsistency
1599 because discarding in-memory changes might cause inconsistency
1600 (e.g. incomplete fncache causes unintentional failure, but
1600 (e.g. incomplete fncache causes unintentional failure, but
1601 redundant one doesn't).
1601 redundant one doesn't).
1602 '''
1602 '''
1603 unfiltered = self.unfiltered() # all file caches are stored unfiltered
1603 unfiltered = self.unfiltered() # all file caches are stored unfiltered
1604 for k in list(self._filecache.keys()):
1604 for k in list(self._filecache.keys()):
1605 # dirstate is invalidated separately in invalidatedirstate()
1605 # dirstate is invalidated separately in invalidatedirstate()
1606 if k == 'dirstate':
1606 if k == 'dirstate':
1607 continue
1607 continue
1608 if (k == 'changelog' and
1608 if (k == 'changelog' and
1609 self.currenttransaction() and
1609 self.currenttransaction() and
1610 self.changelog._delayed):
1610 self.changelog._delayed):
1611 # The changelog object may store unwritten revisions. We don't
1611 # The changelog object may store unwritten revisions. We don't
1612 # want to lose them.
1612 # want to lose them.
1613 # TODO: Solve the problem instead of working around it.
1613 # TODO: Solve the problem instead of working around it.
1614 continue
1614 continue
1615
1615
1616 if clearfilecache:
1616 if clearfilecache:
1617 del self._filecache[k]
1617 del self._filecache[k]
1618 try:
1618 try:
1619 delattr(unfiltered, k)
1619 delattr(unfiltered, k)
1620 except AttributeError:
1620 except AttributeError:
1621 pass
1621 pass
1622 self.invalidatecaches()
1622 self.invalidatecaches()
1623 if not self.currenttransaction():
1623 if not self.currenttransaction():
1624 # TODO: Changing contents of store outside transaction
1624 # TODO: Changing contents of store outside transaction
1625 # causes inconsistency. We should make in-memory store
1625 # causes inconsistency. We should make in-memory store
1626 # changes detectable, and abort if changed.
1626 # changes detectable, and abort if changed.
1627 self.store.invalidatecaches()
1627 self.store.invalidatecaches()
1628
1628
1629 def invalidateall(self):
1629 def invalidateall(self):
1630 '''Fully invalidates both store and non-store parts, causing the
1630 '''Fully invalidates both store and non-store parts, causing the
1631 subsequent operation to reread any outside changes.'''
1631 subsequent operation to reread any outside changes.'''
1632 # extension should hook this to invalidate its caches
1632 # extension should hook this to invalidate its caches
1633 self.invalidate()
1633 self.invalidate()
1634 self.invalidatedirstate()
1634 self.invalidatedirstate()
1635
1635
1636 @unfilteredmethod
1636 @unfilteredmethod
1637 def _refreshfilecachestats(self, tr):
1637 def _refreshfilecachestats(self, tr):
1638 """Reload stats of cached files so that they are flagged as valid"""
1638 """Reload stats of cached files so that they are flagged as valid"""
1639 for k, ce in self._filecache.items():
1639 for k, ce in self._filecache.items():
1640 k = pycompat.sysstr(k)
1640 k = pycompat.sysstr(k)
1641 if k == r'dirstate' or k not in self.__dict__:
1641 if k == r'dirstate' or k not in self.__dict__:
1642 continue
1642 continue
1643 ce.refresh()
1643 ce.refresh()
1644
1644
1645 def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc,
1645 def _lock(self, vfs, lockname, wait, releasefn, acquirefn, desc,
1646 inheritchecker=None, parentenvvar=None):
1646 inheritchecker=None, parentenvvar=None):
1647 parentlock = None
1647 parentlock = None
1648 # the contents of parentenvvar are used by the underlying lock to
1648 # the contents of parentenvvar are used by the underlying lock to
1649 # determine whether it can be inherited
1649 # determine whether it can be inherited
1650 if parentenvvar is not None:
1650 if parentenvvar is not None:
1651 parentlock = encoding.environ.get(parentenvvar)
1651 parentlock = encoding.environ.get(parentenvvar)
1652
1652
1653 timeout = 0
1653 timeout = 0
1654 warntimeout = 0
1654 warntimeout = 0
1655 if wait:
1655 if wait:
1656 timeout = self.ui.configint("ui", "timeout")
1656 timeout = self.ui.configint("ui", "timeout")
1657 warntimeout = self.ui.configint("ui", "timeout.warn")
1657 warntimeout = self.ui.configint("ui", "timeout.warn")
1658
1658
1659 l = lockmod.trylock(self.ui, vfs, lockname, timeout, warntimeout,
1659 l = lockmod.trylock(self.ui, vfs, lockname, timeout, warntimeout,
1660 releasefn=releasefn,
1660 releasefn=releasefn,
1661 acquirefn=acquirefn, desc=desc,
1661 acquirefn=acquirefn, desc=desc,
1662 inheritchecker=inheritchecker,
1662 inheritchecker=inheritchecker,
1663 parentlock=parentlock)
1663 parentlock=parentlock)
1664 return l
1664 return l
1665
1665
1666 def _afterlock(self, callback):
1666 def _afterlock(self, callback):
1667 """add a callback to be run when the repository is fully unlocked
1667 """add a callback to be run when the repository is fully unlocked
1668
1668
1669 The callback will be executed when the outermost lock is released
1669 The callback will be executed when the outermost lock is released
1670 (with wlock being higher level than 'lock')."""
1670 (with wlock being higher level than 'lock')."""
1671 for ref in (self._wlockref, self._lockref):
1671 for ref in (self._wlockref, self._lockref):
1672 l = ref and ref()
1672 l = ref and ref()
1673 if l and l.held:
1673 if l and l.held:
1674 l.postrelease.append(callback)
1674 l.postrelease.append(callback)
1675 break
1675 break
1676 else: # no lock have been found.
1676 else: # no lock have been found.
1677 callback()
1677 callback()
1678
1678
1679 def lock(self, wait=True):
1679 def lock(self, wait=True):
1680 '''Lock the repository store (.hg/store) and return a weak reference
1680 '''Lock the repository store (.hg/store) and return a weak reference
1681 to the lock. Use this before modifying the store (e.g. committing or
1681 to the lock. Use this before modifying the store (e.g. committing or
1682 stripping). If you are opening a transaction, get a lock as well.)
1682 stripping). If you are opening a transaction, get a lock as well.)
1683
1683
1684 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
1684 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
1685 'wlock' first to avoid a dead-lock hazard.'''
1685 'wlock' first to avoid a dead-lock hazard.'''
1686 l = self._currentlock(self._lockref)
1686 l = self._currentlock(self._lockref)
1687 if l is not None:
1687 if l is not None:
1688 l.lock()
1688 l.lock()
1689 return l
1689 return l
1690
1690
1691 l = self._lock(self.svfs, "lock", wait, None,
1691 l = self._lock(self.svfs, "lock", wait, None,
1692 self.invalidate, _('repository %s') % self.origroot)
1692 self.invalidate, _('repository %s') % self.origroot)
1693 self._lockref = weakref.ref(l)
1693 self._lockref = weakref.ref(l)
1694 return l
1694 return l
1695
1695
1696 def _wlockchecktransaction(self):
1696 def _wlockchecktransaction(self):
1697 if self.currenttransaction() is not None:
1697 if self.currenttransaction() is not None:
1698 raise error.LockInheritanceContractViolation(
1698 raise error.LockInheritanceContractViolation(
1699 'wlock cannot be inherited in the middle of a transaction')
1699 'wlock cannot be inherited in the middle of a transaction')
1700
1700
1701 def wlock(self, wait=True):
1701 def wlock(self, wait=True):
1702 '''Lock the non-store parts of the repository (everything under
1702 '''Lock the non-store parts of the repository (everything under
1703 .hg except .hg/store) and return a weak reference to the lock.
1703 .hg except .hg/store) and return a weak reference to the lock.
1704
1704
1705 Use this before modifying files in .hg.
1705 Use this before modifying files in .hg.
1706
1706
1707 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
1707 If both 'lock' and 'wlock' must be acquired, ensure you always acquires
1708 'wlock' first to avoid a dead-lock hazard.'''
1708 'wlock' first to avoid a dead-lock hazard.'''
1709 l = self._wlockref and self._wlockref()
1709 l = self._wlockref and self._wlockref()
1710 if l is not None and l.held:
1710 if l is not None and l.held:
1711 l.lock()
1711 l.lock()
1712 return l
1712 return l
1713
1713
1714 # We do not need to check for non-waiting lock acquisition. Such
1714 # We do not need to check for non-waiting lock acquisition. Such
1715 # acquisition would not cause dead-lock as they would just fail.
1715 # acquisition would not cause dead-lock as they would just fail.
1716 if wait and (self.ui.configbool('devel', 'all-warnings')
1716 if wait and (self.ui.configbool('devel', 'all-warnings')
1717 or self.ui.configbool('devel', 'check-locks')):
1717 or self.ui.configbool('devel', 'check-locks')):
1718 if self._currentlock(self._lockref) is not None:
1718 if self._currentlock(self._lockref) is not None:
1719 self.ui.develwarn('"wlock" acquired after "lock"')
1719 self.ui.develwarn('"wlock" acquired after "lock"')
1720
1720
1721 def unlock():
1721 def unlock():
1722 if self.dirstate.pendingparentchange():
1722 if self.dirstate.pendingparentchange():
1723 self.dirstate.invalidate()
1723 self.dirstate.invalidate()
1724 else:
1724 else:
1725 self.dirstate.write(None)
1725 self.dirstate.write(None)
1726
1726
1727 self._filecache['dirstate'].refresh()
1727 self._filecache['dirstate'].refresh()
1728
1728
1729 l = self._lock(self.vfs, "wlock", wait, unlock,
1729 l = self._lock(self.vfs, "wlock", wait, unlock,
1730 self.invalidatedirstate, _('working directory of %s') %
1730 self.invalidatedirstate, _('working directory of %s') %
1731 self.origroot,
1731 self.origroot,
1732 inheritchecker=self._wlockchecktransaction,
1732 inheritchecker=self._wlockchecktransaction,
1733 parentenvvar='HG_WLOCK_LOCKER')
1733 parentenvvar='HG_WLOCK_LOCKER')
1734 self._wlockref = weakref.ref(l)
1734 self._wlockref = weakref.ref(l)
1735 return l
1735 return l
1736
1736
1737 def _currentlock(self, lockref):
1737 def _currentlock(self, lockref):
1738 """Returns the lock if it's held, or None if it's not."""
1738 """Returns the lock if it's held, or None if it's not."""
1739 if lockref is None:
1739 if lockref is None:
1740 return None
1740 return None
1741 l = lockref()
1741 l = lockref()
1742 if l is None or not l.held:
1742 if l is None or not l.held:
1743 return None
1743 return None
1744 return l
1744 return l
1745
1745
1746 def currentwlock(self):
1746 def currentwlock(self):
1747 """Returns the wlock if it's held, or None if it's not."""
1747 """Returns the wlock if it's held, or None if it's not."""
1748 return self._currentlock(self._wlockref)
1748 return self._currentlock(self._wlockref)
1749
1749
1750 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
1750 def _filecommit(self, fctx, manifest1, manifest2, linkrev, tr, changelist):
1751 """
1751 """
1752 commit an individual file as part of a larger transaction
1752 commit an individual file as part of a larger transaction
1753 """
1753 """
1754
1754
1755 fname = fctx.path()
1755 fname = fctx.path()
1756 fparent1 = manifest1.get(fname, nullid)
1756 fparent1 = manifest1.get(fname, nullid)
1757 fparent2 = manifest2.get(fname, nullid)
1757 fparent2 = manifest2.get(fname, nullid)
1758 if isinstance(fctx, context.filectx):
1758 if isinstance(fctx, context.filectx):
1759 node = fctx.filenode()
1759 node = fctx.filenode()
1760 if node in [fparent1, fparent2]:
1760 if node in [fparent1, fparent2]:
1761 self.ui.debug('reusing %s filelog entry\n' % fname)
1761 self.ui.debug('reusing %s filelog entry\n' % fname)
1762 if manifest1.flags(fname) != fctx.flags():
1762 if manifest1.flags(fname) != fctx.flags():
1763 changelist.append(fname)
1763 changelist.append(fname)
1764 return node
1764 return node
1765
1765
1766 flog = self.file(fname)
1766 flog = self.file(fname)
1767 meta = {}
1767 meta = {}
1768 copy = fctx.renamed()
1768 copy = fctx.renamed()
1769 if copy and copy[0] != fname:
1769 if copy and copy[0] != fname:
1770 # Mark the new revision of this file as a copy of another
1770 # Mark the new revision of this file as a copy of another
1771 # file. This copy data will effectively act as a parent
1771 # file. This copy data will effectively act as a parent
1772 # of this new revision. If this is a merge, the first
1772 # of this new revision. If this is a merge, the first
1773 # parent will be the nullid (meaning "look up the copy data")
1773 # parent will be the nullid (meaning "look up the copy data")
1774 # and the second one will be the other parent. For example:
1774 # and the second one will be the other parent. For example:
1775 #
1775 #
1776 # 0 --- 1 --- 3 rev1 changes file foo
1776 # 0 --- 1 --- 3 rev1 changes file foo
1777 # \ / rev2 renames foo to bar and changes it
1777 # \ / rev2 renames foo to bar and changes it
1778 # \- 2 -/ rev3 should have bar with all changes and
1778 # \- 2 -/ rev3 should have bar with all changes and
1779 # should record that bar descends from
1779 # should record that bar descends from
1780 # bar in rev2 and foo in rev1
1780 # bar in rev2 and foo in rev1
1781 #
1781 #
1782 # this allows this merge to succeed:
1782 # this allows this merge to succeed:
1783 #
1783 #
1784 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
1784 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
1785 # \ / merging rev3 and rev4 should use bar@rev2
1785 # \ / merging rev3 and rev4 should use bar@rev2
1786 # \- 2 --- 4 as the merge base
1786 # \- 2 --- 4 as the merge base
1787 #
1787 #
1788
1788
1789 cfname = copy[0]
1789 cfname = copy[0]
1790 crev = manifest1.get(cfname)
1790 crev = manifest1.get(cfname)
1791 newfparent = fparent2
1791 newfparent = fparent2
1792
1792
1793 if manifest2: # branch merge
1793 if manifest2: # branch merge
1794 if fparent2 == nullid or crev is None: # copied on remote side
1794 if fparent2 == nullid or crev is None: # copied on remote side
1795 if cfname in manifest2:
1795 if cfname in manifest2:
1796 crev = manifest2[cfname]
1796 crev = manifest2[cfname]
1797 newfparent = fparent1
1797 newfparent = fparent1
1798
1798
1799 # Here, we used to search backwards through history to try to find
1799 # Here, we used to search backwards through history to try to find
1800 # where the file copy came from if the source of a copy was not in
1800 # where the file copy came from if the source of a copy was not in
1801 # the parent directory. However, this doesn't actually make sense to
1801 # the parent directory. However, this doesn't actually make sense to
1802 # do (what does a copy from something not in your working copy even
1802 # do (what does a copy from something not in your working copy even
1803 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
1803 # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
1804 # the user that copy information was dropped, so if they didn't
1804 # the user that copy information was dropped, so if they didn't
1805 # expect this outcome it can be fixed, but this is the correct
1805 # expect this outcome it can be fixed, but this is the correct
1806 # behavior in this circumstance.
1806 # behavior in this circumstance.
1807
1807
1808 if crev:
1808 if crev:
1809 self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
1809 self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
1810 meta["copy"] = cfname
1810 meta["copy"] = cfname
1811 meta["copyrev"] = hex(crev)
1811 meta["copyrev"] = hex(crev)
1812 fparent1, fparent2 = nullid, newfparent
1812 fparent1, fparent2 = nullid, newfparent
1813 else:
1813 else:
1814 self.ui.warn(_("warning: can't find ancestor for '%s' "
1814 self.ui.warn(_("warning: can't find ancestor for '%s' "
1815 "copied from '%s'!\n") % (fname, cfname))
1815 "copied from '%s'!\n") % (fname, cfname))
1816
1816
1817 elif fparent1 == nullid:
1817 elif fparent1 == nullid:
1818 fparent1, fparent2 = fparent2, nullid
1818 fparent1, fparent2 = fparent2, nullid
1819 elif fparent2 != nullid:
1819 elif fparent2 != nullid:
1820 # is one parent an ancestor of the other?
1820 # is one parent an ancestor of the other?
1821 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
1821 fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
1822 if fparent1 in fparentancestors:
1822 if fparent1 in fparentancestors:
1823 fparent1, fparent2 = fparent2, nullid
1823 fparent1, fparent2 = fparent2, nullid
1824 elif fparent2 in fparentancestors:
1824 elif fparent2 in fparentancestors:
1825 fparent2 = nullid
1825 fparent2 = nullid
1826
1826
1827 # is the file changed?
1827 # is the file changed?
1828 text = fctx.data()
1828 text = fctx.data()
1829 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
1829 if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
1830 changelist.append(fname)
1830 changelist.append(fname)
1831 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
1831 return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
1832 # are just the flags changed during merge?
1832 # are just the flags changed during merge?
1833 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
1833 elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():
1834 changelist.append(fname)
1834 changelist.append(fname)
1835
1835
1836 return fparent1
1836 return fparent1
1837
1837
1838 def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
1838 def checkcommitpatterns(self, wctx, vdirs, match, status, fail):
1839 """check for commit arguments that aren't committable"""
1839 """check for commit arguments that aren't committable"""
1840 if match.isexact() or match.prefix():
1840 if match.isexact() or match.prefix():
1841 matched = set(status.modified + status.added + status.removed)
1841 matched = set(status.modified + status.added + status.removed)
1842
1842
1843 for f in match.files():
1843 for f in match.files():
1844 f = self.dirstate.normalize(f)
1844 f = self.dirstate.normalize(f)
1845 if f == '.' or f in matched or f in wctx.substate:
1845 if f == '.' or f in matched or f in wctx.substate:
1846 continue
1846 continue
1847 if f in status.deleted:
1847 if f in status.deleted:
1848 fail(f, _('file not found!'))
1848 fail(f, _('file not found!'))
1849 if f in vdirs: # visited directory
1849 if f in vdirs: # visited directory
1850 d = f + '/'
1850 d = f + '/'
1851 for mf in matched:
1851 for mf in matched:
1852 if mf.startswith(d):
1852 if mf.startswith(d):
1853 break
1853 break
1854 else:
1854 else:
1855 fail(f, _("no match under directory!"))
1855 fail(f, _("no match under directory!"))
1856 elif f not in self.dirstate:
1856 elif f not in self.dirstate:
1857 fail(f, _("file not tracked!"))
1857 fail(f, _("file not tracked!"))
1858
1858
1859 @unfilteredmethod
1859 @unfilteredmethod
1860 def commit(self, text="", user=None, date=None, match=None, force=False,
1860 def commit(self, text="", user=None, date=None, match=None, force=False,
1861 editor=False, extra=None):
1861 editor=False, extra=None):
1862 """Add a new revision to current repository.
1862 """Add a new revision to current repository.
1863
1863
1864 Revision information is gathered from the working directory,
1864 Revision information is gathered from the working directory,
1865 match can be used to filter the committed files. If editor is
1865 match can be used to filter the committed files. If editor is
1866 supplied, it is called to get a commit message.
1866 supplied, it is called to get a commit message.
1867 """
1867 """
1868 if extra is None:
1868 if extra is None:
1869 extra = {}
1869 extra = {}
1870
1870
1871 def fail(f, msg):
1871 def fail(f, msg):
1872 raise error.Abort('%s: %s' % (f, msg))
1872 raise error.Abort('%s: %s' % (f, msg))
1873
1873
1874 if not match:
1874 if not match:
1875 match = matchmod.always(self.root, '')
1875 match = matchmod.always(self.root, '')
1876
1876
1877 if not force:
1877 if not force:
1878 vdirs = []
1878 vdirs = []
1879 match.explicitdir = vdirs.append
1879 match.explicitdir = vdirs.append
1880 match.bad = fail
1880 match.bad = fail
1881
1881
1882 wlock = lock = tr = None
1882 wlock = lock = tr = None
1883 try:
1883 try:
1884 wlock = self.wlock()
1884 wlock = self.wlock()
1885 lock = self.lock() # for recent changelog (see issue4368)
1885 lock = self.lock() # for recent changelog (see issue4368)
1886
1886
1887 wctx = self[None]
1887 wctx = self[None]
1888 merge = len(wctx.parents()) > 1
1888 merge = len(wctx.parents()) > 1
1889
1889
1890 if not force and merge and not match.always():
1890 if not force and merge and not match.always():
1891 raise error.Abort(_('cannot partially commit a merge '
1891 raise error.Abort(_('cannot partially commit a merge '
1892 '(do not specify files or patterns)'))
1892 '(do not specify files or patterns)'))
1893
1893
1894 status = self.status(match=match, clean=force)
1894 status = self.status(match=match, clean=force)
1895 if force:
1895 if force:
1896 status.modified.extend(status.clean) # mq may commit clean files
1896 status.modified.extend(status.clean) # mq may commit clean files
1897
1897
1898 # check subrepos
1898 # check subrepos
1899 subs, commitsubs, newstate = subrepoutil.precommit(
1899 subs, commitsubs, newstate = subrepoutil.precommit(
1900 self.ui, wctx, status, match, force=force)
1900 self.ui, wctx, status, match, force=force)
1901
1901
1902 # make sure all explicit patterns are matched
1902 # make sure all explicit patterns are matched
1903 if not force:
1903 if not force:
1904 self.checkcommitpatterns(wctx, vdirs, match, status, fail)
1904 self.checkcommitpatterns(wctx, vdirs, match, status, fail)
1905
1905
1906 cctx = context.workingcommitctx(self, status,
1906 cctx = context.workingcommitctx(self, status,
1907 text, user, date, extra)
1907 text, user, date, extra)
1908
1908
1909 # internal config: ui.allowemptycommit
1909 # internal config: ui.allowemptycommit
1910 allowemptycommit = (wctx.branch() != wctx.p1().branch()
1910 allowemptycommit = (wctx.branch() != wctx.p1().branch()
1911 or extra.get('close') or merge or cctx.files()
1911 or extra.get('close') or merge or cctx.files()
1912 or self.ui.configbool('ui', 'allowemptycommit'))
1912 or self.ui.configbool('ui', 'allowemptycommit'))
1913 if not allowemptycommit:
1913 if not allowemptycommit:
1914 return None
1914 return None
1915
1915
1916 if merge and cctx.deleted():
1916 if merge and cctx.deleted():
1917 raise error.Abort(_("cannot commit merge with missing files"))
1917 raise error.Abort(_("cannot commit merge with missing files"))
1918
1918
1919 ms = mergemod.mergestate.read(self)
1919 ms = mergemod.mergestate.read(self)
1920 mergeutil.checkunresolved(ms)
1920 mergeutil.checkunresolved(ms)
1921
1921
1922 if editor:
1922 if editor:
1923 cctx._text = editor(self, cctx, subs)
1923 cctx._text = editor(self, cctx, subs)
1924 edited = (text != cctx._text)
1924 edited = (text != cctx._text)
1925
1925
1926 # Save commit message in case this transaction gets rolled back
1926 # Save commit message in case this transaction gets rolled back
1927 # (e.g. by a pretxncommit hook). Leave the content alone on
1927 # (e.g. by a pretxncommit hook). Leave the content alone on
1928 # the assumption that the user will use the same editor again.
1928 # the assumption that the user will use the same editor again.
1929 msgfn = self.savecommitmessage(cctx._text)
1929 msgfn = self.savecommitmessage(cctx._text)
1930
1930
1931 # commit subs and write new state
1931 # commit subs and write new state
1932 if subs:
1932 if subs:
1933 for s in sorted(commitsubs):
1933 for s in sorted(commitsubs):
1934 sub = wctx.sub(s)
1934 sub = wctx.sub(s)
1935 self.ui.status(_('committing subrepository %s\n') %
1935 self.ui.status(_('committing subrepository %s\n') %
1936 subrepoutil.subrelpath(sub))
1936 subrepoutil.subrelpath(sub))
1937 sr = sub.commit(cctx._text, user, date)
1937 sr = sub.commit(cctx._text, user, date)
1938 newstate[s] = (newstate[s][0], sr)
1938 newstate[s] = (newstate[s][0], sr)
1939 subrepoutil.writestate(self, newstate)
1939 subrepoutil.writestate(self, newstate)
1940
1940
1941 p1, p2 = self.dirstate.parents()
1941 p1, p2 = self.dirstate.parents()
1942 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
1942 hookp1, hookp2 = hex(p1), (p2 != nullid and hex(p2) or '')
1943 try:
1943 try:
1944 self.hook("precommit", throw=True, parent1=hookp1,
1944 self.hook("precommit", throw=True, parent1=hookp1,
1945 parent2=hookp2)
1945 parent2=hookp2)
1946 tr = self.transaction('commit')
1946 tr = self.transaction('commit')
1947 ret = self.commitctx(cctx, True)
1947 ret = self.commitctx(cctx, True)
1948 except: # re-raises
1948 except: # re-raises
1949 if edited:
1949 if edited:
1950 self.ui.write(
1950 self.ui.write(
1951 _('note: commit message saved in %s\n') % msgfn)
1951 _('note: commit message saved in %s\n') % msgfn)
1952 raise
1952 raise
1953 # update bookmarks, dirstate and mergestate
1953 # update bookmarks, dirstate and mergestate
1954 bookmarks.update(self, [p1, p2], ret)
1954 bookmarks.update(self, [p1, p2], ret)
1955 cctx.markcommitted(ret)
1955 cctx.markcommitted(ret)
1956 ms.reset()
1956 ms.reset()
1957 tr.close()
1957 tr.close()
1958
1958
1959 finally:
1959 finally:
1960 lockmod.release(tr, lock, wlock)
1960 lockmod.release(tr, lock, wlock)
1961
1961
1962 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2):
1962 def commithook(node=hex(ret), parent1=hookp1, parent2=hookp2):
1963 # hack for command that use a temporary commit (eg: histedit)
1963 # hack for command that use a temporary commit (eg: histedit)
1964 # temporary commit got stripped before hook release
1964 # temporary commit got stripped before hook release
1965 if self.changelog.hasnode(ret):
1965 if self.changelog.hasnode(ret):
1966 self.hook("commit", node=node, parent1=parent1,
1966 self.hook("commit", node=node, parent1=parent1,
1967 parent2=parent2)
1967 parent2=parent2)
1968 self._afterlock(commithook)
1968 self._afterlock(commithook)
1969 return ret
1969 return ret
1970
1970
1971 @unfilteredmethod
1971 @unfilteredmethod
1972 def commitctx(self, ctx, error=False):
1972 def commitctx(self, ctx, error=False):
1973 """Add a new revision to current repository.
1973 """Add a new revision to current repository.
1974 Revision information is passed via the context argument.
1974 Revision information is passed via the context argument.
1975 """
1975 """
1976
1976
1977 tr = None
1977 tr = None
1978 p1, p2 = ctx.p1(), ctx.p2()
1978 p1, p2 = ctx.p1(), ctx.p2()
1979 user = ctx.user()
1979 user = ctx.user()
1980
1980
1981 lock = self.lock()
1981 lock = self.lock()
1982 try:
1982 try:
1983 tr = self.transaction("commit")
1983 tr = self.transaction("commit")
1984 trp = weakref.proxy(tr)
1984 trp = weakref.proxy(tr)
1985
1985
1986 if ctx.manifestnode():
1986 if ctx.manifestnode():
1987 # reuse an existing manifest revision
1987 # reuse an existing manifest revision
1988 mn = ctx.manifestnode()
1988 mn = ctx.manifestnode()
1989 files = ctx.files()
1989 files = ctx.files()
1990 elif ctx.files():
1990 elif ctx.files():
1991 m1ctx = p1.manifestctx()
1991 m1ctx = p1.manifestctx()
1992 m2ctx = p2.manifestctx()
1992 m2ctx = p2.manifestctx()
1993 mctx = m1ctx.copy()
1993 mctx = m1ctx.copy()
1994
1994
1995 m = mctx.read()
1995 m = mctx.read()
1996 m1 = m1ctx.read()
1996 m1 = m1ctx.read()
1997 m2 = m2ctx.read()
1997 m2 = m2ctx.read()
1998
1998
1999 # check in files
1999 # check in files
2000 added = []
2000 added = []
2001 changed = []
2001 changed = []
2002 removed = list(ctx.removed())
2002 removed = list(ctx.removed())
2003 linkrev = len(self)
2003 linkrev = len(self)
2004 self.ui.note(_("committing files:\n"))
2004 self.ui.note(_("committing files:\n"))
2005 for f in sorted(ctx.modified() + ctx.added()):
2005 for f in sorted(ctx.modified() + ctx.added()):
2006 self.ui.note(f + "\n")
2006 self.ui.note(f + "\n")
2007 try:
2007 try:
2008 fctx = ctx[f]
2008 fctx = ctx[f]
2009 if fctx is None:
2009 if fctx is None:
2010 removed.append(f)
2010 removed.append(f)
2011 else:
2011 else:
2012 added.append(f)
2012 added.append(f)
2013 m[f] = self._filecommit(fctx, m1, m2, linkrev,
2013 m[f] = self._filecommit(fctx, m1, m2, linkrev,
2014 trp, changed)
2014 trp, changed)
2015 m.setflag(f, fctx.flags())
2015 m.setflag(f, fctx.flags())
2016 except OSError as inst:
2016 except OSError as inst:
2017 self.ui.warn(_("trouble committing %s!\n") % f)
2017 self.ui.warn(_("trouble committing %s!\n") % f)
2018 raise
2018 raise
2019 except IOError as inst:
2019 except IOError as inst:
2020 errcode = getattr(inst, 'errno', errno.ENOENT)
2020 errcode = getattr(inst, 'errno', errno.ENOENT)
2021 if error or errcode and errcode != errno.ENOENT:
2021 if error or errcode and errcode != errno.ENOENT:
2022 self.ui.warn(_("trouble committing %s!\n") % f)
2022 self.ui.warn(_("trouble committing %s!\n") % f)
2023 raise
2023 raise
2024
2024
2025 # update manifest
2025 # update manifest
2026 self.ui.note(_("committing manifest\n"))
2026 self.ui.note(_("committing manifest\n"))
2027 removed = [f for f in sorted(removed) if f in m1 or f in m2]
2027 removed = [f for f in sorted(removed) if f in m1 or f in m2]
2028 drop = [f for f in removed if f in m]
2028 drop = [f for f in removed if f in m]
2029 for f in drop:
2029 for f in drop:
2030 del m[f]
2030 del m[f]
2031 mn = mctx.write(trp, linkrev,
2031 mn = mctx.write(trp, linkrev,
2032 p1.manifestnode(), p2.manifestnode(),
2032 p1.manifestnode(), p2.manifestnode(),
2033 added, drop)
2033 added, drop)
2034 files = changed + removed
2034 files = changed + removed
2035 else:
2035 else:
2036 mn = p1.manifestnode()
2036 mn = p1.manifestnode()
2037 files = []
2037 files = []
2038
2038
2039 # update changelog
2039 # update changelog
2040 self.ui.note(_("committing changelog\n"))
2040 self.ui.note(_("committing changelog\n"))
2041 self.changelog.delayupdate(tr)
2041 self.changelog.delayupdate(tr)
2042 n = self.changelog.add(mn, files, ctx.description(),
2042 n = self.changelog.add(mn, files, ctx.description(),
2043 trp, p1.node(), p2.node(),
2043 trp, p1.node(), p2.node(),
2044 user, ctx.date(), ctx.extra().copy())
2044 user, ctx.date(), ctx.extra().copy())
2045 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
2045 xp1, xp2 = p1.hex(), p2 and p2.hex() or ''
2046 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
2046 self.hook('pretxncommit', throw=True, node=hex(n), parent1=xp1,
2047 parent2=xp2)
2047 parent2=xp2)
2048 # set the new commit is proper phase
2048 # set the new commit is proper phase
2049 targetphase = subrepoutil.newcommitphase(self.ui, ctx)
2049 targetphase = subrepoutil.newcommitphase(self.ui, ctx)
2050 if targetphase:
2050 if targetphase:
2051 # retract boundary do not alter parent changeset.
2051 # retract boundary do not alter parent changeset.
2052 # if a parent have higher the resulting phase will
2052 # if a parent have higher the resulting phase will
2053 # be compliant anyway
2053 # be compliant anyway
2054 #
2054 #
2055 # if minimal phase was 0 we don't need to retract anything
2055 # if minimal phase was 0 we don't need to retract anything
2056 phases.registernew(self, tr, targetphase, [n])
2056 phases.registernew(self, tr, targetphase, [n])
2057 tr.close()
2057 tr.close()
2058 return n
2058 return n
2059 finally:
2059 finally:
2060 if tr:
2060 if tr:
2061 tr.release()
2061 tr.release()
2062 lock.release()
2062 lock.release()
2063
2063
2064 @unfilteredmethod
2064 @unfilteredmethod
2065 def destroying(self):
2065 def destroying(self):
2066 '''Inform the repository that nodes are about to be destroyed.
2066 '''Inform the repository that nodes are about to be destroyed.
2067 Intended for use by strip and rollback, so there's a common
2067 Intended for use by strip and rollback, so there's a common
2068 place for anything that has to be done before destroying history.
2068 place for anything that has to be done before destroying history.
2069
2069
2070 This is mostly useful for saving state that is in memory and waiting
2070 This is mostly useful for saving state that is in memory and waiting
2071 to be flushed when the current lock is released. Because a call to
2071 to be flushed when the current lock is released. Because a call to
2072 destroyed is imminent, the repo will be invalidated causing those
2072 destroyed is imminent, the repo will be invalidated causing those
2073 changes to stay in memory (waiting for the next unlock), or vanish
2073 changes to stay in memory (waiting for the next unlock), or vanish
2074 completely.
2074 completely.
2075 '''
2075 '''
2076 # When using the same lock to commit and strip, the phasecache is left
2076 # When using the same lock to commit and strip, the phasecache is left
2077 # dirty after committing. Then when we strip, the repo is invalidated,
2077 # dirty after committing. Then when we strip, the repo is invalidated,
2078 # causing those changes to disappear.
2078 # causing those changes to disappear.
2079 if '_phasecache' in vars(self):
2079 if '_phasecache' in vars(self):
2080 self._phasecache.write()
2080 self._phasecache.write()
2081
2081
2082 @unfilteredmethod
2082 @unfilteredmethod
2083 def destroyed(self):
2083 def destroyed(self):
2084 '''Inform the repository that nodes have been destroyed.
2084 '''Inform the repository that nodes have been destroyed.
2085 Intended for use by strip and rollback, so there's a common
2085 Intended for use by strip and rollback, so there's a common
2086 place for anything that has to be done after destroying history.
2086 place for anything that has to be done after destroying history.
2087 '''
2087 '''
2088 # When one tries to:
2088 # When one tries to:
2089 # 1) destroy nodes thus calling this method (e.g. strip)
2089 # 1) destroy nodes thus calling this method (e.g. strip)
2090 # 2) use phasecache somewhere (e.g. commit)
2090 # 2) use phasecache somewhere (e.g. commit)
2091 #
2091 #
2092 # then 2) will fail because the phasecache contains nodes that were
2092 # then 2) will fail because the phasecache contains nodes that were
2093 # removed. We can either remove phasecache from the filecache,
2093 # removed. We can either remove phasecache from the filecache,
2094 # causing it to reload next time it is accessed, or simply filter
2094 # causing it to reload next time it is accessed, or simply filter
2095 # the removed nodes now and write the updated cache.
2095 # the removed nodes now and write the updated cache.
2096 self._phasecache.filterunknown(self)
2096 self._phasecache.filterunknown(self)
2097 self._phasecache.write()
2097 self._phasecache.write()
2098
2098
2099 # refresh all repository caches
2099 # refresh all repository caches
2100 self.updatecaches()
2100 self.updatecaches()
2101
2101
2102 # Ensure the persistent tag cache is updated. Doing it now
2102 # Ensure the persistent tag cache is updated. Doing it now
2103 # means that the tag cache only has to worry about destroyed
2103 # means that the tag cache only has to worry about destroyed
2104 # heads immediately after a strip/rollback. That in turn
2104 # heads immediately after a strip/rollback. That in turn
2105 # guarantees that "cachetip == currenttip" (comparing both rev
2105 # guarantees that "cachetip == currenttip" (comparing both rev
2106 # and node) always means no nodes have been added or destroyed.
2106 # and node) always means no nodes have been added or destroyed.
2107
2107
2108 # XXX this is suboptimal when qrefresh'ing: we strip the current
2108 # XXX this is suboptimal when qrefresh'ing: we strip the current
2109 # head, refresh the tag cache, then immediately add a new head.
2109 # head, refresh the tag cache, then immediately add a new head.
2110 # But I think doing it this way is necessary for the "instant
2110 # But I think doing it this way is necessary for the "instant
2111 # tag cache retrieval" case to work.
2111 # tag cache retrieval" case to work.
2112 self.invalidate()
2112 self.invalidate()
2113
2113
2114 def status(self, node1='.', node2=None, match=None,
2114 def status(self, node1='.', node2=None, match=None,
2115 ignored=False, clean=False, unknown=False,
2115 ignored=False, clean=False, unknown=False,
2116 listsubrepos=False):
2116 listsubrepos=False):
2117 '''a convenience method that calls node1.status(node2)'''
2117 '''a convenience method that calls node1.status(node2)'''
2118 return self[node1].status(node2, match, ignored, clean, unknown,
2118 return self[node1].status(node2, match, ignored, clean, unknown,
2119 listsubrepos)
2119 listsubrepos)
2120
2120
2121 def addpostdsstatus(self, ps):
2121 def addpostdsstatus(self, ps):
2122 """Add a callback to run within the wlock, at the point at which status
2122 """Add a callback to run within the wlock, at the point at which status
2123 fixups happen.
2123 fixups happen.
2124
2124
2125 On status completion, callback(wctx, status) will be called with the
2125 On status completion, callback(wctx, status) will be called with the
2126 wlock held, unless the dirstate has changed from underneath or the wlock
2126 wlock held, unless the dirstate has changed from underneath or the wlock
2127 couldn't be grabbed.
2127 couldn't be grabbed.
2128
2128
2129 Callbacks should not capture and use a cached copy of the dirstate --
2129 Callbacks should not capture and use a cached copy of the dirstate --
2130 it might change in the meanwhile. Instead, they should access the
2130 it might change in the meanwhile. Instead, they should access the
2131 dirstate via wctx.repo().dirstate.
2131 dirstate via wctx.repo().dirstate.
2132
2132
2133 This list is emptied out after each status run -- extensions should
2133 This list is emptied out after each status run -- extensions should
2134 make sure it adds to this list each time dirstate.status is called.
2134 make sure it adds to this list each time dirstate.status is called.
2135 Extensions should also make sure they don't call this for statuses
2135 Extensions should also make sure they don't call this for statuses
2136 that don't involve the dirstate.
2136 that don't involve the dirstate.
2137 """
2137 """
2138
2138
2139 # The list is located here for uniqueness reasons -- it is actually
2139 # The list is located here for uniqueness reasons -- it is actually
2140 # managed by the workingctx, but that isn't unique per-repo.
2140 # managed by the workingctx, but that isn't unique per-repo.
2141 self._postdsstatus.append(ps)
2141 self._postdsstatus.append(ps)
2142
2142
2143 def postdsstatus(self):
2143 def postdsstatus(self):
2144 """Used by workingctx to get the list of post-dirstate-status hooks."""
2144 """Used by workingctx to get the list of post-dirstate-status hooks."""
2145 return self._postdsstatus
2145 return self._postdsstatus
2146
2146
2147 def clearpostdsstatus(self):
2147 def clearpostdsstatus(self):
2148 """Used by workingctx to clear post-dirstate-status hooks."""
2148 """Used by workingctx to clear post-dirstate-status hooks."""
2149 del self._postdsstatus[:]
2149 del self._postdsstatus[:]
2150
2150
2151 def heads(self, start=None):
2151 def heads(self, start=None):
2152 if start is None:
2152 if start is None:
2153 cl = self.changelog
2153 cl = self.changelog
2154 headrevs = reversed(cl.headrevs())
2154 headrevs = reversed(cl.headrevs())
2155 return [cl.node(rev) for rev in headrevs]
2155 return [cl.node(rev) for rev in headrevs]
2156
2156
2157 heads = self.changelog.heads(start)
2157 heads = self.changelog.heads(start)
2158 # sort the output in rev descending order
2158 # sort the output in rev descending order
2159 return sorted(heads, key=self.changelog.rev, reverse=True)
2159 return sorted(heads, key=self.changelog.rev, reverse=True)
2160
2160
2161 def branchheads(self, branch=None, start=None, closed=False):
2161 def branchheads(self, branch=None, start=None, closed=False):
2162 '''return a (possibly filtered) list of heads for the given branch
2162 '''return a (possibly filtered) list of heads for the given branch
2163
2163
2164 Heads are returned in topological order, from newest to oldest.
2164 Heads are returned in topological order, from newest to oldest.
2165 If branch is None, use the dirstate branch.
2165 If branch is None, use the dirstate branch.
2166 If start is not None, return only heads reachable from start.
2166 If start is not None, return only heads reachable from start.
2167 If closed is True, return heads that are marked as closed as well.
2167 If closed is True, return heads that are marked as closed as well.
2168 '''
2168 '''
2169 if branch is None:
2169 if branch is None:
2170 branch = self[None].branch()
2170 branch = self[None].branch()
2171 branches = self.branchmap()
2171 branches = self.branchmap()
2172 if branch not in branches:
2172 if branch not in branches:
2173 return []
2173 return []
2174 # the cache returns heads ordered lowest to highest
2174 # the cache returns heads ordered lowest to highest
2175 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
2175 bheads = list(reversed(branches.branchheads(branch, closed=closed)))
2176 if start is not None:
2176 if start is not None:
2177 # filter out the heads that cannot be reached from startrev
2177 # filter out the heads that cannot be reached from startrev
2178 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
2178 fbheads = set(self.changelog.nodesbetween([start], bheads)[2])
2179 bheads = [h for h in bheads if h in fbheads]
2179 bheads = [h for h in bheads if h in fbheads]
2180 return bheads
2180 return bheads
2181
2181
2182 def branches(self, nodes):
2182 def branches(self, nodes):
2183 if not nodes:
2183 if not nodes:
2184 nodes = [self.changelog.tip()]
2184 nodes = [self.changelog.tip()]
2185 b = []
2185 b = []
2186 for n in nodes:
2186 for n in nodes:
2187 t = n
2187 t = n
2188 while True:
2188 while True:
2189 p = self.changelog.parents(n)
2189 p = self.changelog.parents(n)
2190 if p[1] != nullid or p[0] == nullid:
2190 if p[1] != nullid or p[0] == nullid:
2191 b.append((t, n, p[0], p[1]))
2191 b.append((t, n, p[0], p[1]))
2192 break
2192 break
2193 n = p[0]
2193 n = p[0]
2194 return b
2194 return b
2195
2195
2196 def between(self, pairs):
2196 def between(self, pairs):
2197 r = []
2197 r = []
2198
2198
2199 for top, bottom in pairs:
2199 for top, bottom in pairs:
2200 n, l, i = top, [], 0
2200 n, l, i = top, [], 0
2201 f = 1
2201 f = 1
2202
2202
2203 while n != bottom and n != nullid:
2203 while n != bottom and n != nullid:
2204 p = self.changelog.parents(n)[0]
2204 p = self.changelog.parents(n)[0]
2205 if i == f:
2205 if i == f:
2206 l.append(n)
2206 l.append(n)
2207 f = f * 2
2207 f = f * 2
2208 n = p
2208 n = p
2209 i += 1
2209 i += 1
2210
2210
2211 r.append(l)
2211 r.append(l)
2212
2212
2213 return r
2213 return r
2214
2214
2215 def checkpush(self, pushop):
2215 def checkpush(self, pushop):
2216 """Extensions can override this function if additional checks have
2216 """Extensions can override this function if additional checks have
2217 to be performed before pushing, or call it if they override push
2217 to be performed before pushing, or call it if they override push
2218 command.
2218 command.
2219 """
2219 """
2220
2220
2221 @unfilteredpropertycache
2221 @unfilteredpropertycache
2222 def prepushoutgoinghooks(self):
2222 def prepushoutgoinghooks(self):
2223 """Return util.hooks consists of a pushop with repo, remote, outgoing
2223 """Return util.hooks consists of a pushop with repo, remote, outgoing
2224 methods, which are called before pushing changesets.
2224 methods, which are called before pushing changesets.
2225 """
2225 """
2226 return util.hooks()
2226 return util.hooks()
2227
2227
2228 def pushkey(self, namespace, key, old, new):
2228 def pushkey(self, namespace, key, old, new):
2229 try:
2229 try:
2230 tr = self.currenttransaction()
2230 tr = self.currenttransaction()
2231 hookargs = {}
2231 hookargs = {}
2232 if tr is not None:
2232 if tr is not None:
2233 hookargs.update(tr.hookargs)
2233 hookargs.update(tr.hookargs)
2234 hookargs = pycompat.strkwargs(hookargs)
2234 hookargs = pycompat.strkwargs(hookargs)
2235 hookargs[r'namespace'] = namespace
2235 hookargs[r'namespace'] = namespace
2236 hookargs[r'key'] = key
2236 hookargs[r'key'] = key
2237 hookargs[r'old'] = old
2237 hookargs[r'old'] = old
2238 hookargs[r'new'] = new
2238 hookargs[r'new'] = new
2239 self.hook('prepushkey', throw=True, **hookargs)
2239 self.hook('prepushkey', throw=True, **hookargs)
2240 except error.HookAbort as exc:
2240 except error.HookAbort as exc:
2241 self.ui.write_err(_("pushkey-abort: %s\n") % exc)
2241 self.ui.write_err(_("pushkey-abort: %s\n") % exc)
2242 if exc.hint:
2242 if exc.hint:
2243 self.ui.write_err(_("(%s)\n") % exc.hint)
2243 self.ui.write_err(_("(%s)\n") % exc.hint)
2244 return False
2244 return False
2245 self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key))
2245 self.ui.debug('pushing key for "%s:%s"\n' % (namespace, key))
2246 ret = pushkey.push(self, namespace, key, old, new)
2246 ret = pushkey.push(self, namespace, key, old, new)
2247 def runhook():
2247 def runhook():
2248 self.hook('pushkey', namespace=namespace, key=key, old=old, new=new,
2248 self.hook('pushkey', namespace=namespace, key=key, old=old, new=new,
2249 ret=ret)
2249 ret=ret)
2250 self._afterlock(runhook)
2250 self._afterlock(runhook)
2251 return ret
2251 return ret
2252
2252
2253 def listkeys(self, namespace):
2253 def listkeys(self, namespace):
2254 self.hook('prelistkeys', throw=True, namespace=namespace)
2254 self.hook('prelistkeys', throw=True, namespace=namespace)
2255 self.ui.debug('listing keys for "%s"\n' % namespace)
2255 self.ui.debug('listing keys for "%s"\n' % namespace)
2256 values = pushkey.list(self, namespace)
2256 values = pushkey.list(self, namespace)
2257 self.hook('listkeys', namespace=namespace, values=values)
2257 self.hook('listkeys', namespace=namespace, values=values)
2258 return values
2258 return values
2259
2259
2260 def debugwireargs(self, one, two, three=None, four=None, five=None):
2260 def debugwireargs(self, one, two, three=None, four=None, five=None):
2261 '''used to test argument passing over the wire'''
2261 '''used to test argument passing over the wire'''
2262 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
2262 return "%s %s %s %s %s" % (one, two, pycompat.bytestr(three),
2263 pycompat.bytestr(four),
2263 pycompat.bytestr(four),
2264 pycompat.bytestr(five))
2264 pycompat.bytestr(five))
2265
2265
2266 def savecommitmessage(self, text):
2266 def savecommitmessage(self, text):
2267 fp = self.vfs('last-message.txt', 'wb')
2267 fp = self.vfs('last-message.txt', 'wb')
2268 try:
2268 try:
2269 fp.write(text)
2269 fp.write(text)
2270 finally:
2270 finally:
2271 fp.close()
2271 fp.close()
2272 return self.pathto(fp.name[len(self.root) + 1:])
2272 return self.pathto(fp.name[len(self.root) + 1:])
2273
2273
2274 # used to avoid circular references so destructors work
2274 # used to avoid circular references so destructors work
2275 def aftertrans(files):
2275 def aftertrans(files):
2276 renamefiles = [tuple(t) for t in files]
2276 renamefiles = [tuple(t) for t in files]
2277 def a():
2277 def a():
2278 for vfs, src, dest in renamefiles:
2278 for vfs, src, dest in renamefiles:
2279 # if src and dest refer to a same file, vfs.rename is a no-op,
2279 # if src and dest refer to a same file, vfs.rename is a no-op,
2280 # leaving both src and dest on disk. delete dest to make sure
2280 # leaving both src and dest on disk. delete dest to make sure
2281 # the rename couldn't be such a no-op.
2281 # the rename couldn't be such a no-op.
2282 vfs.tryunlink(dest)
2282 vfs.tryunlink(dest)
2283 try:
2283 try:
2284 vfs.rename(src, dest)
2284 vfs.rename(src, dest)
2285 except OSError: # journal file does not yet exist
2285 except OSError: # journal file does not yet exist
2286 pass
2286 pass
2287 return a
2287 return a
2288
2288
2289 def undoname(fn):
2289 def undoname(fn):
2290 base, name = os.path.split(fn)
2290 base, name = os.path.split(fn)
2291 assert name.startswith('journal')
2291 assert name.startswith('journal')
2292 return os.path.join(base, name.replace('journal', 'undo', 1))
2292 return os.path.join(base, name.replace('journal', 'undo', 1))
2293
2293
2294 def instance(ui, path, create):
2294 def instance(ui, path, create):
2295 return localrepository(ui, util.urllocalpath(path), create)
2295 return localrepository(ui, util.urllocalpath(path), create)
2296
2296
2297 def islocal(path):
2297 def islocal(path):
2298 return True
2298 return True
2299
2299
2300 def newreporequirements(repo):
2300 def newreporequirements(repo):
2301 """Determine the set of requirements for a new local repository.
2301 """Determine the set of requirements for a new local repository.
2302
2302
2303 Extensions can wrap this function to specify custom requirements for
2303 Extensions can wrap this function to specify custom requirements for
2304 new repositories.
2304 new repositories.
2305 """
2305 """
2306 ui = repo.ui
2306 ui = repo.ui
2307 requirements = {'revlogv1'}
2307 requirements = {'revlogv1'}
2308 if ui.configbool('format', 'usestore'):
2308 if ui.configbool('format', 'usestore'):
2309 requirements.add('store')
2309 requirements.add('store')
2310 if ui.configbool('format', 'usefncache'):
2310 if ui.configbool('format', 'usefncache'):
2311 requirements.add('fncache')
2311 requirements.add('fncache')
2312 if ui.configbool('format', 'dotencode'):
2312 if ui.configbool('format', 'dotencode'):
2313 requirements.add('dotencode')
2313 requirements.add('dotencode')
2314
2314
2315 compengine = ui.config('experimental', 'format.compression')
2315 compengine = ui.config('experimental', 'format.compression')
2316 if compengine not in util.compengines:
2316 if compengine not in util.compengines:
2317 raise error.Abort(_('compression engine %s defined by '
2317 raise error.Abort(_('compression engine %s defined by '
2318 'experimental.format.compression not available') %
2318 'experimental.format.compression not available') %
2319 compengine,
2319 compengine,
2320 hint=_('run "hg debuginstall" to list available '
2320 hint=_('run "hg debuginstall" to list available '
2321 'compression engines'))
2321 'compression engines'))
2322
2322
2323 # zlib is the historical default and doesn't need an explicit requirement.
2323 # zlib is the historical default and doesn't need an explicit requirement.
2324 if compengine != 'zlib':
2324 if compengine != 'zlib':
2325 requirements.add('exp-compression-%s' % compengine)
2325 requirements.add('exp-compression-%s' % compengine)
2326
2326
2327 if scmutil.gdinitconfig(ui):
2327 if scmutil.gdinitconfig(ui):
2328 requirements.add('generaldelta')
2328 requirements.add('generaldelta')
2329 if ui.configbool('experimental', 'treemanifest'):
2329 if ui.configbool('experimental', 'treemanifest'):
2330 requirements.add('treemanifest')
2330 requirements.add('treemanifest')
2331
2331
2332 revlogv2 = ui.config('experimental', 'revlogv2')
2332 revlogv2 = ui.config('experimental', 'revlogv2')
2333 if revlogv2 == 'enable-unstable-format-and-corrupt-my-data':
2333 if revlogv2 == 'enable-unstable-format-and-corrupt-my-data':
2334 requirements.remove('revlogv1')
2334 requirements.remove('revlogv1')
2335 # generaldelta is implied by revlogv2.
2335 # generaldelta is implied by revlogv2.
2336 requirements.discard('generaldelta')
2336 requirements.discard('generaldelta')
2337 requirements.add(REVLOGV2_REQUIREMENT)
2337 requirements.add(REVLOGV2_REQUIREMENT)
2338
2338
2339 return requirements
2339 return requirements
General Comments 0
You need to be logged in to leave comments. Login now