This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10986

dirstate-item: use the properties in dirstatemap
ClosedPublic

Authored by marmoute on Jul 5 2021, 5:34 AM.

Details

Reviewers
SimonSapin
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb8013cb71ef3: dirstate-item: use the properties in dirstatemap

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

marmoute created this revision.Jul 5 2021, 5:34 AM
SimonSapin accepted this revision.Jul 5 2021, 6:41 AM
baymax updated this revision to Diff 28841.Jul 6 2021, 1:35 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit requested changes to this revision.Jul 7 2021, 4:38 AM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
mercurial/dirstatemap.py
228

not entry.removed?

This revision now requires changes to proceed.Jul 7 2021, 4:38 AM
marmoute added inline comments.Jul 7 2021, 6:18 AM
mercurial/dirstatemap.py
228

good spot. Thanks.

baymax updated this revision to Diff 28923.Jul 7 2021, 8:00 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Jul 7 2021, 8:06 AM
This revision is now accepted and ready to land.Jul 7 2021, 8:06 AM
marmoute added a commit: rHGb8013cb71ef3: dirstate-item: use the properties in dirstatemap.Jul 8 2021, 5:01 AM
Closed by commit rHGb8013cb71ef3: dirstate-item: use the properties in dirstatemap (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 28982.Jul 8 2021, 5:12 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstatemap.py (16 lines)

Diff 28967

mercurial/dirstatemap.py

# XXX we should not be able to have 'm' state and 'FROM_P2' if not # 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 # during a merge. So I (marmoute) am not sure we need the
# conditionnal at all. Adding double checking this with assert # conditionnal at all. Adding double checking this with assert
# would be nice. # would be nice.
if entry is not None: if entry is not None:
# backup the previous state # backup the previous state
if entry.merged: # merge if entry.merged: # merge
size = NONNORMAL size = NONNORMAL
elif entry[0] == b'n' and entry.from_p2: elif entry.from_p2:
size = FROM_P2 size = FROM_P2
self.otherparentset.add(f) self.otherparentset.add(f)
if size == 0: if size == 0:
self.copymap.pop(f, None) self.copymap.pop(f, None)
if entry is not None and entry[0] != b'r' and "_dirs" in self.__dict__: if entry is not None and not entry.removed and "_dirs" in self.__dict__:
pulkitUnsubmitted
Not Done

not entry.removed?

pulkit: `not entry.removed`?
marmouteAuthorUnsubmitted
Done

good spot. Thanks.

marmoute: good spot. Thanks.
self._dirs.delpath(f) self._dirs.delpath(f)
if entry is None and "_alldirs" in self.__dict__: if entry is None and "_alldirs" in self.__dict__:
self._alldirs.addpath(f) self._alldirs.addpath(f)
if "filefoldmap" in self.__dict__: if "filefoldmap" in self.__dict__:
normed = util.normcase(f) normed = util.normcase(f)
self.filefoldmap.pop(normed, None) self.filefoldmap.pop(normed, None)
self._map[f] = DirstateItem(b'r', 0, size, 0) self._map[f] = DirstateItem(b'r', 0, size, 0)
self.nonnormalset.add(f) self.nonnormalset.add(f)
normed = util.normcase(f) normed = util.normcase(f)
self.filefoldmap.pop(normed, None) 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] == b'n' and e[3] == now: if e is not None and e.need_delay(now):
self._map[f] = DirstateItem(e[0], e[1], e[2], AMBIGUOUS_TIME) self._map[f] = DirstateItem(
e.state, e.mode, e.size, AMBIGUOUS_TIME
)
self.nonnormalset.add(f) self.nonnormalset.add(f)
def nonnormalentries(self): def nonnormalentries(self):
'''Compute the nonnormal dirstate entries from the dmap''' '''Compute the nonnormal dirstate entries from the dmap'''
try: try:
return parsers.nonnormalotherparententries(self._map) return parsers.nonnormalotherparententries(self._map)
except AttributeError: except AttributeError:
nonnorm = set() nonnorm = set()
otherparent = set() otherparent = set()
for fname, e in pycompat.iteritems(self._map): for fname, e in pycompat.iteritems(self._map):
if e[0] != b'n' or e[3] == AMBIGUOUS_TIME: if e.state != b'n' or e.mtime == AMBIGUOUS_TIME:
nonnorm.add(fname) nonnorm.add(fname)
if e[0] == b'n' and e[2] == FROM_P2: if e.from_p2:
otherparent.add(fname) otherparent.add(fname)
return nonnorm, otherparent return nonnorm, otherparent
@propertycache @propertycache
def filefoldmap(self): def filefoldmap(self):
"""Returns a dictionary mapping normalized case paths to their """Returns a dictionary mapping normalized case paths to their
non-normalized versions. non-normalized versions.
""" """
try: try:
makefilefoldmap = parsers.make_file_foldmap makefilefoldmap = parsers.make_file_foldmap
except AttributeError: except AttributeError:
pass pass
else: else:
return makefilefoldmap( return makefilefoldmap(
self._map, util.normcasespec, util.normcasefallback self._map, util.normcasespec, util.normcasefallback
) )
f = {} f = {}
normcase = util.normcase normcase = util.normcase
for name, s in pycompat.iteritems(self._map): for name, s in pycompat.iteritems(self._map):
if s[0] != b'r': if not s.removed:
f[normcase(name)] = name f[normcase(name)] = name
f[b'.'] = b'.' # prevents useless util.fspath() invocation f[b'.'] = b'.' # prevents useless util.fspath() invocation
return f return f
def hastrackeddir(self, d): def hastrackeddir(self, d):
""" """
Returns True if the dirstate contains a tracked (not removed) file Returns True if the dirstate contains a tracked (not removed) file
in this directory. in this directory.