This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11058

windows: enforce upper case drive letter for getcwd in mercurial too
ClosedPublic

Authored by marmoute on Jul 10 2021, 1:44 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd6ee6456bd5f: windows: enforce upper case drive letter for getcwd in mercurial too
Summary

This is affecting code that checks if a pull/push destination is the same as a
configured one. For example the one creating divergent bookmark.

Doing this fixes will help fixing test-bookmarks.t and test-bookflow.t on
Windows. However, we also need to fix abspath invocation.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/encoding.py (19 lines)

Diff 29304

mercurial/encoding.py

# encoding.py - character transcoding support for Mercurial # encoding.py - character transcoding support for Mercurial
# #
# Copyright 2005-2009 Olivia Mackall <olivia@selenic.com> and others # Copyright 2005-2009 Olivia Mackall <olivia@selenic.com> and others
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import locale import locale
import os import os
import re
import unicodedata import unicodedata
from .pycompat import getattr from .pycompat import getattr
from . import ( from . import (
error, error,
policy, policy,
pycompat, pycompat,
) )
return super().get(upper(key), default) return super().get(upper(key), default)
environ = WindowsEnviron() environ = WindowsEnviron()
for k, v in os.environ.items(): # re-exports for k, v in os.environ.items(): # re-exports
environ[tolocal(k.encode('utf-8'))] = tolocal(v.encode('utf-8')) environ[tolocal(k.encode('utf-8'))] = tolocal(v.encode('utf-8'))
DRIVE_RE = re.compile(b'^[a-z]:')
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.
# #
# Additionally, py3.8+ uppercases the drive letter when calling # Additionally, py3.8+ uppercases the drive letter when calling
# os.path.realpath(), which is used on ``repo.root``. Since those # os.path.realpath(), which is used on ``repo.root``. Since those
# strings are compared in various places as simple strings, also call # strings are compared in various places as simple strings, also call
# realpath here. See https://bugs.python.org/issue40368 # realpath here. See https://bugs.python.org/issue40368
getcwd = lambda: strtolocal(os.path.realpath(os.getcwd())) # re-exports #
# However this is not reliable, so lets explicitly make this drive
# letter upper case.
#
# note: we should consider dropping realpath here since it seems to
# change the semantic of `getcwd`.
def getcwd():
cwd = os.getcwd() # re-exports
cwd = os.path.realpath(cwd)
cwd = strtolocal(cwd)
if DRIVE_RE.match(cwd):
cwd = cwd[0:1].upper() + cwd[1:]
return cwd
else: else:
getcwd = os.getcwdb # re-exports getcwd = os.getcwdb # re-exports
else: else:
getcwd = os.getcwd # re-exports getcwd = os.getcwd # re-exports
# How to treat ambiguous-width characters. Set to 'wide' to treat as wide. # How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
_wide = _sysstr( _wide = _sysstr(
environ.get(b"HGENCODINGAMBIGUOUS", b"narrow") == b"wide" environ.get(b"HGENCODINGAMBIGUOUS", b"narrow") == b"wide"