( )⚙ D11059 windows: introduce a `util.abspath` to replace os.path.abspath

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11059

windows: introduce a `util.abspath` to replace os.path.abspath
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbb917eea1605: windows: introduce a `util.abspath` to replace os.path.abspath
Summary

This will let us mitigate the drive letter capitalization hell.

See inline comment for details.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jul 10 2021, 1:44 PM
Alphare accepted this revision.Jul 13 2021, 11:38 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:38 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/posix.py (2 lines)
Mmercurial/util.py (3 lines)
Mmercurial/windows.py (19 lines)

Diff 29117

mercurial/posix.py

policy, policy,
pycompat, pycompat,
) )
osutil = policy.importmod('osutil') osutil = policy.importmod('osutil')
normpath = os.path.normpath normpath = os.path.normpath
samestat = os.path.samestat samestat = os.path.samestat
abspath = os.path.abspath # re-exports
try: try:
oslink = os.link oslink = os.link
except AttributeError: except AttributeError:
# Some platforms build Python without os.link on systems that are # Some platforms build Python without os.link on systems that are
# vaguely unix-like but don't have hardlink support. For those # vaguely unix-like but don't have hardlink support. For those
# poor souls, just say we tried and that it failed so we fall back # poor souls, just say we tried and that it failed so we fall back
# to copies. # to copies.
def oslink(src, dst): def oslink(src, dst):

mercurial/util.py

if pycompat.iswindows: if pycompat.iswindows:
from . import windows as platform from . import windows as platform
else: else:
from . import posix as platform from . import posix as platform
_ = i18n._ _ = i18n._
abspath = platform.abspath
bindunixsocket = platform.bindunixsocket bindunixsocket = platform.bindunixsocket
cachestat = platform.cachestat cachestat = platform.cachestat
checkexec = platform.checkexec checkexec = platform.checkexec
checklink = platform.checklink checklink = platform.checklink
copymode = platform.copymode copymode = platform.copymode
expandglobs = platform.expandglobs expandglobs = platform.expandglobs
getfsmountpoint = platform.getfsmountpoint getfsmountpoint = platform.getfsmountpoint
getfstype = platform.getfstype getfstype = platform.getfstype
""" """
try: try:
makedir(name, notindexed) makedir(name, notindexed)
except OSError as err: except OSError as err:
if err.errno == errno.EEXIST: if err.errno == errno.EEXIST:
return return
if err.errno != errno.ENOENT or not name: if err.errno != errno.ENOENT or not name:
raise raise
parent = os.path.dirname(os.path.abspath(name)) parent = os.path.dirname(abspath(name))
if parent == name: if parent == name:
raise raise
makedirs(parent, mode, notindexed) makedirs(parent, mode, notindexed)
try: try:
makedir(name, notindexed) makedir(name, notindexed)
except OSError as err: except OSError as err:
# Catch EEXIST to handle races # Catch EEXIST to handle races
if err.errno == errno.EEXIST: if err.errno == errno.EEXIST:

mercurial/windows.py

def normpath(path): def normpath(path):
return pconvert(os.path.normpath(path)) return pconvert(os.path.normpath(path))
def normcase(path): def normcase(path):
return encoding.upper(path) # NTFS compares via upper() return encoding.upper(path) # NTFS compares via upper()
DRIVE_RE_B = re.compile(b'^[a-z]:')
DRIVE_RE_S = re.compile('^[a-z]:')
def abspath(path):
abs_path = os.path.abspath(path) # re-exports
# Python on Windows is inconsistent regarding the capitalization of drive
# letter and this cause issue with various path comparison along the way.
# So we normalize the drive later to upper case here.
#
# See https://bugs.python.org/issue40368 for and example of this hell.
if isinstance(abs_path, bytes):
if DRIVE_RE_B.match(abs_path):
abs_path = abs_path[0:1].upper() + abs_path[1:]
elif DRIVE_RE_S.match(abs_path):
abs_path = abs_path[0:1].upper() + abs_path[1:]
return abs_path
# see posix.py for definitions # see posix.py for definitions
normcasespec = encoding.normcasespecs.upper normcasespec = encoding.normcasespecs.upper
normcasefallback = encoding.upperfallback normcasefallback = encoding.upperfallback
def samestat(s1, s2): def samestat(s1, s2):
return False return False