This is an archive of the discontinued Mercurial Phabricator instance.

manifest: use list(dict) instead of dict.keys() to get a list of keys
ClosedPublic

Authored by durin42 on Feb 18 2018, 1:00 AM.

Reviewers

pulkit
indygreg

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.

This one feels sub-optimal because of the amount of intermediary variables. But I think it should be OK.

This revision is now accepted and ready to land.Feb 18 2018, 11:30 AM

This revision was automatically updated to reflect the committed changes.

In D2317#38442, @indygreg wrote:

This one feels sub-optimal because of the amount of intermediary variables. But I think it should be OK.

Agreed, though it's equivalent to what's already happening with .keys().

So far treemanifest code hasn't been prominent in profiles at Google, so it's not high on my optimization list.

			Path	Packages
M			mercurial/manifest.py (2 lines)

Status	Author	Revision
Closed	durin42	D2318 py3: whitelist another three passing tests
Closed	durin42	D2317 manifest: use list(dict) instead of dict.keys() to get a list of keys
Closed	durin42	D2316 manifest: correct the one use of iterkeys() on a dict
Closed	durin42	D2315 py3: use default dict iterator instead of iterkeys
Closed	durin42	D2314 py3: whitelist five more passing tests
Closed	durin42	D2313 httppeer: headers are native strings
Closed	durin42	D2312 hgweb: header dict entries are native strings
Closed	durin42	D2311 keepalive: headers are native strings, mark them as such
Closed	durin42	D2310 wireprotoserver: py3 helpfully calls adds HTTP_ to CONTENT_LENGTH
Closed	durin42	D2309 tests: port inline Python in test-http-branchmap.t to Python 3
Closed	durin42	D2308 hgweb_mod: partially undo 8afc25e7effc to fix py3
Closed	durin42	D2307 tags: don't feed both int and None to min()
Closed	durin42	D2306 tests: fix get-with-headers.py on python3 when writing to stdout
Closed	durin42	D2305 webcommands: use pycompat.strkwargs as needed
Closed	durin42	D2304 webcommands: unpack contents of length-1 dict portably
Closed	durin42	D2303 bundle2: use pycompat.strkwargs as needed
Closed	durin42	D2302 tests: add b prefixes to test-rebase-dest.t
Closed	durin42	D2301 rebase: sort roots by revision
Closed	durin42	D2300 httppeer: use %d to format int


	def _walk(self, match):			def _walk(self, match):
	'''Recursively generates matching file names for walk().'''			'''Recursively generates matching file names for walk().'''
	if not match.visitdir(self._dir[:-1] or '.'):			if not match.visitdir(self._dir[:-1] or '.'):
	return			return

	# yield this dir's files and walk its submanifests			# yield this dir's files and walk its submanifests
	self._load()			self._load()
	for p in sorted(self._dirs.keys() + self._files.keys()):			for p in sorted(list(self._dirs) + list(self._files)):
	if p in self._files:			if p in self._files:
	fullp = self._subpath(p)			fullp = self._subpath(p)
	if match(fullp):			if match(fullp):
	yield fullp			yield fullp
	else:			else:
	for f in self._dirs[p]._walk(match):			for f in self._dirs[p]._walk(match):
	yield f			yield f