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