This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3631

py3: use pycompat.fsencode to convert path to bytes
ClosedPublic

Authored by pulkit on May 20 2018, 8:24 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG666d90ace0bb: py3: use pycompat.fsencode to convert path to bytes
Summary

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.

Event Timeline

pulkit created this revision.May 20 2018, 8:24 AM
indygreg accepted this revision.May 21 2018, 2:24 PM
This revision is now accepted and ready to land.May 21 2018, 2:24 PM
Closed by commit rHG666d90ace0bb: py3: use pycompat.fsencode to convert path to bytes (authored by pulkit). · Explain WhyMay 21 2018, 2:36 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.May 22 2018, 7:20 AM
  • a/contrib/hg-ssh

+++ b/contrib/hg-ssh
@@ -39,6 +39,7 @@
from mercurial import (

dispatch,

+ pycompat,

ui as uimod,

)
@@ -69,7 +70,7 @@

path = cmdargv[2]
repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path)))
if repo in allowed_paths:
  • cmd = [b'-R', repo, b'serve', b'--stdio']

+ cmd = [b'-R', pycompat.fsencode(repo), b'serve', b'--stdio']

It's probably better to convert sys.argv and cwd to bytes. Otherwise we'll
have to be a human type checker.

Revision Contents
Changeset List

PathPackages
Mcontrib/hg-ssh (3 lines)

Diff 8856

contrib/hg-ssh

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 ; hgdemandimport.enable() import hgdemandimport ; hgdemandimport.enable()
from mercurial import ( from mercurial import (
dispatch, dispatch,
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()
except ValueError as e: except ValueError as e:
sys.stderr.write('Illegal command "%s": %s\n' % (orig_cmd, e)) sys.stderr.write('Illegal command "%s": %s\n' % (orig_cmd, e))
sys.exit(255) sys.exit(255)
if cmdargv[:2] == ['hg', '-R'] and cmdargv[3:] == ['serve', '--stdio']: if cmdargv[:2] == ['hg', '-R'] and cmdargv[3:] == ['serve', '--stdio']:
path = cmdargv[2] path = cmdargv[2]
repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path))) repo = os.path.normpath(os.path.join(cwd, os.path.expanduser(path)))
if repo in allowed_paths: if repo in allowed_paths:
cmd = [b'-R', repo, b'serve', b'--stdio'] cmd = [b'-R', pycompat.fsencode(repo), b'serve', b'--stdio']
req = dispatch.request(cmd) req = dispatch.request(cmd)
if readonly: if readonly:
if not req.ui: if not req.ui:
req.ui = uimod.ui.load() req.ui = uimod.ui.load()
req.ui.setconfig(b'hooks', b'pretxnopen.hg-ssh', req.ui.setconfig(b'hooks', b'pretxnopen.hg-ssh',
b'python:__main__.rejectpush', b'hg-ssh') b'python:__main__.rejectpush', b'hg-ssh')
req.ui.setconfig(b'hooks', b'prepushkey.hg-ssh', req.ui.setconfig(b'hooks', b'prepushkey.hg-ssh',
b'python:__main__.rejectpush', b'hg-ssh') b'python:__main__.rejectpush', b'hg-ssh')