##// END OF EJS Templates
dirstate: drop all logic around the "non-normal" sets...
dirstate: drop all logic around the "non-normal" sets The dirstate has a lot of code to compute a set of all "non-normal" and "from_other_parent" entries. This is all used in one, unique, location, when `setparent` is called and moved from a merge to a non merge. At that time, any "merge related" information has to be dropped. This is mostly useful for command like `graft` or `shelve` that move to a single-parent state -before- the commit. Otherwise the commit will already have removed all traces of the merge information in the dirstate (e.g. for a regular merges). The bookkeeping for these sets is quite invasive. And it seems simpler to just drop it and do the full computation in the single location where we actually use it (since we have to do the computation at least once anyway). This simplify the code a lot, and clarify why this kind of computation is needed. The possible drawback compared to the previous code are: - if the operation happens in a loop, we will end up doing it multiple time, - the C code to detect entry of interest have been dropped, for now. It will be re-introduced later, with a processing code directly in C for even faster operation. Differential Revision: https://phab.mercurial-scm.org/D11507

File last commit:

r48875:060cd909 default
r48875:060cd909 default
Show More
dirstatemap.py
932 lines | 33.0 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
Simon Sapin
dirstate: Use the Rust implementation of DirstateItem when Rust is enabled...
r48858 if rustmod is None:
DirstateItem = parsers.DirstateItem
else:
DirstateItem = rustmod.DirstateItem
dirstate: split dirstatemap in its own file...
r48295
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
dirstate: update the documentation of the dirstatemap API...
r48810 dict. File state is updated by calling various methods (see each
documentation for details):
- `reset_state`,
- `set_tracked`
- `set_untracked`
- `set_clean`
- `set_possibly_dirty`
dirstate: split dirstatemap in its own file...
r48295
- `copymap` maps destination filenames to their source filename.
The dirstate also provides the following views onto the state:
- `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 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")
def items(self):
return pycompat.iteritems(self._map)
# forward for python2,3 compat
iteritems = items
Simon Sapin
debugstate: Always call dirstatemap.debug_iter()...
r48835 def debug_iter(self, all):
"""
Simon Sapin
debugsate: Change debug_iter() to yield tuples instead of DirstateItem...
r48836 Return an iterator of (filename, state, mode, size, mtime) tuples
Simon Sapin
debugstate: Always call dirstatemap.debug_iter()...
r48835 `all` is unused when Rust is not enabled
"""
Simon Sapin
debugsate: Change debug_iter() to yield tuples instead of DirstateItem...
r48836 for (filename, item) in self.items():
yield (filename, item.state, item.mode, item.size, item.mtime)
Simon Sapin
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate...
r48483
dirstate: split dirstatemap in its own file...
r48295 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-map: factor out the change to _dirs and _alldirs on adding...
r48487 def _dirs_incr(self, filename, old_entry=None):
"""incremente the dirstate counter if applicable"""
if (
old_entry is None or old_entry.removed
) and "_dirs" in self.__dict__:
self._dirs.addpath(filename)
if old_entry is None and "_alldirs" in self.__dict__:
self._alldirs.addpath(filename)
dirstate-map: factor out the change to _dirs and _alldirs on removing...
r48489 def _dirs_decr(self, filename, old_entry=None, remove_variant=False):
dirstate-map: factor out the change to _dirs and _alldirs on dropping...
r48488 """decremente the dirstate counter if applicable"""
if old_entry is not None:
if "_dirs" in self.__dict__ and not old_entry.removed:
self._dirs.delpath(filename)
dirstate-map: factor out the change to _dirs and _alldirs on removing...
r48489 if "_alldirs" in self.__dict__ and not remove_variant:
dirstate-map: factor out the change to _dirs and _alldirs on dropping...
r48488 self._alldirs.delpath(filename)
dirstate-map: factor out the change to _dirs and _alldirs on removing...
r48489 elif remove_variant and "_alldirs" in self.__dict__:
self._alldirs.addpath(filename)
dirstate-map: factor out the change to _dirs and _alldirs on dropping...
r48488 if "filefoldmap" in self.__dict__:
normed = util.normcase(filename)
self.filefoldmap.pop(normed, None)
dirstate: add a `set_possibly_dirty` method...
r48520 def set_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown"""
self[filename].set_possibly_dirty()
dirstate: introduce a `set_clean` method on dirstate's map and items...
r48788 def set_clean(self, filename, mode, size, mtime):
"""mark a file as back to a clean state"""
entry = self[filename]
mtime = mtime & rangemask
size = size & rangemask
entry.set_clean(mode, size, mtime)
self.copymap.pop(filename, None)
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 def reset_state(
self,
filename,
dirstate: support file tracked nowhere in `reset_state`...
r48812 wc_tracked=False,
p1_tracked=False,
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 p2_tracked=False,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
parentfiledata=None,
):
"""Set a entry to a given state, diregarding all previous state
This is to be used by the part of the dirstate API dedicated to
adjusting the dirstate after a update/merge.
note: calling this might result to no entry existing at all if the
dirstate map does not see any point at having one for this file
anymore.
"""
if merged and (clean_p1 or clean_p2):
msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
raise error.ProgrammingError(msg)
# copy information are now outdated
# (maybe new information should be in directly passed to this function)
self.copymap.pop(filename, None)
if not (p1_tracked or p2_tracked or wc_tracked):
dirstate: support file tracked nowhere in `reset_state`...
r48812 old_entry = self._map.pop(filename, None)
self._dirs_decr(filename, old_entry=old_entry)
self.copymap.pop(filename, None)
dirstatemap: temporarily return early in `reset_state`...
r48707 return
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif merged:
# XXX might be merged and removed ?
entry = self.get(filename)
dirstatemap: use the default code to handle "merged" case...
r48715 if entry is None or not entry.tracked:
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 # XXX mostly replicate dirstate.other parent. We should get
# the higher layer to pass us more reliable data where `merged`
dirstatemap: use the default code to handle "merged" case...
r48715 # actually mean merged. Dropping this clause will show failure
# in `test-graft.t`
merged = False
clean_p2 = True
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif not (p1_tracked or p2_tracked) and wc_tracked:
dirstatemap: use the default code to handle "added" case...
r48714 pass # file is added, nothing special to adjust
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif (p1_tracked or p2_tracked) and not wc_tracked:
dirstatemap: use the default code to handle "removed" case...
r48713 pass
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif clean_p2 and wc_tracked:
if p1_tracked or self.get(filename) is not None:
# XXX the `self.get` call is catching some case in
# `test-merge-remove.t` where the file is tracked in p1, the
# p1_tracked argument is False.
#
# In addition, this seems to be a case where the file is marked
# as merged without actually being the result of a merge
# action. So thing are not ideal here.
dirstatemap: use the default code to handle "clean-p2" case...
r48712 merged = True
clean_p2 = False
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif not p1_tracked and p2_tracked and wc_tracked:
dirstatemap: use the default code to handle "p2-tracked" case...
r48711 clean_p2 = True
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif possibly_dirty:
dirstatemap: use the default code to handle "possibly_dirty" case...
r48710 pass
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif wc_tracked:
# this is a "normal" file
if parentfiledata is None:
msg = b'failed to pass parentfiledata for a normal file: %s'
msg %= filename
raise error.ProgrammingError(msg)
else:
assert False, 'unreachable'
dirstatemap: conclude `reset_state` with logic using the new __init__...
r48708 old_entry = self._map.get(filename)
self._dirs_incr(filename, old_entry)
entry = DirstateItem(
wc_tracked=wc_tracked,
p1_tracked=p1_tracked,
p2_tracked=p2_tracked,
merged=merged,
clean_p1=clean_p1,
clean_p2=clean_p2,
possibly_dirty=possibly_dirty,
parentfiledata=parentfiledata,
)
self._map[filename] = entry
dirstate: introduce a set_tracked method on "map" and "item"...
r48804 def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self._dirs_incr(filename)
entry = DirstateItem(
p1_tracked=False,
p2_tracked=False,
wc_tracked=True,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
parentfiledata=None,
)
self._map[filename] = entry
new = True
elif not entry.tracked:
self._dirs_incr(filename, entry)
entry.set_tracked()
new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
self.set_possibly_dirty(filename)
return new
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`...
r48701 def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map"""
dirstate: make dirstatemap.set_untracked deal with added file...
r48786 entry = self.get(f)
if entry is None:
return False
else:
self._dirs_decr(f, old_entry=entry, remove_variant=not entry.added)
if not entry.merged:
self.copymap.pop(f, None)
if entry.added:
self._map.pop(f, None)
else:
entry.set_untracked()
return True
dirstate: split dirstatemap in its own file...
r48295
@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):
pathutil: replace the `skip` argument of `dirs` with a boolean...
r48756 return pathutil.dirs(self._map, only_tracked=True)
dirstate: split dirstatemap in its own file...
r48295
@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
dirstate: move parent state handling in the dirstatemap...
r48873 def setparents(self, p1, p2, fold_p2=False):
dirstate: split dirstatemap in its own file...
r48295 self._parents = (p1, p2)
self._dirtyparents = True
dirstate: move parent state handling in the dirstatemap...
r48873 copies = {}
if fold_p2:
dirstate: drop all logic around the "non-normal" sets...
r48875 for f, s in pycompat.iteritems(self._map):
dirstate: move parent state handling in the dirstatemap...
r48873 # Discard "merged" markers when moving away from a merge state
dirstate: use a new `drop_merge_data` in `setparent`...
r48874 if s.merged or s.from_p2:
source = self.copymap.pop(f, None)
dirstate: move parent state handling in the dirstatemap...
r48873 if source:
copies[f] = source
dirstate: use a new `drop_merge_data` in `setparent`...
r48874 s.drop_merge_data()
dirstate: move parent state handling in the dirstatemap...
r48873 return copies
dirstate: split dirstatemap in its own file...
r48295
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
@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,
):
Simon Sapin
dirstate: Pass the final DirstateItem to _rustmap.addfile()...
r48865 if added:
assert not possibly_dirty
assert not from_p2
item = DirstateItem.new_added()
elif merged:
assert not possibly_dirty
assert not from_p2
item = DirstateItem.new_merged()
elif from_p2:
assert not possibly_dirty
item = DirstateItem.new_from_p2()
elif possibly_dirty:
item = DirstateItem.new_possibly_dirty()
else:
Simon Sapin
dirstate: Appease pytype...
r48866 assert size is not None
assert mtime is not None
Simon Sapin
dirstate: Pass the final DirstateItem to _rustmap.addfile()...
r48865 size = size & rangemask
mtime = mtime & rangemask
item = DirstateItem.new_normal(mode, size, mtime)
self._rustmap.addfile(f, item)
dirstate: same logic as what we did for `_drop`...
r48797 if added:
self.copymap.pop(f, None)
dirstate: split dirstatemap in its own file...
r48295
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 def reset_state(
self,
filename,
dirstate: support file tracked nowhere in `reset_state`...
r48812 wc_tracked=False,
p1_tracked=False,
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 p2_tracked=False,
merged=False,
clean_p1=False,
clean_p2=False,
possibly_dirty=False,
parentfiledata=None,
):
"""Set a entry to a given state, disregarding all previous state
This is to be used by the part of the dirstate API dedicated to
adjusting the dirstate after a update/merge.
note: calling this might result to no entry existing at all if the
dirstate map does not see any point at having one for this file
anymore.
"""
if merged and (clean_p1 or clean_p2):
msg = (
b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
)
raise error.ProgrammingError(msg)
# copy information are now outdated
# (maybe new information should be in directly passed to this function)
self.copymap.pop(filename, None)
if not (p1_tracked or p2_tracked or wc_tracked):
Simon Sapin
dirstate: Replace dropfile with drop_item_and_copy_source...
r48864 self._rustmap.drop_item_and_copy_source(filename)
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif merged:
# XXX might be merged and removed ?
entry = self.get(filename)
if entry is not None and entry.tracked:
# XXX mostly replicate dirstate.other parent. We should get
# the higher layer to pass us more reliable data where `merged`
# actually mean merged. Dropping the else clause will show
# failure in `test-graft.t`
self.addfile(filename, merged=True)
else:
self.addfile(filename, from_p2=True)
elif not (p1_tracked or p2_tracked) and wc_tracked:
self.addfile(
filename, added=True, possibly_dirty=possibly_dirty
)
elif (p1_tracked or p2_tracked) and not wc_tracked:
# XXX might be merged and removed ?
rust-dirstatemap: temporarily use `from_v1_data` in `addfile`...
r48705 self[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 elif clean_p2 and wc_tracked:
if p1_tracked or self.get(filename) is not None:
# XXX the `self.get` call is catching some case in
# `test-merge-remove.t` where the file is tracked in p1, the
# p1_tracked argument is False.
#
# In addition, this seems to be a case where the file is marked
# as merged without actually being the result of a merge
# action. So thing are not ideal here.
self.addfile(filename, merged=True)
else:
self.addfile(filename, from_p2=True)
elif not p1_tracked and p2_tracked and wc_tracked:
self.addfile(
filename, from_p2=True, possibly_dirty=possibly_dirty
)
elif possibly_dirty:
self.addfile(filename, possibly_dirty=possibly_dirty)
elif wc_tracked:
# this is a "normal" file
if parentfiledata is None:
msg = b'failed to pass parentfiledata for a normal file: %s'
msg %= filename
raise error.ProgrammingError(msg)
mode, size, mtime = parentfiledata
self.addfile(filename, mode=mode, size=size, mtime=mtime)
else:
assert False, 'unreachable'
dirstate: introduce a set_tracked method on "map" and "item"...
r48804 def set_tracked(self, filename):
new = False
entry = self.get(filename)
if entry is None:
self.addfile(filename, added=True)
new = True
elif not entry.tracked:
entry.set_tracked()
Simon Sapin
dirstate: Skip no-op conversion in Rust DirstateMap::set_v1...
r48859 self._rustmap.set_dirstate_item(filename, entry)
dirstate: introduce a set_tracked method on "map" and "item"...
r48804 new = True
else:
# XXX This is probably overkill for more case, but we need this to
# fully replace the `normallookup` call with `set_tracked` one.
# Consider smoothing this in the future.
self.set_possibly_dirty(filename)
return new
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`...
r48701 def set_untracked(self, f):
"""Mark a file as no longer tracked in the dirstate map"""
# in merge is only trigger more logic, so it "fine" to pass it.
#
# the inner rust dirstate map code need to be adjusted once the API
# for dirstate/dirstatemap/DirstateItem is a bit more settled
dirstate: make dirstatemap.set_untracked deal with added file...
r48786 entry = self.get(f)
if entry is None:
return False
else:
if entry.added:
Simon Sapin
dirstate: Replace dropfile with drop_item_and_copy_source...
r48864 self._rustmap.drop_item_and_copy_source(f)
dirstate: make dirstatemap.set_untracked deal with added file...
r48786 else:
self._rustmap.removefile(f, in_merge=True)
return True
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`...
r48701
dirstate: split dirstatemap in its own file...
r48295 def removefile(self, *args, **kwargs):
return self._rustmap.removefile(*args, **kwargs)
def get(self, *args, **kwargs):
return self._rustmap.get(*args, **kwargs)
@property
def copymap(self):
return self._rustmap.copymap()
Simon Sapin
debugstate: Always call dirstatemap.debug_iter()...
r48835 def debug_iter(self, all):
Simon Sapin
debugsate: Change debug_iter() to yield tuples instead of DirstateItem...
r48836 """
Return an iterator of (filename, state, mode, size, mtime) tuples
`all`: also include with `state == b' '` dirstate tree nodes that
don't have an associated `DirstateItem`.
"""
Simon Sapin
debugstate: Always call dirstatemap.debug_iter()...
r48835 return self._rustmap.debug_iter(all)
Simon Sapin
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate...
r48483
dirstate: split dirstatemap in its own file...
r48295 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: move parent state handling in the dirstatemap...
r48873 def setparents(self, p1, p2, fold_p2=False):
dirstate: split dirstatemap in its own file...
r48295 self._parents = (p1, p2)
self._dirtyparents = True
dirstate: move parent state handling in the dirstatemap...
r48873 copies = {}
if fold_p2:
dirstate: drop all logic around the "non-normal" sets...
r48875 # Collect into an intermediate list to avoid a `RuntimeError`
# exception due to mutation during iteration.
# TODO: move this the whole loop to Rust where `iter_mut`
# enables in-place mutation of elements of a collection while
# iterating it, without mutating the collection itself.
candidatefiles = [
(f, s)
for f, s in self._rustmap.items()
if s.merged or s.from_p2
]
for f, s in candidatefiles:
dirstate: move parent state handling in the dirstatemap...
r48873 # Discard "merged" markers when moving away from a merge state
if s.merged:
source = self.copymap.get(f)
if source:
copies[f] = source
self.reset_state(
f,
wc_tracked=True,
p1_tracked=True,
possibly_dirty=True,
)
# Also fix up otherparent markers
elif s.from_p2:
source = self.copymap.get(f)
if source:
copies[f] = source
self.reset_state(
f,
p1_tracked=False,
wc_tracked=True,
)
return copies
dirstate: split dirstatemap in its own file...
r48295
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''
Simon Sapin
dirstate-v2: Enforce data size read from the docket file...
r48475 self._rustmap = rustmod.DirstateMap.new_v2(
Simon Sapin
dirstate-v2: Move fixed-size tree metadata into the docket file...
r48482 data, self.docket.data_size, self.docket.tree_metadata
Simon Sapin
dirstate-v2: Enforce data size read from the docket file...
r48475 )
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 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):
Simon Sapin
dirstate-v2: Support appending to the same data file...
r48478 if not self._use_dirstate_v2:
p1, p2 = self.parents()
packed = self._rustmap.write_v1(p1, p2, now)
st.write(packed)
st.close()
self._dirtyparents = False
return
# We can only append to an existing data file if there is one
can_append = self.docket.uuid is not None
Simon Sapin
dirstate-v2: Move fixed-size tree metadata into the docket file...
r48482 packed, meta, append = self._rustmap.write_v2(now, can_append)
Simon Sapin
dirstate-v2: Support appending to the same data file...
r48478 if append:
docket = self.docket
data_filename = docket.data_filename()
if tr:
tr.add(data_filename, docket.data_size)
with self._opener(data_filename, b'r+b') as fp:
fp.seek(docket.data_size)
assert fp.tell() == docket.data_size
written = fp.write(packed)
if written is not None: # py2 may return None
assert written == len(packed), (written, len(packed))
docket.data_size += len(packed)
docket.parents = self.parents()
Simon Sapin
dirstate-v2: Move fixed-size tree metadata into the docket file...
r48482 docket.tree_metadata = meta
Simon Sapin
dirstate-v2: Support appending to the same data file...
r48478 st.write(docket.serialize())
st.close()
else:
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 old_docket = self.docket
new_docket = docketmod.DirstateDocket.with_new_uuid(
Simon Sapin
dirstate-v2: Move fixed-size tree metadata into the docket file...
r48482 self.parents(), len(packed), meta
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 )
Simon Sapin
dirstate-v2: Support appending to the same data file...
r48478 data_filename = new_docket.data_filename()
if tr:
tr.add(data_filename, 0)
self._opener.write(data_filename, packed)
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 # 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:
Simon Sapin
dirstate-v2: Support appending to the same data file...
r48478 data_filename = old_docket.data_filename()
unlink = lambda _tr=None: self._opener.unlink(data_filename)
if tr:
category = b"dirstate-v2-clean-" + old_docket.uuid
tr.addpostclose(category, unlink)
else:
unlink()
Simon Sapin
dirstate-v2: Introduce a docket file...
r48474 self._docket = new_docket
Simon Sapin
dirstate-v2: Support appending to the same data file...
r48478 # Reload from the newly-written file
util.clearcachedproperty(self, b"_rustmap")
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
@propertycache
def dirfoldmap(self):
f = {}
normcase = util.normcase
Simon Sapin
dirstate-v2: Separate iterators for dirfoldmap and debugdirstate...
r48483 for name in self._rustmap.tracked_dirs():
dirstate: split dirstatemap in its own file...
r48295 f[normcase(name)] = name
return f
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492
dirstate: add a `set_possibly_dirty` method...
r48520 def set_possibly_dirty(self, filename):
"""record that the current state of the file on disk is unknown"""
entry = self[filename]
entry.set_possibly_dirty()
Simon Sapin
dirstate: Skip no-op conversion in Rust DirstateMap::set_v1...
r48859 self._rustmap.set_dirstate_item(filename, entry)
dirstate: add a `set_possibly_dirty` method...
r48520
dirstate: introduce a `set_clean` method on dirstate's map and items...
r48788 def set_clean(self, filename, mode, size, mtime):
"""mark a file as back to a clean state"""
entry = self[filename]
mtime = mtime & rangemask
size = size & rangemask
entry.set_clean(mode, size, mtime)
Simon Sapin
dirstate: Skip no-op conversion in Rust DirstateMap::set_v1...
r48859 self._rustmap.set_dirstate_item(filename, entry)
dirstate: introduce a `set_clean` method on dirstate's map and items...
r48788 self._rustmap.copymap().pop(filename, None)
dirstate-map: move most of `dirstate.update_file` logic in the dsmap...
r48492 def __setitem__(self, key, value):
assert isinstance(value, DirstateItem)
Simon Sapin
dirstate: Skip no-op conversion in Rust DirstateMap::set_v1...
r48859 self._rustmap.set_dirstate_item(key, value)