( )⚙ D7440 dirstate: stop caring about match.explicitdir

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7440

dirstate: stop caring about match.explicitdir
ClosedPublic

Authored by martinvonz on Nov 15 2019, 7:34 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdeacffd227e2: dirstate: stop caring about match.explicitdir
Summary

No one passes it in anymore.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 15 2019, 7:34 PM
Alphare accepted this revision.Nov 18 2019, 4:26 AM
pulkit accepted this revision.Nov 19 2019, 7:42 AM
This revision is now accepted and ready to land.Nov 19 2019, 7:42 AM
martinvonz added a commit: rHGdeacffd227e2: dirstate: stop caring about match.explicitdir.Nov 19 2019, 8:13 AM
Closed by commit rHGdeacffd227e2: dirstate: stop caring about match.explicitdir (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (5 lines)

Diff 18175

mercurial/dirstate.py

elif stat.S_ISFIFO(mode): elif stat.S_ISFIFO(mode):
kind = _(b'fifo') kind = _(b'fifo')
elif stat.S_ISSOCK(mode): elif stat.S_ISSOCK(mode):
kind = _(b'socket') kind = _(b'socket')
elif stat.S_ISDIR(mode): elif stat.S_ISDIR(mode):
kind = _(b'directory') kind = _(b'directory')
return _(b'unsupported file type (type is %s)') % kind return _(b'unsupported file type (type is %s)') % kind
matchedir = match.explicitdir
badfn = match.bad badfn = match.bad
dmap = self._map dmap = self._map
lstat = os.lstat lstat = os.lstat
getkind = stat.S_IFMT getkind = stat.S_IFMT
dirkind = stat.S_IFDIR dirkind = stat.S_IFDIR
regkind = stat.S_IFREG regkind = stat.S_IFREG
lnkkind = stat.S_IFLNK lnkkind = stat.S_IFLNK
join = self._join join = self._join
try: try:
st = lstat(join(nf)) st = lstat(join(nf))
kind = getkind(st.st_mode) kind = getkind(st.st_mode)
if kind == dirkind: if kind == dirkind:
if nf in dmap: if nf in dmap:
# file replaced by dir on disk but still in dirstate # file replaced by dir on disk but still in dirstate
results[nf] = None results[nf] = None
if matchedir:
matchedir(nf)
foundadd((nf, ff)) foundadd((nf, ff))
elif kind == regkind or kind == lnkkind: elif kind == regkind or kind == lnkkind:
results[nf] = st results[nf] = st
else: else:
badfn(ff, badtype(kind)) badfn(ff, badtype(kind))
if nf in dmap: if nf in dmap:
results[nf] = None results[nf] = None
except OSError as inst: # nf not found on disk - it is dirstate only except OSError as inst: # nf not found on disk - it is dirstate only
if nf in dmap: # does it exactly match a missing file? if nf in dmap: # does it exactly match a missing file?
results[nf] = None results[nf] = None
else: # does it match a missing directory? else: # does it match a missing directory?
if self._map.hasdir(nf): if self._map.hasdir(nf):
if matchedir:
matchedir(nf)
notfoundadd(nf) notfoundadd(nf)
else: else:
badfn(ff, encoding.strtolocal(inst.strerror)) badfn(ff, encoding.strtolocal(inst.strerror))
# match.files() may contain explicitly-specified paths that shouldn't # match.files() may contain explicitly-specified paths that shouldn't
# be taken; drop them from the list of files found. dirsfound/notfound # be taken; drop them from the list of files found. dirsfound/notfound
# aren't filtered here because they will be tested later. # aren't filtered here because they will be tested later.
if match.anypats(): if match.anypats():