This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1313

dirstate: gate access to self._map.dirs
Needs RevisionPublic

Authored by mbolin on Nov 3 2017, 6:59 PM.

Details

Reviewers
mbthomas
Group Reviewers
hg-reviewers
Summary

_droppath() already checks "dirs" in self._map.__dict__ before accessing
self._map.dirs. This updates _addpath() to be equally cautious.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mbolin created this revision.Nov 3 2017, 6:59 PM
mbthomas requested changes to this revision.Nov 3 2017, 7:15 PM
mbthomas added inline comments.
mercurial/dirstate.py
405

I don't think it's safe to do this. We're looking for clashes between files and directories, so we do need to look in self.dirs, even if that means generating it because we're accessing it for the first time.

This revision now requires changes to proceed.Nov 3 2017, 7:15 PM
pulkit added a subscriber: pulkit.Jun 14 2018, 3:55 PM

Do we need this anymore or can this be abandoned? (trying to close some not-required-any-more differentials)

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (23 lines)

Diff 3267

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 self[f] not in "?r" and "dirs" in self._map.__dict__: if "dirs" in self._map.__dict__ and self[f] not in "?r":
self._map.dirs.delpath(f) self._map.dirs.delpath(f)
if "filefoldmap" in self._map.__dict__: if "filefoldmap" in self._map.__dict__:
normed = util.normcase(f) normed = util.normcase(f)
if normed in self._map.filefoldmap: if normed in self._map.filefoldmap:
del self._map.filefoldmap[normed] 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 "dirs" in self._map.__dict__:
mbthomasUnsubmitted
Not Done

I don't think it's safe to do this. We're looking for clashes between files and directories, so we do need to look in self.dirs, even if that means generating it because we're accessing it for the first time.

mbthomas: I don't think it's safe to do this. We're looking for clashes between files and directories…
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)
# shadows # shadows
for d in util.finddirs(f): for d in util.finddirs(f):
if d in self._map.dirs: if d in self._map.dirs:
break break
entry = self._map.get(d) entry = self._map.get(d)
if entry is not None and entry[0] != 'r': if entry is not None and entry[0] != 'r':
raise error.Abort( raise error.Abort(
_('file %r in dirstate clashes with %r') % (d, f)) _('file %r in dirstate clashes with %r') % (d, f))
if oldstate in "?r" and "dirs" in self._map.__dict__: if oldstate in "?r" and "dirs" in self._map.__dict__:
self._map.dirs.addpath(f) self._map.dirs.addpath(f)
self._dirty = True self._dirty = True
self._updatedfiles.add(f) self._updatedfiles.add(f)
self._map[f] = dirstatetuple(state, mode, size, mtime) self._map[f] = dirstatetuple(state, mode, size, mtime)
if state != 'n' or mtime == -1: if state != 'n' or mtime == -1:
self._map.nonnormalset.add(f) self._map.nonnormalset.add(f)
if size == -2: if size == -2: