##// END OF EJS Templates
dirstate-v2: Introduce a docket file...
dirstate-v2: Introduce a docket file .hg/dirstate now only contains some metadata to point to a separate data file named .hg/dirstate.{}.d with a random hexadecimal identifier. For now every update creates a new data file and removes the old one, but later we’ll (usually) append to an existing file. Separating into two files allows doing the "write to a temporary file then atomically rename into destination" dance with only a small docket file, without always rewriting a lot of data. Differential Revision: https://phab.mercurial-scm.org/D11088

File last commit:

r48474:ff97e793 default
r48474:ff97e793 default
Show More
dirstatemap.py
717 lines | 22.9 KiB | text/x-python | PythonLexer
dirstate: split dirstatemap in its own file...
r48295 # dirstatemap.py
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
import errno
from .i18n import _
from . import (
error,
pathutil,
policy,
pycompat,
txnutil,
util,
)
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 from .dirstateutils import (
docket as docketmod,
)
dirstate: split dirstatemap in its own file...
r48295 parsers = policy.importmod('parsers')
rustmod = policy.importrust('dirstate')
propertycache = util.propertycache
dirstate-item: rename the class to DirstateItem...
r48328 DirstateItem = parsers.DirstateItem
dirstate: split dirstatemap in its own file...
r48295
# a special value used internally for `size` if the file come from the other parent
FROM_P2 = -2
# a special value used internally for `size` if the file is modified/merged/added
NONNORMAL = -1
# a special value used internally for `time` if the time is ambigeous
AMBIGUOUS_TIME = -1
dirstate: move the handling of special case within the dirstatemap...
r48310 rangemask = 0x7FFFFFFF
dirstate: split dirstatemap in its own file...
r48295
class dirstatemap(object):
"""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',
'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.
- `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.
"""
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
self._ui = ui
self._opener = opener
self._root = root
self._filename = b'dirstate'
self._nodelen = 20
self._nodeconstants = nodeconstants
assert (
not use_dirstate_v2
), "should have detected unsupported requirement"
self._parents = None
self._dirtyparents = False
# for consistent view between _pl() and _read() invocations
self._pendingmode = None
@propertycache
def _map(self):
self._map = {}
self.read()
return self._map
@propertycache
def copymap(self):
self.copymap = {}
self._map
return self.copymap
def directories(self):
# Rust / dirstate-v2 only
return []
def clear(self):
self._map.clear()
self.copymap.clear()
self.setparents(self._nodeconstants.nullid, self._nodeconstants.nullid)
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")
def items(self):
return pycompat.iteritems(self._map)
# forward for python2,3 compat
iteritems = items
def __len__(self):
return len(self._map)
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()
def preload(self):
"""Loads the underlying data, if it's not already loaded"""
self._map
dirstate: move the handling of special case within the dirstatemap...
r48310 def addfile(
self,
f,
dirstate: use a `added` parameter to _addpath...
r48314 mode=0,
dirstate: move the handling of special case within the dirstatemap...
r48310 size=None,
mtime=None,
dirstate: use a `added` parameter to _addpath...
r48314 added=False,
dirstate: use a `merged` parameter to _addpath...
r48316 merged=False,
dirstate: move the handling of special case within the dirstatemap...
r48310 from_p2=False,
possibly_dirty=False,
):
dirstate: split dirstatemap in its own file...
r48295 """Add a tracked file to the dirstate."""
dirstate: use a `added` parameter to _addpath...
r48314 if added:
dirstate: use a `merged` parameter to _addpath...
r48316 assert not merged
dirstate: move the handling of special case within the dirstatemap...
r48310 assert not possibly_dirty
assert not from_p2
dirstate: use a `added` parameter to _addpath...
r48314 state = b'a'
dirstate: move the handling of special case within the dirstatemap...
r48310 size = NONNORMAL
mtime = AMBIGUOUS_TIME
dirstate: use a `merged` parameter to _addpath...
r48316 elif merged:
assert not possibly_dirty
assert not from_p2
state = b'm'
size = FROM_P2
mtime = AMBIGUOUS_TIME
dirstate: move the handling of special case within the dirstatemap...
r48310 elif from_p2:
assert not possibly_dirty
dirstate: infer the 'n' state from `from_p2`...
r48318 state = b'n'
dirstate: move the handling of special case within the dirstatemap...
r48310 size = FROM_P2
mtime = AMBIGUOUS_TIME
elif possibly_dirty:
dirstate: infer the 'n' state from `possibly_dirty`...
r48317 state = b'n'
dirstate: move the handling of special case within the dirstatemap...
r48310 size = NONNORMAL
mtime = AMBIGUOUS_TIME
else:
assert size != FROM_P2
assert size != NONNORMAL
dirstate: drop `state` to `_addpath`...
r48319 state = b'n'
dirstate: move the handling of special case within the dirstatemap...
r48310 size = size & rangemask
mtime = mtime & rangemask
dirstate: use a `added` parameter to _addpath...
r48314 assert state is not None
dirstate: move the handling of special case within the dirstatemap...
r48310 assert size is not None
assert mtime is not None
dirstate: no longer pass the `oldstate` value to the dirstatemap...
r48313 old_entry = self.get(f)
if (
old_entry is None or old_entry.removed
) and "_dirs" in self.__dict__:
dirstate: split dirstatemap in its own file...
r48295 self._dirs.addpath(f)
dirstate: no longer pass the `oldstate` value to the dirstatemap...
r48313 if old_entry is None and "_alldirs" in self.__dict__:
dirstate: split dirstatemap in its own file...
r48295 self._alldirs.addpath(f)
dirstate-item: rename the class to DirstateItem...
r48328 self._map[f] = DirstateItem(state, mode, size, mtime)
dirstate: split dirstatemap in its own file...
r48295 if state != b'n' or mtime == AMBIGUOUS_TIME:
self.nonnormalset.add(f)
if size == FROM_P2:
self.otherparentset.add(f)
dirstate: move most of the `remove` logic with dirstatemap `removefile`...
r48300 def removefile(self, f, in_merge=False):
dirstate: split dirstatemap in its own file...
r48295 """
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.
"""
dirstate: move most of the `remove` logic with dirstatemap `removefile`...
r48300 entry = self.get(f)
size = 0
if in_merge:
# XXX we should not be able to have 'm' state and 'FROM_P2' if not
# during a merge. So I (marmoute) am not sure we need the
# conditionnal at all. Adding double checking this with assert
# would be nice.
if entry is not None:
# backup the previous state
dirstate-entry: add a `merged` property...
r48302 if entry.merged: # merge
dirstate: move most of the `remove` logic with dirstatemap `removefile`...
r48300 size = NONNORMAL
dirstate-item: use the properties in dirstatemap...
r48331 elif entry.from_p2:
dirstate: move most of the `remove` logic with dirstatemap `removefile`...
r48300 size = FROM_P2
self.otherparentset.add(f)
dirstate-map: do not use `size` to gate copy dropping during remove_file...
r48472 if entry is not None and not (entry.merged or entry.from_p2):
dirstate: move most of the `remove` logic with dirstatemap `removefile`...
r48300 self.copymap.pop(f, None)
dirstate-item: use the properties in dirstatemap...
r48331 if entry is not None and not entry.removed and "_dirs" in self.__dict__:
dirstate: split dirstatemap in its own file...
r48295 self._dirs.delpath(f)
dirstate: move most of the `remove` logic with dirstatemap `removefile`...
r48300 if entry is None and "_alldirs" in self.__dict__:
dirstate: split dirstatemap in its own file...
r48295 self._alldirs.addpath(f)
if "filefoldmap" in self.__dict__:
normed = util.normcase(f)
self.filefoldmap.pop(normed, None)
dirstate-item: rename the class to DirstateItem...
r48328 self._map[f] = DirstateItem(b'r', 0, size, 0)
dirstate: split dirstatemap in its own file...
r48295 self.nonnormalset.add(f)
dirstate: no longer pass `oldstate` to the `dropfile`...
r48324 def dropfile(self, f):
dirstate: split dirstatemap in its own file...
r48295 """
Remove a file from the dirstate. Returns True if the file was
previously recorded.
"""
dirstate: no longer pass `oldstate` to the `dropfile`...
r48324 old_entry = self._map.pop(f, None)
exists = False
oldstate = b'?'
if old_entry is not None:
exists = True
oldstate = old_entry.state
dirstate: split dirstatemap in its own file...
r48295 if exists:
if oldstate != b"r" and "_dirs" in self.__dict__:
self._dirs.delpath(f)
if "_alldirs" in self.__dict__:
self._alldirs.delpath(f)
if "filefoldmap" in self.__dict__:
normed = util.normcase(f)
self.filefoldmap.pop(normed, None)
self.nonnormalset.discard(f)
return exists
def clearambiguoustimes(self, files, now):
for f in files:
e = self.get(f)
dirstate-item: use the properties in dirstatemap...
r48331 if e is not None and e.need_delay(now):
dirstatemap: use `set_possibly_dirty` in `clearambiguoustimes`...
r48468 e.set_possibly_dirty()
dirstate: split dirstatemap in its own file...
r48295 self.nonnormalset.add(f)
def nonnormalentries(self):
'''Compute the nonnormal dirstate entries from the dmap'''
try:
return parsers.nonnormalotherparententries(self._map)
except AttributeError:
nonnorm = set()
otherparent = set()
for fname, e in pycompat.iteritems(self._map):
dirstate-item: use the properties in dirstatemap...
r48331 if e.state != b'n' or e.mtime == AMBIGUOUS_TIME:
dirstate: split dirstatemap in its own file...
r48295 nonnorm.add(fname)
dirstate-item: use the properties in dirstatemap...
r48331 if e.from_p2:
dirstate: split dirstatemap in its own file...
r48295 otherparent.add(fname)
return nonnorm, otherparent
@propertycache
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:
return makefilefoldmap(
self._map, util.normcasespec, util.normcasefallback
)
f = {}
normcase = util.normcase
for name, s in pycompat.iteritems(self._map):
dirstate-item: use the properties in dirstatemap...
r48331 if not s.removed:
dirstate: split dirstatemap in its own file...
r48295 f[normcase(name)] = name
f[b'.'] = b'.' # prevents useless util.fspath() invocation
return f
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
@propertycache
def _dirs(self):
return pathutil.dirs(self._map, b'r')
@propertycache
def _alldirs(self):
return pathutil.dirs(self._map)
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()
raise error.Abort(
_(b'working directory state may be changed parallelly')
)
self._pendingmode = mode
return fp
def parents(self):
if not self._parents:
try:
fp = self._opendirstatefile()
st = fp.read(2 * self._nodelen)
fp.close()
except IOError as err:
if err.errno != errno.ENOENT:
raise
# File doesn't exist, so the current state is empty
st = b''
l = len(st)
if l == self._nodelen * 2:
self._parents = (
st[: self._nodelen],
st[self._nodelen : 2 * self._nodelen],
)
elif l == 0:
self._parents = (
self._nodeconstants.nullid,
self._nodeconstants.nullid,
)
else:
raise error.Abort(
_(b'working directory state appears damaged!')
)
return self._parents
def setparents(self, p1, p2):
self._parents = (p1, p2)
self._dirtyparents = True
def read(self):
# ignore HG_PENDING because identity is used only for writing
self.identity = util.filestat.frompath(
self._opener.join(self._filename)
)
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
if util.safehasattr(parsers, b'dict_new_presized'):
# Make an estimate of the number of files in the dirstate based on
# its size. This trades wasting some memory for avoiding costly
# resizes. Each entry have a prefix of 17 bytes followed by one or
# two path names. Studies on various large-scale real-world repositories
# found 54 bytes a reasonable upper limit for the average path names.
# Copy entries are ignored for the sake of this estimate.
self._map = parsers.dict_new_presized(len(st) // 71)
# 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)
parse_dirstate = util.nogc(parsers.parse_dirstate)
p = parse_dirstate(self._map, self.copymap, st)
if not self._dirtyparents:
self.setparents(*p)
# Avoid excess attribute lookups by fast pathing certain checks
self.__contains__ = self._map.__contains__
self.__getitem__ = self._map.__getitem__
self.get = self._map.get
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 def write(self, _tr, st, now):
dirstate: split dirstatemap in its own file...
r48295 st.write(
parsers.pack_dirstate(self._map, self.copymap, self.parents(), now)
)
st.close()
self._dirtyparents = False
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
def non_normal_or_other_parent_paths(self):
return self.nonnormalset.union(self.otherparentset)
@propertycache
def identity(self):
self._map
return self.identity
@propertycache
def dirfoldmap(self):
f = {}
normcase = util.normcase
for name in self._dirs:
f[normcase(name)] = name
return f
if rustmod is not None:
class dirstatemap(object):
def __init__(self, ui, opener, root, nodeconstants, use_dirstate_v2):
self._use_dirstate_v2 = use_dirstate_v2
self._nodeconstants = nodeconstants
self._ui = ui
self._opener = opener
self._root = root
self._filename = b'dirstate'
self._nodelen = 20 # Also update Rust code when changing this!
self._parents = None
self._dirtyparents = False
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 self._docket = None
dirstate: split dirstatemap in its own file...
r48295
# for consistent view between _pl() and _read() invocations
self._pendingmode = None
self._use_dirstate_tree = self._ui.configbool(
b"experimental",
b"dirstate-tree.in-memory",
False,
)
dirstate: move the handling of special case within the dirstatemap...
r48310 def addfile(
self,
f,
dirstate: use a `added` parameter to _addpath...
r48314 mode=0,
dirstate: move the handling of special case within the dirstatemap...
r48310 size=None,
mtime=None,
dirstate: use a `added` parameter to _addpath...
r48314 added=False,
dirstate: use a `merged` parameter to _addpath...
r48316 merged=False,
dirstate: move the handling of special case within the dirstatemap...
r48310 from_p2=False,
possibly_dirty=False,
):
return self._rustmap.addfile(
f,
mode,
size,
mtime,
dirstate: use a `added` parameter to _addpath...
r48314 added,
dirstate: use a `merged` parameter to _addpath...
r48316 merged,
dirstate: move the handling of special case within the dirstatemap...
r48310 from_p2,
possibly_dirty,
)
dirstate: split dirstatemap in its own file...
r48295
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)
@property
def copymap(self):
return self._rustmap.copymap()
def directories(self):
return self._rustmap.directories()
def preload(self):
self._rustmap
def clear(self):
self._rustmap.clear()
self.setparents(
self._nodeconstants.nullid, self._nodeconstants.nullid
)
util.clearcachedproperty(self, b"_dirs")
util.clearcachedproperty(self, b"_alldirs")
util.clearcachedproperty(self, b"dirfoldmap")
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):
fp, mode = txnutil.trypending(
self._root, self._opener, self._filename
)
if self._pendingmode is not None and self._pendingmode != mode:
fp.close()
raise error.Abort(
_(b'working directory state may be changed parallelly')
)
self._pendingmode = mode
return fp
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 def _readdirstatefile(self, size=-1):
try:
with self._opendirstatefile() as fp:
return fp.read(size)
except IOError as err:
if err.errno != errno.ENOENT:
raise
# File doesn't exist, so the current state is empty
return b''
dirstate: split dirstatemap in its own file...
r48295 def setparents(self, p1, p2):
self._parents = (p1, p2)
self._dirtyparents = True
def parents(self):
if not self._parents:
if self._use_dirstate_v2:
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 self._parents = self.docket.parents
dirstate: split dirstatemap in its own file...
r48295 else:
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 read_len = self._nodelen * 2
st = self._readdirstatefile(read_len)
l = len(st)
if l == read_len:
self._parents = (
st[: self._nodelen],
st[self._nodelen : 2 * self._nodelen],
)
elif l == 0:
self._parents = (
self._nodeconstants.nullid,
self._nodeconstants.nullid,
)
else:
raise error.Abort(
_(b'working directory state appears damaged!')
)
dirstate: split dirstatemap in its own file...
r48295
return self._parents
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 @property
def docket(self):
if not self._docket:
if not self._use_dirstate_v2:
raise error.ProgrammingError(
b'dirstate only has a docket in v2 format'
)
self._docket = docketmod.DirstateDocket.parse(
self._readdirstatefile(), self._nodeconstants
)
return self._docket
dirstate: split dirstatemap in its own file...
r48295 @propertycache
def _rustmap(self):
"""
Fills the Dirstatemap when called.
"""
# ignore HG_PENDING because identity is used only for writing
self.identity = util.filestat.frompath(
self._opener.join(self._filename)
)
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 if self._use_dirstate_v2:
if self.docket.uuid:
# TODO: use mmap when possible
data = self._opener.read(self.docket.data_filename())
else:
data = b''
self._rustmap = rustmod.DirstateMap.new_v2(data)
parents = self.docket.parents
else:
self._rustmap, parents = rustmod.DirstateMap.new_v1(
self._use_dirstate_tree, self._readdirstatefile()
)
dirstate: split dirstatemap in its own file...
r48295
if parents and not self._dirtyparents:
self.setparents(*parents)
self.__contains__ = self._rustmap.__contains__
self.__getitem__ = self._rustmap.__getitem__
self.get = self._rustmap.get
return self._rustmap
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 def write(self, tr, st, now):
if self._use_dirstate_v2:
packed = self._rustmap.write_v2(now)
old_docket = self.docket
new_docket = docketmod.DirstateDocket.with_new_uuid(
self.parents(), len(packed)
)
self._opener.write(new_docket.data_filename(), packed)
# Write the new docket after the new data file has been
# written. Because `st` was opened with `atomictemp=True`,
# the actual `.hg/dirstate` file is only affected on close.
st.write(new_docket.serialize())
st.close()
# Remove the old data file after the new docket pointing to
# the new data file was written.
if old_docket.uuid:
self._opener.unlink(old_docket.data_filename())
self._docket = new_docket
else:
p1, p2 = self.parents()
packed = self._rustmap.write_v1(p1, p2, now)
st.write(packed)
st.close()
dirstate: split dirstatemap in its own file...
r48295 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):
return self._rustmap.hastrackeddir(d)
def hasdir(self, d):
return self._rustmap.hasdir(d)
@propertycache
def identity(self):
self._rustmap
return self.identity
@property
def nonnormalset(self):
nonnorm = self._rustmap.non_normal_entries()
return nonnorm
@propertycache
def otherparentset(self):
otherparents = self._rustmap.other_parent_entries()
return otherparents
def non_normal_or_other_parent_paths(self):
return self._rustmap.non_normal_or_other_parent_paths()
@propertycache
def dirfoldmap(self):
f = {}
normcase = util.normcase
for name, _pseudo_entry in self.directories():
f[normcase(name)] = name
return f