# HG changeset patch # User Jun Wu # Date 2017-10-12 04:24:32 # Node ID f42dec9c976e8059a44edda5db47352df0a93b4a # Parent a679aa582d8dedb3368ad7b427be3b504a7d0f47 hgweb: do not import uuid immediately to avoid its side effect With hgdemandimport disabled (chg's case), `import uuid` has an immediate side effect calling `ctypes.util.find_library` trying to locate the `libuuid` library. This happens at `import` time before `dispatch.run()`. The call trace is like: File "hg/hg", line 54, in from mercurial import ( File "hg/mercurial/dispatch.py", line 24, in from . import ( File "hg/mercurial/commands.py", line 23, in from . import ( File "hg/mercurial/help.py", line 33, in from .hgweb import ( File "hg/mercurial/hgweb/__init__.py", line 20, in from . import ( File "hg/mercurial/hgweb/hgweb_mod.py", line 14, in from .common import ( File "hg/mercurial/hgweb/common.py", line 15, in import uuid File "/usr/lib64/python2.7/uuid.py", line 404, in lib = ctypes.CDLL(ctypes.util.find_library(libname)) The problem is, `ctypes.util.find_library` will execute `sh -c '/sbin/ldconfig -p 2>/dev/null'` on Python <= 2.7.12. The output of `sh` may pollute the terminal: shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory This patch moves `import uuid` so its side-effect can only happen after the cwd check in `dispatch._getlocal`. Therefore the terminal won't be polluted by importing `uuid`. Differential Revision: https://phab.mercurial-scm.org/D1024 diff --git a/mercurial/hgweb/common.py b/mercurial/hgweb/common.py --- a/mercurial/hgweb/common.py +++ b/mercurial/hgweb/common.py @@ -12,7 +12,6 @@ import base64 import errno import mimetypes import os -import uuid from .. import ( encoding, @@ -221,6 +220,23 @@ def cspvalues(ui): First value is ``None`` if CSP isn't enabled. Second value is ``None`` if CSP isn't enabled or if the CSP header doesn't need a nonce. """ + # Without demandimport, "import uuid" could have an immediate side-effect + # running "ldconfig" on Linux trying to find libuuid. + # With Python <= 2.7.12, that "ldconfig" is run via a shell and the shell + # may pollute the terminal with: + # + # shell-init: error retrieving current directory: getcwd: cannot access + # parent directories: No such file or directory + # + # Python >= 2.7.13 has fixed it by running "ldconfig" directly without a + # shell (hg changeset a09ae70f3489). + # + # Moved "import uuid" from here so it's executed after we know we have + # a sane cwd (i.e. after dispatch.py cwd check). + # + # We can move it back once we no longer need Python <= 2.7.12 support. + import uuid + # Don't allow untrusted CSP setting since it be disable protections # from a trusted/global source. csp = ui.config('web', 'csp', untrusted=False) diff --git a/tests/test-dispatch.t b/tests/test-dispatch.t --- a/tests/test-dispatch.t +++ b/tests/test-dispatch.t @@ -60,3 +60,16 @@ No repo: [255] #endif + +#if rmcwd + +Current directory removed: + + $ mkdir $TESTTMP/repo1 + $ cd $TESTTMP/repo1 + $ rm -rf $TESTTMP/repo1 + $ HGDEMANDIMPORT=disable hg version -q + abort: error getting current working directory: * (glob) + [255] + +#endif