This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6042

py3: convert filtername to str if it's None
ClosedPublic

Authored by pulkit on Mar 1 2019, 7:13 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG38de3300414f: py3: convert filtername to str if it's None

Summary

I have not called pycompat.bytestr() and rather converted the value there
because I am starting to get concerned about the function call overhead of all
this bytes to str or vice versa convert functions.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 1 2019, 7:13 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 1 2019, 7:13 PM

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

+ filtername = repo.filtername
+ if filtername is None:
+ filtername = 'None'
repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n',
repo.filtername, duration)

+ filtername, duration)

Perhaps, we can use %r instead. It's just logging, we wouldn't care the output
format. Or simply, repo.filtername or b'None'.

pulkit edited the summary of this revision. (Show Details)Mar 3 2019, 4:02 PM

pulkit updated this revision to Diff 14320.

pulkit updated this revision to Diff 14321.Mar 3 2019, 4:07 PM

Closed by commit rHG38de3300414f: py3: convert filtername to str if it's None (authored by pulkit). · Explain WhyMar 4 2019, 9:08 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/branchmap.py (5 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14285		Mar 1 2019, 7:13 PM	★	★
Diff 2	14320		Mar 3 2019, 4:01 PM	★	★
Diff 3	14321		Mar 3 2019, 4:07 PM	★	★
Diff 4	14341	rHG38de3300414fb7412418ba7e7be62320d30a6524	Mar 1 2019, 6:54 PM	★	★

Commit	Parents	Author	Summary	Date
		Pulkit Goyal		Mar 1 2019, 6:54 PM

Status	Author	Revision
Closed	pulkit	D6042 py3: convert filtername to str if it's None
Closed	pulkit	D6041 py3: pass a str to getpass.getpass()
Closed	pulkit	D6040 py3: port things from chgserver.py
Closed	pulkit	D6039 py3: make sure return value of posix.groupname() is bytes

Diff 14320

mercurial/branchmap.py

	for heads in self.values():			for heads in self.values():
	tiprev = max(cl.rev(node) for node in heads)			tiprev = max(cl.rev(node) for node in heads)
	if tiprev > self.tiprev:			if tiprev > self.tiprev:
	self.tipnode = cl.node(tiprev)			self.tipnode = cl.node(tiprev)
	self.tiprev = tiprev			self.tiprev = tiprev
	self.filteredhash = scmutil.filteredhash(repo, self.tiprev)			self.filteredhash = scmutil.filteredhash(repo, self.tiprev)

	duration = util.timer() - starttime			duration = util.timer() - starttime
				filtername = repo.filtername
				if filtername is None:
				filtername = 'None'
	repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n',			repo.ui.log('branchcache', 'updated %s branch cache in %.4f seconds\n',
	repo.filtername, duration)			repo.filtername or b'None', duration)

	self.write(repo)			self.write(repo)


	class remotebranchcache(branchcache):			class remotebranchcache(branchcache):
	"""Branchmap info for a remote connection, should not write locally"""			"""Branchmap info for a remote connection, should not write locally"""
	def write(self, repo):			def write(self, repo):
	pass			pass