Mercurial > hg
view contrib/docker/apache-server/entrypoint.sh @ 45217:4e5da64d5549
tests: make check-py3-compat.py actually load the specified files correctly
For most uses, this change is essentially a no-op, as this script is generally
only run by test-check-py3-compat.t, which will already put `$TESTDIR/..` in
`$PYTHONPATH`.
When running outside of tests, however, `$PYTHONPATH` is likely not set, causing
check-py3-compat.py to parse the file from the repo, but then import the
installed version, and raise any errors about the installed version, not the one
currently in the repo.
Additionally, this helps users (like me) who have a strange set up where their
home directory (and thus their hg repos) happen to be in a subdirectory of
sys.prefix (which is /usr on my system). Since the '.' entry added to sys.path
takes precedence over the absolute path of `$TESTDIR/..` in `$PYTHONPATH`, the
path to the modules that it imports (and that show up in any stack trace) are
*relative*, meaning that we don't detect them as starting with `sys.prefix`.
Sample non-test invocation, and the difference this change makes (the path for
'error at <path>:<line>' is correct now)::
Before:
```
$ python3 contrib/check-py3-compat.py mercurial/win*.py
mercurial/win32.py: error importing: <ValueError> _type_ 'v' not supported (error at check-py3-compat.py:65)
mercurial/windows.py: error importing: <ModuleNotFoundError> No module named 'msvcrt' (error at check-py3-compat.py:65)
```
After:
```
$ python3 contrib/check-py3-compat.py mercurial/win*.py
mercurial/win32.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:11)
mercurial/windows.py: error importing: <ModuleNotFoundError> No module named 'msvcrt' (error at windows.py:12)
```
Differential Revision: https://phab.mercurial-scm.org/D8814
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Fri, 24 Jul 2020 16:32:45 -0700 |
parents | fd5247a88e63 |
children |
line wrap: on
line source
#!/bin/bash # This script gets executed on container start. Its job is to set up # the Mercurial environment and invoke the server. # Mercurial can be started in two modes. # If the MERCURIAL_SOURCE environment variable is set and it points to a # Mercurial source directory, we will install Mercurial from that directory. # Otherwise, we download the Mercurial source and install it manually. set -e SOURCE_DIR=/var/hg/source INSTALL_DIR=/var/hg/install REPOS_DIR=/var/hg/repos HTDOCS_DIR=/var/hg/htdocs if [ ! -d ${SOURCE_DIR} ]; then echo "Mercurial source not available at ${SOURCE_DIR}" echo "You need to mount a volume containing the Mercurial source code" echo "when running the container. For example:" echo "" echo " $ docker run -v ~/src/hg:/${SOURCE_DIR} hg-apache" echo "" echo "This container will now stop running." exit 1 fi echo "Installing Mercurial from ${SOURCE_DIR} into ${INSTALL_DIR}" pushd ${SOURCE_DIR} /usr/bin/python2.7 setup.py install --root=/ --prefix=${INSTALL_DIR} --force popd mkdir -p ${HTDOCS_DIR} # Provide a default config if the user hasn't supplied one. if [ ! -f ${HTDOCS_DIR}/config ]; then cp /defaulthgwebconfig ${HTDOCS_DIR}/config fi if [ ! -f ${HTDOCS_DIR}/hgweb.wsgi ]; then cat >> ${HTDOCS_DIR}/hgweb.wsgi << EOF config = '${HTDOCS_DIR}/config' import sys sys.path.insert(0, '${INSTALL_DIR}/lib/python2.7/site-packages') from mercurial import demandimport demandimport.enable() from mercurial.hgweb import hgweb application = hgweb(config) EOF fi mkdir -p ${REPOS_DIR} if [ ! -d ${REPOS_DIR}/repo ]; then ${INSTALL_DIR}/bin/hg init ${REPOS_DIR}/repo chown -R www-data:www-data ${REPOS_DIR}/repo fi # This is necessary to make debuginstall happy. if [ ! -f ~/.hgrc ]; then cat >> ~/.hgrc << EOF [ui] username = Dummy User <nobody@example.com> EOF fi echo "Verifying Mercurial installation looks happy" ${INSTALL_DIR}/bin/hg debuginstall . /etc/apache2/envvars echo "Starting Apache HTTP Server on port 80" echo "We hope you remembered to publish this port when running the container!" echo "If this is an interactive container, simply CTRL^C to stop." exec "$@"