##// END OF EJS Templates
dirstate: deprecated `drop` outside of `update/merge`...
marmoute -
r48463:6f8d6dd3 default
parent child Browse files
Show More
@@ -1,1623 +1,1630 b''
1 # dirstate.py - working directory tracking for mercurial
1 # dirstate.py - working directory tracking for mercurial
2 #
2 #
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
3 # Copyright 2005-2007 Olivia Mackall <olivia@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 collections
10 import collections
11 import contextlib
11 import contextlib
12 import errno
12 import errno
13 import os
13 import os
14 import stat
14 import stat
15
15
16 from .i18n import _
16 from .i18n import _
17 from .pycompat import delattr
17 from .pycompat import delattr
18
18
19 from hgdemandimport import tracing
19 from hgdemandimport import tracing
20
20
21 from . import (
21 from . import (
22 dirstatemap,
22 dirstatemap,
23 encoding,
23 encoding,
24 error,
24 error,
25 match as matchmod,
25 match as matchmod,
26 pathutil,
26 pathutil,
27 policy,
27 policy,
28 pycompat,
28 pycompat,
29 scmutil,
29 scmutil,
30 sparse,
30 sparse,
31 util,
31 util,
32 )
32 )
33
33
34 from .interfaces import (
34 from .interfaces import (
35 dirstate as intdirstate,
35 dirstate as intdirstate,
36 util as interfaceutil,
36 util as interfaceutil,
37 )
37 )
38
38
39 parsers = policy.importmod('parsers')
39 parsers = policy.importmod('parsers')
40 rustmod = policy.importrust('dirstate')
40 rustmod = policy.importrust('dirstate')
41
41
42 SUPPORTS_DIRSTATE_V2 = rustmod is not None
42 SUPPORTS_DIRSTATE_V2 = rustmod is not None
43
43
44 propertycache = util.propertycache
44 propertycache = util.propertycache
45 filecache = scmutil.filecache
45 filecache = scmutil.filecache
46 _rangemask = dirstatemap.rangemask
46 _rangemask = dirstatemap.rangemask
47
47
48 DirstateItem = parsers.DirstateItem
48 DirstateItem = parsers.DirstateItem
49
49
50
50
51 class repocache(filecache):
51 class repocache(filecache):
52 """filecache for files in .hg/"""
52 """filecache for files in .hg/"""
53
53
54 def join(self, obj, fname):
54 def join(self, obj, fname):
55 return obj._opener.join(fname)
55 return obj._opener.join(fname)
56
56
57
57
58 class rootcache(filecache):
58 class rootcache(filecache):
59 """filecache for files in the repository root"""
59 """filecache for files in the repository root"""
60
60
61 def join(self, obj, fname):
61 def join(self, obj, fname):
62 return obj._join(fname)
62 return obj._join(fname)
63
63
64
64
65 def _getfsnow(vfs):
65 def _getfsnow(vfs):
66 '''Get "now" timestamp on filesystem'''
66 '''Get "now" timestamp on filesystem'''
67 tmpfd, tmpname = vfs.mkstemp()
67 tmpfd, tmpname = vfs.mkstemp()
68 try:
68 try:
69 return os.fstat(tmpfd)[stat.ST_MTIME]
69 return os.fstat(tmpfd)[stat.ST_MTIME]
70 finally:
70 finally:
71 os.close(tmpfd)
71 os.close(tmpfd)
72 vfs.unlink(tmpname)
72 vfs.unlink(tmpname)
73
73
74
74
75 def requires_parents_change(func):
75 def requires_parents_change(func):
76 def wrap(self, *args, **kwargs):
76 def wrap(self, *args, **kwargs):
77 if not self.pendingparentchange():
77 if not self.pendingparentchange():
78 msg = 'calling `%s` outside of a parentchange context'
78 msg = 'calling `%s` outside of a parentchange context'
79 msg %= func.__name__
79 msg %= func.__name__
80 raise error.ProgrammingError(msg)
80 raise error.ProgrammingError(msg)
81 return func(self, *args, **kwargs)
81 return func(self, *args, **kwargs)
82
82
83 return wrap
83 return wrap
84
84
85
85
86 def requires_no_parents_change(func):
86 def requires_no_parents_change(func):
87 def wrap(self, *args, **kwargs):
87 def wrap(self, *args, **kwargs):
88 if self.pendingparentchange():
88 if self.pendingparentchange():
89 msg = 'calling `%s` inside of a parentchange context'
89 msg = 'calling `%s` inside of a parentchange context'
90 msg %= func.__name__
90 msg %= func.__name__
91 raise error.ProgrammingError(msg)
91 raise error.ProgrammingError(msg)
92 return func(self, *args, **kwargs)
92 return func(self, *args, **kwargs)
93
93
94 return wrap
94 return wrap
95
95
96
96
97 @interfaceutil.implementer(intdirstate.idirstate)
97 @interfaceutil.implementer(intdirstate.idirstate)
98 class dirstate(object):
98 class dirstate(object):
99 def __init__(
99 def __init__(
100 self,
100 self,
101 opener,
101 opener,
102 ui,
102 ui,
103 root,
103 root,
104 validate,
104 validate,
105 sparsematchfn,
105 sparsematchfn,
106 nodeconstants,
106 nodeconstants,
107 use_dirstate_v2,
107 use_dirstate_v2,
108 ):
108 ):
109 """Create a new dirstate object.
109 """Create a new dirstate object.
110
110
111 opener is an open()-like callable that can be used to open the
111 opener is an open()-like callable that can be used to open the
112 dirstate file; root is the root of the directory tracked by
112 dirstate file; root is the root of the directory tracked by
113 the dirstate.
113 the dirstate.
114 """
114 """
115 self._use_dirstate_v2 = use_dirstate_v2
115 self._use_dirstate_v2 = use_dirstate_v2
116 self._nodeconstants = nodeconstants
116 self._nodeconstants = nodeconstants
117 self._opener = opener
117 self._opener = opener
118 self._validate = validate
118 self._validate = validate
119 self._root = root
119 self._root = root
120 self._sparsematchfn = sparsematchfn
120 self._sparsematchfn = sparsematchfn
121 # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is
121 # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is
122 # UNC path pointing to root share (issue4557)
122 # UNC path pointing to root share (issue4557)
123 self._rootdir = pathutil.normasprefix(root)
123 self._rootdir = pathutil.normasprefix(root)
124 self._dirty = False
124 self._dirty = False
125 self._lastnormaltime = 0
125 self._lastnormaltime = 0
126 self._ui = ui
126 self._ui = ui
127 self._filecache = {}
127 self._filecache = {}
128 self._parentwriters = 0
128 self._parentwriters = 0
129 self._filename = b'dirstate'
129 self._filename = b'dirstate'
130 self._pendingfilename = b'%s.pending' % self._filename
130 self._pendingfilename = b'%s.pending' % self._filename
131 self._plchangecallbacks = {}
131 self._plchangecallbacks = {}
132 self._origpl = None
132 self._origpl = None
133 self._updatedfiles = set()
133 self._updatedfiles = set()
134 self._mapcls = dirstatemap.dirstatemap
134 self._mapcls = dirstatemap.dirstatemap
135 # Access and cache cwd early, so we don't access it for the first time
135 # Access and cache cwd early, so we don't access it for the first time
136 # after a working-copy update caused it to not exist (accessing it then
136 # after a working-copy update caused it to not exist (accessing it then
137 # raises an exception).
137 # raises an exception).
138 self._cwd
138 self._cwd
139
139
140 def prefetch_parents(self):
140 def prefetch_parents(self):
141 """make sure the parents are loaded
141 """make sure the parents are loaded
142
142
143 Used to avoid a race condition.
143 Used to avoid a race condition.
144 """
144 """
145 self._pl
145 self._pl
146
146
147 @contextlib.contextmanager
147 @contextlib.contextmanager
148 def parentchange(self):
148 def parentchange(self):
149 """Context manager for handling dirstate parents.
149 """Context manager for handling dirstate parents.
150
150
151 If an exception occurs in the scope of the context manager,
151 If an exception occurs in the scope of the context manager,
152 the incoherent dirstate won't be written when wlock is
152 the incoherent dirstate won't be written when wlock is
153 released.
153 released.
154 """
154 """
155 self._parentwriters += 1
155 self._parentwriters += 1
156 yield
156 yield
157 # Typically we want the "undo" step of a context manager in a
157 # Typically we want the "undo" step of a context manager in a
158 # finally block so it happens even when an exception
158 # finally block so it happens even when an exception
159 # occurs. In this case, however, we only want to decrement
159 # occurs. In this case, however, we only want to decrement
160 # parentwriters if the code in the with statement exits
160 # parentwriters if the code in the with statement exits
161 # normally, so we don't have a try/finally here on purpose.
161 # normally, so we don't have a try/finally here on purpose.
162 self._parentwriters -= 1
162 self._parentwriters -= 1
163
163
164 def pendingparentchange(self):
164 def pendingparentchange(self):
165 """Returns true if the dirstate is in the middle of a set of changes
165 """Returns true if the dirstate is in the middle of a set of changes
166 that modify the dirstate parent.
166 that modify the dirstate parent.
167 """
167 """
168 return self._parentwriters > 0
168 return self._parentwriters > 0
169
169
170 @propertycache
170 @propertycache
171 def _map(self):
171 def _map(self):
172 """Return the dirstate contents (see documentation for dirstatemap)."""
172 """Return the dirstate contents (see documentation for dirstatemap)."""
173 self._map = self._mapcls(
173 self._map = self._mapcls(
174 self._ui,
174 self._ui,
175 self._opener,
175 self._opener,
176 self._root,
176 self._root,
177 self._nodeconstants,
177 self._nodeconstants,
178 self._use_dirstate_v2,
178 self._use_dirstate_v2,
179 )
179 )
180 return self._map
180 return self._map
181
181
182 @property
182 @property
183 def _sparsematcher(self):
183 def _sparsematcher(self):
184 """The matcher for the sparse checkout.
184 """The matcher for the sparse checkout.
185
185
186 The working directory may not include every file from a manifest. The
186 The working directory may not include every file from a manifest. The
187 matcher obtained by this property will match a path if it is to be
187 matcher obtained by this property will match a path if it is to be
188 included in the working directory.
188 included in the working directory.
189 """
189 """
190 # TODO there is potential to cache this property. For now, the matcher
190 # TODO there is potential to cache this property. For now, the matcher
191 # is resolved on every access. (But the called function does use a
191 # is resolved on every access. (But the called function does use a
192 # cache to keep the lookup fast.)
192 # cache to keep the lookup fast.)
193 return self._sparsematchfn()
193 return self._sparsematchfn()
194
194
195 @repocache(b'branch')
195 @repocache(b'branch')
196 def _branch(self):
196 def _branch(self):
197 try:
197 try:
198 return self._opener.read(b"branch").strip() or b"default"
198 return self._opener.read(b"branch").strip() or b"default"
199 except IOError as inst:
199 except IOError as inst:
200 if inst.errno != errno.ENOENT:
200 if inst.errno != errno.ENOENT:
201 raise
201 raise
202 return b"default"
202 return b"default"
203
203
204 @property
204 @property
205 def _pl(self):
205 def _pl(self):
206 return self._map.parents()
206 return self._map.parents()
207
207
208 def hasdir(self, d):
208 def hasdir(self, d):
209 return self._map.hastrackeddir(d)
209 return self._map.hastrackeddir(d)
210
210
211 @rootcache(b'.hgignore')
211 @rootcache(b'.hgignore')
212 def _ignore(self):
212 def _ignore(self):
213 files = self._ignorefiles()
213 files = self._ignorefiles()
214 if not files:
214 if not files:
215 return matchmod.never()
215 return matchmod.never()
216
216
217 pats = [b'include:%s' % f for f in files]
217 pats = [b'include:%s' % f for f in files]
218 return matchmod.match(self._root, b'', [], pats, warn=self._ui.warn)
218 return matchmod.match(self._root, b'', [], pats, warn=self._ui.warn)
219
219
220 @propertycache
220 @propertycache
221 def _slash(self):
221 def _slash(self):
222 return self._ui.configbool(b'ui', b'slash') and pycompat.ossep != b'/'
222 return self._ui.configbool(b'ui', b'slash') and pycompat.ossep != b'/'
223
223
224 @propertycache
224 @propertycache
225 def _checklink(self):
225 def _checklink(self):
226 return util.checklink(self._root)
226 return util.checklink(self._root)
227
227
228 @propertycache
228 @propertycache
229 def _checkexec(self):
229 def _checkexec(self):
230 return bool(util.checkexec(self._root))
230 return bool(util.checkexec(self._root))
231
231
232 @propertycache
232 @propertycache
233 def _checkcase(self):
233 def _checkcase(self):
234 return not util.fscasesensitive(self._join(b'.hg'))
234 return not util.fscasesensitive(self._join(b'.hg'))
235
235
236 def _join(self, f):
236 def _join(self, f):
237 # much faster than os.path.join()
237 # much faster than os.path.join()
238 # it's safe because f is always a relative path
238 # it's safe because f is always a relative path
239 return self._rootdir + f
239 return self._rootdir + f
240
240
241 def flagfunc(self, buildfallback):
241 def flagfunc(self, buildfallback):
242 if self._checklink and self._checkexec:
242 if self._checklink and self._checkexec:
243
243
244 def f(x):
244 def f(x):
245 try:
245 try:
246 st = os.lstat(self._join(x))
246 st = os.lstat(self._join(x))
247 if util.statislink(st):
247 if util.statislink(st):
248 return b'l'
248 return b'l'
249 if util.statisexec(st):
249 if util.statisexec(st):
250 return b'x'
250 return b'x'
251 except OSError:
251 except OSError:
252 pass
252 pass
253 return b''
253 return b''
254
254
255 return f
255 return f
256
256
257 fallback = buildfallback()
257 fallback = buildfallback()
258 if self._checklink:
258 if self._checklink:
259
259
260 def f(x):
260 def f(x):
261 if os.path.islink(self._join(x)):
261 if os.path.islink(self._join(x)):
262 return b'l'
262 return b'l'
263 if b'x' in fallback(x):
263 if b'x' in fallback(x):
264 return b'x'
264 return b'x'
265 return b''
265 return b''
266
266
267 return f
267 return f
268 if self._checkexec:
268 if self._checkexec:
269
269
270 def f(x):
270 def f(x):
271 if b'l' in fallback(x):
271 if b'l' in fallback(x):
272 return b'l'
272 return b'l'
273 if util.isexec(self._join(x)):
273 if util.isexec(self._join(x)):
274 return b'x'
274 return b'x'
275 return b''
275 return b''
276
276
277 return f
277 return f
278 else:
278 else:
279 return fallback
279 return fallback
280
280
281 @propertycache
281 @propertycache
282 def _cwd(self):
282 def _cwd(self):
283 # internal config: ui.forcecwd
283 # internal config: ui.forcecwd
284 forcecwd = self._ui.config(b'ui', b'forcecwd')
284 forcecwd = self._ui.config(b'ui', b'forcecwd')
285 if forcecwd:
285 if forcecwd:
286 return forcecwd
286 return forcecwd
287 return encoding.getcwd()
287 return encoding.getcwd()
288
288
289 def getcwd(self):
289 def getcwd(self):
290 """Return the path from which a canonical path is calculated.
290 """Return the path from which a canonical path is calculated.
291
291
292 This path should be used to resolve file patterns or to convert
292 This path should be used to resolve file patterns or to convert
293 canonical paths back to file paths for display. It shouldn't be
293 canonical paths back to file paths for display. It shouldn't be
294 used to get real file paths. Use vfs functions instead.
294 used to get real file paths. Use vfs functions instead.
295 """
295 """
296 cwd = self._cwd
296 cwd = self._cwd
297 if cwd == self._root:
297 if cwd == self._root:
298 return b''
298 return b''
299 # self._root ends with a path separator if self._root is '/' or 'C:\'
299 # self._root ends with a path separator if self._root is '/' or 'C:\'
300 rootsep = self._root
300 rootsep = self._root
301 if not util.endswithsep(rootsep):
301 if not util.endswithsep(rootsep):
302 rootsep += pycompat.ossep
302 rootsep += pycompat.ossep
303 if cwd.startswith(rootsep):
303 if cwd.startswith(rootsep):
304 return cwd[len(rootsep) :]
304 return cwd[len(rootsep) :]
305 else:
305 else:
306 # we're outside the repo. return an absolute path.
306 # we're outside the repo. return an absolute path.
307 return cwd
307 return cwd
308
308
309 def pathto(self, f, cwd=None):
309 def pathto(self, f, cwd=None):
310 if cwd is None:
310 if cwd is None:
311 cwd = self.getcwd()
311 cwd = self.getcwd()
312 path = util.pathto(self._root, cwd, f)
312 path = util.pathto(self._root, cwd, f)
313 if self._slash:
313 if self._slash:
314 return util.pconvert(path)
314 return util.pconvert(path)
315 return path
315 return path
316
316
317 def __getitem__(self, key):
317 def __getitem__(self, key):
318 """Return the current state of key (a filename) in the dirstate.
318 """Return the current state of key (a filename) in the dirstate.
319
319
320 States are:
320 States are:
321 n normal
321 n normal
322 m needs merging
322 m needs merging
323 r marked for removal
323 r marked for removal
324 a marked for addition
324 a marked for addition
325 ? not tracked
325 ? not tracked
326
326
327 XXX The "state" is a bit obscure to be in the "public" API. we should
327 XXX The "state" is a bit obscure to be in the "public" API. we should
328 consider migrating all user of this to going through the dirstate entry
328 consider migrating all user of this to going through the dirstate entry
329 instead.
329 instead.
330 """
330 """
331 entry = self._map.get(key)
331 entry = self._map.get(key)
332 if entry is not None:
332 if entry is not None:
333 return entry.state
333 return entry.state
334 return b'?'
334 return b'?'
335
335
336 def __contains__(self, key):
336 def __contains__(self, key):
337 return key in self._map
337 return key in self._map
338
338
339 def __iter__(self):
339 def __iter__(self):
340 return iter(sorted(self._map))
340 return iter(sorted(self._map))
341
341
342 def items(self):
342 def items(self):
343 return pycompat.iteritems(self._map)
343 return pycompat.iteritems(self._map)
344
344
345 iteritems = items
345 iteritems = items
346
346
347 def directories(self):
347 def directories(self):
348 return self._map.directories()
348 return self._map.directories()
349
349
350 def parents(self):
350 def parents(self):
351 return [self._validate(p) for p in self._pl]
351 return [self._validate(p) for p in self._pl]
352
352
353 def p1(self):
353 def p1(self):
354 return self._validate(self._pl[0])
354 return self._validate(self._pl[0])
355
355
356 def p2(self):
356 def p2(self):
357 return self._validate(self._pl[1])
357 return self._validate(self._pl[1])
358
358
359 @property
359 @property
360 def in_merge(self):
360 def in_merge(self):
361 """True if a merge is in progress"""
361 """True if a merge is in progress"""
362 return self._pl[1] != self._nodeconstants.nullid
362 return self._pl[1] != self._nodeconstants.nullid
363
363
364 def branch(self):
364 def branch(self):
365 return encoding.tolocal(self._branch)
365 return encoding.tolocal(self._branch)
366
366
367 def setparents(self, p1, p2=None):
367 def setparents(self, p1, p2=None):
368 """Set dirstate parents to p1 and p2.
368 """Set dirstate parents to p1 and p2.
369
369
370 When moving from two parents to one, "merged" entries a
370 When moving from two parents to one, "merged" entries a
371 adjusted to normal and previous copy records discarded and
371 adjusted to normal and previous copy records discarded and
372 returned by the call.
372 returned by the call.
373
373
374 See localrepo.setparents()
374 See localrepo.setparents()
375 """
375 """
376 if p2 is None:
376 if p2 is None:
377 p2 = self._nodeconstants.nullid
377 p2 = self._nodeconstants.nullid
378 if self._parentwriters == 0:
378 if self._parentwriters == 0:
379 raise ValueError(
379 raise ValueError(
380 b"cannot set dirstate parent outside of "
380 b"cannot set dirstate parent outside of "
381 b"dirstate.parentchange context manager"
381 b"dirstate.parentchange context manager"
382 )
382 )
383
383
384 self._dirty = True
384 self._dirty = True
385 oldp2 = self._pl[1]
385 oldp2 = self._pl[1]
386 if self._origpl is None:
386 if self._origpl is None:
387 self._origpl = self._pl
387 self._origpl = self._pl
388 self._map.setparents(p1, p2)
388 self._map.setparents(p1, p2)
389 copies = {}
389 copies = {}
390 if (
390 if (
391 oldp2 != self._nodeconstants.nullid
391 oldp2 != self._nodeconstants.nullid
392 and p2 == self._nodeconstants.nullid
392 and p2 == self._nodeconstants.nullid
393 ):
393 ):
394 candidatefiles = self._map.non_normal_or_other_parent_paths()
394 candidatefiles = self._map.non_normal_or_other_parent_paths()
395
395
396 for f in candidatefiles:
396 for f in candidatefiles:
397 s = self._map.get(f)
397 s = self._map.get(f)
398 if s is None:
398 if s is None:
399 continue
399 continue
400
400
401 # Discard "merged" markers when moving away from a merge state
401 # Discard "merged" markers when moving away from a merge state
402 if s.merged:
402 if s.merged:
403 source = self._map.copymap.get(f)
403 source = self._map.copymap.get(f)
404 if source:
404 if source:
405 copies[f] = source
405 copies[f] = source
406 self.normallookup(f)
406 self.normallookup(f)
407 # Also fix up otherparent markers
407 # Also fix up otherparent markers
408 elif s.from_p2:
408 elif s.from_p2:
409 source = self._map.copymap.get(f)
409 source = self._map.copymap.get(f)
410 if source:
410 if source:
411 copies[f] = source
411 copies[f] = source
412 self._add(f)
412 self._add(f)
413 return copies
413 return copies
414
414
415 def setbranch(self, branch):
415 def setbranch(self, branch):
416 self.__class__._branch.set(self, encoding.fromlocal(branch))
416 self.__class__._branch.set(self, encoding.fromlocal(branch))
417 f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True)
417 f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True)
418 try:
418 try:
419 f.write(self._branch + b'\n')
419 f.write(self._branch + b'\n')
420 f.close()
420 f.close()
421
421
422 # make sure filecache has the correct stat info for _branch after
422 # make sure filecache has the correct stat info for _branch after
423 # replacing the underlying file
423 # replacing the underlying file
424 ce = self._filecache[b'_branch']
424 ce = self._filecache[b'_branch']
425 if ce:
425 if ce:
426 ce.refresh()
426 ce.refresh()
427 except: # re-raises
427 except: # re-raises
428 f.discard()
428 f.discard()
429 raise
429 raise
430
430
431 def invalidate(self):
431 def invalidate(self):
432 """Causes the next access to reread the dirstate.
432 """Causes the next access to reread the dirstate.
433
433
434 This is different from localrepo.invalidatedirstate() because it always
434 This is different from localrepo.invalidatedirstate() because it always
435 rereads the dirstate. Use localrepo.invalidatedirstate() if you want to
435 rereads the dirstate. Use localrepo.invalidatedirstate() if you want to
436 check whether the dirstate has changed before rereading it."""
436 check whether the dirstate has changed before rereading it."""
437
437
438 for a in ("_map", "_branch", "_ignore"):
438 for a in ("_map", "_branch", "_ignore"):
439 if a in self.__dict__:
439 if a in self.__dict__:
440 delattr(self, a)
440 delattr(self, a)
441 self._lastnormaltime = 0
441 self._lastnormaltime = 0
442 self._dirty = False
442 self._dirty = False
443 self._updatedfiles.clear()
443 self._updatedfiles.clear()
444 self._parentwriters = 0
444 self._parentwriters = 0
445 self._origpl = None
445 self._origpl = None
446
446
447 def copy(self, source, dest):
447 def copy(self, source, dest):
448 """Mark dest as a copy of source. Unmark dest if source is None."""
448 """Mark dest as a copy of source. Unmark dest if source is None."""
449 if source == dest:
449 if source == dest:
450 return
450 return
451 self._dirty = True
451 self._dirty = True
452 if source is not None:
452 if source is not None:
453 self._map.copymap[dest] = source
453 self._map.copymap[dest] = source
454 self._updatedfiles.add(source)
454 self._updatedfiles.add(source)
455 self._updatedfiles.add(dest)
455 self._updatedfiles.add(dest)
456 elif self._map.copymap.pop(dest, None):
456 elif self._map.copymap.pop(dest, None):
457 self._updatedfiles.add(dest)
457 self._updatedfiles.add(dest)
458
458
459 def copied(self, file):
459 def copied(self, file):
460 return self._map.copymap.get(file, None)
460 return self._map.copymap.get(file, None)
461
461
462 def copies(self):
462 def copies(self):
463 return self._map.copymap
463 return self._map.copymap
464
464
465 @requires_no_parents_change
465 @requires_no_parents_change
466 def set_tracked(self, filename):
466 def set_tracked(self, filename):
467 """a "public" method for generic code to mark a file as tracked
467 """a "public" method for generic code to mark a file as tracked
468
468
469 This function is to be called outside of "update/merge" case. For
469 This function is to be called outside of "update/merge" case. For
470 example by a command like `hg add X`.
470 example by a command like `hg add X`.
471
471
472 return True the file was previously untracked, False otherwise.
472 return True the file was previously untracked, False otherwise.
473 """
473 """
474 entry = self._map.get(filename)
474 entry = self._map.get(filename)
475 if entry is None:
475 if entry is None:
476 self._add(filename)
476 self._add(filename)
477 return True
477 return True
478 elif not entry.tracked:
478 elif not entry.tracked:
479 self.normallookup(filename)
479 self.normallookup(filename)
480 return True
480 return True
481 return False
481 return False
482
482
483 @requires_no_parents_change
483 @requires_no_parents_change
484 def set_untracked(self, filename):
484 def set_untracked(self, filename):
485 """a "public" method for generic code to mark a file as untracked
485 """a "public" method for generic code to mark a file as untracked
486
486
487 This function is to be called outside of "update/merge" case. For
487 This function is to be called outside of "update/merge" case. For
488 example by a command like `hg remove X`.
488 example by a command like `hg remove X`.
489
489
490 return True the file was previously tracked, False otherwise.
490 return True the file was previously tracked, False otherwise.
491 """
491 """
492 entry = self._map.get(filename)
492 entry = self._map.get(filename)
493 if entry is None:
493 if entry is None:
494 return False
494 return False
495 elif entry.added:
495 elif entry.added:
496 self._drop(filename)
496 self._drop(filename)
497 return True
497 return True
498 else:
498 else:
499 self._remove(filename)
499 self._remove(filename)
500 return True
500 return True
501
501
502 @requires_parents_change
502 @requires_parents_change
503 def update_file_reference(
503 def update_file_reference(
504 self,
504 self,
505 filename,
505 filename,
506 p1_tracked,
506 p1_tracked,
507 ):
507 ):
508 """Set a file as tracked in the parent (or not)
508 """Set a file as tracked in the parent (or not)
509
509
510 This is to be called when adjust the dirstate to a new parent after an history
510 This is to be called when adjust the dirstate to a new parent after an history
511 rewriting operation.
511 rewriting operation.
512
512
513 It should not be called during a merge (p2 != nullid) and only within
513 It should not be called during a merge (p2 != nullid) and only within
514 a `with dirstate.parentchange():` context.
514 a `with dirstate.parentchange():` context.
515 """
515 """
516 if self.in_merge:
516 if self.in_merge:
517 msg = b'update_file_reference should not be called when merging'
517 msg = b'update_file_reference should not be called when merging'
518 raise error.ProgrammingError(msg)
518 raise error.ProgrammingError(msg)
519 entry = self._map.get(filename)
519 entry = self._map.get(filename)
520 if entry is None:
520 if entry is None:
521 wc_tracked = False
521 wc_tracked = False
522 else:
522 else:
523 wc_tracked = entry.tracked
523 wc_tracked = entry.tracked
524 if p1_tracked and wc_tracked:
524 if p1_tracked and wc_tracked:
525 # the underlying reference might have changed, we will have to
525 # the underlying reference might have changed, we will have to
526 # check it.
526 # check it.
527 self.normallookup(filename)
527 self.normallookup(filename)
528 elif not (p1_tracked or wc_tracked):
528 elif not (p1_tracked or wc_tracked):
529 # the file is no longer relevant to anyone
529 # the file is no longer relevant to anyone
530 self._drop(filename)
530 self._drop(filename)
531 elif (not p1_tracked) and wc_tracked:
531 elif (not p1_tracked) and wc_tracked:
532 if not entry.added:
532 if not entry.added:
533 self._add(filename)
533 self._add(filename)
534 elif p1_tracked and not wc_tracked:
534 elif p1_tracked and not wc_tracked:
535 if entry is None or not entry.removed:
535 if entry is None or not entry.removed:
536 self._remove(filename)
536 self._remove(filename)
537 else:
537 else:
538 assert False, 'unreachable'
538 assert False, 'unreachable'
539
539
540 @requires_parents_change
540 @requires_parents_change
541 def update_file(
541 def update_file(
542 self,
542 self,
543 filename,
543 filename,
544 wc_tracked,
544 wc_tracked,
545 p1_tracked,
545 p1_tracked,
546 p2_tracked=False,
546 p2_tracked=False,
547 merged=False,
547 merged=False,
548 clean_p1=False,
548 clean_p1=False,
549 clean_p2=False,
549 clean_p2=False,
550 possibly_dirty=False,
550 possibly_dirty=False,
551 ):
551 ):
552 """update the information about a file in the dirstate
552 """update the information about a file in the dirstate
553
553
554 This is to be called when the direstates parent changes to keep track
554 This is to be called when the direstates parent changes to keep track
555 of what is the file situation in regards to the working copy and its parent.
555 of what is the file situation in regards to the working copy and its parent.
556
556
557 This function must be called within a `dirstate.parentchange` context.
557 This function must be called within a `dirstate.parentchange` context.
558
558
559 note: the API is at an early stage and we might need to ajust it
559 note: the API is at an early stage and we might need to ajust it
560 depending of what information ends up being relevant and useful to
560 depending of what information ends up being relevant and useful to
561 other processing.
561 other processing.
562 """
562 """
563 if not self.pendingparentchange():
563 if not self.pendingparentchange():
564 msg = b'calling `update_file` outside of a parentchange context'
564 msg = b'calling `update_file` outside of a parentchange context'
565 raise error.ProgrammingError(msg)
565 raise error.ProgrammingError(msg)
566 if merged and (clean_p1 or clean_p2):
566 if merged and (clean_p1 or clean_p2):
567 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
567 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
568 raise error.ProgrammingError(msg)
568 raise error.ProgrammingError(msg)
569 assert not (merged and (clean_p1 or clean_p1))
569 assert not (merged and (clean_p1 or clean_p1))
570 if not (p1_tracked or p2_tracked or wc_tracked):
570 if not (p1_tracked or p2_tracked or wc_tracked):
571 self._drop(filename)
571 self._drop(filename)
572 elif merged:
572 elif merged:
573 assert wc_tracked
573 assert wc_tracked
574 if not self.in_merge:
574 if not self.in_merge:
575 self.normallookup(filename)
575 self.normallookup(filename)
576 self.otherparent(filename)
576 self.otherparent(filename)
577 elif not (p1_tracked or p2_tracked) and wc_tracked:
577 elif not (p1_tracked or p2_tracked) and wc_tracked:
578 self._addpath(filename, added=True, possibly_dirty=possibly_dirty)
578 self._addpath(filename, added=True, possibly_dirty=possibly_dirty)
579 self._map.copymap.pop(filename, None)
579 self._map.copymap.pop(filename, None)
580 elif (p1_tracked or p2_tracked) and not wc_tracked:
580 elif (p1_tracked or p2_tracked) and not wc_tracked:
581 self._remove(filename)
581 self._remove(filename)
582 elif clean_p2 and wc_tracked:
582 elif clean_p2 and wc_tracked:
583 assert p2_tracked
583 assert p2_tracked
584 self.otherparent(filename)
584 self.otherparent(filename)
585 elif not p1_tracked and p2_tracked and wc_tracked:
585 elif not p1_tracked and p2_tracked and wc_tracked:
586 self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty)
586 self._addpath(filename, from_p2=True, possibly_dirty=possibly_dirty)
587 self._map.copymap.pop(filename, None)
587 self._map.copymap.pop(filename, None)
588 elif possibly_dirty:
588 elif possibly_dirty:
589 self._addpath(filename, possibly_dirty=possibly_dirty)
589 self._addpath(filename, possibly_dirty=possibly_dirty)
590 elif wc_tracked:
590 elif wc_tracked:
591 self.normal(filename)
591 self.normal(filename)
592 # XXX We need something for file that are dirty after an update
592 # XXX We need something for file that are dirty after an update
593 else:
593 else:
594 assert False, 'unreachable'
594 assert False, 'unreachable'
595
595
596 @requires_parents_change
596 @requires_parents_change
597 def update_parent_file_data(self, f, filedata):
597 def update_parent_file_data(self, f, filedata):
598 """update the information about the content of a file
598 """update the information about the content of a file
599
599
600 This function should be called within a `dirstate.parentchange` context.
600 This function should be called within a `dirstate.parentchange` context.
601 """
601 """
602 self.normal(f, parentfiledata=filedata)
602 self.normal(f, parentfiledata=filedata)
603
603
604 def _addpath(
604 def _addpath(
605 self,
605 self,
606 f,
606 f,
607 mode=0,
607 mode=0,
608 size=None,
608 size=None,
609 mtime=None,
609 mtime=None,
610 added=False,
610 added=False,
611 merged=False,
611 merged=False,
612 from_p2=False,
612 from_p2=False,
613 possibly_dirty=False,
613 possibly_dirty=False,
614 ):
614 ):
615 entry = self._map.get(f)
615 entry = self._map.get(f)
616 if added or entry is not None and entry.removed:
616 if added or entry is not None and entry.removed:
617 scmutil.checkfilename(f)
617 scmutil.checkfilename(f)
618 if self._map.hastrackeddir(f):
618 if self._map.hastrackeddir(f):
619 msg = _(b'directory %r already in dirstate')
619 msg = _(b'directory %r already in dirstate')
620 msg %= pycompat.bytestr(f)
620 msg %= pycompat.bytestr(f)
621 raise error.Abort(msg)
621 raise error.Abort(msg)
622 # shadows
622 # shadows
623 for d in pathutil.finddirs(f):
623 for d in pathutil.finddirs(f):
624 if self._map.hastrackeddir(d):
624 if self._map.hastrackeddir(d):
625 break
625 break
626 entry = self._map.get(d)
626 entry = self._map.get(d)
627 if entry is not None and not entry.removed:
627 if entry is not None and not entry.removed:
628 msg = _(b'file %r in dirstate clashes with %r')
628 msg = _(b'file %r in dirstate clashes with %r')
629 msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
629 msg %= (pycompat.bytestr(d), pycompat.bytestr(f))
630 raise error.Abort(msg)
630 raise error.Abort(msg)
631 self._dirty = True
631 self._dirty = True
632 self._updatedfiles.add(f)
632 self._updatedfiles.add(f)
633 self._map.addfile(
633 self._map.addfile(
634 f,
634 f,
635 mode=mode,
635 mode=mode,
636 size=size,
636 size=size,
637 mtime=mtime,
637 mtime=mtime,
638 added=added,
638 added=added,
639 merged=merged,
639 merged=merged,
640 from_p2=from_p2,
640 from_p2=from_p2,
641 possibly_dirty=possibly_dirty,
641 possibly_dirty=possibly_dirty,
642 )
642 )
643
643
644 def normal(self, f, parentfiledata=None):
644 def normal(self, f, parentfiledata=None):
645 """Mark a file normal and clean.
645 """Mark a file normal and clean.
646
646
647 parentfiledata: (mode, size, mtime) of the clean file
647 parentfiledata: (mode, size, mtime) of the clean file
648
648
649 parentfiledata should be computed from memory (for mode,
649 parentfiledata should be computed from memory (for mode,
650 size), as or close as possible from the point where we
650 size), as or close as possible from the point where we
651 determined the file was clean, to limit the risk of the
651 determined the file was clean, to limit the risk of the
652 file having been changed by an external process between the
652 file having been changed by an external process between the
653 moment where the file was determined to be clean and now."""
653 moment where the file was determined to be clean and now."""
654 if parentfiledata:
654 if parentfiledata:
655 (mode, size, mtime) = parentfiledata
655 (mode, size, mtime) = parentfiledata
656 else:
656 else:
657 s = os.lstat(self._join(f))
657 s = os.lstat(self._join(f))
658 mode = s.st_mode
658 mode = s.st_mode
659 size = s.st_size
659 size = s.st_size
660 mtime = s[stat.ST_MTIME]
660 mtime = s[stat.ST_MTIME]
661 self._addpath(f, mode=mode, size=size, mtime=mtime)
661 self._addpath(f, mode=mode, size=size, mtime=mtime)
662 self._map.copymap.pop(f, None)
662 self._map.copymap.pop(f, None)
663 if f in self._map.nonnormalset:
663 if f in self._map.nonnormalset:
664 self._map.nonnormalset.remove(f)
664 self._map.nonnormalset.remove(f)
665 if mtime > self._lastnormaltime:
665 if mtime > self._lastnormaltime:
666 # Remember the most recent modification timeslot for status(),
666 # Remember the most recent modification timeslot for status(),
667 # to make sure we won't miss future size-preserving file content
667 # to make sure we won't miss future size-preserving file content
668 # modifications that happen within the same timeslot.
668 # modifications that happen within the same timeslot.
669 self._lastnormaltime = mtime
669 self._lastnormaltime = mtime
670
670
671 def normallookup(self, f):
671 def normallookup(self, f):
672 '''Mark a file normal, but possibly dirty.'''
672 '''Mark a file normal, but possibly dirty.'''
673 if self.in_merge:
673 if self.in_merge:
674 # if there is a merge going on and the file was either
674 # if there is a merge going on and the file was either
675 # "merged" or coming from other parent (-2) before
675 # "merged" or coming from other parent (-2) before
676 # being removed, restore that state.
676 # being removed, restore that state.
677 entry = self._map.get(f)
677 entry = self._map.get(f)
678 if entry is not None:
678 if entry is not None:
679 # XXX this should probably be dealt with a a lower level
679 # XXX this should probably be dealt with a a lower level
680 # (see `merged_removed` and `from_p2_removed`)
680 # (see `merged_removed` and `from_p2_removed`)
681 if entry.merged_removed or entry.from_p2_removed:
681 if entry.merged_removed or entry.from_p2_removed:
682 source = self._map.copymap.get(f)
682 source = self._map.copymap.get(f)
683 if entry.merged_removed:
683 if entry.merged_removed:
684 self.merge(f)
684 self.merge(f)
685 elif entry.from_p2_removed:
685 elif entry.from_p2_removed:
686 self.otherparent(f)
686 self.otherparent(f)
687 if source is not None:
687 if source is not None:
688 self.copy(source, f)
688 self.copy(source, f)
689 return
689 return
690 elif entry.merged or entry.from_p2:
690 elif entry.merged or entry.from_p2:
691 return
691 return
692 self._addpath(f, possibly_dirty=True)
692 self._addpath(f, possibly_dirty=True)
693 self._map.copymap.pop(f, None)
693 self._map.copymap.pop(f, None)
694
694
695 def otherparent(self, f):
695 def otherparent(self, f):
696 '''Mark as coming from the other parent, always dirty.'''
696 '''Mark as coming from the other parent, always dirty.'''
697 if not self.in_merge:
697 if not self.in_merge:
698 msg = _(b"setting %r to other parent only allowed in merges") % f
698 msg = _(b"setting %r to other parent only allowed in merges") % f
699 raise error.Abort(msg)
699 raise error.Abort(msg)
700 entry = self._map.get(f)
700 entry = self._map.get(f)
701 if entry is not None and entry.tracked:
701 if entry is not None and entry.tracked:
702 # merge-like
702 # merge-like
703 self._addpath(f, merged=True)
703 self._addpath(f, merged=True)
704 else:
704 else:
705 # add-like
705 # add-like
706 self._addpath(f, from_p2=True)
706 self._addpath(f, from_p2=True)
707 self._map.copymap.pop(f, None)
707 self._map.copymap.pop(f, None)
708
708
709 def add(self, f):
709 def add(self, f):
710 '''Mark a file added.'''
710 '''Mark a file added.'''
711 if not self.pendingparentchange():
711 if not self.pendingparentchange():
712 util.nouideprecwarn(
712 util.nouideprecwarn(
713 b"do not use `add` outside of update/merge context."
713 b"do not use `add` outside of update/merge context."
714 b" Use `set_tracked`",
714 b" Use `set_tracked`",
715 b'6.0',
715 b'6.0',
716 stacklevel=2,
716 stacklevel=2,
717 )
717 )
718 self._add(f)
718 self._add(f)
719
719
720 def _add(self, filename):
720 def _add(self, filename):
721 """internal function to mark a file as added"""
721 """internal function to mark a file as added"""
722 self._addpath(filename, added=True)
722 self._addpath(filename, added=True)
723 self._map.copymap.pop(filename, None)
723 self._map.copymap.pop(filename, None)
724
724
725 def remove(self, f):
725 def remove(self, f):
726 '''Mark a file removed'''
726 '''Mark a file removed'''
727 if not self.pendingparentchange():
727 if not self.pendingparentchange():
728 util.nouideprecwarn(
728 util.nouideprecwarn(
729 b"do not use `remove` outside of update/merge context."
729 b"do not use `remove` outside of update/merge context."
730 b" Use `set_untracked`",
730 b" Use `set_untracked`",
731 b'6.0',
731 b'6.0',
732 stacklevel=2,
732 stacklevel=2,
733 )
733 )
734 self._remove(f)
734 self._remove(f)
735
735
736 def _remove(self, filename):
736 def _remove(self, filename):
737 """internal function to mark a file removed"""
737 """internal function to mark a file removed"""
738 self._dirty = True
738 self._dirty = True
739 self._updatedfiles.add(filename)
739 self._updatedfiles.add(filename)
740 self._map.removefile(filename, in_merge=self.in_merge)
740 self._map.removefile(filename, in_merge=self.in_merge)
741
741
742 def merge(self, f):
742 def merge(self, f):
743 '''Mark a file merged.'''
743 '''Mark a file merged.'''
744 if not self.in_merge:
744 if not self.in_merge:
745 return self.normallookup(f)
745 return self.normallookup(f)
746 return self.otherparent(f)
746 return self.otherparent(f)
747
747
748 def drop(self, f):
748 def drop(self, f):
749 '''Drop a file from the dirstate'''
749 '''Drop a file from the dirstate'''
750 if not self.pendingparentchange():
751 util.nouideprecwarn(
752 b"do not use `drop` outside of update/merge context."
753 b" Use `set_untracked`",
754 b'6.0',
755 stacklevel=2,
756 )
750 self._drop(f)
757 self._drop(f)
751
758
752 def _drop(self, filename):
759 def _drop(self, filename):
753 """internal function to drop a file from the dirstate"""
760 """internal function to drop a file from the dirstate"""
754 if self._map.dropfile(filename):
761 if self._map.dropfile(filename):
755 self._dirty = True
762 self._dirty = True
756 self._updatedfiles.add(filename)
763 self._updatedfiles.add(filename)
757 self._map.copymap.pop(filename, None)
764 self._map.copymap.pop(filename, None)
758
765
759 def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
766 def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
760 if exists is None:
767 if exists is None:
761 exists = os.path.lexists(os.path.join(self._root, path))
768 exists = os.path.lexists(os.path.join(self._root, path))
762 if not exists:
769 if not exists:
763 # Maybe a path component exists
770 # Maybe a path component exists
764 if not ignoremissing and b'/' in path:
771 if not ignoremissing and b'/' in path:
765 d, f = path.rsplit(b'/', 1)
772 d, f = path.rsplit(b'/', 1)
766 d = self._normalize(d, False, ignoremissing, None)
773 d = self._normalize(d, False, ignoremissing, None)
767 folded = d + b"/" + f
774 folded = d + b"/" + f
768 else:
775 else:
769 # No path components, preserve original case
776 # No path components, preserve original case
770 folded = path
777 folded = path
771 else:
778 else:
772 # recursively normalize leading directory components
779 # recursively normalize leading directory components
773 # against dirstate
780 # against dirstate
774 if b'/' in normed:
781 if b'/' in normed:
775 d, f = normed.rsplit(b'/', 1)
782 d, f = normed.rsplit(b'/', 1)
776 d = self._normalize(d, False, ignoremissing, True)
783 d = self._normalize(d, False, ignoremissing, True)
777 r = self._root + b"/" + d
784 r = self._root + b"/" + d
778 folded = d + b"/" + util.fspath(f, r)
785 folded = d + b"/" + util.fspath(f, r)
779 else:
786 else:
780 folded = util.fspath(normed, self._root)
787 folded = util.fspath(normed, self._root)
781 storemap[normed] = folded
788 storemap[normed] = folded
782
789
783 return folded
790 return folded
784
791
785 def _normalizefile(self, path, isknown, ignoremissing=False, exists=None):
792 def _normalizefile(self, path, isknown, ignoremissing=False, exists=None):
786 normed = util.normcase(path)
793 normed = util.normcase(path)
787 folded = self._map.filefoldmap.get(normed, None)
794 folded = self._map.filefoldmap.get(normed, None)
788 if folded is None:
795 if folded is None:
789 if isknown:
796 if isknown:
790 folded = path
797 folded = path
791 else:
798 else:
792 folded = self._discoverpath(
799 folded = self._discoverpath(
793 path, normed, ignoremissing, exists, self._map.filefoldmap
800 path, normed, ignoremissing, exists, self._map.filefoldmap
794 )
801 )
795 return folded
802 return folded
796
803
797 def _normalize(self, path, isknown, ignoremissing=False, exists=None):
804 def _normalize(self, path, isknown, ignoremissing=False, exists=None):
798 normed = util.normcase(path)
805 normed = util.normcase(path)
799 folded = self._map.filefoldmap.get(normed, None)
806 folded = self._map.filefoldmap.get(normed, None)
800 if folded is None:
807 if folded is None:
801 folded = self._map.dirfoldmap.get(normed, None)
808 folded = self._map.dirfoldmap.get(normed, None)
802 if folded is None:
809 if folded is None:
803 if isknown:
810 if isknown:
804 folded = path
811 folded = path
805 else:
812 else:
806 # store discovered result in dirfoldmap so that future
813 # store discovered result in dirfoldmap so that future
807 # normalizefile calls don't start matching directories
814 # normalizefile calls don't start matching directories
808 folded = self._discoverpath(
815 folded = self._discoverpath(
809 path, normed, ignoremissing, exists, self._map.dirfoldmap
816 path, normed, ignoremissing, exists, self._map.dirfoldmap
810 )
817 )
811 return folded
818 return folded
812
819
813 def normalize(self, path, isknown=False, ignoremissing=False):
820 def normalize(self, path, isknown=False, ignoremissing=False):
814 """
821 """
815 normalize the case of a pathname when on a casefolding filesystem
822 normalize the case of a pathname when on a casefolding filesystem
816
823
817 isknown specifies whether the filename came from walking the
824 isknown specifies whether the filename came from walking the
818 disk, to avoid extra filesystem access.
825 disk, to avoid extra filesystem access.
819
826
820 If ignoremissing is True, missing path are returned
827 If ignoremissing is True, missing path are returned
821 unchanged. Otherwise, we try harder to normalize possibly
828 unchanged. Otherwise, we try harder to normalize possibly
822 existing path components.
829 existing path components.
823
830
824 The normalized case is determined based on the following precedence:
831 The normalized case is determined based on the following precedence:
825
832
826 - version of name already stored in the dirstate
833 - version of name already stored in the dirstate
827 - version of name stored on disk
834 - version of name stored on disk
828 - version provided via command arguments
835 - version provided via command arguments
829 """
836 """
830
837
831 if self._checkcase:
838 if self._checkcase:
832 return self._normalize(path, isknown, ignoremissing)
839 return self._normalize(path, isknown, ignoremissing)
833 return path
840 return path
834
841
835 def clear(self):
842 def clear(self):
836 self._map.clear()
843 self._map.clear()
837 self._lastnormaltime = 0
844 self._lastnormaltime = 0
838 self._updatedfiles.clear()
845 self._updatedfiles.clear()
839 self._dirty = True
846 self._dirty = True
840
847
841 def rebuild(self, parent, allfiles, changedfiles=None):
848 def rebuild(self, parent, allfiles, changedfiles=None):
842 if changedfiles is None:
849 if changedfiles is None:
843 # Rebuild entire dirstate
850 # Rebuild entire dirstate
844 to_lookup = allfiles
851 to_lookup = allfiles
845 to_drop = []
852 to_drop = []
846 lastnormaltime = self._lastnormaltime
853 lastnormaltime = self._lastnormaltime
847 self.clear()
854 self.clear()
848 self._lastnormaltime = lastnormaltime
855 self._lastnormaltime = lastnormaltime
849 elif len(changedfiles) < 10:
856 elif len(changedfiles) < 10:
850 # Avoid turning allfiles into a set, which can be expensive if it's
857 # Avoid turning allfiles into a set, which can be expensive if it's
851 # large.
858 # large.
852 to_lookup = []
859 to_lookup = []
853 to_drop = []
860 to_drop = []
854 for f in changedfiles:
861 for f in changedfiles:
855 if f in allfiles:
862 if f in allfiles:
856 to_lookup.append(f)
863 to_lookup.append(f)
857 else:
864 else:
858 to_drop.append(f)
865 to_drop.append(f)
859 else:
866 else:
860 changedfilesset = set(changedfiles)
867 changedfilesset = set(changedfiles)
861 to_lookup = changedfilesset & set(allfiles)
868 to_lookup = changedfilesset & set(allfiles)
862 to_drop = changedfilesset - to_lookup
869 to_drop = changedfilesset - to_lookup
863
870
864 if self._origpl is None:
871 if self._origpl is None:
865 self._origpl = self._pl
872 self._origpl = self._pl
866 self._map.setparents(parent, self._nodeconstants.nullid)
873 self._map.setparents(parent, self._nodeconstants.nullid)
867
874
868 for f in to_lookup:
875 for f in to_lookup:
869 self.normallookup(f)
876 self.normallookup(f)
870 for f in to_drop:
877 for f in to_drop:
871 self._drop(f)
878 self._drop(f)
872
879
873 self._dirty = True
880 self._dirty = True
874
881
875 def identity(self):
882 def identity(self):
876 """Return identity of dirstate itself to detect changing in storage
883 """Return identity of dirstate itself to detect changing in storage
877
884
878 If identity of previous dirstate is equal to this, writing
885 If identity of previous dirstate is equal to this, writing
879 changes based on the former dirstate out can keep consistency.
886 changes based on the former dirstate out can keep consistency.
880 """
887 """
881 return self._map.identity
888 return self._map.identity
882
889
883 def write(self, tr):
890 def write(self, tr):
884 if not self._dirty:
891 if not self._dirty:
885 return
892 return
886
893
887 filename = self._filename
894 filename = self._filename
888 if tr:
895 if tr:
889 # 'dirstate.write()' is not only for writing in-memory
896 # 'dirstate.write()' is not only for writing in-memory
890 # changes out, but also for dropping ambiguous timestamp.
897 # changes out, but also for dropping ambiguous timestamp.
891 # delayed writing re-raise "ambiguous timestamp issue".
898 # delayed writing re-raise "ambiguous timestamp issue".
892 # See also the wiki page below for detail:
899 # See also the wiki page below for detail:
893 # https://www.mercurial-scm.org/wiki/DirstateTransactionPlan
900 # https://www.mercurial-scm.org/wiki/DirstateTransactionPlan
894
901
895 # emulate dropping timestamp in 'parsers.pack_dirstate'
902 # emulate dropping timestamp in 'parsers.pack_dirstate'
896 now = _getfsnow(self._opener)
903 now = _getfsnow(self._opener)
897 self._map.clearambiguoustimes(self._updatedfiles, now)
904 self._map.clearambiguoustimes(self._updatedfiles, now)
898
905
899 # emulate that all 'dirstate.normal' results are written out
906 # emulate that all 'dirstate.normal' results are written out
900 self._lastnormaltime = 0
907 self._lastnormaltime = 0
901 self._updatedfiles.clear()
908 self._updatedfiles.clear()
902
909
903 # delay writing in-memory changes out
910 # delay writing in-memory changes out
904 tr.addfilegenerator(
911 tr.addfilegenerator(
905 b'dirstate',
912 b'dirstate',
906 (self._filename,),
913 (self._filename,),
907 self._writedirstate,
914 self._writedirstate,
908 location=b'plain',
915 location=b'plain',
909 )
916 )
910 return
917 return
911
918
912 st = self._opener(filename, b"w", atomictemp=True, checkambig=True)
919 st = self._opener(filename, b"w", atomictemp=True, checkambig=True)
913 self._writedirstate(st)
920 self._writedirstate(st)
914
921
915 def addparentchangecallback(self, category, callback):
922 def addparentchangecallback(self, category, callback):
916 """add a callback to be called when the wd parents are changed
923 """add a callback to be called when the wd parents are changed
917
924
918 Callback will be called with the following arguments:
925 Callback will be called with the following arguments:
919 dirstate, (oldp1, oldp2), (newp1, newp2)
926 dirstate, (oldp1, oldp2), (newp1, newp2)
920
927
921 Category is a unique identifier to allow overwriting an old callback
928 Category is a unique identifier to allow overwriting an old callback
922 with a newer callback.
929 with a newer callback.
923 """
930 """
924 self._plchangecallbacks[category] = callback
931 self._plchangecallbacks[category] = callback
925
932
926 def _writedirstate(self, st):
933 def _writedirstate(self, st):
927 # notify callbacks about parents change
934 # notify callbacks about parents change
928 if self._origpl is not None and self._origpl != self._pl:
935 if self._origpl is not None and self._origpl != self._pl:
929 for c, callback in sorted(
936 for c, callback in sorted(
930 pycompat.iteritems(self._plchangecallbacks)
937 pycompat.iteritems(self._plchangecallbacks)
931 ):
938 ):
932 callback(self, self._origpl, self._pl)
939 callback(self, self._origpl, self._pl)
933 self._origpl = None
940 self._origpl = None
934 # use the modification time of the newly created temporary file as the
941 # use the modification time of the newly created temporary file as the
935 # filesystem's notion of 'now'
942 # filesystem's notion of 'now'
936 now = util.fstat(st)[stat.ST_MTIME] & _rangemask
943 now = util.fstat(st)[stat.ST_MTIME] & _rangemask
937
944
938 # enough 'delaywrite' prevents 'pack_dirstate' from dropping
945 # enough 'delaywrite' prevents 'pack_dirstate' from dropping
939 # timestamp of each entries in dirstate, because of 'now > mtime'
946 # timestamp of each entries in dirstate, because of 'now > mtime'
940 delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite')
947 delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite')
941 if delaywrite > 0:
948 if delaywrite > 0:
942 # do we have any files to delay for?
949 # do we have any files to delay for?
943 for f, e in pycompat.iteritems(self._map):
950 for f, e in pycompat.iteritems(self._map):
944 if e.need_delay(now):
951 if e.need_delay(now):
945 import time # to avoid useless import
952 import time # to avoid useless import
946
953
947 # rather than sleep n seconds, sleep until the next
954 # rather than sleep n seconds, sleep until the next
948 # multiple of n seconds
955 # multiple of n seconds
949 clock = time.time()
956 clock = time.time()
950 start = int(clock) - (int(clock) % delaywrite)
957 start = int(clock) - (int(clock) % delaywrite)
951 end = start + delaywrite
958 end = start + delaywrite
952 time.sleep(end - clock)
959 time.sleep(end - clock)
953 now = end # trust our estimate that the end is near now
960 now = end # trust our estimate that the end is near now
954 break
961 break
955
962
956 self._map.write(st, now)
963 self._map.write(st, now)
957 self._lastnormaltime = 0
964 self._lastnormaltime = 0
958 self._dirty = False
965 self._dirty = False
959
966
960 def _dirignore(self, f):
967 def _dirignore(self, f):
961 if self._ignore(f):
968 if self._ignore(f):
962 return True
969 return True
963 for p in pathutil.finddirs(f):
970 for p in pathutil.finddirs(f):
964 if self._ignore(p):
971 if self._ignore(p):
965 return True
972 return True
966 return False
973 return False
967
974
968 def _ignorefiles(self):
975 def _ignorefiles(self):
969 files = []
976 files = []
970 if os.path.exists(self._join(b'.hgignore')):
977 if os.path.exists(self._join(b'.hgignore')):
971 files.append(self._join(b'.hgignore'))
978 files.append(self._join(b'.hgignore'))
972 for name, path in self._ui.configitems(b"ui"):
979 for name, path in self._ui.configitems(b"ui"):
973 if name == b'ignore' or name.startswith(b'ignore.'):
980 if name == b'ignore' or name.startswith(b'ignore.'):
974 # we need to use os.path.join here rather than self._join
981 # we need to use os.path.join here rather than self._join
975 # because path is arbitrary and user-specified
982 # because path is arbitrary and user-specified
976 files.append(os.path.join(self._rootdir, util.expandpath(path)))
983 files.append(os.path.join(self._rootdir, util.expandpath(path)))
977 return files
984 return files
978
985
979 def _ignorefileandline(self, f):
986 def _ignorefileandline(self, f):
980 files = collections.deque(self._ignorefiles())
987 files = collections.deque(self._ignorefiles())
981 visited = set()
988 visited = set()
982 while files:
989 while files:
983 i = files.popleft()
990 i = files.popleft()
984 patterns = matchmod.readpatternfile(
991 patterns = matchmod.readpatternfile(
985 i, self._ui.warn, sourceinfo=True
992 i, self._ui.warn, sourceinfo=True
986 )
993 )
987 for pattern, lineno, line in patterns:
994 for pattern, lineno, line in patterns:
988 kind, p = matchmod._patsplit(pattern, b'glob')
995 kind, p = matchmod._patsplit(pattern, b'glob')
989 if kind == b"subinclude":
996 if kind == b"subinclude":
990 if p not in visited:
997 if p not in visited:
991 files.append(p)
998 files.append(p)
992 continue
999 continue
993 m = matchmod.match(
1000 m = matchmod.match(
994 self._root, b'', [], [pattern], warn=self._ui.warn
1001 self._root, b'', [], [pattern], warn=self._ui.warn
995 )
1002 )
996 if m(f):
1003 if m(f):
997 return (i, lineno, line)
1004 return (i, lineno, line)
998 visited.add(i)
1005 visited.add(i)
999 return (None, -1, b"")
1006 return (None, -1, b"")
1000
1007
1001 def _walkexplicit(self, match, subrepos):
1008 def _walkexplicit(self, match, subrepos):
1002 """Get stat data about the files explicitly specified by match.
1009 """Get stat data about the files explicitly specified by match.
1003
1010
1004 Return a triple (results, dirsfound, dirsnotfound).
1011 Return a triple (results, dirsfound, dirsnotfound).
1005 - results is a mapping from filename to stat result. It also contains
1012 - results is a mapping from filename to stat result. It also contains
1006 listings mapping subrepos and .hg to None.
1013 listings mapping subrepos and .hg to None.
1007 - dirsfound is a list of files found to be directories.
1014 - dirsfound is a list of files found to be directories.
1008 - dirsnotfound is a list of files that the dirstate thinks are
1015 - dirsnotfound is a list of files that the dirstate thinks are
1009 directories and that were not found."""
1016 directories and that were not found."""
1010
1017
1011 def badtype(mode):
1018 def badtype(mode):
1012 kind = _(b'unknown')
1019 kind = _(b'unknown')
1013 if stat.S_ISCHR(mode):
1020 if stat.S_ISCHR(mode):
1014 kind = _(b'character device')
1021 kind = _(b'character device')
1015 elif stat.S_ISBLK(mode):
1022 elif stat.S_ISBLK(mode):
1016 kind = _(b'block device')
1023 kind = _(b'block device')
1017 elif stat.S_ISFIFO(mode):
1024 elif stat.S_ISFIFO(mode):
1018 kind = _(b'fifo')
1025 kind = _(b'fifo')
1019 elif stat.S_ISSOCK(mode):
1026 elif stat.S_ISSOCK(mode):
1020 kind = _(b'socket')
1027 kind = _(b'socket')
1021 elif stat.S_ISDIR(mode):
1028 elif stat.S_ISDIR(mode):
1022 kind = _(b'directory')
1029 kind = _(b'directory')
1023 return _(b'unsupported file type (type is %s)') % kind
1030 return _(b'unsupported file type (type is %s)') % kind
1024
1031
1025 badfn = match.bad
1032 badfn = match.bad
1026 dmap = self._map
1033 dmap = self._map
1027 lstat = os.lstat
1034 lstat = os.lstat
1028 getkind = stat.S_IFMT
1035 getkind = stat.S_IFMT
1029 dirkind = stat.S_IFDIR
1036 dirkind = stat.S_IFDIR
1030 regkind = stat.S_IFREG
1037 regkind = stat.S_IFREG
1031 lnkkind = stat.S_IFLNK
1038 lnkkind = stat.S_IFLNK
1032 join = self._join
1039 join = self._join
1033 dirsfound = []
1040 dirsfound = []
1034 foundadd = dirsfound.append
1041 foundadd = dirsfound.append
1035 dirsnotfound = []
1042 dirsnotfound = []
1036 notfoundadd = dirsnotfound.append
1043 notfoundadd = dirsnotfound.append
1037
1044
1038 if not match.isexact() and self._checkcase:
1045 if not match.isexact() and self._checkcase:
1039 normalize = self._normalize
1046 normalize = self._normalize
1040 else:
1047 else:
1041 normalize = None
1048 normalize = None
1042
1049
1043 files = sorted(match.files())
1050 files = sorted(match.files())
1044 subrepos.sort()
1051 subrepos.sort()
1045 i, j = 0, 0
1052 i, j = 0, 0
1046 while i < len(files) and j < len(subrepos):
1053 while i < len(files) and j < len(subrepos):
1047 subpath = subrepos[j] + b"/"
1054 subpath = subrepos[j] + b"/"
1048 if files[i] < subpath:
1055 if files[i] < subpath:
1049 i += 1
1056 i += 1
1050 continue
1057 continue
1051 while i < len(files) and files[i].startswith(subpath):
1058 while i < len(files) and files[i].startswith(subpath):
1052 del files[i]
1059 del files[i]
1053 j += 1
1060 j += 1
1054
1061
1055 if not files or b'' in files:
1062 if not files or b'' in files:
1056 files = [b'']
1063 files = [b'']
1057 # constructing the foldmap is expensive, so don't do it for the
1064 # constructing the foldmap is expensive, so don't do it for the
1058 # common case where files is ['']
1065 # common case where files is ['']
1059 normalize = None
1066 normalize = None
1060 results = dict.fromkeys(subrepos)
1067 results = dict.fromkeys(subrepos)
1061 results[b'.hg'] = None
1068 results[b'.hg'] = None
1062
1069
1063 for ff in files:
1070 for ff in files:
1064 if normalize:
1071 if normalize:
1065 nf = normalize(ff, False, True)
1072 nf = normalize(ff, False, True)
1066 else:
1073 else:
1067 nf = ff
1074 nf = ff
1068 if nf in results:
1075 if nf in results:
1069 continue
1076 continue
1070
1077
1071 try:
1078 try:
1072 st = lstat(join(nf))
1079 st = lstat(join(nf))
1073 kind = getkind(st.st_mode)
1080 kind = getkind(st.st_mode)
1074 if kind == dirkind:
1081 if kind == dirkind:
1075 if nf in dmap:
1082 if nf in dmap:
1076 # file replaced by dir on disk but still in dirstate
1083 # file replaced by dir on disk but still in dirstate
1077 results[nf] = None
1084 results[nf] = None
1078 foundadd((nf, ff))
1085 foundadd((nf, ff))
1079 elif kind == regkind or kind == lnkkind:
1086 elif kind == regkind or kind == lnkkind:
1080 results[nf] = st
1087 results[nf] = st
1081 else:
1088 else:
1082 badfn(ff, badtype(kind))
1089 badfn(ff, badtype(kind))
1083 if nf in dmap:
1090 if nf in dmap:
1084 results[nf] = None
1091 results[nf] = None
1085 except OSError as inst: # nf not found on disk - it is dirstate only
1092 except OSError as inst: # nf not found on disk - it is dirstate only
1086 if nf in dmap: # does it exactly match a missing file?
1093 if nf in dmap: # does it exactly match a missing file?
1087 results[nf] = None
1094 results[nf] = None
1088 else: # does it match a missing directory?
1095 else: # does it match a missing directory?
1089 if self._map.hasdir(nf):
1096 if self._map.hasdir(nf):
1090 notfoundadd(nf)
1097 notfoundadd(nf)
1091 else:
1098 else:
1092 badfn(ff, encoding.strtolocal(inst.strerror))
1099 badfn(ff, encoding.strtolocal(inst.strerror))
1093
1100
1094 # match.files() may contain explicitly-specified paths that shouldn't
1101 # match.files() may contain explicitly-specified paths that shouldn't
1095 # be taken; drop them from the list of files found. dirsfound/notfound
1102 # be taken; drop them from the list of files found. dirsfound/notfound
1096 # aren't filtered here because they will be tested later.
1103 # aren't filtered here because they will be tested later.
1097 if match.anypats():
1104 if match.anypats():
1098 for f in list(results):
1105 for f in list(results):
1099 if f == b'.hg' or f in subrepos:
1106 if f == b'.hg' or f in subrepos:
1100 # keep sentinel to disable further out-of-repo walks
1107 # keep sentinel to disable further out-of-repo walks
1101 continue
1108 continue
1102 if not match(f):
1109 if not match(f):
1103 del results[f]
1110 del results[f]
1104
1111
1105 # Case insensitive filesystems cannot rely on lstat() failing to detect
1112 # Case insensitive filesystems cannot rely on lstat() failing to detect
1106 # a case-only rename. Prune the stat object for any file that does not
1113 # a case-only rename. Prune the stat object for any file that does not
1107 # match the case in the filesystem, if there are multiple files that
1114 # match the case in the filesystem, if there are multiple files that
1108 # normalize to the same path.
1115 # normalize to the same path.
1109 if match.isexact() and self._checkcase:
1116 if match.isexact() and self._checkcase:
1110 normed = {}
1117 normed = {}
1111
1118
1112 for f, st in pycompat.iteritems(results):
1119 for f, st in pycompat.iteritems(results):
1113 if st is None:
1120 if st is None:
1114 continue
1121 continue
1115
1122
1116 nc = util.normcase(f)
1123 nc = util.normcase(f)
1117 paths = normed.get(nc)
1124 paths = normed.get(nc)
1118
1125
1119 if paths is None:
1126 if paths is None:
1120 paths = set()
1127 paths = set()
1121 normed[nc] = paths
1128 normed[nc] = paths
1122
1129
1123 paths.add(f)
1130 paths.add(f)
1124
1131
1125 for norm, paths in pycompat.iteritems(normed):
1132 for norm, paths in pycompat.iteritems(normed):
1126 if len(paths) > 1:
1133 if len(paths) > 1:
1127 for path in paths:
1134 for path in paths:
1128 folded = self._discoverpath(
1135 folded = self._discoverpath(
1129 path, norm, True, None, self._map.dirfoldmap
1136 path, norm, True, None, self._map.dirfoldmap
1130 )
1137 )
1131 if path != folded:
1138 if path != folded:
1132 results[path] = None
1139 results[path] = None
1133
1140
1134 return results, dirsfound, dirsnotfound
1141 return results, dirsfound, dirsnotfound
1135
1142
1136 def walk(self, match, subrepos, unknown, ignored, full=True):
1143 def walk(self, match, subrepos, unknown, ignored, full=True):
1137 """
1144 """
1138 Walk recursively through the directory tree, finding all files
1145 Walk recursively through the directory tree, finding all files
1139 matched by match.
1146 matched by match.
1140
1147
1141 If full is False, maybe skip some known-clean files.
1148 If full is False, maybe skip some known-clean files.
1142
1149
1143 Return a dict mapping filename to stat-like object (either
1150 Return a dict mapping filename to stat-like object (either
1144 mercurial.osutil.stat instance or return value of os.stat()).
1151 mercurial.osutil.stat instance or return value of os.stat()).
1145
1152
1146 """
1153 """
1147 # full is a flag that extensions that hook into walk can use -- this
1154 # full is a flag that extensions that hook into walk can use -- this
1148 # implementation doesn't use it at all. This satisfies the contract
1155 # implementation doesn't use it at all. This satisfies the contract
1149 # because we only guarantee a "maybe".
1156 # because we only guarantee a "maybe".
1150
1157
1151 if ignored:
1158 if ignored:
1152 ignore = util.never
1159 ignore = util.never
1153 dirignore = util.never
1160 dirignore = util.never
1154 elif unknown:
1161 elif unknown:
1155 ignore = self._ignore
1162 ignore = self._ignore
1156 dirignore = self._dirignore
1163 dirignore = self._dirignore
1157 else:
1164 else:
1158 # if not unknown and not ignored, drop dir recursion and step 2
1165 # if not unknown and not ignored, drop dir recursion and step 2
1159 ignore = util.always
1166 ignore = util.always
1160 dirignore = util.always
1167 dirignore = util.always
1161
1168
1162 matchfn = match.matchfn
1169 matchfn = match.matchfn
1163 matchalways = match.always()
1170 matchalways = match.always()
1164 matchtdir = match.traversedir
1171 matchtdir = match.traversedir
1165 dmap = self._map
1172 dmap = self._map
1166 listdir = util.listdir
1173 listdir = util.listdir
1167 lstat = os.lstat
1174 lstat = os.lstat
1168 dirkind = stat.S_IFDIR
1175 dirkind = stat.S_IFDIR
1169 regkind = stat.S_IFREG
1176 regkind = stat.S_IFREG
1170 lnkkind = stat.S_IFLNK
1177 lnkkind = stat.S_IFLNK
1171 join = self._join
1178 join = self._join
1172
1179
1173 exact = skipstep3 = False
1180 exact = skipstep3 = False
1174 if match.isexact(): # match.exact
1181 if match.isexact(): # match.exact
1175 exact = True
1182 exact = True
1176 dirignore = util.always # skip step 2
1183 dirignore = util.always # skip step 2
1177 elif match.prefix(): # match.match, no patterns
1184 elif match.prefix(): # match.match, no patterns
1178 skipstep3 = True
1185 skipstep3 = True
1179
1186
1180 if not exact and self._checkcase:
1187 if not exact and self._checkcase:
1181 normalize = self._normalize
1188 normalize = self._normalize
1182 normalizefile = self._normalizefile
1189 normalizefile = self._normalizefile
1183 skipstep3 = False
1190 skipstep3 = False
1184 else:
1191 else:
1185 normalize = self._normalize
1192 normalize = self._normalize
1186 normalizefile = None
1193 normalizefile = None
1187
1194
1188 # step 1: find all explicit files
1195 # step 1: find all explicit files
1189 results, work, dirsnotfound = self._walkexplicit(match, subrepos)
1196 results, work, dirsnotfound = self._walkexplicit(match, subrepos)
1190 if matchtdir:
1197 if matchtdir:
1191 for d in work:
1198 for d in work:
1192 matchtdir(d[0])
1199 matchtdir(d[0])
1193 for d in dirsnotfound:
1200 for d in dirsnotfound:
1194 matchtdir(d)
1201 matchtdir(d)
1195
1202
1196 skipstep3 = skipstep3 and not (work or dirsnotfound)
1203 skipstep3 = skipstep3 and not (work or dirsnotfound)
1197 work = [d for d in work if not dirignore(d[0])]
1204 work = [d for d in work if not dirignore(d[0])]
1198
1205
1199 # step 2: visit subdirectories
1206 # step 2: visit subdirectories
1200 def traverse(work, alreadynormed):
1207 def traverse(work, alreadynormed):
1201 wadd = work.append
1208 wadd = work.append
1202 while work:
1209 while work:
1203 tracing.counter('dirstate.walk work', len(work))
1210 tracing.counter('dirstate.walk work', len(work))
1204 nd = work.pop()
1211 nd = work.pop()
1205 visitentries = match.visitchildrenset(nd)
1212 visitentries = match.visitchildrenset(nd)
1206 if not visitentries:
1213 if not visitentries:
1207 continue
1214 continue
1208 if visitentries == b'this' or visitentries == b'all':
1215 if visitentries == b'this' or visitentries == b'all':
1209 visitentries = None
1216 visitentries = None
1210 skip = None
1217 skip = None
1211 if nd != b'':
1218 if nd != b'':
1212 skip = b'.hg'
1219 skip = b'.hg'
1213 try:
1220 try:
1214 with tracing.log('dirstate.walk.traverse listdir %s', nd):
1221 with tracing.log('dirstate.walk.traverse listdir %s', nd):
1215 entries = listdir(join(nd), stat=True, skip=skip)
1222 entries = listdir(join(nd), stat=True, skip=skip)
1216 except OSError as inst:
1223 except OSError as inst:
1217 if inst.errno in (errno.EACCES, errno.ENOENT):
1224 if inst.errno in (errno.EACCES, errno.ENOENT):
1218 match.bad(
1225 match.bad(
1219 self.pathto(nd), encoding.strtolocal(inst.strerror)
1226 self.pathto(nd), encoding.strtolocal(inst.strerror)
1220 )
1227 )
1221 continue
1228 continue
1222 raise
1229 raise
1223 for f, kind, st in entries:
1230 for f, kind, st in entries:
1224 # Some matchers may return files in the visitentries set,
1231 # Some matchers may return files in the visitentries set,
1225 # instead of 'this', if the matcher explicitly mentions them
1232 # instead of 'this', if the matcher explicitly mentions them
1226 # and is not an exactmatcher. This is acceptable; we do not
1233 # and is not an exactmatcher. This is acceptable; we do not
1227 # make any hard assumptions about file-or-directory below
1234 # make any hard assumptions about file-or-directory below
1228 # based on the presence of `f` in visitentries. If
1235 # based on the presence of `f` in visitentries. If
1229 # visitchildrenset returned a set, we can always skip the
1236 # visitchildrenset returned a set, we can always skip the
1230 # entries *not* in the set it provided regardless of whether
1237 # entries *not* in the set it provided regardless of whether
1231 # they're actually a file or a directory.
1238 # they're actually a file or a directory.
1232 if visitentries and f not in visitentries:
1239 if visitentries and f not in visitentries:
1233 continue
1240 continue
1234 if normalizefile:
1241 if normalizefile:
1235 # even though f might be a directory, we're only
1242 # even though f might be a directory, we're only
1236 # interested in comparing it to files currently in the
1243 # interested in comparing it to files currently in the
1237 # dmap -- therefore normalizefile is enough
1244 # dmap -- therefore normalizefile is enough
1238 nf = normalizefile(
1245 nf = normalizefile(
1239 nd and (nd + b"/" + f) or f, True, True
1246 nd and (nd + b"/" + f) or f, True, True
1240 )
1247 )
1241 else:
1248 else:
1242 nf = nd and (nd + b"/" + f) or f
1249 nf = nd and (nd + b"/" + f) or f
1243 if nf not in results:
1250 if nf not in results:
1244 if kind == dirkind:
1251 if kind == dirkind:
1245 if not ignore(nf):
1252 if not ignore(nf):
1246 if matchtdir:
1253 if matchtdir:
1247 matchtdir(nf)
1254 matchtdir(nf)
1248 wadd(nf)
1255 wadd(nf)
1249 if nf in dmap and (matchalways or matchfn(nf)):
1256 if nf in dmap and (matchalways or matchfn(nf)):
1250 results[nf] = None
1257 results[nf] = None
1251 elif kind == regkind or kind == lnkkind:
1258 elif kind == regkind or kind == lnkkind:
1252 if nf in dmap:
1259 if nf in dmap:
1253 if matchalways or matchfn(nf):
1260 if matchalways or matchfn(nf):
1254 results[nf] = st
1261 results[nf] = st
1255 elif (matchalways or matchfn(nf)) and not ignore(
1262 elif (matchalways or matchfn(nf)) and not ignore(
1256 nf
1263 nf
1257 ):
1264 ):
1258 # unknown file -- normalize if necessary
1265 # unknown file -- normalize if necessary
1259 if not alreadynormed:
1266 if not alreadynormed:
1260 nf = normalize(nf, False, True)
1267 nf = normalize(nf, False, True)
1261 results[nf] = st
1268 results[nf] = st
1262 elif nf in dmap and (matchalways or matchfn(nf)):
1269 elif nf in dmap and (matchalways or matchfn(nf)):
1263 results[nf] = None
1270 results[nf] = None
1264
1271
1265 for nd, d in work:
1272 for nd, d in work:
1266 # alreadynormed means that processwork doesn't have to do any
1273 # alreadynormed means that processwork doesn't have to do any
1267 # expensive directory normalization
1274 # expensive directory normalization
1268 alreadynormed = not normalize or nd == d
1275 alreadynormed = not normalize or nd == d
1269 traverse([d], alreadynormed)
1276 traverse([d], alreadynormed)
1270
1277
1271 for s in subrepos:
1278 for s in subrepos:
1272 del results[s]
1279 del results[s]
1273 del results[b'.hg']
1280 del results[b'.hg']
1274
1281
1275 # step 3: visit remaining files from dmap
1282 # step 3: visit remaining files from dmap
1276 if not skipstep3 and not exact:
1283 if not skipstep3 and not exact:
1277 # If a dmap file is not in results yet, it was either
1284 # If a dmap file is not in results yet, it was either
1278 # a) not matching matchfn b) ignored, c) missing, or d) under a
1285 # a) not matching matchfn b) ignored, c) missing, or d) under a
1279 # symlink directory.
1286 # symlink directory.
1280 if not results and matchalways:
1287 if not results and matchalways:
1281 visit = [f for f in dmap]
1288 visit = [f for f in dmap]
1282 else:
1289 else:
1283 visit = [f for f in dmap if f not in results and matchfn(f)]
1290 visit = [f for f in dmap if f not in results and matchfn(f)]
1284 visit.sort()
1291 visit.sort()
1285
1292
1286 if unknown:
1293 if unknown:
1287 # unknown == True means we walked all dirs under the roots
1294 # unknown == True means we walked all dirs under the roots
1288 # that wasn't ignored, and everything that matched was stat'ed
1295 # that wasn't ignored, and everything that matched was stat'ed
1289 # and is already in results.
1296 # and is already in results.
1290 # The rest must thus be ignored or under a symlink.
1297 # The rest must thus be ignored or under a symlink.
1291 audit_path = pathutil.pathauditor(self._root, cached=True)
1298 audit_path = pathutil.pathauditor(self._root, cached=True)
1292
1299
1293 for nf in iter(visit):
1300 for nf in iter(visit):
1294 # If a stat for the same file was already added with a
1301 # If a stat for the same file was already added with a
1295 # different case, don't add one for this, since that would
1302 # different case, don't add one for this, since that would
1296 # make it appear as if the file exists under both names
1303 # make it appear as if the file exists under both names
1297 # on disk.
1304 # on disk.
1298 if (
1305 if (
1299 normalizefile
1306 normalizefile
1300 and normalizefile(nf, True, True) in results
1307 and normalizefile(nf, True, True) in results
1301 ):
1308 ):
1302 results[nf] = None
1309 results[nf] = None
1303 # Report ignored items in the dmap as long as they are not
1310 # Report ignored items in the dmap as long as they are not
1304 # under a symlink directory.
1311 # under a symlink directory.
1305 elif audit_path.check(nf):
1312 elif audit_path.check(nf):
1306 try:
1313 try:
1307 results[nf] = lstat(join(nf))
1314 results[nf] = lstat(join(nf))
1308 # file was just ignored, no links, and exists
1315 # file was just ignored, no links, and exists
1309 except OSError:
1316 except OSError:
1310 # file doesn't exist
1317 # file doesn't exist
1311 results[nf] = None
1318 results[nf] = None
1312 else:
1319 else:
1313 # It's either missing or under a symlink directory
1320 # It's either missing or under a symlink directory
1314 # which we in this case report as missing
1321 # which we in this case report as missing
1315 results[nf] = None
1322 results[nf] = None
1316 else:
1323 else:
1317 # We may not have walked the full directory tree above,
1324 # We may not have walked the full directory tree above,
1318 # so stat and check everything we missed.
1325 # so stat and check everything we missed.
1319 iv = iter(visit)
1326 iv = iter(visit)
1320 for st in util.statfiles([join(i) for i in visit]):
1327 for st in util.statfiles([join(i) for i in visit]):
1321 results[next(iv)] = st
1328 results[next(iv)] = st
1322 return results
1329 return results
1323
1330
1324 def _rust_status(self, matcher, list_clean, list_ignored, list_unknown):
1331 def _rust_status(self, matcher, list_clean, list_ignored, list_unknown):
1325 # Force Rayon (Rust parallelism library) to respect the number of
1332 # Force Rayon (Rust parallelism library) to respect the number of
1326 # workers. This is a temporary workaround until Rust code knows
1333 # workers. This is a temporary workaround until Rust code knows
1327 # how to read the config file.
1334 # how to read the config file.
1328 numcpus = self._ui.configint(b"worker", b"numcpus")
1335 numcpus = self._ui.configint(b"worker", b"numcpus")
1329 if numcpus is not None:
1336 if numcpus is not None:
1330 encoding.environ.setdefault(b'RAYON_NUM_THREADS', b'%d' % numcpus)
1337 encoding.environ.setdefault(b'RAYON_NUM_THREADS', b'%d' % numcpus)
1331
1338
1332 workers_enabled = self._ui.configbool(b"worker", b"enabled", True)
1339 workers_enabled = self._ui.configbool(b"worker", b"enabled", True)
1333 if not workers_enabled:
1340 if not workers_enabled:
1334 encoding.environ[b"RAYON_NUM_THREADS"] = b"1"
1341 encoding.environ[b"RAYON_NUM_THREADS"] = b"1"
1335
1342
1336 (
1343 (
1337 lookup,
1344 lookup,
1338 modified,
1345 modified,
1339 added,
1346 added,
1340 removed,
1347 removed,
1341 deleted,
1348 deleted,
1342 clean,
1349 clean,
1343 ignored,
1350 ignored,
1344 unknown,
1351 unknown,
1345 warnings,
1352 warnings,
1346 bad,
1353 bad,
1347 traversed,
1354 traversed,
1348 dirty,
1355 dirty,
1349 ) = rustmod.status(
1356 ) = rustmod.status(
1350 self._map._rustmap,
1357 self._map._rustmap,
1351 matcher,
1358 matcher,
1352 self._rootdir,
1359 self._rootdir,
1353 self._ignorefiles(),
1360 self._ignorefiles(),
1354 self._checkexec,
1361 self._checkexec,
1355 self._lastnormaltime,
1362 self._lastnormaltime,
1356 bool(list_clean),
1363 bool(list_clean),
1357 bool(list_ignored),
1364 bool(list_ignored),
1358 bool(list_unknown),
1365 bool(list_unknown),
1359 bool(matcher.traversedir),
1366 bool(matcher.traversedir),
1360 )
1367 )
1361
1368
1362 self._dirty |= dirty
1369 self._dirty |= dirty
1363
1370
1364 if matcher.traversedir:
1371 if matcher.traversedir:
1365 for dir in traversed:
1372 for dir in traversed:
1366 matcher.traversedir(dir)
1373 matcher.traversedir(dir)
1367
1374
1368 if self._ui.warn:
1375 if self._ui.warn:
1369 for item in warnings:
1376 for item in warnings:
1370 if isinstance(item, tuple):
1377 if isinstance(item, tuple):
1371 file_path, syntax = item
1378 file_path, syntax = item
1372 msg = _(b"%s: ignoring invalid syntax '%s'\n") % (
1379 msg = _(b"%s: ignoring invalid syntax '%s'\n") % (
1373 file_path,
1380 file_path,
1374 syntax,
1381 syntax,
1375 )
1382 )
1376 self._ui.warn(msg)
1383 self._ui.warn(msg)
1377 else:
1384 else:
1378 msg = _(b"skipping unreadable pattern file '%s': %s\n")
1385 msg = _(b"skipping unreadable pattern file '%s': %s\n")
1379 self._ui.warn(
1386 self._ui.warn(
1380 msg
1387 msg
1381 % (
1388 % (
1382 pathutil.canonpath(
1389 pathutil.canonpath(
1383 self._rootdir, self._rootdir, item
1390 self._rootdir, self._rootdir, item
1384 ),
1391 ),
1385 b"No such file or directory",
1392 b"No such file or directory",
1386 )
1393 )
1387 )
1394 )
1388
1395
1389 for (fn, message) in bad:
1396 for (fn, message) in bad:
1390 matcher.bad(fn, encoding.strtolocal(message))
1397 matcher.bad(fn, encoding.strtolocal(message))
1391
1398
1392 status = scmutil.status(
1399 status = scmutil.status(
1393 modified=modified,
1400 modified=modified,
1394 added=added,
1401 added=added,
1395 removed=removed,
1402 removed=removed,
1396 deleted=deleted,
1403 deleted=deleted,
1397 unknown=unknown,
1404 unknown=unknown,
1398 ignored=ignored,
1405 ignored=ignored,
1399 clean=clean,
1406 clean=clean,
1400 )
1407 )
1401 return (lookup, status)
1408 return (lookup, status)
1402
1409
1403 def status(self, match, subrepos, ignored, clean, unknown):
1410 def status(self, match, subrepos, ignored, clean, unknown):
1404 """Determine the status of the working copy relative to the
1411 """Determine the status of the working copy relative to the
1405 dirstate and return a pair of (unsure, status), where status is of type
1412 dirstate and return a pair of (unsure, status), where status is of type
1406 scmutil.status and:
1413 scmutil.status and:
1407
1414
1408 unsure:
1415 unsure:
1409 files that might have been modified since the dirstate was
1416 files that might have been modified since the dirstate was
1410 written, but need to be read to be sure (size is the same
1417 written, but need to be read to be sure (size is the same
1411 but mtime differs)
1418 but mtime differs)
1412 status.modified:
1419 status.modified:
1413 files that have definitely been modified since the dirstate
1420 files that have definitely been modified since the dirstate
1414 was written (different size or mode)
1421 was written (different size or mode)
1415 status.clean:
1422 status.clean:
1416 files that have definitely not been modified since the
1423 files that have definitely not been modified since the
1417 dirstate was written
1424 dirstate was written
1418 """
1425 """
1419 listignored, listclean, listunknown = ignored, clean, unknown
1426 listignored, listclean, listunknown = ignored, clean, unknown
1420 lookup, modified, added, unknown, ignored = [], [], [], [], []
1427 lookup, modified, added, unknown, ignored = [], [], [], [], []
1421 removed, deleted, clean = [], [], []
1428 removed, deleted, clean = [], [], []
1422
1429
1423 dmap = self._map
1430 dmap = self._map
1424 dmap.preload()
1431 dmap.preload()
1425
1432
1426 use_rust = True
1433 use_rust = True
1427
1434
1428 allowed_matchers = (
1435 allowed_matchers = (
1429 matchmod.alwaysmatcher,
1436 matchmod.alwaysmatcher,
1430 matchmod.exactmatcher,
1437 matchmod.exactmatcher,
1431 matchmod.includematcher,
1438 matchmod.includematcher,
1432 )
1439 )
1433
1440
1434 if rustmod is None:
1441 if rustmod is None:
1435 use_rust = False
1442 use_rust = False
1436 elif self._checkcase:
1443 elif self._checkcase:
1437 # Case-insensitive filesystems are not handled yet
1444 # Case-insensitive filesystems are not handled yet
1438 use_rust = False
1445 use_rust = False
1439 elif subrepos:
1446 elif subrepos:
1440 use_rust = False
1447 use_rust = False
1441 elif sparse.enabled:
1448 elif sparse.enabled:
1442 use_rust = False
1449 use_rust = False
1443 elif not isinstance(match, allowed_matchers):
1450 elif not isinstance(match, allowed_matchers):
1444 # Some matchers have yet to be implemented
1451 # Some matchers have yet to be implemented
1445 use_rust = False
1452 use_rust = False
1446
1453
1447 if use_rust:
1454 if use_rust:
1448 try:
1455 try:
1449 return self._rust_status(
1456 return self._rust_status(
1450 match, listclean, listignored, listunknown
1457 match, listclean, listignored, listunknown
1451 )
1458 )
1452 except rustmod.FallbackError:
1459 except rustmod.FallbackError:
1453 pass
1460 pass
1454
1461
1455 def noop(f):
1462 def noop(f):
1456 pass
1463 pass
1457
1464
1458 dcontains = dmap.__contains__
1465 dcontains = dmap.__contains__
1459 dget = dmap.__getitem__
1466 dget = dmap.__getitem__
1460 ladd = lookup.append # aka "unsure"
1467 ladd = lookup.append # aka "unsure"
1461 madd = modified.append
1468 madd = modified.append
1462 aadd = added.append
1469 aadd = added.append
1463 uadd = unknown.append if listunknown else noop
1470 uadd = unknown.append if listunknown else noop
1464 iadd = ignored.append if listignored else noop
1471 iadd = ignored.append if listignored else noop
1465 radd = removed.append
1472 radd = removed.append
1466 dadd = deleted.append
1473 dadd = deleted.append
1467 cadd = clean.append if listclean else noop
1474 cadd = clean.append if listclean else noop
1468 mexact = match.exact
1475 mexact = match.exact
1469 dirignore = self._dirignore
1476 dirignore = self._dirignore
1470 checkexec = self._checkexec
1477 checkexec = self._checkexec
1471 copymap = self._map.copymap
1478 copymap = self._map.copymap
1472 lastnormaltime = self._lastnormaltime
1479 lastnormaltime = self._lastnormaltime
1473
1480
1474 # We need to do full walks when either
1481 # We need to do full walks when either
1475 # - we're listing all clean files, or
1482 # - we're listing all clean files, or
1476 # - match.traversedir does something, because match.traversedir should
1483 # - match.traversedir does something, because match.traversedir should
1477 # be called for every dir in the working dir
1484 # be called for every dir in the working dir
1478 full = listclean or match.traversedir is not None
1485 full = listclean or match.traversedir is not None
1479 for fn, st in pycompat.iteritems(
1486 for fn, st in pycompat.iteritems(
1480 self.walk(match, subrepos, listunknown, listignored, full=full)
1487 self.walk(match, subrepos, listunknown, listignored, full=full)
1481 ):
1488 ):
1482 if not dcontains(fn):
1489 if not dcontains(fn):
1483 if (listignored or mexact(fn)) and dirignore(fn):
1490 if (listignored or mexact(fn)) and dirignore(fn):
1484 if listignored:
1491 if listignored:
1485 iadd(fn)
1492 iadd(fn)
1486 else:
1493 else:
1487 uadd(fn)
1494 uadd(fn)
1488 continue
1495 continue
1489
1496
1490 # This is equivalent to 'state, mode, size, time = dmap[fn]' but not
1497 # This is equivalent to 'state, mode, size, time = dmap[fn]' but not
1491 # written like that for performance reasons. dmap[fn] is not a
1498 # written like that for performance reasons. dmap[fn] is not a
1492 # Python tuple in compiled builds. The CPython UNPACK_SEQUENCE
1499 # Python tuple in compiled builds. The CPython UNPACK_SEQUENCE
1493 # opcode has fast paths when the value to be unpacked is a tuple or
1500 # opcode has fast paths when the value to be unpacked is a tuple or
1494 # a list, but falls back to creating a full-fledged iterator in
1501 # a list, but falls back to creating a full-fledged iterator in
1495 # general. That is much slower than simply accessing and storing the
1502 # general. That is much slower than simply accessing and storing the
1496 # tuple members one by one.
1503 # tuple members one by one.
1497 t = dget(fn)
1504 t = dget(fn)
1498 mode = t.mode
1505 mode = t.mode
1499 size = t.size
1506 size = t.size
1500 time = t.mtime
1507 time = t.mtime
1501
1508
1502 if not st and t.tracked:
1509 if not st and t.tracked:
1503 dadd(fn)
1510 dadd(fn)
1504 elif t.merged:
1511 elif t.merged:
1505 madd(fn)
1512 madd(fn)
1506 elif t.added:
1513 elif t.added:
1507 aadd(fn)
1514 aadd(fn)
1508 elif t.removed:
1515 elif t.removed:
1509 radd(fn)
1516 radd(fn)
1510 elif t.tracked:
1517 elif t.tracked:
1511 if (
1518 if (
1512 size >= 0
1519 size >= 0
1513 and (
1520 and (
1514 (size != st.st_size and size != st.st_size & _rangemask)
1521 (size != st.st_size and size != st.st_size & _rangemask)
1515 or ((mode ^ st.st_mode) & 0o100 and checkexec)
1522 or ((mode ^ st.st_mode) & 0o100 and checkexec)
1516 )
1523 )
1517 or t.from_p2
1524 or t.from_p2
1518 or fn in copymap
1525 or fn in copymap
1519 ):
1526 ):
1520 if stat.S_ISLNK(st.st_mode) and size != st.st_size:
1527 if stat.S_ISLNK(st.st_mode) and size != st.st_size:
1521 # issue6456: Size returned may be longer due to
1528 # issue6456: Size returned may be longer due to
1522 # encryption on EXT-4 fscrypt, undecided.
1529 # encryption on EXT-4 fscrypt, undecided.
1523 ladd(fn)
1530 ladd(fn)
1524 else:
1531 else:
1525 madd(fn)
1532 madd(fn)
1526 elif (
1533 elif (
1527 time != st[stat.ST_MTIME]
1534 time != st[stat.ST_MTIME]
1528 and time != st[stat.ST_MTIME] & _rangemask
1535 and time != st[stat.ST_MTIME] & _rangemask
1529 ):
1536 ):
1530 ladd(fn)
1537 ladd(fn)
1531 elif st[stat.ST_MTIME] == lastnormaltime:
1538 elif st[stat.ST_MTIME] == lastnormaltime:
1532 # fn may have just been marked as normal and it may have
1539 # fn may have just been marked as normal and it may have
1533 # changed in the same second without changing its size.
1540 # changed in the same second without changing its size.
1534 # This can happen if we quickly do multiple commits.
1541 # This can happen if we quickly do multiple commits.
1535 # Force lookup, so we don't miss such a racy file change.
1542 # Force lookup, so we don't miss such a racy file change.
1536 ladd(fn)
1543 ladd(fn)
1537 elif listclean:
1544 elif listclean:
1538 cadd(fn)
1545 cadd(fn)
1539 status = scmutil.status(
1546 status = scmutil.status(
1540 modified, added, removed, deleted, unknown, ignored, clean
1547 modified, added, removed, deleted, unknown, ignored, clean
1541 )
1548 )
1542 return (lookup, status)
1549 return (lookup, status)
1543
1550
1544 def matches(self, match):
1551 def matches(self, match):
1545 """
1552 """
1546 return files in the dirstate (in whatever state) filtered by match
1553 return files in the dirstate (in whatever state) filtered by match
1547 """
1554 """
1548 dmap = self._map
1555 dmap = self._map
1549 if rustmod is not None:
1556 if rustmod is not None:
1550 dmap = self._map._rustmap
1557 dmap = self._map._rustmap
1551
1558
1552 if match.always():
1559 if match.always():
1553 return dmap.keys()
1560 return dmap.keys()
1554 files = match.files()
1561 files = match.files()
1555 if match.isexact():
1562 if match.isexact():
1556 # fast path -- filter the other way around, since typically files is
1563 # fast path -- filter the other way around, since typically files is
1557 # much smaller than dmap
1564 # much smaller than dmap
1558 return [f for f in files if f in dmap]
1565 return [f for f in files if f in dmap]
1559 if match.prefix() and all(fn in dmap for fn in files):
1566 if match.prefix() and all(fn in dmap for fn in files):
1560 # fast path -- all the values are known to be files, so just return
1567 # fast path -- all the values are known to be files, so just return
1561 # that
1568 # that
1562 return list(files)
1569 return list(files)
1563 return [f for f in dmap if match(f)]
1570 return [f for f in dmap if match(f)]
1564
1571
1565 def _actualfilename(self, tr):
1572 def _actualfilename(self, tr):
1566 if tr:
1573 if tr:
1567 return self._pendingfilename
1574 return self._pendingfilename
1568 else:
1575 else:
1569 return self._filename
1576 return self._filename
1570
1577
1571 def savebackup(self, tr, backupname):
1578 def savebackup(self, tr, backupname):
1572 '''Save current dirstate into backup file'''
1579 '''Save current dirstate into backup file'''
1573 filename = self._actualfilename(tr)
1580 filename = self._actualfilename(tr)
1574 assert backupname != filename
1581 assert backupname != filename
1575
1582
1576 # use '_writedirstate' instead of 'write' to write changes certainly,
1583 # use '_writedirstate' instead of 'write' to write changes certainly,
1577 # because the latter omits writing out if transaction is running.
1584 # because the latter omits writing out if transaction is running.
1578 # output file will be used to create backup of dirstate at this point.
1585 # output file will be used to create backup of dirstate at this point.
1579 if self._dirty or not self._opener.exists(filename):
1586 if self._dirty or not self._opener.exists(filename):
1580 self._writedirstate(
1587 self._writedirstate(
1581 self._opener(filename, b"w", atomictemp=True, checkambig=True)
1588 self._opener(filename, b"w", atomictemp=True, checkambig=True)
1582 )
1589 )
1583
1590
1584 if tr:
1591 if tr:
1585 # ensure that subsequent tr.writepending returns True for
1592 # ensure that subsequent tr.writepending returns True for
1586 # changes written out above, even if dirstate is never
1593 # changes written out above, even if dirstate is never
1587 # changed after this
1594 # changed after this
1588 tr.addfilegenerator(
1595 tr.addfilegenerator(
1589 b'dirstate',
1596 b'dirstate',
1590 (self._filename,),
1597 (self._filename,),
1591 self._writedirstate,
1598 self._writedirstate,
1592 location=b'plain',
1599 location=b'plain',
1593 )
1600 )
1594
1601
1595 # ensure that pending file written above is unlinked at
1602 # ensure that pending file written above is unlinked at
1596 # failure, even if tr.writepending isn't invoked until the
1603 # failure, even if tr.writepending isn't invoked until the
1597 # end of this transaction
1604 # end of this transaction
1598 tr.registertmp(filename, location=b'plain')
1605 tr.registertmp(filename, location=b'plain')
1599
1606
1600 self._opener.tryunlink(backupname)
1607 self._opener.tryunlink(backupname)
1601 # hardlink backup is okay because _writedirstate is always called
1608 # hardlink backup is okay because _writedirstate is always called
1602 # with an "atomictemp=True" file.
1609 # with an "atomictemp=True" file.
1603 util.copyfile(
1610 util.copyfile(
1604 self._opener.join(filename),
1611 self._opener.join(filename),
1605 self._opener.join(backupname),
1612 self._opener.join(backupname),
1606 hardlink=True,
1613 hardlink=True,
1607 )
1614 )
1608
1615
1609 def restorebackup(self, tr, backupname):
1616 def restorebackup(self, tr, backupname):
1610 '''Restore dirstate by backup file'''
1617 '''Restore dirstate by backup file'''
1611 # this "invalidate()" prevents "wlock.release()" from writing
1618 # this "invalidate()" prevents "wlock.release()" from writing
1612 # changes of dirstate out after restoring from backup file
1619 # changes of dirstate out after restoring from backup file
1613 self.invalidate()
1620 self.invalidate()
1614 filename = self._actualfilename(tr)
1621 filename = self._actualfilename(tr)
1615 o = self._opener
1622 o = self._opener
1616 if util.samefile(o.join(backupname), o.join(filename)):
1623 if util.samefile(o.join(backupname), o.join(filename)):
1617 o.unlink(backupname)
1624 o.unlink(backupname)
1618 else:
1625 else:
1619 o.rename(backupname, filename, checkambig=True)
1626 o.rename(backupname, filename, checkambig=True)
1620
1627
1621 def clearbackup(self, tr, backupname):
1628 def clearbackup(self, tr, backupname):
1622 '''Clear backup file'''
1629 '''Clear backup file'''
1623 self._opener.unlink(backupname)
1630 self._opener.unlink(backupname)
General Comments 0
You need to be logged in to leave comments. Login now