This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1099

dagutil: use a listcomp instead of a map()
ClosedPublic

Authored by durin42 on Oct 15 2017, 9:30 PM.

Download Raw Diff

Details

Reviewers

ryanmce

Group Reviewers

hg-reviewers

Commits

rHG09397d0dd3b7: dagutil: use a listcomp instead of a map()

Summary

In Python 3, the map() returns a generator object instead of a list,
and some parts of hg depend on this being consumable more than once or
sortable in place.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Oct 15 2017, 9:30 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 15 2017, 9:30 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

durin42 added a child revision: D1100: wireproto: use listcomp instead of map().Oct 15 2017, 9:30 PM

queued

This revision is now accepted and ready to land.Oct 16 2017, 5:15 AM

Closed by commit rHG09397d0dd3b7: dagutil: use a listcomp instead of a map() (authored by durin42). · Explain WhyOct 16 2017, 5:17 AM

This revision was automatically updated to reflect the committed changes.

I have no preference, but pycompat.maplist() could be used.

Oh, I always forget maplist() exists. Probably doesn't matter for this case.

Revision Contents
Changeset List

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

Status	Author	Revision
Closed	durin42	D1104 peer: ensure command names are always ascii bytestrs
Closed	durin42	D1103 httppeer: always produce native str header keys and values
Closed	durin42	D1102 wireproto: use %d to encode int, not %s
Closed	durin42	D1101 wireproto: use a proper exception instead of `assert False`
Closed	durin42	D1100 wireproto: use listcomp instead of map()
Closed	durin42	D1099 dagutil: use a listcomp instead of a map()
Closed	durin42	D1092 peer: when collecting method names for batch calls, bytes-ify __name__
Closed	durin42	D1091 python3: replace im_{self,func} with __{self,func}__ globally
Closed	durin42	D1090 httppeer: extract content-type from headers using native str
Closed	durin42	D1089 httppeer: convert request url back to bytes before inspecting it
Closed	durin42	D1088 templater: explode if we try to emit a str
Closed	durin42	D1087 hgweb: fill in content-type and content-length as native strings
Closed	durin42	D1086 hgweb: mimetype guessing needs a unicode path
Closed	durin42	D1085 hgweb: set sent_headers attr as early as practical
Closed	durin42	D1084 hgweb: detect Python 3-era libraries and use modern attribute names
Closed	durin42	D1083 server: indent block that's about to get conditionalized

Diff 2791

mercurial/dagutil.py

	return ix			return ix
	def _internalizeall(self, ids, filterunknown):			def _internalizeall(self, ids, filterunknown):
	rl = self._revlog			rl = self._revlog
	if filterunknown:			if filterunknown:
	return [r for r in map(rl.nodemap.get, ids)			return [r for r in map(rl.nodemap.get, ids)
	if (r is not None			if (r is not None
	and r != nullrev			and r != nullrev
	and r not in rl.filteredrevs)]			and r not in rl.filteredrevs)]
	return map(self._internalize, ids)			return [self._internalize(i) for i in ids]


	class revlogdag(revlogbaseddag):			class revlogdag(revlogbaseddag):
	'''dag interface to a revlog'''			'''dag interface to a revlog'''

	def __init__(self, revlog):			def __init__(self, revlog):
	revlogbaseddag.__init__(self, revlog, set(revlog))			revlogbaseddag.__init__(self, revlog, set(revlog))

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2791		Oct 15 2017, 9:30 PM	★	★
Diff 2	2801	rHG09397d0dd3b7d25e095d617e6a2ab785f8d980db	Oct 15 2017, 12:37 AM	★	★