( )⚙ D11207 upgrade: byteify an i18n message

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11207

upgrade: byteify an i18n message
ClosedPublic

Authored by mharbison72 on Jul 21 2021, 4:07 PM.

Download Raw Diff

Tags

None

Subscribers

marmoute, mercurial-patches

Details

Reviewers

marmoute
Alphare

Group Reviewers

Commits

rHG6b9ad3a0c348: upgrade: byteify an i18n message

Diff Detail

Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Jul 21 2021, 4:07 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 21 2021, 4:07 PM

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

__file__ is not bytes, so this will crash, will it not ?

This revision now requires changes to proceed.Jul 21 2021, 4:56 PM

In D11207#172082, @marmoute wrote:

file is not bytes, so this will crash, will it not ?

I don't follow. _() wants bytes, and the path variable that is formatted in the string is also bytes (because it is split with bytes).

Ha, I confused this with something else. Sorry about that.

This revision now requires review to proceed.Jul 21 2021, 6:01 PM

Alphare accepted this revision.Jul 22 2021, 12:01 PM

This revision is now accepted and ready to land.Jul 22 2021, 12:01 PM

mharbison72 added a commit: rHG6b9ad3a0c348: upgrade: byteify an i18n message.Jul 22 2021, 1:07 PM

Closed by commit rHG6b9ad3a0c348: upgrade: byteify an i18n message (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/upgrade_utils/engine.py (2 lines)

Diff 29709

mercurial/upgrade_utils/engine.py

	mandir = path.rsplit(b'/', 1)[0]			mandir = path.rsplit(b'/', 1)[0]
	return manifest.manifestrevlog(			return manifest.manifestrevlog(
	repo.nodeconstants, repo.svfs, tree=mandir			repo.nodeconstants, repo.svfs, tree=mandir
	)			)
	else:			else:
	# drop the extension and the `data/` prefix			# drop the extension and the `data/` prefix
	path_part = path.rsplit(b'.', 1)[0].split(b'/', 1)			path_part = path.rsplit(b'.', 1)[0].split(b'/', 1)
	if len(path_part) < 2:			if len(path_part) < 2:
	msg = _('cannot recognize revlog from filename: %s')			msg = _(b'cannot recognize revlog from filename: %s')
	msg %= path			msg %= path
	raise error.Abort(msg)			raise error.Abort(msg)
	path = path_part[1]			path = path_part[1]
	return filelog.filelog(repo.svfs, path)			return filelog.filelog(repo.svfs, path)


	def _copyrevlog(tr, destrepo, oldrl, rl_type, unencodedname):			def _copyrevlog(tr, destrepo, oldrl, rl_type, unencodedname):
	"""copy all relevant files for `oldrl` into `destrepo` store			"""copy all relevant files for `oldrl` into `destrepo` store