Mercurial > public > mercurial-scm > hg-stable

diff mercurial/pycompat.py @ 34639:a568a46751b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
selectors2: do not use platform.system() `platform.system()` may have a side effect spawning a shell executing `uname -p`, which may print a warning when the current directory is removed: shell-init: error retrieving current directory: getcwd: cannot access parent directories: No such file or directory This patch changes selectors2 to test the `sys.platform` string, which is a much safer way to detect Jython. Jython's `sys.platform` looks like this: Jython 2.7.1 (default:0df7adb1b397, Jun 30 2017, 19:02:43) [OpenJDK 64-Bit Server VM (Oracle Corporation)] on java1.8.0_144 Type "help", "copyright", "credits" or "license" for more information. >>> import sys >>> sys.platform 'java1.8.0_144 ( ==linux2 for targets )' Differential Revision: https://phab.mercurial-scm.org/D1018
author Jun Wu <quark@fb.com>
date Wed, 11 Oct 2017 17:27:21 -0700
parents 192f7b126ed2
children c0a6c19690ff
line wrap: on
line diff
--- a/mercurial/pycompat.py	Mon Oct 09 12:42:28 2017 -0700
+++ b/mercurial/pycompat.py	Wed Oct 11 17:27:21 2017 -0700
@@ -314,3 +314,5 @@
     stringio = cStringIO.StringIO
     maplist = map
     rawinput = raw_input
+
+isjython = sysplatform.startswith('java')