This is an archive of the discontinued Mercurial Phabricator instance.

pulkit retitled this revision from py3: use pycompat.bytestr to convert str to bytes to py3: use util.forcebytestr to convert str to bytes.Mar 1 2018, 7:47 AM

pulkit updated this revision to Diff 6244.

yuja accepted this revision.Mar 1 2018, 8:26 AM

This revision is now accepted and ready to land.Mar 1 2018, 8:26 AM

Closed by commit rHG724ddf2444a7: py3: use util.forcebytestr to convert str to bytes (authored by pulkit). · Explain WhyMar 1 2018, 8:40 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/exchange.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6198		Feb 28 2018, 5:29 PM	★	★
Diff 2	6244		Mar 1 2018, 7:47 AM	★	★
Diff 3	6245	rHG724ddf2444a7d77137056ccf1c8bdc5e64d65b4c	Feb 28 2018, 9:25 AM	★	★

Status	Author	Revision
Closed	pulkit	D2511 py3: add 14 new passing tests to whitelist
Closed	pulkit	D2510 py3: add b'' prefixes in tests/test-rollback.t
Closed	pulkit	D2509 py3: add b'' prefix in tests/test-revlog-v2.t
Closed	pulkit	D2508 py3: add b'' prefixes in tests/test-revlog.t
Closed	pulkit	D2507 py3: make sure we open the file in bytes mode
Closed	pulkit	D2506 py3: add b'' prefixes in tests/test-revlog-ancestry.py
Closed	pulkit	D2505 py3: port the markdirver extension in tests/test-resolve.t
Closed	pulkit	D2504 py3: backout changeset 56635c506608 which wrongly added couple of b''
Closed	pulkit	D2503 py3: add a missing b'' in tests/bruterebase.py
Closed	pulkit	D2502 py3: use '%d' for integers instead of b'%s'
Closed	pulkit	D2501 py3: make sure we write in mergestate in bytes mode
Closed	pulkit	D2500 py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Closed	pulkit	D2499 py3: replace str() calls with their preferred bytes equivalent
Closed	pulkit	D2498 py3: use util.forcebytestr to convert str to bytes
Closed	pulkit	D2497 py3: convert error messages to bytes using util.forcebytestr()
Closed	pulkit	D2496 py3: slice over bytes or use startswith() to prevent getting ascii values

Diff 6244

mercurial/exchange.py

	cg.apply(repo)			cg.apply(repo)
	else:			else:
	bundle2.applybundle(repo, cg, tr, 'clonebundles', url)			bundle2.applybundle(repo, cg, tr, 'clonebundles', url)
	return True			return True
	except urlerr.httperror as e:			except urlerr.httperror as e:
	ui.warn(_('HTTP error fetching bundle: %s\n') %			ui.warn(_('HTTP error fetching bundle: %s\n') %
	util.forcebytestr(e))			util.forcebytestr(e))
	except urlerr.urlerror as e:			except urlerr.urlerror as e:
	ui.warn(_('error fetching bundle: %s\n') % e.reason)			ui.warn(_('error fetching bundle: %s\n') %
				util.forcebytestr(e.reason))

	return False			return False

This is an archive of the discontinued Mercurial Phabricator instance.

py3: use util.forcebytestr to convert str to bytesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 6244

mercurial/exchange.py

py3: use util.forcebytestr to convert str to bytes
ClosedPublic

Revision Contents
Changeset List