( )⚙ D11042 hg-ssh: normalize the drive of the current working directory on windows

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11042

hg-ssh: normalize the drive of the current working directory on windows
ClosedPublic

Authored by marmoute on Jul 9 2021, 8:34 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG724066f23e2d: hg-ssh: normalize the drive of the current working directory on windows
Summary

For some reason os.getcwd() can return either c: or C:. We normalize this to
C: and the like. This fix test-ssh-bundle1.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, 8:34 PM
baymax updated this revision to Diff 29077.Jul 9 2021, 9:21 PM

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

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

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

Alphare accepted this revision.Jul 13 2021, 11:25 AM
This revision is now accepted and ready to land.Jul 13 2021, 11:25 AM

Revision Contents
Changeset List

PathPackages
Mcontrib/hg-ssh (7 lines)

Diff 29115

contrib/hg-ssh

command="cd repos && hg-ssh user/thomas/* projects/{mercurial,foo}" command="cd repos && hg-ssh user/thomas/* projects/{mercurial,foo}"
You can also add a --read-only flag to allow read-only access to a key, e.g.: You can also add a --read-only flag to allow read-only access to a key, e.g.:
command="hg-ssh --read-only repos/*" command="hg-ssh --read-only repos/*"
""" """
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import re
import shlex import shlex
import sys import sys
# enable importing on demand to reduce startup time # enable importing on demand to reduce startup time
import hgdemandimport import hgdemandimport
hgdemandimport.enable() hgdemandimport.enable()
from mercurial import ( from mercurial import (
dispatch, dispatch,
pycompat, pycompat,
ui as uimod, ui as uimod,
) )
def main(): def main():
# Prevent insertion/deletion of CRs # Prevent insertion/deletion of CRs
dispatch.initstdio() dispatch.initstdio()
cwd = os.getcwd() cwd = os.getcwd()
if os.name == 'nt':
# os.getcwd() is inconsistent on the capitalization of the drive
# letter, so adjust it. see https://bugs.python.org/issue40368
if re.match('^[a-z]:', cwd):
cwd = cwd[0:1].upper() + cwd[1:]
readonly = False readonly = False
args = sys.argv[1:] args = sys.argv[1:]
while len(args): while len(args):
if args[0] == '--read-only': if args[0] == '--read-only':
readonly = True readonly = True
args.pop(0) args.pop(0)
else: else:
break break