comparison tests/test-import-bypass.t @ 22947:c63a09b6b337

tests: use $PYTHON instead of hardcoding python This makes running the testsuite with pypy possible.
author Augie Fackler <raf@durin42.com>
date Wed, 15 Oct 2014 15:35:59 -0400
parents ffaaa80fa724
children 093e8a5e995f
comparison
equal deleted inserted replaced
22946:77c121da6143 22947:c63a09b6b337
141 141
142 Test patch.eol is handled 142 Test patch.eol is handled
143 (this also tests that editor is not invoked for '--bypass', if the 143 (this also tests that editor is not invoked for '--bypass', if the
144 commit message is explicitly specified, regardless of '--edit') 144 commit message is explicitly specified, regardless of '--edit')
145 145
146 $ python -c 'file("a", "wb").write("a\r\n")' 146 $ $PYTHON -c 'file("a", "wb").write("a\r\n")'
147 $ hg ci -m makeacrlf 147 $ hg ci -m makeacrlf
148 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff 148 $ HGEDITOR=cat hg import -m 'should fail because of eol' --edit --bypass ../test.diff
149 applying ../test.diff 149 applying ../test.diff
150 patching file a 150 patching file a
151 Hunk #1 FAILED at 0 151 Hunk #1 FAILED at 0