dirstate.py
1863 lines
| 63.7 KiB
| text/x-python
|
PythonLexer
/ mercurial / dirstate.py
Martin Geisler
|
r8226 | # dirstate.py - working directory tracking for mercurial | ||
# | ||||
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
mpm@selenic.com
|
r1089 | |||
Gregory Szorc
|
r27503 | from __future__ import absolute_import | ||
Laurent Charignon
|
r27670 | import collections | ||
Augie Fackler
|
r32346 | import contextlib | ||
Gregory Szorc
|
r27503 | import errno | ||
import os | ||||
import stat | ||||
from .i18n import _ | ||||
from .node import nullid | ||||
Gregory Szorc
|
r43360 | from .pycompat import delattr | ||
Augie Fackler
|
r43533 | |||
from hgdemandimport import tracing | ||||
Gregory Szorc
|
r27503 | from . import ( | ||
encoding, | ||||
error, | ||||
match as matchmod, | ||||
pathutil, | ||||
Yuya Nishihara
|
r32372 | policy, | ||
Pulkit Goyal
|
r30304 | pycompat, | ||
Gregory Szorc
|
r27503 | scmutil, | ||
FUJIWARA Katsunori
|
r31050 | txnutil, | ||
Gregory Szorc
|
r27503 | util, | ||
) | ||||
mpm@selenic.com
|
r1089 | |||
Augie Fackler
|
r43197 | from .interfaces import ( | ||
dirstate as intdirstate, | ||||
util as interfaceutil, | ||||
) | ||||
Augie Fackler
|
r43906 | parsers = policy.importmod('parsers') | ||
rustmod = policy.importrust('dirstate') | ||||
Yuya Nishihara
|
r32372 | |||
Matt Mackall
|
r8261 | propertycache = util.propertycache | ||
Idan Kamara
|
r16201 | filecache = scmutil.filecache | ||
Augie Fackler
|
r43346 | _rangemask = 0x7FFFFFFF | ||
Idan Kamara
|
r16201 | |||
Raphaël Gomès
|
r43000 | dirstatetuple = parsers.dirstatetuple | ||
Siddharth Agarwal
|
r21808 | |||
Augie Fackler
|
r43346 | |||
Idan Kamara
|
r16201 | class repocache(filecache): | ||
"""filecache for files in .hg/""" | ||||
Augie Fackler
|
r43346 | |||
Idan Kamara
|
r16201 | def join(self, obj, fname): | ||
return obj._opener.join(fname) | ||||
Matt Mackall
|
r4610 | |||
Augie Fackler
|
r43346 | |||
Idan Kamara
|
r16202 | class rootcache(filecache): | ||
"""filecache for files in the repository root""" | ||||
Augie Fackler
|
r43346 | |||
Idan Kamara
|
r16202 | def join(self, obj, fname): | ||
return obj._join(fname) | ||||
Augie Fackler
|
r43346 | |||
FUJIWARA Katsunori
|
r26634 | def _getfsnow(vfs): | ||
'''Get "now" timestamp on filesystem''' | ||||
tmpfd, tmpname = vfs.mkstemp() | ||||
try: | ||||
Augie Fackler
|
r36799 | return os.fstat(tmpfd)[stat.ST_MTIME] | ||
FUJIWARA Katsunori
|
r26634 | finally: | ||
os.close(tmpfd) | ||||
vfs.unlink(tmpname) | ||||
Augie Fackler
|
r43346 | |||
Augie Fackler
|
r43197 | @interfaceutil.implementer(intdirstate.idirstate) | ||
Eric Hopper
|
r1559 | class dirstate(object): | ||
Gregory Szorc
|
r33373 | def __init__(self, opener, ui, root, validate, sparsematchfn): | ||
Martin Geisler
|
r10145 | '''Create a new dirstate object. | ||
opener is an open()-like callable that can be used to open the | ||||
dirstate file; root is the root of the directory tracked by | ||||
the dirstate. | ||||
''' | ||||
Matt Mackall
|
r4614 | self._opener = opener | ||
Matt Mackall
|
r13032 | self._validate = validate | ||
Matt Mackall
|
r4614 | self._root = root | ||
Gregory Szorc
|
r33373 | self._sparsematchfn = sparsematchfn | ||
Yuya Nishihara
|
r24198 | # ntpath.join(root, '') of Python 2.7.9 does not add sep if root is | ||
# UNC path pointing to root share (issue4557) | ||||
FUJIWARA Katsunori
|
r24833 | self._rootdir = pathutil.normasprefix(root) | ||
Matt Mackall
|
r4903 | self._dirty = False | ||
Martin Geisler
|
r15791 | self._lastnormaltime = 0 | ||
Matt Mackall
|
r4614 | self._ui = ui | ||
Idan Kamara
|
r16200 | self._filecache = {} | ||
Durham Goode
|
r22404 | self._parentwriters = 0 | ||
Augie Fackler
|
r43347 | self._filename = b'dirstate' | ||
self._pendingfilename = b'%s.pending' % self._filename | ||||
Mateusz Kwapich
|
r29772 | self._plchangecallbacks = {} | ||
self._origpl = None | ||||
Durham Goode
|
r31206 | self._updatedfiles = set() | ||
Mark Thomas
|
r35085 | self._mapcls = dirstatemap | ||
Martin von Zweigbergk
|
r41823 | # Access and cache cwd early, so we don't access it for the first time | ||
# after a working-copy update caused it to not exist (accessing it then | ||||
# raises an exception). | ||||
self._cwd | ||||
Durham Goode
|
r22404 | |||
Augie Fackler
|
r32346 | @contextlib.contextmanager | ||
def parentchange(self): | ||||
'''Context manager for handling dirstate parents. | ||||
If an exception occurs in the scope of the context manager, | ||||
the incoherent dirstate won't be written when wlock is | ||||
released. | ||||
''' | ||||
self._parentwriters += 1 | ||||
yield | ||||
# Typically we want the "undo" step of a context manager in a | ||||
# finally block so it happens even when an exception | ||||
# occurs. In this case, however, we only want to decrement | ||||
# parentwriters if the code in the with statement exits | ||||
# normally, so we don't have a try/finally here on purpose. | ||||
self._parentwriters -= 1 | ||||
Durham Goode
|
r22404 | def pendingparentchange(self): | ||
'''Returns true if the dirstate is in the middle of a set of changes | ||||
that modify the dirstate parent. | ||||
''' | ||||
return self._parentwriters > 0 | ||||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r8261 | @propertycache | ||
def _map(self): | ||||
Mark Thomas
|
r35077 | """Return the dirstate contents (see documentation for dirstatemap).""" | ||
Mark Thomas
|
r35085 | self._map = self._mapcls(self._ui, self._opener, self._root) | ||
Matt Mackall
|
r8261 | return self._map | ||
Gregory Szorc
|
r33373 | @property | ||
def _sparsematcher(self): | ||||
"""The matcher for the sparse checkout. | ||||
The working directory may not include every file from a manifest. The | ||||
matcher obtained by this property will match a path if it is to be | ||||
included in the working directory. | ||||
""" | ||||
# TODO there is potential to cache this property. For now, the matcher | ||||
# is resolved on every access. (But the called function does use a | ||||
# cache to keep the lookup fast.) | ||||
return self._sparsematchfn() | ||||
Augie Fackler
|
r43347 | @repocache(b'branch') | ||
Matt Mackall
|
r8261 | def _branch(self): | ||
try: | ||||
Augie Fackler
|
r43347 | return self._opener.read(b"branch").strip() or b"default" | ||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Pierre-Yves David
|
r15799 | if inst.errno != errno.ENOENT: | ||
raise | ||||
Augie Fackler
|
r43347 | return b"default" | ||
Matt Mackall
|
r8261 | |||
Durham Goode
|
r34340 | @property | ||
Matt Mackall
|
r8261 | def _pl(self): | ||
Durham Goode
|
r34339 | return self._map.parents() | ||
Matt Mackall
|
r8261 | |||
Mark Thomas
|
r35083 | def hasdir(self, d): | ||
return self._map.hastrackeddir(d) | ||||
FUJIWARA Katsunori
|
r16143 | |||
Augie Fackler
|
r43347 | @rootcache(b'.hgignore') | ||
Matt Mackall
|
r8261 | def _ignore(self): | ||
Laurent Charignon
|
r27594 | files = self._ignorefiles() | ||
Durham Goode
|
r25216 | if not files: | ||
Martin von Zweigbergk
|
r41825 | return matchmod.never() | ||
Durham Goode
|
r25216 | |||
Augie Fackler
|
r43347 | pats = [b'include:%s' % f for f in files] | ||
return matchmod.match(self._root, b'', [], pats, warn=self._ui.warn) | ||||
Matt Mackall
|
r8261 | |||
@propertycache | ||||
def _slash(self): | ||||
Augie Fackler
|
r43347 | return self._ui.configbool(b'ui', b'slash') and pycompat.ossep != b'/' | ||
Matt Mackall
|
r8261 | |||
@propertycache | ||||
def _checklink(self): | ||||
return util.checklink(self._root) | ||||
@propertycache | ||||
def _checkexec(self): | ||||
return util.checkexec(self._root) | ||||
@propertycache | ||||
def _checkcase(self): | ||||
Augie Fackler
|
r43347 | return not util.fscasesensitive(self._join(b'.hg')) | ||
Matt Mackall
|
r8261 | |||
Matt Mackall
|
r4905 | def _join(self, f): | ||
Benoit Boissinot
|
r6972 | # much faster than os.path.join() | ||
Benoit Boissinot
|
r6973 | # it's safe because f is always a relative path | ||
Benoit Boissinot
|
r6972 | return self._rootdir + f | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r15337 | def flagfunc(self, buildfallback): | ||
if self._checklink and self._checkexec: | ||||
Augie Fackler
|
r43346 | |||
Matt Mackall
|
r15337 | def f(x): | ||
Bryan O'Sullivan
|
r18869 | try: | ||
st = os.lstat(self._join(x)) | ||||
if util.statislink(st): | ||||
Augie Fackler
|
r43347 | return b'l' | ||
Bryan O'Sullivan
|
r18869 | if util.statisexec(st): | ||
Augie Fackler
|
r43347 | return b'x' | ||
Bryan O'Sullivan
|
r18869 | except OSError: | ||
pass | ||||
Augie Fackler
|
r43347 | return b'' | ||
Augie Fackler
|
r43346 | |||
Matt Mackall
|
r15337 | return f | ||
fallback = buildfallback() | ||||
Matt Mackall
|
r6743 | if self._checklink: | ||
Augie Fackler
|
r43346 | |||
Matt Mackall
|
r6743 | def f(x): | ||
Benoit Boissinot
|
r6972 | if os.path.islink(self._join(x)): | ||
Augie Fackler
|
r43347 | return b'l' | ||
if b'x' in fallback(x): | ||||
return b'x' | ||||
return b'' | ||||
Augie Fackler
|
r43346 | |||
Matt Mackall
|
r6743 | return f | ||
if self._checkexec: | ||||
Augie Fackler
|
r43346 | |||
Matt Mackall
|
r6743 | def f(x): | ||
Augie Fackler
|
r43347 | if b'l' in fallback(x): | ||
return b'l' | ||||
Adrian Buehlmann
|
r14273 | if util.isexec(self._join(x)): | ||
Augie Fackler
|
r43347 | return b'x' | ||
return b'' | ||||
Augie Fackler
|
r43346 | |||
Matt Mackall
|
r6743 | return f | ||
Matt Mackall
|
r15337 | else: | ||
return fallback | ||||
Matt Mackall
|
r6743 | |||
Pierre-Yves David
|
r20335 | @propertycache | ||
def _cwd(self): | ||||
FUJIWARA Katsunori
|
r33212 | # internal config: ui.forcecwd | ||
Augie Fackler
|
r43347 | forcecwd = self._ui.config(b'ui', b'forcecwd') | ||
FUJIWARA Katsunori
|
r33212 | if forcecwd: | ||
return forcecwd | ||||
Matt Harbison
|
r39843 | return encoding.getcwd() | ||
Pierre-Yves David
|
r20335 | |||
mpm@selenic.com
|
r1089 | def getcwd(self): | ||
Yuya Nishihara
|
r26293 | '''Return the path from which a canonical path is calculated. | ||
This path should be used to resolve file patterns or to convert | ||||
canonical paths back to file paths for display. It shouldn't be | ||||
used to get real file paths. Use vfs functions instead. | ||||
''' | ||||
Pierre-Yves David
|
r20335 | cwd = self._cwd | ||
Matt Mackall
|
r10282 | if cwd == self._root: | ||
Augie Fackler
|
r43347 | return b'' | ||
Matt Mackall
|
r4614 | # self._root ends with a path separator if self._root is '/' or 'C:\' | ||
rootsep = self._root | ||||
Shun-ichi GOTO
|
r5843 | if not util.endswithsep(rootsep): | ||
Pulkit Goyal
|
r30614 | rootsep += pycompat.ossep | ||
Alexis S. L. Carvalho
|
r4230 | if cwd.startswith(rootsep): | ||
Augie Fackler
|
r43346 | return cwd[len(rootsep) :] | ||
Alexis S. L. Carvalho
|
r4230 | else: | ||
# we're outside the repo. return an absolute path. | ||||
return cwd | ||||
mpm@selenic.com
|
r1089 | |||
Alexis S. L. Carvalho
|
r4525 | def pathto(self, f, cwd=None): | ||
if cwd is None: | ||||
cwd = self.getcwd() | ||||
Matt Mackall
|
r4614 | path = util.pathto(self._root, cwd, f) | ||
Alexis S. L. Carvalho
|
r4527 | if self._slash: | ||
Matt Mackall
|
r19210 | return util.pconvert(path) | ||
Alexis S. L. Carvalho
|
r4527 | return path | ||
Alexis S. L. Carvalho
|
r4525 | |||
mpm@selenic.com
|
r1089 | def __getitem__(self, key): | ||
Greg Ward
|
r9518 | '''Return the current state of key (a filename) in the dirstate. | ||
Martin Geisler
|
r10145 | |||
Greg Ward
|
r9518 | States are: | ||
n normal | ||||
m needs merging | ||||
r marked for removal | ||||
a marked for addition | ||||
? not tracked | ||||
''' | ||||
Augie Fackler
|
r43347 | return self._map.get(key, (b"?",))[0] | ||
mpm@selenic.com
|
r1089 | |||
def __contains__(self, key): | ||||
Matt Mackall
|
r4614 | return key in self._map | ||
def __iter__(self): | ||||
Alex Gaynor
|
r33673 | return iter(sorted(self._map)) | ||
mpm@selenic.com
|
r1089 | |||
Augie Fackler
|
r32550 | def items(self): | ||
Gregory Szorc
|
r43376 | return pycompat.iteritems(self._map) | ||
Bryan O'Sullivan
|
r18792 | |||
Augie Fackler
|
r32550 | iteritems = items | ||
mpm@selenic.com
|
r1089 | def parents(self): | ||
Matt Mackall
|
r13032 | return [self._validate(p) for p in self._pl] | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r13876 | def p1(self): | ||
return self._validate(self._pl[0]) | ||||
def p2(self): | ||||
return self._validate(self._pl[1]) | ||||
Matt Mackall
|
r4179 | def branch(self): | ||
Matt Mackall
|
r13047 | return encoding.tolocal(self._branch) | ||
Matt Mackall
|
r4179 | |||
mpm@selenic.com
|
r1089 | def setparents(self, p1, p2=nullid): | ||
Patrick Mezard
|
r16551 | """Set dirstate parents to p1 and p2. | ||
When moving from two parents to one, 'm' merged entries a | ||||
adjusted to normal and previous copy records discarded and | ||||
returned by the call. | ||||
See localrepo.setparents() | ||||
""" | ||||
Durham Goode
|
r22407 | if self._parentwriters == 0: | ||
Augie Fackler
|
r43346 | raise ValueError( | ||
Augie Fackler
|
r43347 | b"cannot set dirstate parent outside of " | ||
b"dirstate.parentchange context manager" | ||||
Augie Fackler
|
r43346 | ) | ||
Durham Goode
|
r22407 | |||
Durham Goode
|
r34340 | self._dirty = True | ||
Patrick Mezard
|
r16509 | oldp2 = self._pl[1] | ||
Mateusz Kwapich
|
r29772 | if self._origpl is None: | ||
self._origpl = self._pl | ||||
Durham Goode
|
r34340 | self._map.setparents(p1, p2) | ||
Patrick Mezard
|
r16551 | copies = {} | ||
Patrick Mezard
|
r16509 | if oldp2 != nullid and p2 == nullid: | ||
Durham Goode
|
r34675 | candidatefiles = self._map.nonnormalset.union( | ||
Augie Fackler
|
r43346 | self._map.otherparentset | ||
) | ||||
Durham Goode
|
r31278 | for f in candidatefiles: | ||
s = self._map.get(f) | ||||
if s is None: | ||||
continue | ||||
Matt Mackall
|
r22895 | # Discard 'm' markers when moving away from a merge state | ||
Augie Fackler
|
r43347 | if s[0] == b'm': | ||
Durham Goode
|
r34337 | source = self._map.copymap.get(f) | ||
Michael Bolin
|
r33983 | if source: | ||
copies[f] = source | ||||
Patrick Mezard
|
r16509 | self.normallookup(f) | ||
Matt Mackall
|
r22895 | # Also fix up otherparent markers | ||
Augie Fackler
|
r43347 | elif s[0] == b'n' and s[2] == -2: | ||
Durham Goode
|
r34337 | source = self._map.copymap.get(f) | ||
Michael Bolin
|
r33983 | if source: | ||
copies[f] = source | ||||
Matt Mackall
|
r22895 | self.add(f) | ||
Patrick Mezard
|
r16551 | return copies | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4179 | def setbranch(self, branch): | ||
Yuya Nishihara
|
r40454 | self.__class__._branch.set(self, encoding.fromlocal(branch)) | ||
Augie Fackler
|
r43347 | f = self._opener(b'branch', b'w', atomictemp=True, checkambig=True) | ||
Idan Kamara
|
r16472 | try: | ||
Augie Fackler
|
r43347 | f.write(self._branch + b'\n') | ||
Idan Kamara
|
r16472 | f.close() | ||
Idan Kamara
|
r18317 | |||
# make sure filecache has the correct stat info for _branch after | ||||
# replacing the underlying file | ||||
Augie Fackler
|
r43347 | ce = self._filecache[b'_branch'] | ||
Idan Kamara
|
r18317 | if ce: | ||
ce.refresh() | ||||
Augie Fackler
|
r43346 | except: # re-raises | ||
Idan Kamara
|
r18076 | f.discard() | ||
raise | ||||
Matt Mackall
|
r4179 | |||
Matt Mackall
|
r4613 | def invalidate(self): | ||
Siddharth Agarwal
|
r32682 | '''Causes the next access to reread the dirstate. | ||
This is different from localrepo.invalidatedirstate() because it always | ||||
rereads the dirstate. Use localrepo.invalidatedirstate() if you want to | ||||
check whether the dirstate has changed before rereading it.''' | ||||
Augie Fackler
|
r43809 | for a in ("_map", "_branch", "_ignore"): | ||
Alexis S. L. Carvalho
|
r4953 | if a in self.__dict__: | ||
delattr(self, a) | ||||
Martin Geisler
|
r15791 | self._lastnormaltime = 0 | ||
Matt Mackall
|
r4903 | self._dirty = False | ||
Durham Goode
|
r31206 | self._updatedfiles.clear() | ||
Durham Goode
|
r22404 | self._parentwriters = 0 | ||
Mateusz Kwapich
|
r29772 | self._origpl = None | ||
Bryan O'Sullivan
|
r4375 | |||
mpm@selenic.com
|
r1089 | def copy(self, source, dest): | ||
Martin Geisler
|
r10145 | """Mark dest as a copy of source. Unmark dest if source is None.""" | ||
Patrick Mezard
|
r6680 | if source == dest: | ||
return | ||||
Matt Mackall
|
r4903 | self._dirty = True | ||
Patrick Mezard
|
r7566 | if source is not None: | ||
Durham Goode
|
r34337 | self._map.copymap[dest] = source | ||
Durham Goode
|
r31206 | self._updatedfiles.add(source) | ||
self._updatedfiles.add(dest) | ||||
Durham Goode
|
r34337 | elif self._map.copymap.pop(dest, None): | ||
Durham Goode
|
r31206 | self._updatedfiles.add(dest) | ||
mpm@selenic.com
|
r1089 | |||
def copied(self, file): | ||||
Durham Goode
|
r34337 | return self._map.copymap.get(file, None) | ||
Matt Mackall
|
r3154 | |||
def copies(self): | ||||
Durham Goode
|
r34337 | return self._map.copymap | ||
mpm@selenic.com
|
r1089 | |||
Adrian Buehlmann
|
r17196 | def _addpath(self, f, state, mode, size, mtime): | ||
Maxim Dounin
|
r5487 | oldstate = self[f] | ||
Augie Fackler
|
r43347 | if state == b'a' or oldstate == b'r': | ||
Adrian Buehlmann
|
r13974 | scmutil.checkfilename(f) | ||
Mark Thomas
|
r35083 | if self._map.hastrackeddir(f): | ||
Augie Fackler
|
r43346 | raise error.Abort( | ||
Augie Fackler
|
r43347 | _(b'directory %r already in dirstate') % pycompat.bytestr(f) | ||
Augie Fackler
|
r43346 | ) | ||
Matt Mackall
|
r6767 | # shadows | ||
Martin von Zweigbergk
|
r44032 | for d in pathutil.finddirs(f): | ||
Mark Thomas
|
r35083 | if self._map.hastrackeddir(d): | ||
Matt Mackall
|
r6767 | break | ||
Michael Bolin
|
r34189 | entry = self._map.get(d) | ||
Augie Fackler
|
r43347 | if entry is not None and entry[0] != b'r': | ||
Pierre-Yves David
|
r26587 | raise error.Abort( | ||
Augie Fackler
|
r43347 | _(b'file %r in dirstate clashes with %r') | ||
Augie Fackler
|
r43346 | % (pycompat.bytestr(d), pycompat.bytestr(f)) | ||
) | ||||
Joshua Redstone
|
r17094 | self._dirty = True | ||
Durham Goode
|
r31206 | self._updatedfiles.add(f) | ||
Mark Thomas
|
r35080 | self._map.addfile(f, oldstate, state, mode, size, mtime) | ||
Maxim Dounin
|
r5487 | |||
Valentin Gatien-Baron
|
r42656 | def normal(self, f, parentfiledata=None): | ||
'''Mark a file normal and clean. | ||||
parentfiledata: (mode, size, mtime) of the clean file | ||||
parentfiledata should be computed from memory (for mode, | ||||
size), as or close as possible from the point where we | ||||
determined the file was clean, to limit the risk of the | ||||
file having been changed by an external process between the | ||||
moment where the file was determined to be clean and now.''' | ||||
if parentfiledata: | ||||
(mode, size, mtime) = parentfiledata | ||||
else: | ||||
s = os.lstat(self._join(f)) | ||||
mode = s.st_mode | ||||
size = s.st_size | ||||
mtime = s[stat.ST_MTIME] | ||||
Augie Fackler
|
r43347 | self._addpath(f, b'n', mode, size & _rangemask, mtime & _rangemask) | ||
Durham Goode
|
r34337 | self._map.copymap.pop(f, None) | ||
Durham Goode
|
r34675 | if f in self._map.nonnormalset: | ||
self._map.nonnormalset.remove(f) | ||||
Adrian Buehlmann
|
r13763 | if mtime > self._lastnormaltime: | ||
# Remember the most recent modification timeslot for status(), | ||||
Adrian Buehlmann
|
r13754 | # to make sure we won't miss future size-preserving file content | ||
# modifications that happen within the same timeslot. | ||||
Adrian Buehlmann
|
r13763 | self._lastnormaltime = mtime | ||
Greg Ward
|
r13704 | |||
Alexis S. L. Carvalho
|
r5210 | def normallookup(self, f): | ||
Martin Geisler
|
r10145 | '''Mark a file normal, but possibly dirty.''' | ||
Michael Bolin
|
r34189 | if self._pl[1] != nullid: | ||
Alexis S. L. Carvalho
|
r6298 | # if there is a merge going on and the file was either | ||
Benoit Boissinot
|
r10968 | # in state 'm' (-1) or coming from other parent (-2) before | ||
# being removed, restore that state. | ||||
Michael Bolin
|
r34189 | entry = self._map.get(f) | ||
if entry is not None: | ||||
Augie Fackler
|
r43347 | if entry[0] == b'r' and entry[2] in (-1, -2): | ||
Durham Goode
|
r34337 | source = self._map.copymap.get(f) | ||
Michael Bolin
|
r34189 | if entry[2] == -1: | ||
self.merge(f) | ||||
elif entry[2] == -2: | ||||
self.otherparent(f) | ||||
if source: | ||||
self.copy(source, f) | ||||
return | ||||
Augie Fackler
|
r43347 | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == -2: | ||
Michael Bolin
|
r34189 | return | ||
Augie Fackler
|
r43347 | self._addpath(f, b'n', 0, -1, -1) | ||
Durham Goode
|
r34337 | self._map.copymap.pop(f, None) | ||
Alexis S. L. Carvalho
|
r5210 | |||
Benoit Boissinot
|
r10968 | def otherparent(self, f): | ||
'''Mark as coming from the other parent, always dirty.''' | ||||
if self._pl[1] == nullid: | ||||
Augie Fackler
|
r43346 | raise error.Abort( | ||
Martin von Zweigbergk
|
r43387 | _(b"setting %r to other parent only allowed in merges") % f | ||
Augie Fackler
|
r43346 | ) | ||
Augie Fackler
|
r43347 | if f in self and self[f] == b'n': | ||
Matt Mackall
|
r22896 | # merge-like | ||
Augie Fackler
|
r43347 | self._addpath(f, b'm', 0, -2, -1) | ||
Matt Mackall
|
r22896 | else: | ||
# add-like | ||||
Augie Fackler
|
r43347 | self._addpath(f, b'n', 0, -2, -1) | ||
Durham Goode
|
r34337 | self._map.copymap.pop(f, None) | ||
Matt Mackall
|
r4904 | |||
def add(self, f): | ||||
Martin Geisler
|
r10145 | '''Mark a file added.''' | ||
Augie Fackler
|
r43347 | self._addpath(f, b'a', 0, -1, -1) | ||
Durham Goode
|
r34337 | self._map.copymap.pop(f, None) | ||
Matt Mackall
|
r4616 | |||
Matt Mackall
|
r4904 | def remove(self, f): | ||
Martin Geisler
|
r10145 | '''Mark a file removed.''' | ||
Matt Mackall
|
r4904 | self._dirty = True | ||
Mark Thomas
|
r35080 | oldstate = self[f] | ||
Alexis S. L. Carvalho
|
r6297 | size = 0 | ||
Michael Bolin
|
r34189 | if self._pl[1] != nullid: | ||
entry = self._map.get(f) | ||||
if entry is not None: | ||||
# backup the previous state | ||||
Augie Fackler
|
r43347 | if entry[0] == b'm': # merge | ||
Michael Bolin
|
r34189 | size = -1 | ||
Augie Fackler
|
r43347 | elif entry[0] == b'n' and entry[2] == -2: # other parent | ||
Michael Bolin
|
r34189 | size = -2 | ||
Durham Goode
|
r34675 | self._map.otherparentset.add(f) | ||
Mark Thomas
|
r35082 | self._updatedfiles.add(f) | ||
Mark Thomas
|
r35080 | self._map.removefile(f, oldstate, size) | ||
Michael Bolin
|
r33983 | if size == 0: | ||
Durham Goode
|
r34337 | self._map.copymap.pop(f, None) | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r4904 | def merge(self, f): | ||
Martin Geisler
|
r10145 | '''Mark a file merged.''' | ||
Patrick Mezard
|
r16509 | if self._pl[1] == nullid: | ||
return self.normallookup(f) | ||||
Matt Mackall
|
r22897 | return self.otherparent(f) | ||
Matt Mackall
|
r4904 | |||
Matt Mackall
|
r14434 | def drop(self, f): | ||
'''Drop a file from the dirstate''' | ||||
Mark Thomas
|
r35080 | oldstate = self[f] | ||
if self._map.dropfile(f, oldstate): | ||||
Matt Mackall
|
r15399 | self._dirty = True | ||
Mark Thomas
|
r35082 | self._updatedfiles.add(f) | ||
Durham Goode
|
r34337 | self._map.copymap.pop(f, None) | ||
mpm@selenic.com
|
r1089 | |||
Siddharth Agarwal
|
r24538 | def _discoverpath(self, path, normed, ignoremissing, exists, storemap): | ||
if exists is None: | ||||
exists = os.path.lexists(os.path.join(self._root, path)) | ||||
if not exists: | ||||
# Maybe a path component exists | ||||
Augie Fackler
|
r43347 | if not ignoremissing and b'/' in path: | ||
d, f = path.rsplit(b'/', 1) | ||||
Siddharth Agarwal
|
r24538 | d = self._normalize(d, False, ignoremissing, None) | ||
Augie Fackler
|
r43347 | folded = d + b"/" + f | ||
Siddharth Agarwal
|
r24538 | else: | ||
# No path components, preserve original case | ||||
folded = path | ||||
else: | ||||
# recursively normalize leading directory components | ||||
# against dirstate | ||||
Augie Fackler
|
r43347 | if b'/' in normed: | ||
d, f = normed.rsplit(b'/', 1) | ||||
Siddharth Agarwal
|
r24538 | d = self._normalize(d, False, ignoremissing, True) | ||
Augie Fackler
|
r43347 | r = self._root + b"/" + d | ||
folded = d + b"/" + util.fspath(f, r) | ||||
Siddharth Agarwal
|
r24538 | else: | ||
folded = util.fspath(normed, self._root) | ||||
storemap[normed] = folded | ||||
return folded | ||||
Siddharth Agarwal
|
r24539 | def _normalizefile(self, path, isknown, ignoremissing=False, exists=None): | ||
Matt Mackall
|
r15488 | normed = util.normcase(path) | ||
Durham Goode
|
r34677 | folded = self._map.filefoldmap.get(normed, None) | ||
Matt Mackall
|
r13717 | if folded is None: | ||
Patrick Mezard
|
r16542 | if isknown: | ||
Matt Mackall
|
r13717 | folded = path | ||
Petr Kodl
|
r7068 | else: | ||
Augie Fackler
|
r43346 | folded = self._discoverpath( | ||
path, normed, ignoremissing, exists, self._map.filefoldmap | ||||
) | ||||
Siddharth Agarwal
|
r24539 | return folded | ||
Matt Mackall
|
r16302 | |||
Patrick Mezard
|
r16542 | def _normalize(self, path, isknown, ignoremissing=False, exists=None): | ||
Matt Mackall
|
r15488 | normed = util.normcase(path) | ||
Durham Goode
|
r34677 | folded = self._map.filefoldmap.get(normed, None) | ||
Siddharth Agarwal
|
r24561 | if folded is None: | ||
Durham Goode
|
r34679 | folded = self._map.dirfoldmap.get(normed, None) | ||
Matt Mackall
|
r13717 | if folded is None: | ||
Patrick Mezard
|
r16542 | if isknown: | ||
Matt Mackall
|
r13717 | folded = path | ||
Petr Kodl
|
r7068 | else: | ||
Siddharth Agarwal
|
r24540 | # store discovered result in dirfoldmap so that future | ||
# normalizefile calls don't start matching directories | ||||
Augie Fackler
|
r43346 | folded = self._discoverpath( | ||
path, normed, ignoremissing, exists, self._map.dirfoldmap | ||||
) | ||||
Matt Mackall
|
r13717 | return folded | ||
Patrick Mezard
|
r16542 | def normalize(self, path, isknown=False, ignoremissing=False): | ||
Matt Mackall
|
r13717 | ''' | ||
normalize the case of a pathname when on a casefolding filesystem | ||||
isknown specifies whether the filename came from walking the | ||||
Patrick Mezard
|
r16542 | disk, to avoid extra filesystem access. | ||
If ignoremissing is True, missing path are returned | ||||
unchanged. Otherwise, we try harder to normalize possibly | ||||
existing path components. | ||||
Matt Mackall
|
r13717 | |||
The normalized case is determined based on the following precedence: | ||||
- version of name already stored in the dirstate | ||||
- version of name stored on disk | ||||
- version provided via command arguments | ||||
''' | ||||
if self._checkcase: | ||||
Patrick Mezard
|
r16542 | return self._normalize(path, isknown, ignoremissing) | ||
Matt Mackall
|
r13717 | return path | ||
Paul Moore
|
r6677 | |||
Alexis S. L. Carvalho
|
r5065 | def clear(self): | ||
Durham Goode
|
r34934 | self._map.clear() | ||
Martin Geisler
|
r15791 | self._lastnormaltime = 0 | ||
Durham Goode
|
r31206 | self._updatedfiles.clear() | ||
Alexis S. L. Carvalho
|
r5123 | self._dirty = True | ||
Alexis S. L. Carvalho
|
r5065 | |||
Durham Goode
|
r18760 | def rebuild(self, parent, allfiles, changedfiles=None): | ||
Pierre-Yves David
|
r25448 | if changedfiles is None: | ||
Christian Delahousse
|
r27176 | # Rebuild entire dirstate | ||
Kyle Lippincott
|
r44343 | to_lookup = allfiles | ||
to_drop = [] | ||||
Christian Delahousse
|
r27176 | lastnormaltime = self._lastnormaltime | ||
self.clear() | ||||
self._lastnormaltime = lastnormaltime | ||||
Kyle Lippincott
|
r44343 | elif len(changedfiles) < 10: | ||
# Avoid turning allfiles into a set, which can be expensive if it's | ||||
# large. | ||||
to_lookup = [] | ||||
to_drop = [] | ||||
for f in changedfiles: | ||||
if f in allfiles: | ||||
to_lookup.append(f) | ||||
else: | ||||
to_drop.append(f) | ||||
else: | ||||
changedfilesset = set(changedfiles) | ||||
to_lookup = changedfilesset & set(allfiles) | ||||
to_drop = changedfilesset - to_lookup | ||||
Christian Delahousse
|
r27176 | |||
Mateusz Kwapich
|
r29772 | if self._origpl is None: | ||
self._origpl = self._pl | ||||
Durham Goode
|
r34340 | self._map.setparents(parent, nullid) | ||
Kyle Lippincott
|
r44343 | |||
for f in to_lookup: | ||||
self.normallookup(f) | ||||
for f in to_drop: | ||||
self.drop(f) | ||||
Mateusz Kwapich
|
r30026 | |||
Matt Mackall
|
r4903 | self._dirty = True | ||
mpm@selenic.com
|
r1089 | |||
FUJIWARA Katsunori
|
r32750 | def identity(self): | ||
'''Return identity of dirstate itself to detect changing in storage | ||||
If identity of previous dirstate is equal to this, writing | ||||
changes based on the former dirstate out can keep consistency. | ||||
''' | ||||
Durham Goode
|
r34676 | return self._map.identity | ||
FUJIWARA Katsunori
|
r32750 | |||
Pierre-Yves David
|
r29673 | def write(self, tr): | ||
Matt Mackall
|
r4612 | if not self._dirty: | ||
Benoit Boissinot
|
r1794 | return | ||
FUJIWARA Katsunori
|
r21931 | |||
FUJIWARA Katsunori
|
r26634 | filename = self._filename | ||
Pierre-Yves David
|
r29673 | if tr: | ||
FUJIWARA Katsunori
|
r26634 | # 'dirstate.write()' is not only for writing in-memory | ||
# changes out, but also for dropping ambiguous timestamp. | ||||
# delayed writing re-raise "ambiguous timestamp issue". | ||||
# See also the wiki page below for detail: | ||||
# https://www.mercurial-scm.org/wiki/DirstateTransactionPlan | ||||
# emulate dropping timestamp in 'parsers.pack_dirstate' | ||||
FUJIWARA Katsunori
|
r26747 | now = _getfsnow(self._opener) | ||
Mark Thomas
|
r35079 | self._map.clearambiguoustimes(self._updatedfiles, now) | ||
FUJIWARA Katsunori
|
r26634 | |||
# emulate that all 'dirstate.normal' results are written out | ||||
self._lastnormaltime = 0 | ||||
Durham Goode
|
r31206 | self._updatedfiles.clear() | ||
FUJIWARA Katsunori
|
r26634 | |||
# delay writing in-memory changes out | ||||
Augie Fackler
|
r43346 | tr.addfilegenerator( | ||
Augie Fackler
|
r43347 | b'dirstate', | ||
Augie Fackler
|
r43346 | (self._filename,), | ||
self._writedirstate, | ||||
Augie Fackler
|
r43347 | location=b'plain', | ||
Augie Fackler
|
r43346 | ) | ||
FUJIWARA Katsunori
|
r26634 | return | ||
Augie Fackler
|
r43347 | st = self._opener(filename, b"w", atomictemp=True, checkambig=True) | ||
FUJIWARA Katsunori
|
r26521 | self._writedirstate(st) | ||
Mateusz Kwapich
|
r29772 | def addparentchangecallback(self, category, callback): | ||
"""add a callback to be called when the wd parents are changed | ||||
Callback will be called with the following arguments: | ||||
dirstate, (oldp1, oldp2), (newp1, newp2) | ||||
Category is a unique identifier to allow overwriting an old callback | ||||
with a newer callback. | ||||
""" | ||||
self._plchangecallbacks[category] = callback | ||||
FUJIWARA Katsunori
|
r26521 | def _writedirstate(self, st): | ||
Mateusz Kwapich
|
r29772 | # notify callbacks about parents change | ||
if self._origpl is not None and self._origpl != self._pl: | ||||
Gregory Szorc
|
r43376 | for c, callback in sorted( | ||
pycompat.iteritems(self._plchangecallbacks) | ||||
): | ||||
Mateusz Kwapich
|
r29772 | callback(self, self._origpl, self._pl) | ||
self._origpl = None | ||||
Adrian Buehlmann
|
r9509 | # use the modification time of the newly created temporary file as the | ||
# filesystem's notion of 'now' | ||||
Augie Fackler
|
r36799 | now = util.fstat(st)[stat.ST_MTIME] & _rangemask | ||
Matt Mackall
|
r27397 | |||
# enough 'delaywrite' prevents 'pack_dirstate' from dropping | ||||
# timestamp of each entries in dirstate, because of 'now > mtime' | ||||
Augie Fackler
|
r43347 | delaywrite = self._ui.configint(b'debug', b'dirstate.delaywrite') | ||
Matt Mackall
|
r27397 | if delaywrite > 0: | ||
Matt Mackall
|
r27398 | # do we have any files to delay for? | ||
Yuya Nishihara
|
r43606 | for f, e in pycompat.iteritems(self._map): | ||
Augie Fackler
|
r43347 | if e[0] == b'n' and e[3] == now: | ||
Augie Fackler
|
r43346 | import time # to avoid useless import | ||
Matt Mackall
|
r27399 | # rather than sleep n seconds, sleep until the next | ||
# multiple of n seconds | ||||
clock = time.time() | ||||
start = int(clock) - (int(clock) % delaywrite) | ||||
end = start + delaywrite | ||||
time.sleep(end - clock) | ||||
Augie Fackler
|
r43346 | now = end # trust our estimate that the end is near now | ||
Matt Mackall
|
r27398 | break | ||
Matt Mackall
|
r27397 | |||
Durham Goode
|
r34674 | self._map.write(st, now) | ||
Mads Kiilerich
|
r21026 | self._lastnormaltime = 0 | ||
Durham Goode
|
r34674 | self._dirty = False | ||
mpm@selenic.com
|
r1089 | |||
Alexis S. L. Carvalho
|
r6032 | def _dirignore(self, f): | ||
if self._ignore(f): | ||||
return True | ||||
Martin von Zweigbergk
|
r44032 | for p in pathutil.finddirs(f): | ||
Matt Mackall
|
r6767 | if self._ignore(p): | ||
Alexis S. L. Carvalho
|
r6032 | return True | ||
return False | ||||
Laurent Charignon
|
r27594 | def _ignorefiles(self): | ||
files = [] | ||||
Augie Fackler
|
r43347 | if os.path.exists(self._join(b'.hgignore')): | ||
files.append(self._join(b'.hgignore')) | ||||
for name, path in self._ui.configitems(b"ui"): | ||||
if name == b'ignore' or name.startswith(b'ignore.'): | ||||
Laurent Charignon
|
r27594 | # we need to use os.path.join here rather than self._join | ||
# because path is arbitrary and user-specified | ||||
files.append(os.path.join(self._rootdir, util.expandpath(path))) | ||||
return files | ||||
Laurent Charignon
|
r27670 | def _ignorefileandline(self, f): | ||
files = collections.deque(self._ignorefiles()) | ||||
visited = set() | ||||
while files: | ||||
i = files.popleft() | ||||
Augie Fackler
|
r43346 | patterns = matchmod.readpatternfile( | ||
i, self._ui.warn, sourceinfo=True | ||||
) | ||||
Laurent Charignon
|
r27670 | for pattern, lineno, line in patterns: | ||
Augie Fackler
|
r43347 | kind, p = matchmod._patsplit(pattern, b'glob') | ||
if kind == b"subinclude": | ||||
Laurent Charignon
|
r27670 | if p not in visited: | ||
files.append(p) | ||||
continue | ||||
Augie Fackler
|
r43346 | m = matchmod.match( | ||
Augie Fackler
|
r43347 | self._root, b'', [], [pattern], warn=self._ui.warn | ||
Augie Fackler
|
r43346 | ) | ||
Laurent Charignon
|
r27670 | if m(f): | ||
return (i, lineno, line) | ||||
visited.add(i) | ||||
Augie Fackler
|
r43347 | return (None, -1, b"") | ||
Laurent Charignon
|
r27670 | |||
Siddharth Agarwal
|
r19173 | def _walkexplicit(self, match, subrepos): | ||
'''Get stat data about the files explicitly specified by match. | ||||
Matt Mackall
|
r3529 | |||
Siddharth Agarwal
|
r19174 | Return a triple (results, dirsfound, dirsnotfound). | ||
Siddharth Agarwal
|
r19173 | - results is a mapping from filename to stat result. It also contains | ||
listings mapping subrepos and .hg to None. | ||||
Siddharth Agarwal
|
r19174 | - dirsfound is a list of files found to be directories. | ||
Siddharth Agarwal
|
r19173 | - dirsnotfound is a list of files that the dirstate thinks are | ||
directories and that were not found.''' | ||||
Matt Mackall
|
r6578 | |||
Matt Mackall
|
r8681 | def badtype(mode): | ||
Augie Fackler
|
r43347 | kind = _(b'unknown') | ||
Matt Mackall
|
r10282 | if stat.S_ISCHR(mode): | ||
Augie Fackler
|
r43347 | kind = _(b'character device') | ||
Matt Mackall
|
r10282 | elif stat.S_ISBLK(mode): | ||
Augie Fackler
|
r43347 | kind = _(b'block device') | ||
Matt Mackall
|
r10282 | elif stat.S_ISFIFO(mode): | ||
Augie Fackler
|
r43347 | kind = _(b'fifo') | ||
Matt Mackall
|
r10282 | elif stat.S_ISSOCK(mode): | ||
Augie Fackler
|
r43347 | kind = _(b'socket') | ||
Matt Mackall
|
r10282 | elif stat.S_ISDIR(mode): | ||
Augie Fackler
|
r43347 | kind = _(b'directory') | ||
return _(b'unsupported file type (type is %s)') % kind | ||||
Matt Mackall
|
r6830 | |||
Matt Mackall
|
r8676 | badfn = match.bad | ||
Matt Mackall
|
r6831 | dmap = self._map | ||
Matt Mackall
|
r5000 | lstat = os.lstat | ||
Matt Mackall
|
r6830 | getkind = stat.S_IFMT | ||
Matt Mackall
|
r6828 | dirkind = stat.S_IFDIR | ||
Matt Mackall
|
r6830 | regkind = stat.S_IFREG | ||
lnkkind = stat.S_IFLNK | ||||
Matt Mackall
|
r6831 | join = self._join | ||
Siddharth Agarwal
|
r19174 | dirsfound = [] | ||
foundadd = dirsfound.append | ||||
Siddharth Agarwal
|
r19173 | dirsnotfound = [] | ||
Siddharth Agarwal
|
r19175 | notfoundadd = dirsnotfound.append | ||
Matt Mackall
|
r6820 | |||
Martin von Zweigbergk
|
r24448 | if not match.isexact() and self._checkcase: | ||
Matt Mackall
|
r12907 | normalize = self._normalize | ||
else: | ||||
Siddharth Agarwal
|
r18032 | normalize = None | ||
Matt Mackall
|
r12907 | |||
Martin Geisler
|
r12211 | files = sorted(match.files()) | ||
subrepos.sort() | ||||
i, j = 0, 0 | ||||
while i < len(files) and j < len(subrepos): | ||||
Augie Fackler
|
r43347 | subpath = subrepos[j] + b"/" | ||
Oleg Stepanov
|
r13233 | if files[i] < subpath: | ||
Martin Geisler
|
r12211 | i += 1 | ||
continue | ||||
trbs
|
r13339 | while i < len(files) and files[i].startswith(subpath): | ||
Martin Geisler
|
r12211 | del files[i] | ||
j += 1 | ||||
Augie Fackler
|
r43347 | if not files or b'' in files: | ||
files = [b''] | ||||
Martin von Zweigbergk
|
r42527 | # constructing the foldmap is expensive, so don't do it for the | ||
Martin von Zweigbergk
|
r42528 | # common case where files is [''] | ||
Martin von Zweigbergk
|
r42527 | normalize = None | ||
Augie Fackler
|
r10176 | results = dict.fromkeys(subrepos) | ||
Augie Fackler
|
r43347 | results[b'.hg'] = None | ||
Matt Mackall
|
r5000 | |||
Martin Geisler
|
r12211 | for ff in files: | ||
Martin von Zweigbergk
|
r42527 | if normalize: | ||
Siddharth Agarwal
|
r24522 | nf = normalize(ff, False, True) | ||
Siddharth Agarwal
|
r18032 | else: | ||
Siddharth Agarwal
|
r24522 | nf = ff | ||
Matt Mackall
|
r6829 | if nf in results: | ||
Matt Mackall
|
r6820 | continue | ||
try: | ||||
Matt Mackall
|
r6831 | st = lstat(join(nf)) | ||
Matt Mackall
|
r6830 | kind = getkind(st.st_mode) | ||
if kind == dirkind: | ||||
Simon Heimberg
|
r8588 | if nf in dmap: | ||
Mads Kiilerich
|
r21115 | # file replaced by dir on disk but still in dirstate | ||
Simon Heimberg
|
r8588 | results[nf] = None | ||
Matt Harbison
|
r24537 | foundadd((nf, ff)) | ||
Matt Mackall
|
r12401 | elif kind == regkind or kind == lnkkind: | ||
Matt Mackall
|
r6830 | results[nf] = st | ||
Matt Mackall
|
r6828 | else: | ||
Matt Mackall
|
r8681 | badfn(ff, badtype(kind)) | ||
Matt Mackall
|
r6830 | if nf in dmap: | ||
Matt Mackall
|
r6829 | results[nf] = None | ||
Augie Fackler
|
r43346 | except OSError as inst: # nf not found on disk - it is dirstate only | ||
if nf in dmap: # does it exactly match a missing file? | ||||
Matt Mackall
|
r8675 | results[nf] = None | ||
Augie Fackler
|
r43346 | else: # does it match a missing directory? | ||
Mark Thomas
|
r35083 | if self._map.hasdir(nf): | ||
Martin von Zweigbergk
|
r23375 | notfoundadd(nf) | ||
Matt Mackall
|
r8677 | else: | ||
Augie Fackler
|
r34024 | badfn(ff, encoding.strtolocal(inst.strerror)) | ||
Matt Mackall
|
r6820 | |||
Yuya Nishihara
|
r36218 | # match.files() may contain explicitly-specified paths that shouldn't | ||
# be taken; drop them from the list of files found. dirsfound/notfound | ||||
# aren't filtered here because they will be tested later. | ||||
if match.anypats(): | ||||
for f in list(results): | ||||
Augie Fackler
|
r43347 | if f == b'.hg' or f in subrepos: | ||
Yuya Nishihara
|
r36218 | # keep sentinel to disable further out-of-repo walks | ||
continue | ||||
if not match(f): | ||||
del results[f] | ||||
Matt Harbison
|
r25877 | # Case insensitive filesystems cannot rely on lstat() failing to detect | ||
# a case-only rename. Prune the stat object for any file that does not | ||||
# match the case in the filesystem, if there are multiple files that | ||||
# normalize to the same path. | ||||
if match.isexact() and self._checkcase: | ||||
normed = {} | ||||
Gregory Szorc
|
r43376 | for f, st in pycompat.iteritems(results): | ||
Matt Harbison
|
r25877 | if st is None: | ||
continue | ||||
nc = util.normcase(f) | ||||
paths = normed.get(nc) | ||||
if paths is None: | ||||
paths = set() | ||||
normed[nc] = paths | ||||
paths.add(f) | ||||
Gregory Szorc
|
r43376 | for norm, paths in pycompat.iteritems(normed): | ||
Matt Harbison
|
r25877 | if len(paths) > 1: | ||
for path in paths: | ||||
Augie Fackler
|
r43346 | folded = self._discoverpath( | ||
path, norm, True, None, self._map.dirfoldmap | ||||
) | ||||
Matt Harbison
|
r25877 | if path != folded: | ||
results[path] = None | ||||
Siddharth Agarwal
|
r19174 | return results, dirsfound, dirsnotfound | ||
Siddharth Agarwal
|
r19173 | |||
Siddharth Agarwal
|
r19190 | def walk(self, match, subrepos, unknown, ignored, full=True): | ||
Siddharth Agarwal
|
r19173 | ''' | ||
Walk recursively through the directory tree, finding all files | ||||
matched by match. | ||||
Siddharth Agarwal
|
r19190 | If full is False, maybe skip some known-clean files. | ||
Siddharth Agarwal
|
r19173 | Return a dict mapping filename to stat-like object (either | ||
mercurial.osutil.stat instance or return value of os.stat()). | ||||
Siddharth Agarwal
|
r19190 | |||
Siddharth Agarwal
|
r19173 | ''' | ||
Siddharth Agarwal
|
r19190 | # full is a flag that extensions that hook into walk can use -- this | ||
# implementation doesn't use it at all. This satisfies the contract | ||||
# because we only guarantee a "maybe". | ||||
Siddharth Agarwal
|
r19173 | |||
if ignored: | ||||
ignore = util.never | ||||
dirignore = util.never | ||||
Mads Kiilerich
|
r21115 | elif unknown: | ||
ignore = self._ignore | ||||
dirignore = self._dirignore | ||||
else: | ||||
# if not unknown and not ignored, drop dir recursion and step 2 | ||||
Siddharth Agarwal
|
r19173 | ignore = util.always | ||
dirignore = util.always | ||||
matchfn = match.matchfn | ||||
matchalways = match.always() | ||||
matchtdir = match.traversedir | ||||
dmap = self._map | ||||
Yuya Nishihara
|
r32203 | listdir = util.listdir | ||
Siddharth Agarwal
|
r19173 | lstat = os.lstat | ||
dirkind = stat.S_IFDIR | ||||
regkind = stat.S_IFREG | ||||
lnkkind = stat.S_IFLNK | ||||
join = self._join | ||||
exact = skipstep3 = False | ||||
Augie Fackler
|
r43346 | if match.isexact(): # match.exact | ||
Siddharth Agarwal
|
r19173 | exact = True | ||
Augie Fackler
|
r43346 | dirignore = util.always # skip step 2 | ||
elif match.prefix(): # match.match, no patterns | ||||
Siddharth Agarwal
|
r19173 | skipstep3 = True | ||
if not exact and self._checkcase: | ||||
normalize = self._normalize | ||||
Siddharth Agarwal
|
r24541 | normalizefile = self._normalizefile | ||
Siddharth Agarwal
|
r19173 | skipstep3 = False | ||
else: | ||||
Siddharth Agarwal
|
r24560 | normalize = self._normalize | ||
Siddharth Agarwal
|
r24541 | normalizefile = None | ||
Siddharth Agarwal
|
r19173 | |||
# step 1: find all explicit files | ||||
results, work, dirsnotfound = self._walkexplicit(match, subrepos) | ||||
Martin von Zweigbergk
|
r44112 | if matchtdir: | ||
for d in work: | ||||
matchtdir(d[0]) | ||||
for d in dirsnotfound: | ||||
matchtdir(d) | ||||
Siddharth Agarwal
|
r19173 | |||
Siddharth Agarwal
|
r19172 | skipstep3 = skipstep3 and not (work or dirsnotfound) | ||
Matt Harbison
|
r24537 | work = [d for d in work if not dirignore(d[0])] | ||
Siddharth Agarwal
|
r19171 | |||
Matt Mackall
|
r6826 | # step 2: visit subdirectories | ||
Siddharth Agarwal
|
r24560 | def traverse(work, alreadynormed): | ||
Siddharth Agarwal
|
r24559 | wadd = work.append | ||
while work: | ||||
Augie Fackler
|
r43533 | tracing.counter('dirstate.walk work', len(work)) | ||
Siddharth Agarwal
|
r24560 | nd = work.pop() | ||
Kyle Lippincott
|
r38991 | visitentries = match.visitchildrenset(nd) | ||
if not visitentries: | ||||
Martin von Zweigbergk
|
r32177 | continue | ||
Augie Fackler
|
r43347 | if visitentries == b'this' or visitentries == b'all': | ||
Kyle Lippincott
|
r38991 | visitentries = None | ||
Siddharth Agarwal
|
r24559 | skip = None | ||
Augie Fackler
|
r43347 | if nd != b'': | ||
skip = b'.hg' | ||||
Siddharth Agarwal
|
r24559 | try: | ||
Augie Fackler
|
r43533 | with tracing.log('dirstate.walk.traverse listdir %s', nd): | ||
entries = listdir(join(nd), stat=True, skip=skip) | ||||
Gregory Szorc
|
r25660 | except OSError as inst: | ||
Siddharth Agarwal
|
r24559 | if inst.errno in (errno.EACCES, errno.ENOENT): | ||
Augie Fackler
|
r43346 | match.bad( | ||
self.pathto(nd), encoding.strtolocal(inst.strerror) | ||||
) | ||||
Siddharth Agarwal
|
r24559 | continue | ||
raise | ||||
for f, kind, st in entries: | ||||
Kyle Lippincott
|
r39296 | # Some matchers may return files in the visitentries set, | ||
# instead of 'this', if the matcher explicitly mentions them | ||||
# and is not an exactmatcher. This is acceptable; we do not | ||||
# make any hard assumptions about file-or-directory below | ||||
# based on the presence of `f` in visitentries. If | ||||
# visitchildrenset returned a set, we can always skip the | ||||
# entries *not* in the set it provided regardless of whether | ||||
# they're actually a file or a directory. | ||||
Kyle Lippincott
|
r38991 | if visitentries and f not in visitentries: | ||
continue | ||||
Siddharth Agarwal
|
r24559 | if normalizefile: | ||
# even though f might be a directory, we're only | ||||
# interested in comparing it to files currently in the | ||||
# dmap -- therefore normalizefile is enough | ||||
Augie Fackler
|
r43346 | nf = normalizefile( | ||
Augie Fackler
|
r43347 | nd and (nd + b"/" + f) or f, True, True | ||
Augie Fackler
|
r43346 | ) | ||
Siddharth Agarwal
|
r24559 | else: | ||
Augie Fackler
|
r43347 | nf = nd and (nd + b"/" + f) or f | ||
Siddharth Agarwal
|
r24559 | if nf not in results: | ||
if kind == dirkind: | ||||
if not ignore(nf): | ||||
if matchtdir: | ||||
matchtdir(nf) | ||||
Siddharth Agarwal
|
r24560 | wadd(nf) | ||
Siddharth Agarwal
|
r24559 | if nf in dmap and (matchalways or matchfn(nf)): | ||
results[nf] = None | ||||
elif kind == regkind or kind == lnkkind: | ||||
if nf in dmap: | ||||
if matchalways or matchfn(nf): | ||||
results[nf] = st | ||||
Augie Fackler
|
r43346 | elif (matchalways or matchfn(nf)) and not ignore( | ||
nf | ||||
): | ||||
Siddharth Agarwal
|
r24560 | # unknown file -- normalize if necessary | ||
if not alreadynormed: | ||||
nf = normalize(nf, False, True) | ||||
Siddharth Agarwal
|
r24559 | results[nf] = st | ||
elif nf in dmap and (matchalways or matchfn(nf)): | ||||
Matt Mackall
|
r6829 | results[nf] = None | ||
Siddharth Agarwal
|
r24559 | |||
Siddharth Agarwal
|
r24560 | for nd, d in work: | ||
# alreadynormed means that processwork doesn't have to do any | ||||
# expensive directory normalization | ||||
alreadynormed = not normalize or nd == d | ||||
traverse([d], alreadynormed) | ||||
mpm@selenic.com
|
r1089 | |||
Siddharth Agarwal
|
r18812 | for s in subrepos: | ||
del results[s] | ||||
Augie Fackler
|
r43347 | del results[b'.hg'] | ||
Siddharth Agarwal
|
r18812 | |||
Mads Kiilerich
|
r21115 | # step 3: visit remaining files from dmap | ||
Matt Mackall
|
r8684 | if not skipstep3 and not exact: | ||
Mads Kiilerich
|
r21115 | # If a dmap file is not in results yet, it was either | ||
# a) not matching matchfn b) ignored, c) missing, or d) under a | ||||
# symlink directory. | ||||
Siddharth Agarwal
|
r18815 | if not results and matchalways: | ||
Pulkit Goyal
|
r31422 | visit = [f for f in dmap] | ||
Siddharth Agarwal
|
r18815 | else: | ||
visit = [f for f in dmap if f not in results and matchfn(f)] | ||||
visit.sort() | ||||
Durham Goode
|
r18625 | if unknown: | ||
Mads Kiilerich
|
r21115 | # unknown == True means we walked all dirs under the roots | ||
# that wasn't ignored, and everything that matched was stat'ed | ||||
# and is already in results. | ||||
# The rest must thus be ignored or under a symlink. | ||||
Yuya Nishihara
|
r33722 | audit_path = pathutil.pathauditor(self._root, cached=True) | ||
Durham Goode
|
r18625 | |||
for nf in iter(visit): | ||||
Martin von Zweigbergk
|
r24621 | # If a stat for the same file was already added with a | ||
# different case, don't add one for this, since that would | ||||
# make it appear as if the file exists under both names | ||||
# on disk. | ||||
Augie Fackler
|
r43346 | if ( | ||
normalizefile | ||||
and normalizefile(nf, True, True) in results | ||||
): | ||||
Martin von Zweigbergk
|
r24621 | results[nf] = None | ||
Durham Goode
|
r18625 | # Report ignored items in the dmap as long as they are not | ||
# under a symlink directory. | ||||
Martin von Zweigbergk
|
r24621 | elif audit_path.check(nf): | ||
Durham Goode
|
r18663 | try: | ||
results[nf] = lstat(join(nf)) | ||||
Mads Kiilerich
|
r21115 | # file was just ignored, no links, and exists | ||
Durham Goode
|
r18663 | except OSError: | ||
# file doesn't exist | ||||
results[nf] = None | ||||
Durham Goode
|
r18625 | else: | ||
# It's either missing or under a symlink directory | ||||
Mads Kiilerich
|
r21115 | # which we in this case report as missing | ||
Durham Goode
|
r18625 | results[nf] = None | ||
else: | ||||
# We may not have walked the full directory tree above, | ||||
Mads Kiilerich
|
r21115 | # so stat and check everything we missed. | ||
Augie Fackler
|
r31507 | iv = iter(visit) | ||
Bryan O'Sullivan
|
r26984 | for st in util.statfiles([join(i) for i in visit]): | ||
Augie Fackler
|
r31507 | results[next(iv)] = st | ||
Matt Mackall
|
r6829 | return results | ||
mpm@selenic.com
|
r1089 | |||
Raphaël Gomès
|
r44537 | def _rust_status(self, matcher, list_clean): | ||
# Force Rayon (Rust parallelism library) to respect the number of | ||||
# workers. This is a temporary workaround until Rust code knows | ||||
# how to read the config file. | ||||
numcpus = self._ui.configint(b"worker", b"numcpus") | ||||
if numcpus is not None: | ||||
encoding.environ.setdefault(b'RAYON_NUM_THREADS', b'%d' % numcpus) | ||||
workers_enabled = self._ui.configbool(b"worker", b"enabled", True) | ||||
if not workers_enabled: | ||||
encoding.environ[b"RAYON_NUM_THREADS"] = b"1" | ||||
( | ||||
lookup, | ||||
modified, | ||||
added, | ||||
removed, | ||||
deleted, | ||||
unknown, | ||||
clean, | ||||
) = rustmod.status( | ||||
self._map._rustmap, | ||||
matcher, | ||||
self._rootdir, | ||||
bool(list_clean), | ||||
self._lastnormaltime, | ||||
self._checkexec, | ||||
) | ||||
status = scmutil.status( | ||||
modified=modified, | ||||
added=added, | ||||
removed=removed, | ||||
deleted=deleted, | ||||
unknown=unknown, | ||||
ignored=[], | ||||
clean=clean, | ||||
) | ||||
return (lookup, status) | ||||
Augie Fackler
|
r10176 | def status(self, match, subrepos, ignored, clean, unknown): | ||
Greg Ward
|
r9518 | '''Determine the status of the working copy relative to the | ||
Martin von Zweigbergk
|
r22915 | dirstate and return a pair of (unsure, status), where status is of type | ||
scmutil.status and: | ||||
Greg Ward
|
r9518 | |||
unsure: | ||||
files that might have been modified since the dirstate was | ||||
written, but need to be read to be sure (size is the same | ||||
but mtime differs) | ||||
Martin von Zweigbergk
|
r22915 | status.modified: | ||
Greg Ward
|
r9518 | files that have definitely been modified since the dirstate | ||
was written (different size or mode) | ||||
Martin von Zweigbergk
|
r22915 | status.clean: | ||
Greg Ward
|
r9518 | files that have definitely not been modified since the | ||
dirstate was written | ||||
''' | ||||
Matt Mackall
|
r6753 | listignored, listclean, listunknown = ignored, clean, unknown | ||
Thomas Arendsen Hein
|
r2022 | lookup, modified, added, unknown, ignored = [], [], [], [], [] | ||
Vadim Gelfer
|
r2661 | removed, deleted, clean = [], [], [] | ||
mpm@selenic.com
|
r1089 | |||
Matt Mackall
|
r5003 | dmap = self._map | ||
Durham Goode
|
r34936 | dmap.preload() | ||
Raphaël Gomès
|
r43568 | |||
use_rust = True | ||||
Raphaël Gomès
|
r44369 | |||
allowed_matchers = (matchmod.alwaysmatcher, matchmod.exactmatcher) | ||||
Raphaël Gomès
|
r43568 | if rustmod is None: | ||
use_rust = False | ||||
elif subrepos: | ||||
use_rust = False | ||||
Raphaël Gomès
|
r44369 | elif bool(listunknown): | ||
Raphaël Gomès
|
r43568 | # Pathauditor does not exist yet in Rust, unknown files | ||
# can't be trusted. | ||||
use_rust = False | ||||
elif self._ignorefiles() and listignored: | ||||
# Rust has no ignore mechanism yet, so don't use Rust for | ||||
# commands that need ignore. | ||||
use_rust = False | ||||
Raphaël Gomès
|
r44369 | elif not isinstance(match, allowed_matchers): | ||
Raphaël Gomès
|
r43568 | # Matchers have yet to be implemented | ||
use_rust = False | ||||
if use_rust: | ||||
Raphaël Gomès
|
r44537 | return self._rust_status(match, listclean) | ||
Raphaël Gomès
|
r43568 | |||
Martin von Zweigbergk
|
r44019 | def noop(f): | ||
pass | ||||
Durham Goode
|
r34936 | dcontains = dmap.__contains__ | ||
dget = dmap.__getitem__ | ||||
Augie Fackler
|
r43346 | ladd = lookup.append # aka "unsure" | ||
Matt Mackall
|
r5003 | madd = modified.append | ||
aadd = added.append | ||||
Martin von Zweigbergk
|
r44019 | uadd = unknown.append if listunknown else noop | ||
iadd = ignored.append if listignored else noop | ||||
Matt Mackall
|
r5003 | radd = removed.append | ||
dadd = deleted.append | ||||
Martin von Zweigbergk
|
r44019 | cadd = clean.append if listclean else noop | ||
Siddharth Agarwal
|
r18034 | mexact = match.exact | ||
dirignore = self._dirignore | ||||
checkexec = self._checkexec | ||||
Durham Goode
|
r34337 | copymap = self._map.copymap | ||
Siddharth Agarwal
|
r18034 | lastnormaltime = self._lastnormaltime | ||
Matt Mackall
|
r5003 | |||
Siddharth Agarwal
|
r19191 | # We need to do full walks when either | ||
# - we're listing all clean files, or | ||||
# - match.traversedir does something, because match.traversedir should | ||||
# be called for every dir in the working dir | ||||
full = listclean or match.traversedir is not None | ||||
Gregory Szorc
|
r43376 | for fn, st in pycompat.iteritems( | ||
self.walk(match, subrepos, listunknown, listignored, full=full) | ||||
): | ||||
Durham Goode
|
r34936 | if not dcontains(fn): | ||
Siddharth Agarwal
|
r18034 | if (listignored or mexact(fn)) and dirignore(fn): | ||
Matt Mackall
|
r6753 | if listignored: | ||
Alexis S. L. Carvalho
|
r6033 | iadd(fn) | ||
Siddharth Agarwal
|
r19910 | else: | ||
Matt Mackall
|
r5003 | uadd(fn) | ||
Benoit Boissinot
|
r1471 | continue | ||
Matt Mackall
|
r6591 | |||
Siddharth Agarwal
|
r21810 | # This is equivalent to 'state, mode, size, time = dmap[fn]' but not | ||
# written like that for performance reasons. dmap[fn] is not a | ||||
# Python tuple in compiled builds. The CPython UNPACK_SEQUENCE | ||||
# opcode has fast paths when the value to be unpacked is a tuple or | ||||
# a list, but falls back to creating a full-fledged iterator in | ||||
# general. That is much slower than simply accessing and storing the | ||||
# tuple members one by one. | ||||
Durham Goode
|
r34936 | t = dget(fn) | ||
Siddharth Agarwal
|
r21810 | state = t[0] | ||
mode = t[1] | ||||
size = t[2] | ||||
time = t[3] | ||||
Matt Mackall
|
r6591 | |||
Augie Fackler
|
r43347 | if not st and state in b"nma": | ||
Matt Mackall
|
r6818 | dadd(fn) | ||
Augie Fackler
|
r43347 | elif state == b'n': | ||
Augie Fackler
|
r43346 | if ( | ||
size >= 0 | ||||
and ( | ||||
(size != st.st_size and size != st.st_size & _rangemask) | ||||
or ((mode ^ st.st_mode) & 0o100 and checkexec) | ||||
) | ||||
or size == -2 # other parent | ||||
or fn in copymap | ||||
): | ||||
Matt Mackall
|
r5003 | madd(fn) | ||
Augie Fackler
|
r43346 | elif ( | ||
time != st[stat.ST_MTIME] | ||||
and time != st[stat.ST_MTIME] & _rangemask | ||||
): | ||||
Matt Mackall
|
r5003 | ladd(fn) | ||
Augie Fackler
|
r36799 | elif st[stat.ST_MTIME] == lastnormaltime: | ||
Mads Kiilerich
|
r24181 | # fn may have just been marked as normal and it may have | ||
# changed in the same second without changing its size. | ||||
# This can happen if we quickly do multiple commits. | ||||
Adrian Buehlmann
|
r13763 | # Force lookup, so we don't miss such a racy file change. | ||
Greg Ward
|
r13704 | ladd(fn) | ||
Matt Mackall
|
r6753 | elif listclean: | ||
Matt Mackall
|
r5003 | cadd(fn) | ||
Augie Fackler
|
r43347 | elif state == b'm': | ||
Matt Mackall
|
r5003 | madd(fn) | ||
Augie Fackler
|
r43347 | elif state == b'a': | ||
Matt Mackall
|
r5003 | aadd(fn) | ||
Augie Fackler
|
r43347 | elif state == b'r': | ||
Matt Mackall
|
r5003 | radd(fn) | ||
mason@suse.com
|
r1183 | |||
Augie Fackler
|
r43346 | return ( | ||
lookup, | ||||
scmutil.status( | ||||
modified, added, removed, deleted, unknown, ignored, clean | ||||
), | ||||
) | ||||
Siddharth Agarwal
|
r21984 | |||
def matches(self, match): | ||||
''' | ||||
return files in the dirstate (in whatever state) filtered by match | ||||
''' | ||||
dmap = self._map | ||||
if match.always(): | ||||
return dmap.keys() | ||||
files = match.files() | ||||
Martin von Zweigbergk
|
r24448 | if match.isexact(): | ||
Siddharth Agarwal
|
r21984 | # fast path -- filter the other way around, since typically files is | ||
# much smaller than dmap | ||||
return [f for f in files if f in dmap] | ||||
Martin von Zweigbergk
|
r25275 | if match.prefix() and all(fn in dmap for fn in files): | ||
Siddharth Agarwal
|
r21984 | # fast path -- all the values are known to be files, so just return | ||
# that | ||||
return list(files) | ||||
return [f for f in dmap if match(f)] | ||||
FUJIWARA Katsunori
|
r26632 | |||
FUJIWARA Katsunori
|
r26746 | def _actualfilename(self, tr): | ||
if tr: | ||||
FUJIWARA Katsunori
|
r26633 | return self._pendingfilename | ||
else: | ||||
return self._filename | ||||
Adam Simpkins
|
r33440 | def savebackup(self, tr, backupname): | ||
'''Save current dirstate into backup file''' | ||||
FUJIWARA Katsunori
|
r26746 | filename = self._actualfilename(tr) | ||
Adam Simpkins
|
r33440 | assert backupname != filename | ||
FUJIWARA Katsunori
|
r26633 | |||
# use '_writedirstate' instead of 'write' to write changes certainly, | ||||
# because the latter omits writing out if transaction is running. | ||||
# output file will be used to create backup of dirstate at this point. | ||||
Jun Wu
|
r31208 | if self._dirty or not self._opener.exists(filename): | ||
Augie Fackler
|
r43346 | self._writedirstate( | ||
Augie Fackler
|
r43347 | self._opener(filename, b"w", atomictemp=True, checkambig=True) | ||
Augie Fackler
|
r43346 | ) | ||
FUJIWARA Katsunori
|
r26633 | |||
if tr: | ||||
# ensure that subsequent tr.writepending returns True for | ||||
# changes written out above, even if dirstate is never | ||||
# changed after this | ||||
Augie Fackler
|
r43346 | tr.addfilegenerator( | ||
Augie Fackler
|
r43347 | b'dirstate', | ||
Augie Fackler
|
r43346 | (self._filename,), | ||
self._writedirstate, | ||||
Augie Fackler
|
r43347 | location=b'plain', | ||
Augie Fackler
|
r43346 | ) | ||
FUJIWARA Katsunori
|
r26633 | |||
# ensure that pending file written above is unlinked at | ||||
# failure, even if tr.writepending isn't invoked until the | ||||
# end of this transaction | ||||
Augie Fackler
|
r43347 | tr.registertmp(filename, location=b'plain') | ||
FUJIWARA Katsunori
|
r26633 | |||
Ryan McElroy
|
r31547 | self._opener.tryunlink(backupname) | ||
Jun Wu
|
r31207 | # hardlink backup is okay because _writedirstate is always called | ||
# with an "atomictemp=True" file. | ||||
Augie Fackler
|
r43346 | util.copyfile( | ||
self._opener.join(filename), | ||||
self._opener.join(backupname), | ||||
hardlink=True, | ||||
) | ||||
FUJIWARA Katsunori
|
r26632 | |||
Adam Simpkins
|
r33440 | def restorebackup(self, tr, backupname): | ||
'''Restore dirstate by backup file''' | ||||
FUJIWARA Katsunori
|
r26632 | # this "invalidate()" prevents "wlock.release()" from writing | ||
# changes of dirstate out after restoring from backup file | ||||
self.invalidate() | ||||
FUJIWARA Katsunori
|
r26746 | filename = self._actualfilename(tr) | ||
Mark Thomas
|
r34941 | o = self._opener | ||
if util.samefile(o.join(backupname), o.join(filename)): | ||||
o.unlink(backupname) | ||||
else: | ||||
o.rename(backupname, filename, checkambig=True) | ||||
FUJIWARA Katsunori
|
r26632 | |||
Adam Simpkins
|
r33440 | def clearbackup(self, tr, backupname): | ||
'''Clear backup file''' | ||||
self._opener.unlink(backupname) | ||||
Durham Goode
|
r34333 | |||
Augie Fackler
|
r43346 | |||
Durham Goode
|
r34333 | class dirstatemap(object): | ||
Mark Thomas
|
r35077 | """Map encapsulating the dirstate's contents. | ||
The dirstate contains the following state: | ||||
- `identity` is the identity of the dirstate file, which can be used to | ||||
detect when changes have occurred to the dirstate file. | ||||
- `parents` is a pair containing the parents of the working copy. The | ||||
parents are updated by calling `setparents`. | ||||
- the state map maps filenames to tuples of (state, mode, size, mtime), | ||||
where state is a single character representing 'normal', 'added', | ||||
Mark Thomas
|
r35078 | 'removed', or 'merged'. It is read by treating the dirstate as a | ||
dict. File state is updated by calling the `addfile`, `removefile` and | ||||
`dropfile` methods. | ||||
Mark Thomas
|
r35077 | |||
- `copymap` maps destination filenames to their source filename. | ||||
The dirstate also provides the following views onto the state: | ||||
- `nonnormalset` is a set of the filenames that have state other | ||||
than 'normal', or are normal but have an mtime of -1 ('normallookup'). | ||||
- `otherparentset` is a set of the filenames that are marked as coming | ||||
from the second parent when the dirstate is currently being merged. | ||||
- `filefoldmap` is a dict mapping normalized filenames to the denormalized | ||||
form that they appear as in the dirstate. | ||||
- `dirfoldmap` is a dict mapping normalized directory names to the | ||||
denormalized form that they appear as in the dirstate. | ||||
""" | ||||
Durham Goode
|
r34338 | def __init__(self, ui, opener, root): | ||
self._ui = ui | ||||
self._opener = opener | ||||
self._root = root | ||||
Augie Fackler
|
r43347 | self._filename = b'dirstate' | ||
Durham Goode
|
r34338 | |||
Durham Goode
|
r34340 | self._parents = None | ||
self._dirtyparents = False | ||||
Durham Goode
|
r34333 | |||
Durham Goode
|
r34338 | # for consistent view between _pl() and _read() invocations | ||
self._pendingmode = None | ||||
Durham Goode
|
r34935 | @propertycache | ||
def _map(self): | ||||
self._map = {} | ||||
self.read() | ||||
return self._map | ||||
@propertycache | ||||
def copymap(self): | ||||
self.copymap = {} | ||||
self._map | ||||
return self.copymap | ||||
Durham Goode
|
r34934 | def clear(self): | ||
Durham Goode
|
r34936 | self._map.clear() | ||
self.copymap.clear() | ||||
Durham Goode
|
r34934 | self.setparents(nullid, nullid) | ||
Augie Fackler
|
r43347 | util.clearcachedproperty(self, b"_dirs") | ||
util.clearcachedproperty(self, b"_alldirs") | ||||
util.clearcachedproperty(self, b"filefoldmap") | ||||
util.clearcachedproperty(self, b"dirfoldmap") | ||||
util.clearcachedproperty(self, b"nonnormalset") | ||||
util.clearcachedproperty(self, b"otherparentset") | ||||
Durham Goode
|
r34934 | |||
Augie Fackler
|
r35896 | def items(self): | ||
Gregory Szorc
|
r43376 | return pycompat.iteritems(self._map) | ||
Durham Goode
|
r34333 | |||
Augie Fackler
|
r35896 | # forward for python2,3 compat | ||
iteritems = items | ||||
Simon Whitaker
|
r34409 | def __len__(self): | ||
return len(self._map) | ||||
Durham Goode
|
r34333 | def __iter__(self): | ||
return iter(self._map) | ||||
def get(self, key, default=None): | ||||
return self._map.get(key, default) | ||||
def __contains__(self, key): | ||||
return key in self._map | ||||
def __getitem__(self, key): | ||||
return self._map[key] | ||||
def keys(self): | ||||
return self._map.keys() | ||||
Durham Goode
|
r34334 | |||
Durham Goode
|
r34936 | def preload(self): | ||
"""Loads the underlying data, if it's not already loaded""" | ||||
self._map | ||||
Mark Thomas
|
r35080 | def addfile(self, f, oldstate, state, mode, size, mtime): | ||
Mark Thomas
|
r35078 | """Add a tracked file to the dirstate.""" | ||
Augie Fackler
|
r43809 | if oldstate in b"?r" and "_dirs" in self.__dict__: | ||
Mark Thomas
|
r35083 | self._dirs.addpath(f) | ||
Augie Fackler
|
r43809 | if oldstate == b"?" and "_alldirs" in self.__dict__: | ||
Mark Thomas
|
r35083 | self._alldirs.addpath(f) | ||
Mark Thomas
|
r35078 | self._map[f] = dirstatetuple(state, mode, size, mtime) | ||
Augie Fackler
|
r43347 | if state != b'n' or mtime == -1: | ||
Mark Thomas
|
r35079 | self.nonnormalset.add(f) | ||
if size == -2: | ||||
self.otherparentset.add(f) | ||||
Mark Thomas
|
r35078 | |||
Mark Thomas
|
r35080 | def removefile(self, f, oldstate, size): | ||
Mark Thomas
|
r35078 | """ | ||
Mark a file as removed in the dirstate. | ||||
The `size` parameter is used to store sentinel values that indicate | ||||
the file's previous state. In the future, we should refactor this | ||||
to be more explicit about what that state is. | ||||
""" | ||||
Augie Fackler
|
r43809 | if oldstate not in b"?r" and "_dirs" in self.__dict__: | ||
Mark Thomas
|
r35083 | self._dirs.delpath(f) | ||
Augie Fackler
|
r43809 | if oldstate == b"?" and "_alldirs" in self.__dict__: | ||
Mark Thomas
|
r35083 | self._alldirs.addpath(f) | ||
Augie Fackler
|
r43809 | if "filefoldmap" in self.__dict__: | ||
Mark Thomas
|
r35081 | normed = util.normcase(f) | ||
self.filefoldmap.pop(normed, None) | ||||
Augie Fackler
|
r43347 | self._map[f] = dirstatetuple(b'r', 0, size, 0) | ||
Mark Thomas
|
r35079 | self.nonnormalset.add(f) | ||
Mark Thomas
|
r35078 | |||
Mark Thomas
|
r35080 | def dropfile(self, f, oldstate): | ||
Mark Thomas
|
r35078 | """ | ||
Remove a file from the dirstate. Returns True if the file was | ||||
previously recorded. | ||||
""" | ||||
Mark Thomas
|
r35079 | exists = self._map.pop(f, None) is not None | ||
Mark Thomas
|
r35080 | if exists: | ||
Augie Fackler
|
r43809 | if oldstate != b"r" and "_dirs" in self.__dict__: | ||
Mark Thomas
|
r35083 | self._dirs.delpath(f) | ||
Augie Fackler
|
r43809 | if "_alldirs" in self.__dict__: | ||
Mark Thomas
|
r35083 | self._alldirs.delpath(f) | ||
Augie Fackler
|
r43809 | if "filefoldmap" in self.__dict__: | ||
Mark Thomas
|
r35081 | normed = util.normcase(f) | ||
self.filefoldmap.pop(normed, None) | ||||
Mark Thomas
|
r35079 | self.nonnormalset.discard(f) | ||
return exists | ||||
def clearambiguoustimes(self, files, now): | ||||
for f in files: | ||||
e = self.get(f) | ||||
Augie Fackler
|
r43347 | if e is not None and e[0] == b'n' and e[3] == now: | ||
Mark Thomas
|
r35079 | self._map[f] = dirstatetuple(e[0], e[1], e[2], -1) | ||
self.nonnormalset.add(f) | ||||
Mark Thomas
|
r35078 | |||
Durham Goode
|
r34334 | def nonnormalentries(self): | ||
'''Compute the nonnormal dirstate entries from the dmap''' | ||||
try: | ||||
return parsers.nonnormalotherparententries(self._map) | ||||
except AttributeError: | ||||
nonnorm = set() | ||||
otherparent = set() | ||||
Gregory Szorc
|
r43376 | for fname, e in pycompat.iteritems(self._map): | ||
Augie Fackler
|
r43347 | if e[0] != b'n' or e[3] == -1: | ||
Durham Goode
|
r34334 | nonnorm.add(fname) | ||
Augie Fackler
|
r43347 | if e[0] == b'n' and e[2] == -2: | ||
Durham Goode
|
r34334 | otherparent.add(fname) | ||
return nonnorm, otherparent | ||||
Durham Goode
|
r34677 | @propertycache | ||
Durham Goode
|
r34335 | def filefoldmap(self): | ||
"""Returns a dictionary mapping normalized case paths to their | ||||
non-normalized versions. | ||||
""" | ||||
try: | ||||
makefilefoldmap = parsers.make_file_foldmap | ||||
except AttributeError: | ||||
pass | ||||
else: | ||||
Augie Fackler
|
r43346 | return makefilefoldmap( | ||
self._map, util.normcasespec, util.normcasefallback | ||||
) | ||||
Durham Goode
|
r34335 | |||
f = {} | ||||
normcase = util.normcase | ||||
Gregory Szorc
|
r43376 | for name, s in pycompat.iteritems(self._map): | ||
Augie Fackler
|
r43347 | if s[0] != b'r': | ||
Durham Goode
|
r34335 | f[normcase(name)] = name | ||
Augie Fackler
|
r43347 | f[b'.'] = b'.' # prevents useless util.fspath() invocation | ||
Durham Goode
|
r34335 | return f | ||
Durham Goode
|
r34336 | |||
Mark Thomas
|
r35083 | def hastrackeddir(self, d): | ||
""" | ||||
Returns True if the dirstate contains a tracked (not removed) file | ||||
in this directory. | ||||
""" | ||||
return d in self._dirs | ||||
def hasdir(self, d): | ||||
""" | ||||
Returns True if the dirstate contains a file (tracked or removed) | ||||
in this directory. | ||||
""" | ||||
return d in self._alldirs | ||||
Durham Goode
|
r34678 | @propertycache | ||
Mark Thomas
|
r35083 | def _dirs(self): | ||
r43923 | return pathutil.dirs(self._map, b'r') | |||
Durham Goode
|
r34338 | |||
Mark Thomas
|
r35083 | @propertycache | ||
def _alldirs(self): | ||||
r43923 | return pathutil.dirs(self._map) | |||
Mark Thomas
|
r35083 | |||
Durham Goode
|
r34338 | def _opendirstatefile(self): | ||
fp, mode = txnutil.trypending(self._root, self._opener, self._filename) | ||||
if self._pendingmode is not None and self._pendingmode != mode: | ||||
fp.close() | ||||
Augie Fackler
|
r43346 | raise error.Abort( | ||
Martin von Zweigbergk
|
r43387 | _(b'working directory state may be changed parallelly') | ||
Augie Fackler
|
r43346 | ) | ||
Durham Goode
|
r34338 | self._pendingmode = mode | ||
return fp | ||||
Durham Goode
|
r34339 | def parents(self): | ||
Durham Goode
|
r34340 | if not self._parents: | ||
try: | ||||
fp = self._opendirstatefile() | ||||
st = fp.read(40) | ||||
fp.close() | ||||
except IOError as err: | ||||
if err.errno != errno.ENOENT: | ||||
raise | ||||
# File doesn't exist, so the current state is empty | ||||
Augie Fackler
|
r43347 | st = b'' | ||
Durham Goode
|
r34340 | |||
Durham Goode
|
r34339 | l = len(st) | ||
if l == 40: | ||||
Yuya Nishihara
|
r39485 | self._parents = (st[:20], st[20:40]) | ||
Durham Goode
|
r34340 | elif l == 0: | ||
Yuya Nishihara
|
r39485 | self._parents = (nullid, nullid) | ||
Durham Goode
|
r34340 | else: | ||
Augie Fackler
|
r43346 | raise error.Abort( | ||
Martin von Zweigbergk
|
r43387 | _(b'working directory state appears damaged!') | ||
Augie Fackler
|
r43346 | ) | ||
Durham Goode
|
r34340 | |||
return self._parents | ||||
def setparents(self, p1, p2): | ||||
self._parents = (p1, p2) | ||||
self._dirtyparents = True | ||||
Durham Goode
|
r34673 | |||
def read(self): | ||||
Durham Goode
|
r34676 | # ignore HG_PENDING because identity is used only for writing | ||
self.identity = util.filestat.frompath( | ||||
Augie Fackler
|
r43346 | self._opener.join(self._filename) | ||
) | ||||
Durham Goode
|
r34676 | |||
Durham Goode
|
r34673 | try: | ||
fp = self._opendirstatefile() | ||||
try: | ||||
st = fp.read() | ||||
finally: | ||||
fp.close() | ||||
except IOError as err: | ||||
if err.errno != errno.ENOENT: | ||||
raise | ||||
return | ||||
if not st: | ||||
return | ||||
Augie Fackler
|
r43347 | if util.safehasattr(parsers, b'dict_new_presized'): | ||
Durham Goode
|
r34673 | # Make an estimate of the number of files in the dirstate based on | ||
# its size. From a linear regression on a set of real-world repos, | ||||
# all over 10,000 files, the size of a dirstate entry is 85 | ||||
# bytes. The cost of resizing is significantly higher than the cost | ||||
# of filling in a larger presized dict, so subtract 20% from the | ||||
# size. | ||||
# | ||||
# This heuristic is imperfect in many ways, so in a future dirstate | ||||
# format update it makes sense to just record the number of entries | ||||
# on write. | ||||
Yuya Nishihara
|
r36640 | self._map = parsers.dict_new_presized(len(st) // 71) | ||
Durham Goode
|
r34673 | |||
# Python's garbage collector triggers a GC each time a certain number | ||||
# of container objects (the number being defined by | ||||
# gc.get_threshold()) are allocated. parse_dirstate creates a tuple | ||||
# for each file in the dirstate. The C version then immediately marks | ||||
# them as not to be tracked by the collector. However, this has no | ||||
# effect on when GCs are triggered, only on what objects the GC looks | ||||
# into. This means that O(number of files) GCs are unavoidable. | ||||
# Depending on when in the process's lifetime the dirstate is parsed, | ||||
# this can get very expensive. As a workaround, disable GC while | ||||
# parsing the dirstate. | ||||
# | ||||
# (we cannot decorate the function directly since it is in a C module) | ||||
Raphaël Gomès
|
r42992 | parse_dirstate = util.nogc(parsers.parse_dirstate) | ||
Durham Goode
|
r34673 | p = parse_dirstate(self._map, self.copymap, st) | ||
if not self._dirtyparents: | ||||
self.setparents(*p) | ||||
Durham Goode
|
r34674 | |||
Durham Goode
|
r34936 | # Avoid excess attribute lookups by fast pathing certain checks | ||
self.__contains__ = self._map.__contains__ | ||||
self.__getitem__ = self._map.__getitem__ | ||||
self.get = self._map.get | ||||
Durham Goode
|
r34674 | def write(self, st, now): | ||
Augie Fackler
|
r43346 | st.write( | ||
parsers.pack_dirstate(self._map, self.copymap, self.parents(), now) | ||||
) | ||||
Durham Goode
|
r34674 | st.close() | ||
self._dirtyparents = False | ||||
Durham Goode
|
r34675 | self.nonnormalset, self.otherparentset = self.nonnormalentries() | ||
@propertycache | ||||
def nonnormalset(self): | ||||
nonnorm, otherparents = self.nonnormalentries() | ||||
self.otherparentset = otherparents | ||||
return nonnorm | ||||
@propertycache | ||||
def otherparentset(self): | ||||
nonnorm, otherparents = self.nonnormalentries() | ||||
self.nonnormalset = nonnorm | ||||
return otherparents | ||||
Durham Goode
|
r34676 | @propertycache | ||
def identity(self): | ||||
Durham Goode
|
r34935 | self._map | ||
Durham Goode
|
r34676 | return self.identity | ||
Durham Goode
|
r34679 | @propertycache | ||
def dirfoldmap(self): | ||||
f = {} | ||||
normcase = util.normcase | ||||
Mark Thomas
|
r35083 | for name in self._dirs: | ||
Durham Goode
|
r34679 | f[normcase(name)] = name | ||
return f | ||||
Raphaël Gomès
|
r43000 | |||
if rustmod is not None: | ||||
Augie Fackler
|
r43346 | |||
Raphaël Gomès
|
r43000 | class dirstatemap(object): | ||
def __init__(self, ui, opener, root): | ||||
self._ui = ui | ||||
self._opener = opener | ||||
self._root = root | ||||
Augie Fackler
|
r43347 | self._filename = b'dirstate' | ||
Raphaël Gomès
|
r43000 | self._parents = None | ||
self._dirtyparents = False | ||||
# for consistent view between _pl() and _read() invocations | ||||
self._pendingmode = None | ||||
def addfile(self, *args, **kwargs): | ||||
return self._rustmap.addfile(*args, **kwargs) | ||||
def removefile(self, *args, **kwargs): | ||||
return self._rustmap.removefile(*args, **kwargs) | ||||
def dropfile(self, *args, **kwargs): | ||||
return self._rustmap.dropfile(*args, **kwargs) | ||||
def clearambiguoustimes(self, *args, **kwargs): | ||||
return self._rustmap.clearambiguoustimes(*args, **kwargs) | ||||
def nonnormalentries(self): | ||||
return self._rustmap.nonnormalentries() | ||||
def get(self, *args, **kwargs): | ||||
return self._rustmap.get(*args, **kwargs) | ||||
@propertycache | ||||
def _rustmap(self): | ||||
self._rustmap = rustmod.DirstateMap(self._root) | ||||
self.read() | ||||
return self._rustmap | ||||
@property | ||||
def copymap(self): | ||||
return self._rustmap.copymap() | ||||
def preload(self): | ||||
self._rustmap | ||||
def clear(self): | ||||
self._rustmap.clear() | ||||
self.setparents(nullid, nullid) | ||||
Augie Fackler
|
r43347 | util.clearcachedproperty(self, b"_dirs") | ||
util.clearcachedproperty(self, b"_alldirs") | ||||
util.clearcachedproperty(self, b"dirfoldmap") | ||||
Raphaël Gomès
|
r43000 | |||
def items(self): | ||||
return self._rustmap.items() | ||||
def keys(self): | ||||
return iter(self._rustmap) | ||||
def __contains__(self, key): | ||||
return key in self._rustmap | ||||
def __getitem__(self, item): | ||||
return self._rustmap[item] | ||||
def __len__(self): | ||||
return len(self._rustmap) | ||||
def __iter__(self): | ||||
return iter(self._rustmap) | ||||
# forward for python2,3 compat | ||||
iteritems = items | ||||
def _opendirstatefile(self): | ||||
Augie Fackler
|
r43346 | fp, mode = txnutil.trypending( | ||
self._root, self._opener, self._filename | ||||
) | ||||
Raphaël Gomès
|
r43000 | if self._pendingmode is not None and self._pendingmode != mode: | ||
fp.close() | ||||
Augie Fackler
|
r43346 | raise error.Abort( | ||
Martin von Zweigbergk
|
r43387 | _(b'working directory state may be changed parallelly') | ||
Augie Fackler
|
r43346 | ) | ||
Raphaël Gomès
|
r43000 | self._pendingmode = mode | ||
return fp | ||||
def setparents(self, p1, p2): | ||||
self._rustmap.setparents(p1, p2) | ||||
self._parents = (p1, p2) | ||||
self._dirtyparents = True | ||||
def parents(self): | ||||
if not self._parents: | ||||
try: | ||||
fp = self._opendirstatefile() | ||||
st = fp.read(40) | ||||
fp.close() | ||||
except IOError as err: | ||||
if err.errno != errno.ENOENT: | ||||
raise | ||||
# File doesn't exist, so the current state is empty | ||||
Augie Fackler
|
r43347 | st = b'' | ||
Raphaël Gomès
|
r43000 | |||
try: | ||||
self._parents = self._rustmap.parents(st) | ||||
except ValueError: | ||||
Augie Fackler
|
r43346 | raise error.Abort( | ||
Martin von Zweigbergk
|
r43387 | _(b'working directory state appears damaged!') | ||
Augie Fackler
|
r43346 | ) | ||
Raphaël Gomès
|
r43000 | |||
return self._parents | ||||
def read(self): | ||||
# ignore HG_PENDING because identity is used only for writing | ||||
self.identity = util.filestat.frompath( | ||||
Augie Fackler
|
r43346 | self._opener.join(self._filename) | ||
) | ||||
Raphaël Gomès
|
r43000 | |||
try: | ||||
fp = self._opendirstatefile() | ||||
try: | ||||
st = fp.read() | ||||
finally: | ||||
fp.close() | ||||
except IOError as err: | ||||
if err.errno != errno.ENOENT: | ||||
raise | ||||
return | ||||
if not st: | ||||
return | ||||
parse_dirstate = util.nogc(self._rustmap.read) | ||||
parents = parse_dirstate(st) | ||||
if parents and not self._dirtyparents: | ||||
self.setparents(*parents) | ||||
Raphaël Gomès
|
r43574 | self.__contains__ = self._rustmap.__contains__ | ||
self.__getitem__ = self._rustmap.__getitem__ | ||||
self.get = self._rustmap.get | ||||
Raphaël Gomès
|
r43000 | def write(self, st, now): | ||
parents = self.parents() | ||||
st.write(self._rustmap.write(parents[0], parents[1], now)) | ||||
st.close() | ||||
self._dirtyparents = False | ||||
@propertycache | ||||
def filefoldmap(self): | ||||
"""Returns a dictionary mapping normalized case paths to their | ||||
non-normalized versions. | ||||
""" | ||||
return self._rustmap.filefoldmapasdict() | ||||
def hastrackeddir(self, d): | ||||
Augie Fackler
|
r43346 | self._dirs # Trigger Python's propertycache | ||
Raphaël Gomès
|
r43000 | return self._rustmap.hastrackeddir(d) | ||
def hasdir(self, d): | ||||
Augie Fackler
|
r43346 | self._dirs # Trigger Python's propertycache | ||
Raphaël Gomès
|
r43000 | return self._rustmap.hasdir(d) | ||
@propertycache | ||||
def _dirs(self): | ||||
return self._rustmap.getdirs() | ||||
@propertycache | ||||
def _alldirs(self): | ||||
return self._rustmap.getalldirs() | ||||
@propertycache | ||||
def identity(self): | ||||
self._rustmap | ||||
return self.identity | ||||
@property | ||||
def nonnormalset(self): | ||||
nonnorm, otherparents = self._rustmap.nonnormalentries() | ||||
return nonnorm | ||||
Raphaël Gomès
|
r44719 | @propertycache | ||
Raphaël Gomès
|
r43000 | def otherparentset(self): | ||
nonnorm, otherparents = self._rustmap.nonnormalentries() | ||||
return otherparents | ||||
@propertycache | ||||
def dirfoldmap(self): | ||||
f = {} | ||||
normcase = util.normcase | ||||
for name in self._dirs: | ||||
f[normcase(name)] = name | ||||
return f | ||||