This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2504

py3: backout changeset 56635c506608 which wrongly added couple of b''
ClosedPublic

Authored by pulkit on Feb 28 2018, 5:29 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG4dc6f0905722: py3: backout changeset 56635c506608 which wrongly added couple of b''
rHG45e443342934: py3: backout changeset 56635c506608 which wrongly added couple of b''

Summary

I am not sure what I was thinking when I added that but while fixing rebase
tests, I revisited the file and found that I did wrong. I am sorry for this.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 28 2018, 5:29 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 28 2018, 5:29 PM

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

pulkit added a child revision: D2505: py3: port the markdirver extension in tests/test-resolve.t.Feb 28 2018, 5:29 PM

Closed by commit rHG45e443342934: py3: backout changeset 56635c506608 which wrongly added couple of b'' (authored by pulkit). · Explain WhyMar 1 2018, 4:35 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/fakemergerecord.py (4 lines)

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 6204

tests/fakemergerecord.py


	@command(b'fakemergerecord',			@command(b'fakemergerecord',
	[(b'X', b'mandatory', None, b'add a fake mandatory record'),			[(b'X', b'mandatory', None, b'add a fake mandatory record'),
	(b'x', b'advisory', None, b'add a fake advisory record')], '')			(b'x', b'advisory', None, b'add a fake advisory record')], '')
	def fakemergerecord(ui, repo, pats, *opts):			def fakemergerecord(ui, repo, pats, *opts):
	with repo.wlock():			with repo.wlock():
	ms = merge.mergestate.read(repo)			ms = merge.mergestate.read(repo)
	records = ms._makerecords()			records = ms._makerecords()
	if opts.get(b'mandatory'):			if opts.get('mandatory'):
	records.append((b'X', b'mandatory record'))			records.append((b'X', b'mandatory record'))
	if opts.get(b'advisory'):			if opts.get('advisory'):
	records.append((b'x', b'advisory record'))			records.append((b'x', b'advisory record'))
	ms._writerecords(records)			ms._writerecords(records)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6204		Feb 28 2018, 5:29 PM	★	★
Diff 2	6236	rHG45e4433429346ec38ba6c1fccb328f4148c58868	Feb 28 2018, 11:18 AM	★	★