This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1343

dirstate: move dropping of folded filenames into the dirstate map
ClosedPublic

Authored by mbthomas on Nov 8 2017, 12:31 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGe6c64744781f: dirstate: move dropping of folded filenames into the dirstate map
rHG6326579352cf: dirstate: move dropping of folded filenames into the dirstate map
Summary

When dropping files from the dirstate, the corresponding entry in the
filefoldmap is also dropped. Move this into the dirstate map object. A future
implementation of the dirstate will maintain the filefoldmap differently.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mbthomas created this revision.Nov 8 2017, 12:31 PM
mbthomas updated this revision to Diff 3440.Nov 13 2017, 7:18 AM
durin42 accepted this revision.Nov 13 2017, 5:46 PM
This revision is now accepted and ready to land.Nov 13 2017, 5:46 PM
durin42 added a comment.Nov 13 2017, 5:46 PM

btw I'm dubious of the 'filefoldmap' in self.dict checks, as that very much looks like it should be an invariant now

mbthomas added a comment.Nov 14 2017, 2:26 PM

The filefoldmap (and dirfoldmap) are still @propertycached. They only ever get accessed on systems with case insensitive filesystems, and so will often not be there at all.

mbthomas updated this revision to Diff 3517.Nov 15 2017, 4:08 AM
durin42 accepted this revision.Nov 17 2017, 5:22 PM
Closed by commit rHG6326579352cf: dirstate: move dropping of folded filenames into the dirstate map (authored by mbthomas). · Explain WhyNov 17 2017, 5:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (14 lines)

Diff 3616

mercurial/dirstate.py

def copied(self, file): def copied(self, file):
return self._map.copymap.get(file, None) return self._map.copymap.get(file, None)
def copies(self): def copies(self):
return self._map.copymap return self._map.copymap
def _droppath(self, f): def _droppath(self, f):
if "filefoldmap" in self._map.__dict__:
normed = util.normcase(f)
if normed in self._map.filefoldmap:
del self._map.filefoldmap[normed]
self._updatedfiles.add(f) self._updatedfiles.add(f)
def _addpath(self, f, state, mode, size, mtime): def _addpath(self, f, state, mode, size, mtime):
oldstate = self[f] oldstate = self[f]
if state == 'a' or oldstate == 'r': if state == 'a' or oldstate == 'r':
scmutil.checkfilename(f) scmutil.checkfilename(f)
if f in self._map.dirs: if f in self._map.dirs:
raise error.Abort(_('directory %r already in dirstate') % f) raise error.Abort(_('directory %r already in dirstate') % f)
- `dirs` is a set-like object containing all the directories that contain - `dirs` is a set-like object containing all the directories that contain
files in the dirstate, excluding any files that are marked as removed. files in the dirstate, excluding any files that are marked as removed.
- `filefoldmap` is a dict mapping normalized filenames to the denormalized - `filefoldmap` is a dict mapping normalized filenames to the denormalized
form that they appear as in the dirstate. form that they appear as in the dirstate.
- `dirfoldmap` is a dict mapping normalized directory names to the - `dirfoldmap` is a dict mapping normalized directory names to the
denormalized form that they appear as in the dirstate. denormalized form that they appear as in the dirstate.
Once instantiated, the filefoldmap and dirfoldmap views must be maintained
by the caller.
""" """
def __init__(self, ui, opener, root): def __init__(self, ui, opener, root):
self._ui = ui self._ui = ui
self._opener = opener self._opener = opener
self._root = root self._root = root
self._filename = 'dirstate' self._filename = 'dirstate'
Mark a file as removed in the dirstate. Mark a file as removed in the dirstate.
The `size` parameter is used to store sentinel values that indicate The `size` parameter is used to store sentinel values that indicate
the file's previous state. In the future, we should refactor this the file's previous state. In the future, we should refactor this
to be more explicit about what that state is. to be more explicit about what that state is.
""" """
if oldstate not in "?r" and "dirs" in self.__dict__: if oldstate not in "?r" and "dirs" in self.__dict__:
self.dirs.delpath(f) self.dirs.delpath(f)
if "filefoldmap" in self.__dict__:
normed = util.normcase(f)
self.filefoldmap.pop(normed, None)
self._map[f] = dirstatetuple('r', 0, size, 0) self._map[f] = dirstatetuple('r', 0, size, 0)
self.nonnormalset.add(f) self.nonnormalset.add(f)
def dropfile(self, f, oldstate): def dropfile(self, f, oldstate):
""" """
Remove a file from the dirstate. Returns True if the file was Remove a file from the dirstate. Returns True if the file was
previously recorded. previously recorded.
""" """
exists = self._map.pop(f, None) is not None exists = self._map.pop(f, None) is not None
if exists: if exists:
if oldstate != "r" and "dirs" in self.__dict__: if oldstate != "r" and "dirs" in self.__dict__:
self.dirs.delpath(f) self.dirs.delpath(f)
if "filefoldmap" in self.__dict__:
normed = util.normcase(f)
self.filefoldmap.pop(normed, None)
self.nonnormalset.discard(f) self.nonnormalset.discard(f)
return exists return exists
def clearambiguoustimes(self, files, now): def clearambiguoustimes(self, files, now):
for f in files: for f in files:
e = self.get(f) e = self.get(f)
if e is not None and e[0] == 'n' and e[3] == now: if e is not None and e[0] == 'n' and e[3] == now:
self._map[f] = dirstatetuple(e[0], e[1], e[2], -1) self._map[f] = dirstatetuple(e[0], e[1], e[2], -1)