Mercurial > hg
view tests/test-update-reverse.t @ 34639:a568a46751b6
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 | bd625cd4e5e7 |
children | 5c2a4f37eace |
line wrap: on
line source
$ hg init $ touch a $ hg add a $ hg commit -m "Added a" $ touch main $ hg add main $ hg commit -m "Added main" $ hg checkout 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 'main' should be gone: $ ls a $ touch side1 $ hg add side1 $ hg commit -m "Added side1" created new head $ touch side2 $ hg add side2 $ hg commit -m "Added side2" $ hg log changeset: 3:91ebc10ed028 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added side2 changeset: 2:b932d7dbb1e1 parent: 0:c2eda428b523 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added side1 changeset: 1:71a760306caf user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added main changeset: 0:c2eda428b523 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added a $ hg heads changeset: 3:91ebc10ed028 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added side2 changeset: 1:71a760306caf user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: Added main $ ls a side1 side2 $ hg update --debug -C 1 resolving manifests branchmerge: False, force: True, partial: False ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf side1: other deleted -> r removing side1 side2: other deleted -> r removing side2 main: remote created -> g getting main 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ ls a main