This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1790

py3: use pycompat.ziplist instead of inbuilt zip
ClosedPublic

Authored by pulkit on Dec 28 2017, 7:48 PM.

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHGcb0db11f392d: py3: use pycompat.ziplist instead of inbuilt zip

Summary

zip just like map on Python 3 returns a generator object instead of list. This
results in error if we try to iterate over the result once we consume it. We
have added pycompat.ziplist which returns a list.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

Event Timeline

pulkit created this revision.Dec 28 2017, 7:48 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 28 2017, 7:48 PM

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

pulkit added a child revision: D1791: tests: make autodiff.py work on Python 3.Dec 28 2017, 7:48 PM

durin42 accepted this revision.Jan 10 2018, 5:56 PM

This revision is now accepted and ready to land.Jan 10 2018, 5:56 PM

Closed by commit rHGcb0db11f392d: py3: use pycompat.ziplist instead of inbuilt zip (authored by pulkit). · Explain WhyJan 10 2018, 6:03 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Status	Author	Revision
Closed	pulkit	D1800 py3: add 8 new passing tests to the whitelist
Closed	pulkit	D1799 py3: use list() to get a list of items using dict.items()
Closed	pulkit	D1798 py3: convert dict keys' to str before passing as kwargs
Closed	pulkit	D1797 py3: make sure we open the file to write in bytes mode
Closed	pulkit	D1796 py3: don't use dict.iterkeys()
Closed	pulkit	D1795 py3: use pycompat.bytestr() instead of str()
Closed	pulkit	D1794 py3: make regular expressions bytes by prepending b''
Closed	pulkit	D1793 py3: slice on bytes instead of indexing
Closed	pulkit	D1792 py3: use node.hex(h.digest()) instead of h.hexdigest()
Closed	pulkit	D1791 tests: make autodiff.py work on Python 3
Closed	pulkit	D1790 py3: use pycompat.ziplist instead of inbuilt zip
Closed	pulkit	D1789 py3: use bytes and open() instead of file() in test-diff-upgrade.t
Closed	pulkit	D1788 tests: add b'' to string literals where bytes are required

Diff 4773

mercurial/context.py

	del hist[p]			del hist[p]
	del needed[p]			del needed[p]
	else:			else:
	needed[p] -= 1			needed[p] -= 1

	hist[f] = curr			hist[f] = curr
	del pcache[f]			del pcache[f]

	return zip(hist[base][0], hist[base][1].splitlines(True))			return pycompat.ziplist(hist[base][0], hist[base][1].splitlines(True))

	def ancestors(self, followfirst=False):			def ancestors(self, followfirst=False):
	visit = {}			visit = {}
	c = self			c = self
	if followfirst:			if followfirst:
	cut = 1			cut = 1
	else:			else:
	cut = None			cut = None

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4667		Dec 28 2017, 7:48 PM	★	★
Diff 2	4773	rHGcb0db11f392d9623113749633d9040505f7aad2a	Dec 28 2017, 5:02 PM	★	★