This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1799

py3: use list() to get a list of items using dict.items()
ClosedPublic

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

Download Raw Diff

Details

Reviewers

durin42

Group Reviewers

hg-reviewers

Commits

rHG3328d53254d9: py3: use list() to get a list of items using dict.items()

Summary

dict.items() on Python 3 returns a generator over the values of the dictionary,
hence we can't delete elements while iterating over dict.items() in Python 3.

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:50 PM

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

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

pulkit added a child revision: D1800: py3: add 8 new passing tests to the whitelist.Dec 28 2017, 8:04 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 rHG3328d53254d9: py3: use list() to get a list of items using dict.items() (authored by pulkit). · Explain WhyJan 10 2018, 6:04 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/patch.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 4782

mercurial/patch.py

	for f in removed:			for f in removed:
	if f not in ctx1:			if f not in ctx1:
	# Merged-in additions that are then removed are reported as removed.			# Merged-in additions that are then removed are reported as removed.
	# They are not in ctx1, so We don't want to show them in the diff.			# They are not in ctx1, so We don't want to show them in the diff.
	removedset.remove(f)			removedset.remove(f)
	modified = sorted(modifiedset)			modified = sorted(modifiedset)
	added = sorted(addedset)			added = sorted(addedset)
	removed = sorted(removedset)			removed = sorted(removedset)
	for dst, src in copy.items():			for dst, src in list(copy.items()):
	if src not in ctx1:			if src not in ctx1:
	# Files merged in during a merge and then copied/renamed are			# Files merged in during a merge and then copied/renamed are
	# reported as copies. We want to show them in the diff as additions.			# reported as copies. We want to show them in the diff as additions.
	del copy[dst]			del copy[dst]

	def difffn(opts, losedata):			def difffn(opts, losedata):
	return trydiff(repo, revs, ctx1, ctx2, modified, added, removed,			return trydiff(repo, revs, ctx1, ctx2, modified, added, removed,
	copy, getfilectx, opts, losedata, prefix, relroot)			copy, getfilectx, opts, losedata, prefix, relroot)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4676		Dec 28 2017, 7:50 PM	★	★
Diff 2	4782	rHG3328d53254d9a0ddabb8e2df3d5b9bf22a539de3	Dec 28 2017, 7:03 PM	★	★