From patchwork Sat Jul 10 17:45:00 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D11058: windows: enforce upper case drive letter for getcwd in
 mercurial too
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 49372
Message-Id: <differential-rev-PHID-DREV-cjtx4rhf3hirw75nn2qi-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Sat, 10 Jul 2021 17:45:00 +0000

marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION 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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11058

AFFECTED FILES
  mercurial/encoding.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/mercurial/encoding.py b/mercurial/encoding.py
--- a/mercurial/encoding.py
+++ b/mercurial/encoding.py
@@ -9,6 +9,7 @@
 
 import locale
 import os
+import re
 import unicodedata
 
 from .pycompat import getattr
@@ -352,6 +353,8 @@
         environ[tolocal(k.encode('utf-8'))] = tolocal(v.encode('utf-8'))
 
 
+DRIVE_RE = re.compile(b'^[a-z]:')
+
 if pycompat.ispy3:
     # os.getcwd() on Python 3 returns string, but it has os.getcwdb() which
     # returns bytes.
@@ -363,7 +366,21 @@
         # 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
+        #
+        # 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:
         getcwd = os.getcwdb  # re-exports
 else: