This is an archive of the discontinued Mercurial Phabricator instance.

hgext/transplant.py
314	Use `util.forcebytestr()` to stringify an exception object of unknown encoding.
mercurial/patch.py
1462	Here `bytestr()` is probably fine, but could be `forcebytestr()`, too.

This revision now requires changes to proceed.Feb 14 2018, 8:32 AM

pulkit retitled this revision from py3: use pycompat.bytestr instead of str for converting errors to bytes to py3: use util.forcebytestr instead of str for converting errors to bytes.Feb 14 2018, 11:26 AM

pulkit updated this revision to Diff 5725.

yuja accepted this revision.Feb 15 2018, 7:18 AM

This revision is now accepted and ready to land.Feb 15 2018, 7:18 AM

Closed by commit rHG6ea0b78ddcac: py3: use util.forcebytestr instead of str for converting errors to bytes (authored by pulkit). · Explain WhyFeb 15 2018, 7:40 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/transplant.py (2 lines)
M			mercurial/patch.py (2 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5709		Feb 14 2018, 7:36 AM	★	★
Diff 2	5725		Feb 14 2018, 11:25 AM	★	★
Diff 3	5758	rHG6ea0b78ddcacc0354fbb08b31ffba78bef218ff2	Feb 14 2018, 7:13 AM	★	★

Status	Author	Revision
Closed	pulkit	D2271 py3: slice over bytes to prevent getting ascii values
Closed	pulkit	D2270 py3: converts bytes to pycompat.bytestr to get bytechrs while enumerating
Closed	pulkit	D2269 py3: use util.forcebytestr instead of str for converting errors to bytes
Closed	pulkit	D2268 py3: use pycompat.{bytes\|str}kwargs in transplant.py
Closed	pulkit	D2267 py3: replace file() with open() in transplant.py
Closed	pulkit	D2266 py3: use "%d" for converting int to bytes in transplant.py
Closed	pulkit	D2265 py3: open files in bytes mode in transplant.py
Closed	pulkit	D2264 py3: use pycompat.bytestr instead of str
Closed	pulkit	D2263 py3: use "%d" to convert integers to bytes

Diff 5725

hgext/transplant.py

	files = list(files)			files = list(files)
	except Exception as inst:			except Exception as inst:
	seriespath = os.path.join(self.path, 'series')			seriespath = os.path.join(self.path, 'series')
	if os.path.exists(seriespath):			if os.path.exists(seriespath):
	os.unlink(seriespath)			os.unlink(seriespath)
	p1 = repo.dirstate.p1()			p1 = repo.dirstate.p1()
	p2 = node			p2 = node
	self.log(user, date, message, p1, p2, merge=merge)			self.log(user, date, message, p1, p2, merge=merge)
	self.ui.write(str(inst) + '\n')			self.ui.write(util.forcebytestr(inst) + '\n')
				yujaUnsubmitted Not Done Use `util.forcebytestr()` to stringify an exception object of unknown encoding. yuja: Use `util.forcebytestr()` to stringify an exception object of unknown encoding.
	raise TransplantError(_('fix up the working directory and run '			raise TransplantError(_('fix up the working directory and run '
	'hg transplant --continue'))			'hg transplant --continue'))
	else:			else:
	files = None			files = None
	if merge:			if merge:
	p1, p2 = repo.dirstate.parents()			p1, p2 = repo.dirstate.parents()
	repo.setparents(p1, node)			repo.setparents(p1, node)
	m = match.always(repo.root, '')			m = match.always(repo.root, '')

mercurial/patch.py

	if l <= 'Z' and l >= 'A':			if l <= 'Z' and l >= 'A':
	l = ord(l) - ord('A') + 1			l = ord(l) - ord('A') + 1
	else:			else:
	l = ord(l) - ord('a') + 27			l = ord(l) - ord('a') + 27
	try:			try:
	dec.append(util.b85decode(line[1:])[:l])			dec.append(util.b85decode(line[1:])[:l])
	except ValueError as e:			except ValueError as e:
	raise PatchError(_('could not decode "%s" binary patch: %s')			raise PatchError(_('could not decode "%s" binary patch: %s')
	% (self._fname, str(e)))			% (self._fname, util.forcebytestr(e)))
				yujaUnsubmitted Not Done Here `bytestr()` is probably fine, but could be `forcebytestr()`, too. yuja: Here `bytestr()` is probably fine, but could be `forcebytestr()`, too.
	line = getline(lr, self.hunk)			line = getline(lr, self.hunk)
	text = zlib.decompress(''.join(dec))			text = zlib.decompress(''.join(dec))
	if len(text) != size:			if len(text) != size:
	raise PatchError(_('"%s" length is %d bytes, should be %d')			raise PatchError(_('"%s" length is %d bytes, should be %d')
	% (self._fname, len(text), size))			% (self._fname, len(text), size))
	self.text = text			self.text = text

	def parsefilename(str):			def parsefilename(str):

This is an archive of the discontinued Mercurial Phabricator instance.

py3: use util.forcebytestr instead of str for converting errors to bytesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 5725

hgext/transplant.py

mercurial/patch.py

py3: use util.forcebytestr instead of str for converting errors to bytes
ClosedPublic

Revision Contents
Changeset List