This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11057

compat: enforce upper case drive letter in mercurial too
AbandonedPublic

Authored by marmoute on Jul 9 2021, 9:00 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Summary

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

Doing this fixes test-bookmarks.t and test-bookflow.t on Windows.

Diff Detail

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

Event Timeline

marmoute created this revision.Jul 9 2021, 9:00 PM
marmoute planned changes to this revision.Jul 9 2021, 9:02 PM

Actually, test-bookmarks is still broken on Windows, so lets investigate further

baymax updated this revision to Diff 29111.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

mharbison72 added a subscriber: mharbison72.Jul 10 2021, 4:38 PM
mharbison72 added inline comments.
mercurial/encoding.py
370–371

I'm a little confused by this. Is this making py3.7 and py3.8 runs consistent, or is there something unreliable about py3.8 itself with the upper casing?

marmoute added inline comments.Jul 11 2021, 7:29 AM
mercurial/encoding.py
370–371

This is making Windows consistent with Windows, regardless of Python version.

Alphare accepted this revision.Jul 13 2021, 11:18 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:18 AM
durin42 added a subscriber: durin42.Oct 18 2021, 3:15 PM

Seems fine, needs rebased.

marmoute abandoned this revision.Nov 16 2021, 11:53 AM

It looks like I pruned this ages ago in favor of something else. So abandoning this.

Revision Contents
Changeset List

PathPackages
Mmercurial/encoding.py (16 lines)

Diff 29111

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.
mharbison72Unsubmitted
Not Done

I'm a little confused by this. Is this making py3.7 and py3.8 runs consistent, or is there something unreliable about py3.8 itself with the upper casing?

mharbison72: I'm a little confused by this. Is this making py3.7 and py3.8 runs consistent, or is there…
marmouteAuthorUnsubmitted
Done

This is making Windows consistent with Windows, regardless of Python version.

marmoute: This is making Windows consistent with Windows, regardless of Python version.
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"