This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10998

windows: replicate the normalizing behavior of os.environ
ClosedPublic

Authored by Alphare on Jul 7 2021, 9:14 AM.

Download Raw Diff

Details

Reviewers

marmoute

Group Reviewers

hg-reviewers

Commits

rHGaf633293a5bd: windows: replicate the normalizing behavior of os.environ

Summary

On Windows, os.environ normalizes environment variables to uppercase. Our
current bytes-based environ substitution object is a simple dict, so we add
the normalization behavior.

This fixes test-http-peer.t on Windows.

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

Alphare created this revision.Jul 7 2021, 9:14 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 7 2021, 9:14 AM

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

Alphare added a child revision: D10999: compat: normalise path before comparison in revlog splitting test.Jul 7 2021, 9:14 AM

This diff is mostly unreadable as a large portion is considered moved…

Alphare added a parent revision: D11024: encoding: move case-related utils up.Jul 8 2021, 9:56 AM

Alphare edited the summary of this revision. (Show Details)

Alphare updated this revision to Diff 28999.

marmoute accepted this revision.Jul 8 2021, 10:36 AM

Alphare added a commit: rHGaf633293a5bd: windows: replicate the normalizing behavior of os.environ.Jul 8 2021, 4:20 PM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGaf633293a5bd: windows: replicate the normalizing behavior of os.environ (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/encoding.py (17 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	28931		Jul 7 2021, 9:14 AM	★	★
Diff 2	28999		Jul 8 2021, 9:56 AM	★	★
Diff 3	29025	rHGaf633293a5bd9deda7ed7a06adba874e8234dcd9	Jul 8 2021, 9:55 AM	★	★

Status	Author	Revision
Closed	Alphare	D10999 compat: normalise path before comparison in revlog splitting test
Closed	Alphare	D10998 windows: replicate the normalizing behavior of os.environ
Closed	Alphare	D11024 encoding: move case-related utils up

Diff 29025

mercurial/encoding.py

	return s.upper() # we don't know how to fold this except in ASCII			return s.upper() # we don't know how to fold this except in ASCII
	except LookupError as k:			except LookupError as k:
	raise error.Abort(k, hint=b"please check your locale settings")			raise error.Abort(k, hint=b"please check your locale settings")


	if not _nativeenviron:			if not _nativeenviron:
	# now encoding and helper functions are available, recreate the environ			# now encoding and helper functions are available, recreate the environ
	# dict to be exported to other modules			# dict to be exported to other modules
	environ = {			if pycompat.iswindows and pycompat.ispy3:
	tolocal(k.encode('utf-8')): tolocal(v.encode('utf-8'))
	for k, v in os.environ.items() # re-exports			class WindowsEnviron(dict):
	}			"""`os.environ` normalizes environment variables to uppercase on windows"""

				def get(self, key, default=None):
				return super().get(upper(key), default)

				environ = WindowsEnviron()

				for k, v in os.environ.items(): # re-exports
				environ[tolocal(k.encode('utf-8'))] = tolocal(v.encode('utf-8'))


	if pycompat.ispy3:			if pycompat.ispy3:
	# os.getcwd() on Python 3 returns string, but it has os.getcwdb() which			# os.getcwd() on Python 3 returns string, but it has os.getcwdb() which
	# returns bytes.			# returns bytes.
	if pycompat.iswindows:			if pycompat.iswindows:
	# Python 3 on Windows issues a DeprecationWarning about using the bytes			# Python 3 on Windows issues a DeprecationWarning about using the bytes
	# API when os.getcwdb() is called.			# API when os.getcwdb() is called.
	#			#