This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5026

py3: use '%s' instead of %r in hgext/convert/subversion.py
ClosedPublic

Authored by pulkit on Oct 12 2018, 9:58 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG4d6019c0e0ef: py3: use '%s' instead of %r in hgext/convert/subversion.py

Summary

Using '%r' on bytes in python 3 adds b'' prefixes to output which is bad. I
don't see a reason why we want to repr() the string here, so just switched to
'%s'. This fixes some output failure in one of the subversion test.

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

pulkit created this revision.Oct 12 2018, 9:58 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptOct 12 2018, 9:58 PM

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

pulkit added a child revision: D5027: py3: use sys.stdout.buffer for binary output in tests/svnxml.py.Oct 12 2018, 9:58 PM

Closed by commit rHG4d6019c0e0ef: py3: use '%s' instead of %r in hgext/convert/subversion.py (authored by pulkit). · Explain WhyOct 13 2018, 1:04 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/convert/subversion.py (4 lines)

Status	Author	Revision
Closed	pulkit	D5042 py3: add some glob to make output compatible with python 3
Closed	pulkit	D5041 py3: add a b'' prefix in tests/test-requires.t
Closed	pulkit	D5040 py3: use '%d' for rev nums instead of '%s'
Closed	pulkit	D5039 py3: add __pycache__ to .hgignore
Closed	pulkit	D5038 py3: more globing of things to make output compatible between py2 and py3
Closed	pulkit	D5037 py3: use stringutil.pprint() instead of '%r'
Closed	pulkit	D5036 py3: use '%d' for integers instead of '%s'
Closed	pulkit	D5035 py3: add some py3 specific output to test
Closed	pulkit	D5034 py3: use stringutil.pprint() in color.py instead of '%r'
Closed	pulkit	D5033 py3: add b'' prefixes in tests/test-progress.t
Closed	pulkit	D5032 py3: add b'' prefixes to tests/test-keyword.t
Closed	pulkit	D5031 py3: use stringutil.pprint() if we are printing bool values
Closed	pulkit	D5030 py3: glob some difference between py2 and py3 output
Closed	pulkit	D5029 py3: byteify tests/wireprotosimplecache.py
Closed	pulkit	D5028 py3: add b'' prefixes in tests/test-help.t
Closed	pulkit	D5027 py3: use sys.stdout.buffer for binary output in tests/svnxml.py
Closed	pulkit	D5026 py3: use '%s' instead of %r in hgext/convert/subversion.py
Closed	pulkit	D5025 py3: make test-contrib-perf.t work on python 3
Closed	pulkit	D5024 py3: add 3 more passing tests to whitelist caught by buildbot
Closed	pulkit	D5023 py3: add some r'' prefixes in hgext/narrow/narrowwirepeer.py

Diff 11981

hgext/convert/subversion.py

	if os.path.isfile(os.path.join(path, '.svn', 'entries')):			if os.path.isfile(os.path.join(path, '.svn', 'entries')):
	self.wc = os.path.realpath(path)			self.wc = os.path.realpath(path)
	self.run0('update')			self.run0('update')
	else:			else:
	if not re.search(br'^(file\|http\|https\|svn\|svn\+ssh)\://', path):			if not re.search(br'^(file\|http\|https\|svn\|svn\+ssh)\://', path):
	path = os.path.realpath(path)			path = os.path.realpath(path)
	if os.path.isdir(os.path.dirname(path)):			if os.path.isdir(os.path.dirname(path)):
	if not os.path.exists(os.path.join(path, 'db', 'fs-type')):			if not os.path.exists(os.path.join(path, 'db', 'fs-type')):
	ui.status(_('initializing svn repository %r\n') %			ui.status(_("initializing svn repository '%s'\n") %
	os.path.basename(path))			os.path.basename(path))
	commandline(ui, 'svnadmin').run0('create', path)			commandline(ui, 'svnadmin').run0('create', path)
	created = path			created = path
	path = util.normpath(path)			path = util.normpath(path)
	if not path.startswith('/'):			if not path.startswith('/'):
	path = '/' + path			path = '/' + path
	path = 'file://' + path			path = 'file://' + path

	wcpath = os.path.join(encoding.getcwd(), os.path.basename(path) +			wcpath = os.path.join(encoding.getcwd(), os.path.basename(path) +
	'-wc')			'-wc')
	ui.status(_('initializing svn working copy %r\n')			ui.status(_("initializing svn working copy '%s'\n")
	% os.path.basename(wcpath))			% os.path.basename(wcpath))
	self.run0('checkout', path, wcpath)			self.run0('checkout', path, wcpath)

	self.wc = wcpath			self.wc = wcpath
	self.opener = vfsmod.vfs(self.wc)			self.opener = vfsmod.vfs(self.wc)
	self.wopener = vfsmod.vfs(self.wc)			self.wopener = vfsmod.vfs(self.wc)
	self.childmap = mapfile(ui, self.join('hg-childmap'))			self.childmap = mapfile(ui, self.join('hg-childmap'))
	if util.checkexec(self.wc):			if util.checkexec(self.wc):

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	11960		Oct 12 2018, 9:58 PM	★	★
Diff 2	11981	rHG4d6019c0e0ef314ed9bacf1a70ffd7ddaadeb2e9	Oct 12 2018, 8:58 PM	★	★