This is an archive of the discontinued Mercurial Phabricator instance.

patchbomb: don't unintentionally duplicate headers
ClosedPublic

Authored by durin42 on Aug 9 2018, 10:06 PM.

Download Raw Diff

Details

Reviewers

pulkit
indygreg

Group Reviewers

hg-reviewers

Commits

rHGcecb05c371f7: patchbomb: don't unintentionally duplicate headers

Summary

This dict-like of headers is only mostly dict-like: if you set a key
that already exists, you it appends another value, rather than
replacing the one that was already present.

This fixes test-patchbomb-bookmark.t on Python 3.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 9 2018, 10:06 PM

Herald added a reviewer: pulkit. · View Herald TranscriptAug 9 2018, 10:06 PM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

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

durin42 added a child revision: D4230: tests: put some Python 3 polish on inline Python invocations.Aug 9 2018, 10:06 PM

Eww. But I got nothing better that doesn't involve reconstructing the message instance :/

This revision is now accepted and ready to land.Aug 9 2018, 11:20 PM

Closed by commit rHGcecb05c371f7: patchbomb: don't unintentionally duplicate headers (authored by durin42). · Explain WhyAug 9 2018, 11:22 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			contrib/python3-whitelist (1 line)
M			hgext/patchbomb.py (9 lines)

Commit	Parents	Author	Summary	Date
		Augie Fackler		Aug 9 2018, 7:39 PM

Status	Author	Revision
Closed	durin42	D4234 tests: allow for a bonus newline in base64'd email payload
Closed	durin42	D4233 mail: be more cautious about bytes vs str for py3 compat
Closed	durin42	D4232 patchbomb: use native strings when determining attachment disposition
Closed	durin42	D4231 mail: always fall back to iso-8859-1 if us-ascii won't work (BC)
Closed	durin42	D4230 tests: put some Python 3 polish on inline Python invocations
Closed	durin42	D4229 patchbomb: don't unintentionally duplicate headers
Closed	durin42	D4228 patchbomb: use sysstrs when describing content-type
Closed	durin42	D4223 patchbomb: use native strs for email header keys and values
Closed	durin42	D4222 patchbomb: use email.encoders instead of email.Encoders
Closed	durin42	D4221 mail: properly handle email addresses typically being unicodes
Closed	durin42	D4220 tests: fix Python3 issues in Python one-liners in test-patchbomb.t
Closed	durin42	D4219 dummysmtpd: accept additional kwargs from stdlib smtpd
Closed	durin42	D4218 mail: fix debug print, which appears to have been broken for a long time
Closed	durin42	D3957 patchbomb: python 3 really wants those email addresses in unicode
Closed	durin42	D3956 mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile
Closed	durin42	D3955 mail: modernize check for Python-with-TLS
Closed	durin42	D3954 mail: cope with Py3 unicode antics on email addresses
Closed	durin42	D3953 mail: fix _encode to be more correct on Python 3
Closed	durin42	D3951 patchbomb: work around email module really wanting to write unicode data

Diff 10223

contrib/python3-whitelist

	test-obsolete-distributed.t			test-obsolete-distributed.t
	test-obsolete-divergent.t			test-obsolete-divergent.t
	test-obsolete-tag-cache.t			test-obsolete-tag-cache.t
	test-pager.t			test-pager.t
	test-parents.t			test-parents.t
	test-parseindex2.py			test-parseindex2.py
	test-patch-offset.t			test-patch-offset.t
	test-patch.t			test-patch.t
				test-patchbomb-bookmark.t
	test-patchbomb-tls.t			test-patchbomb-tls.t
	test-pathconflicts-merge.t			test-pathconflicts-merge.t
	test-pathconflicts-update.t			test-pathconflicts-update.t
	test-pathencode.py			test-pathencode.py
	test-pending.t			test-pending.t
	test-permissions.t			test-permissions.t
	test-phases.t			test-phases.t
	test-pull-branch.t			test-pull-branch.t

hgext/patchbomb.py

	if bcc:			if bcc:
	m['Bcc'] = ', '.join(bcc)			m['Bcc'] = ', '.join(bcc)
	if replyto:			if replyto:
	m['Reply-To'] = ', '.join(replyto)			m['Reply-To'] = ', '.join(replyto)
	# Fix up all headers to be native strings.			# Fix up all headers to be native strings.
	# TODO(durin42): this should probably be cleaned up above in the future.			# TODO(durin42): this should probably be cleaned up above in the future.
	if pycompat.ispy3:			if pycompat.ispy3:
	for hdr, val in list(m.items()):			for hdr, val in list(m.items()):
				change = False
	if isinstance(hdr, bytes):			if isinstance(hdr, bytes):
	del m[hdr]			del m[hdr]
	hdr = pycompat.strurl(hdr)			hdr = pycompat.strurl(hdr)
				change = True
	if isinstance(val, bytes):			if isinstance(val, bytes):
	val = pycompat.strurl(val)			val = pycompat.strurl(val)
				if not change:
				# prevent duplicate headers
				del m[hdr]
				change = True
				if change:
	m[hdr] = val			m[hdr] = val
	if opts.get('test'):			if opts.get('test'):
	ui.status(_('displaying '), subj, ' ...\n')			ui.status(_('displaying '), subj, ' ...\n')
	ui.pager('email')			ui.pager('email')
	generator = emailgen.Generator(_bytesgenerator(ui),			generator = emailgen.Generator(_bytesgenerator(ui),
	mangle_from_=False)			mangle_from_=False)
	try:			try:
	generator.flatten(m, 0)			generator.flatten(m, 0)
	ui.write('\n')			ui.write('\n')

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	10223		Aug 9 2018, 10:06 PM	★	★
Diff 2	10261	rHGcecb05c371f7beaf4168a2b8f2ac94a8e3352bdd	Aug 9 2018, 7:39 PM	★	★