This is an archive of the discontinued Mercurial Phabricator instance.

Differential D754

dirstate: move filefoldmap to dirstatemap
ClosedPublic

Authored by durham on Sep 20 2017, 8:03 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGd8b35920b7b1: dirstate: move filefoldmap to dirstatemap
rHG19a5ad535cb1: dirstate: move filefoldmap to dirstatemap
Summary

As part of moving the dirstate storage logic to a separate class, lets move the
filfoldmap computation to that class. This will allow extensions to replace the
dirstate storage with something that persists the filefoldmap.

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

durham created this revision.Sep 20 2017, 8:03 PM
indygreg accepted this revision.Sep 24 2017, 11:10 AM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/dirstate.py
1359

Since this is aiming to be a new interface of sorts, could we get a docstring here as a follow-up?

This revision is now accepted and ready to land.Sep 24 2017, 11:10 AM
durham updated this revision to Diff 2078.Sep 26 2017, 6:58 AM
durham marked an inline comment as done.Sep 26 2017, 6:59 AM
Closed by commit rHG19a5ad535cb1: dirstate: move filefoldmap to dirstatemap (authored by durham). · Explain WhySep 29 2017, 2:43 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (35 lines)

Diff 2157

mercurial/dirstate.py

@propertycache @propertycache
def _otherparentset(self): def _otherparentset(self):
nonnorm, otherparents = self._map.nonnormalentries() nonnorm, otherparents = self._map.nonnormalentries()
self._nonnormalset = nonnorm self._nonnormalset = nonnorm
return otherparents return otherparents
@propertycache @propertycache
def _filefoldmap(self): def _filefoldmap(self):
try: return self._map.filefoldmap()
makefilefoldmap = parsers.make_file_foldmap
except AttributeError:
pass
else:
return makefilefoldmap(self._map._map, util.normcasespec,
util.normcasefallback)
f = {}
normcase = util.normcase
for name, s in self._map.iteritems():
if s[0] != 'r':
f[normcase(name)] = name
f['.'] = '.' # prevents useless util.fspath() invocation
return f
@propertycache @propertycache
def _dirfoldmap(self): def _dirfoldmap(self):
f = {} f = {}
normcase = util.normcase normcase = util.normcase
for name in self._dirs: for name in self._dirs:
f[normcase(name)] = name f[normcase(name)] = name
return f return f
otherparent = set() otherparent = set()
for fname, e in self._map.iteritems(): for fname, e in self._map.iteritems():
if e[0] != 'n' or e[3] == -1: if e[0] != 'n' or e[3] == -1:
nonnorm.add(fname) nonnorm.add(fname)
if e[0] == 'n' and e[2] == -2: if e[0] == 'n' and e[2] == -2:
otherparent.add(fname) otherparent.add(fname)
return nonnorm, otherparent return nonnorm, otherparent
def filefoldmap(self):
indygregUnsubmitted
Done

Since this is aiming to be a new interface of sorts, could we get a docstring here as a follow-up?

indygreg: Since this is aiming to be a new interface of sorts, could we get a docstring here as a follow…
"""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 self._map.iteritems():
if s[0] != 'r':
f[normcase(name)] = name
f['.'] = '.' # prevents useless util.fspath() invocation
return f