This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9806

windows: wrap `os.getcwd()` in `os.path.realpath()` on py3
ClosedPublic

Authored by mharbison72 on Jan 17 2021, 2:18 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3dfebba99ef6: windows: wrap `os.getcwd()` in `os.path.realpath()` on py3
Summary

I noticed various test-check-* failures that were printing absolute paths
when repo relative paths were expected. This was due to the drive letter in
repo.root being uppercased as it is run through os.path.realpath(), and then
the simple string comparison against the (lowercased) _cwd member of dirstate
in dirstate.getcwd() causing an absolute path to be returned, instead of the
expected b''. That in turn causes scmutil.getuipathfn() to wrongly use
repo.pathto() with an absolute cwd path.
.

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 (7 lines)

Diff 25083

mercurial/encoding.py

} }
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.
getcwd = lambda: strtolocal(os.getcwd()) # re-exports #
# Additionally, py3.8+ uppercases the drive letter when calling
# os.path.realpath(), which is used on ``repo.root``. Since those
# strings are compared in various places as simple strings, also call
# realpath here. See https://bugs.python.org/issue40368
getcwd = lambda: strtolocal(os.path.realpath(os.getcwd())) # re-exports
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"