##// END OF EJS Templates
py3: quote several instances of $PYTHON for Windows...
Matt Harbison -
r40907:07e181ed default
parent child Browse files
Show More
@@ -165,7 +165,7 b' Check that extensions are loaded in phas'
165 > def custompredicate(repo, subset, x):
165 > def custompredicate(repo, subset, x):
166 > return smartset.baseset([r for r in subset if r in {0}])
166 > return smartset.baseset([r for r in subset if r in {0}])
167 > EOF
167 > EOF
168 $ $PYTHON $TESTTMP/unflush.py foo.py
168 $ "$PYTHON" $TESTTMP/unflush.py foo.py
169
169
170 $ cp foo.py bar.py
170 $ cp foo.py bar.py
171 $ echo 'foo = foo.py' >> $HGRCPATH
171 $ echo 'foo = foo.py' >> $HGRCPATH
@@ -264,7 +264,7 b' limit mark, regardless of importing modu'
264 > def extsetup():
264 > def extsetup():
265 > print('ambigabs.s=%s' % ambigabs.s, flush=True)
265 > print('ambigabs.s=%s' % ambigabs.s, flush=True)
266 > NO_CHECK_EOF
266 > NO_CHECK_EOF
267 $ $PYTHON $TESTTMP/unflush.py loadabs.py
267 $ "$PYTHON" $TESTTMP/unflush.py loadabs.py
268 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
268 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadabs=loadabs.py root)
269 ambigabs.s=libroot/ambig.py
269 ambigabs.s=libroot/ambig.py
270 $TESTTMP/a
270 $TESTTMP/a
@@ -280,7 +280,7 b' limit mark, regardless of importing modu'
280 > def extsetup():
280 > def extsetup():
281 > print('ambigrel.s=%s' % ambigrel.s, flush=True)
281 > print('ambigrel.s=%s' % ambigrel.s, flush=True)
282 > NO_CHECK_EOF
282 > NO_CHECK_EOF
283 $ $PYTHON $TESTTMP/unflush.py loadrel.py
283 $ "$PYTHON" $TESTTMP/unflush.py loadrel.py
284 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
284 $ (PYTHONPATH=${PYTHONPATH}${PATHSEP}${TESTTMP}/libroot; hg --config extensions.loadrel=loadrel.py root)
285 ambigrel.s=libroot/mod/ambig.py
285 ambigrel.s=libroot/mod/ambig.py
286 $TESTTMP/a
286 $TESTTMP/a
@@ -1825,7 +1825,7 b' Prohibit the use of unicode strings as t'
1825 > def ext(*args, **opts):
1825 > def ext(*args, **opts):
1826 > print(opts[b'opt'], flush=True)
1826 > print(opts[b'opt'], flush=True)
1827 > EOF
1827 > EOF
1828 $ $PYTHON $TESTTMP/unflush.py $TESTTMP/test_unicode_default_value.py
1828 $ "$PYTHON" $TESTTMP/unflush.py $TESTTMP/test_unicode_default_value.py
1829 $ cat > $TESTTMP/opt-unicode-default/.hg/hgrc << EOF
1829 $ cat > $TESTTMP/opt-unicode-default/.hg/hgrc << EOF
1830 > [extensions]
1830 > [extensions]
1831 > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
1831 > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
@@ -6,7 +6,7 b' when we do a merge.'
6 > import sys, os
6 > import sys, os
7 > print("merging for", os.path.basename(sys.argv[1]))
7 > print("merging for", os.path.basename(sys.argv[1]))
8 > EOF
8 > EOF
9 $ HGMERGE="$PYTHON ../merge"; export HGMERGE
9 $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE
10
10
11 Creating base:
11 Creating base:
12
12
@@ -66,7 +66,7 b' regardless of the commit message in the '
66 new changesets 80971e65b431
66 new changesets 80971e65b431
67 updating to branch default
67 updating to branch default
68 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
68 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69 $ HGEDITOR=cat hg --config ui.patch="$PYTHON ../dummypatch.py" --cwd b import --edit ../exported-tip.patch
69 $ HGEDITOR=cat hg --config ui.patch="\"$PYTHON\" ../dummypatch.py" --cwd b import --edit ../exported-tip.patch
70 applying ../exported-tip.patch
70 applying ../exported-tip.patch
71 second change
71 second change
72
72
@@ -11,7 +11,7 b''
11 >
11 >
12 > print("merging for", os.path.basename(sys.argv[1]))
12 > print("merging for", os.path.basename(sys.argv[1]))
13 > EOF
13 > EOF
14 $ HGMERGE="$PYTHON ../merge"; export HGMERGE
14 $ HGMERGE="\"$PYTHON\" ../merge"; export HGMERGE
15
15
16 $ hg init t
16 $ hg init t
17 $ cd t
17 $ cd t
General Comments 0
You need to be logged in to leave comments. Login now