This is an archive of the discontinued Mercurial Phabricator instance.

py3: preserve chunks as an iterable of bytes
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Download Raw Diff

Details

Reviewers

pulkit
durin42

Group Reviewers

hg-reviewers

Commits

rHGc1104fe76e69: py3: preserve chunks as an iterable of bytes

Summary

patch.diffstat() returns a bytes. util.chunkbuffer() expects an
iterable of bytes. Feeding it a single bytes instance on Python 3
will iterate the characters as integers. This blows up
util.chunkbuffer.

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

indygreg created this revision.Feb 11 2018, 9:35 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 11 2018, 9:35 PM

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

indygreg added a child revision: D2163: py3: use raw string for key in **kwargs.Feb 11 2018, 9:35 PM

pulkit accepted this revision.Feb 12 2018, 2:36 AM

durin42 accepted this revision.Feb 12 2018, 9:30 PM

This revision is now accepted and ready to land.Feb 12 2018, 9:30 PM

Closed by commit rHGc1104fe76e69: py3: preserve chunks as an iterable of bytes (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Status	Author	Revision
Closed	indygreg	D2151 py3: check for bytes instead of str in hg.share()
Closed	indygreg	D2150 py3: port metaedit extension to Python 3
Closed	indygreg	D2149 py3: pass system string to email.message.Message.set_type()
Closed	indygreg	D2148 py3: open temporary file in binary mode
Closed	indygreg	D2147 py3: use email parser that operates on bytes
Closed	indygreg	D2176 py3: convert traceback representation to bytes when logging
Closed	indygreg	D2175 py3: use b'' in mockblackbox.py
Closed	indygreg	D2174 py3: convert context to bytes instead of str
Closed	indygreg	D2173 py3: add missing b'' literal to sshprotoext.py
Closed	indygreg	D2172 py3: convert FrameInfo members to bytes
Closed	indygreg	D2171 ui: use named attributes on FrameInfo instance
Closed	indygreg	D2170 py3: make dummyssh compatible with Python 3
Closed	indygreg	D2169 py3: explicitly cast bool to bytes
Closed	indygreg	D2168 mail: import email.utils not email.Utils
Closed	indygreg	D2167 py3: cast character set to bytes
Closed	indygreg	D2166 py3: cast decode() argument to system string
Closed	indygreg	D2165 githelp: cast commands to bytes
Closed	indygreg	D2164 py3: avoid changing dictionary during iteration
Closed	indygreg	D2163 py3: use raw string for key in **kwargs
Closed	indygreg	D2162 py3: preserve chunks as an iterable of bytes
Closed	indygreg	D2161 py3: use b'' for changegroup version literals
Closed	indygreg	D2160 py3: use b'' in inline extension
Closed	indygreg	D2159 py3: use hex(hasher.digest())
Needs Revision	indygreg	D2158 py3: use raw string for open() mode
Closed	indygreg	D2157 py3: use string for "close" value in commit extras
Closed	indygreg	D2156 py3: catch TypeError during template operations
Closed	indygreg	D2155 py3: use bytes literals for test extension
Closed	indygreg	D2154 py3: use system strings when calling __import__
Closed	indygreg	D2153 py3: open patches.queue in binary mode
Closed	indygreg	D2152 py3: compare against bytes instead of str
Closed	indygreg	D2146 py3: port string formatting
Closed	indygreg	D2145 py3: port ext-phase-report.py extension
Closed	indygreg	D2144 py3: more robustly cast UUID to bytes
Closed	indygreg	D2143 py3: use bytes() to cast context instances
Closed	indygreg	D2142 py3: convert __doc__ to bytes
Closed	indygreg	D2141 py3: cast repr() result to bytes
Closed	indygreg	D2140 py3: fix file i/o in test-status.t
Closed	indygreg	D2139 py3: pass system string to socket.getservbyname
Closed	indygreg	D2138 run-tests: report tests that exception occurred in
Closed	indygreg	D2137 py3: use raw string for file open mode
Closed	indygreg	D2136 py3: convert content-type to bytes

Diff 5586

mercurial/logcmdutil.py


	chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,			chunks = patch.diff(repo, node1, node2, match, changes, opts=diffopts,
	prefix=prefix, relroot=relroot,			prefix=prefix, relroot=relroot,
	hunksfilterfn=hunksfilterfn)			hunksfilterfn=hunksfilterfn)

	if fp is not None or ui.canwritewithoutlabels():			if fp is not None or ui.canwritewithoutlabels():
	out = fp or ui			out = fp or ui
	if stat:			if stat:
	chunks = patch.diffstat(util.iterlines(chunks), width=width)			chunks = [patch.diffstat(util.iterlines(chunks), width=width)]
	for chunk in util.filechunkiter(util.chunkbuffer(chunks)):			for chunk in util.filechunkiter(util.chunkbuffer(chunks)):
	out.write(chunk)			out.write(chunk)
	else:			else:
	if stat:			if stat:
	chunks = patch.diffstatui(util.iterlines(chunks), width=width)			chunks = patch.diffstatui(util.iterlines(chunks), width=width)
	else:			else:
	chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks,			chunks = patch.difflabel(lambda chunks, **kwargs: chunks, chunks,
	opts=diffopts)			opts=diffopts)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5463		Feb 11 2018, 9:35 PM	★	★
Diff 2	5586	rHGc1104fe76e6917a8e219611d6713ea9e32a00df4	Feb 11 2018, 7:50 PM	★	★