This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: add a comment on why we don't need to check if something is a dir/file
ClosedPublic

Authored by spectral on Aug 8 2018, 8:08 PM.

Reviewers

martinvonz

Group Reviewers

hg-reviewers

Commits

Summary

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

martinvonz requested changes to this revision.Aug 8 2018, 8:15 PM

This revision now requires changes to proceed.Aug 8 2018, 8:15 PM

Oops, meant to accept it (and it's queued).

Note that test-check-commit.t says hello:

+  6: summary line too long (limit is 78)
+   dirstate: add a comment on why we don't need to check if something is a dir/file

This revision is now accepted and ready to land.Aug 8 2018, 8:19 PM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/dirstate.py (5 lines)

Status	Author	Revision
Closed	spectral	D4161 dirstate: add a comment on why we don't need to check if something is a dir/file
Closed	spectral	D4160 match: add missing "return set()", add FIXME to test to doc a bug
Closed	spectral	D4159 match: correct doc for _rootsdirsandparents after 5a7df82de142

	entries = listdir(join(nd), stat=True, skip=skip)			entries = listdir(join(nd), stat=True, skip=skip)
	except OSError as inst:			except OSError as inst:
	if inst.errno in (errno.EACCES, errno.ENOENT):			if inst.errno in (errno.EACCES, errno.ENOENT):
	match.bad(self.pathto(nd),			match.bad(self.pathto(nd),
	encoding.strtolocal(inst.strerror))			encoding.strtolocal(inst.strerror))
	continue			continue
	raise			raise
	for f, kind, st in entries:			for f, kind, st in entries:
				# If we needed to inspect any files, visitentries would have
				# been 'this' or 'all', and we would have set it to None
				# above. If we have visitentries populated here, we don't
				# care about any files in this directory, so no need to
				# check the type of `f`.
	if visitentries and f not in visitentries:			if visitentries and f not in visitentries:
	continue			continue
	if normalizefile:			if normalizefile:
	# even though f might be a directory, we're only			# even though f might be a directory, we're only
	# interested in comparing it to files currently in the			# interested in comparing it to files currently in the
	# dmap -- therefore normalizefile is enough			# dmap -- therefore normalizefile is enough
	nf = normalizefile(nd and (nd + "/" + f) or f, True,			nf = normalizefile(nd and (nd + "/" + f) or f, True,
	True)			True)