# HG changeset patch
# User Matt Harbison <matt_harbi...@yahoo.com>
# Date 1499403920 14400
# Fri Jul 07 01:05:20 2017 -0400
# Node ID 00962c2340c32700c6134907268d6802b77c3350
# Parent d2d4b210a0409032368aee07012bb5412ea66289
tests: quote $PYTHON for Windows
When unquoted, MSYS sees the colon between the drive letter and path as a Unix
path separator and unhelpfully splits on it, feeding only the drive letter as
the command. Much chaos ensues.
I vaguely remember trying to get the test runner to use /letter/path/to/exe
syntax the last time this happened, without success. I doubt a check-code rule
would work, since sometimes it is quoted, and sometimes the quotes are escaped.
diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -18,7 +18,7 @@
> evolution=createmarkers,exchange
> bundle2-output-capture=True
> [ui]
- > ssh=$PYTHON "$TESTDIR/dummyssh"
+ > ssh="$PYTHON" "$TESTDIR/dummyssh"
> logtemplate={rev}:{node|short} {phase} {author} {bookmarks}
{desc|firstline}
> [web]
> push_ssl = false
@@ -909,7 +909,7 @@
$ cp $TESTTMP/hgrc.orig $HGRCPATH
$ cat >> $HGRCPATH <<EOF
> [ui]
- > ssh=$PYTHON "$TESTDIR/dummyssh"
+ > ssh="$PYTHON" "$TESTDIR/dummyssh"
> EOF
$ cat >> $TESTTMP/locktester.py <<EOF
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -1044,7 +1044,7 @@
$ hg id -R remote -r 0
abort: repository remote not found!
[255]
- $ hg --config share.pool=share -q clone -e "$PYTHON \"$TESTDIR/dummyssh\"" a
ssh://user@dummy/remote
+ $ hg --config share.pool=share -q clone -e "\"$PYTHON\"
\"$TESTDIR/dummyssh\"" a ssh://user@dummy/remote
$ hg -R remote id -r 0
acb14030fe0a
diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -69,7 +69,7 @@
Server returns 404
- $ $PYTHON $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid
+ $ "$PYTHON" $TESTDIR/dumbhttp.py -p $HGPORT1 --pid http.pid
$ cat http.pid >> $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT running-404
applying clone bundle from http://localhost:$HGPORT1/bundle.hg
@@ -197,7 +197,7 @@
Feature works over SSH
- $ hg clone -U -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/server
ssh-full-clone
+ $ hg clone -U -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/server
ssh-full-clone
applying clone bundle from http://localhost:$HGPORT1/full.hg
adding changesets
adding manifests
diff --git a/tests/test-http-branchmap.t b/tests/test-http-branchmap.t
--- a/tests/test-http-branchmap.t
+++ b/tests/test-http-branchmap.t
@@ -87,7 +87,7 @@
> EOF
$ echo baz >> b/foo
$ hg -R b ci -m baz
- $ hg push -R b -e '$PYTHON oldhg' ssh://dummy/ --encoding latin1
+ $ hg push -R b -e "\"$PYTHON\" oldhg" ssh://dummy/ --encoding latin1
pushing to ssh://dummy/
searching for changes
remote: adding changesets
diff --git a/tests/test-init.t b/tests/test-init.t
--- a/tests/test-init.t
+++ b/tests/test-init.t
@@ -106,7 +106,7 @@
init+push to remote2
- $ hg init -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2
+ $ hg init -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote2
$ hg incoming -R remote2 local
comparing with local
changeset: 0:08b9e9f63b32
@@ -116,7 +116,7 @@
summary: init
- $ hg push -R local -e "$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote2
+ $ hg push -R local -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote2
pushing to ssh://user@dummy/remote2
searching for changes
remote: adding changesets
@@ -126,7 +126,7 @@
clone to remote1
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" local
ssh://user@dummy/remote1
searching for changes
remote: adding changesets
remote: adding manifests
@@ -134,7 +134,7 @@
remote: added 1 changesets with 1 changes to 1 files
The largefiles extension doesn't crash
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local
ssh://user@dummy/remotelf --config extensions.largefiles=
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" local
ssh://user@dummy/remotelf --config extensions.largefiles=
The fsmonitor extension is incompatible with the largefiles extension and
has been disabled. (fsmonitor !)
The fsmonitor extension is incompatible with the largefiles extension and
has been disabled. (fsmonitor !)
searching for changes
@@ -145,14 +145,14 @@
init to existing repo
- $ hg init -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1
+ $ hg init -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote1
abort: repository remote1 already exists!
abort: could not create remote repo!
[255]
clone to existing repo
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remote1
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" local
ssh://user@dummy/remote1
abort: repository remote1 already exists!
abort: could not create remote repo!
[255]
@@ -251,7 +251,7 @@
$ hg -R local bookmark test
$ hg -R local bookmarks
* test 0:08b9e9f63b32
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" local
ssh://user@dummy/remote-bookmarks
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" local
ssh://user@dummy/remote-bookmarks
searching for changes
remote: adding changesets
remote: adding manifests
diff --git a/tests/test-largefiles-wireproto.t
b/tests/test-largefiles-wireproto.t
--- a/tests/test-largefiles-wireproto.t
+++ b/tests/test-largefiles-wireproto.t
@@ -112,7 +112,7 @@
#endif
vanilla clients locked out from largefiles ssh repos
- $ hg --config extensions.largefiles=! clone -e "$PYTHON
\"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
+ $ hg --config extensions.largefiles=! clone -e "\"$PYTHON\"
\"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
remote:
remote: This repository uses the largefiles extension.
remote:
diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
--- a/tests/test-ssh-bundle1.t
+++ b/tests/test-ssh-bundle1.t
@@ -44,21 +44,21 @@
repo not found error
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent
local
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/nonexistent local
remote: abort: repository nonexistent not found!
abort: no suitable response from remote hg!
[255]
non-existent absolute path
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy//`pwd`/nonexistent local
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy//`pwd`/nonexistent local
remote: abort: repository /$TESTTMP/nonexistent not found!
abort: no suitable response from remote hg!
[255]
clone remote via stream
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/remote local-stream
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/remote local-stream
streaming all changes
4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob)
@@ -80,7 +80,7 @@
clone bookmarks via stream
$ hg -R local-stream book mybook
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/local-stream stream2
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/local-stream stream2
streaming all changes
4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob)
@@ -96,7 +96,7 @@
clone remote via pull
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
local
requesting all changes
adding changesets
adding manifests
@@ -123,14 +123,14 @@
$ hg paths
default = ssh://user@dummy/remote
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\""
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
pulling from ssh://user@dummy/remote
searching for changes
no changes found
pull from wrong ssh URL
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/doesnotexist
pulling from ssh://user@dummy/doesnotexist
remote: abort: repository doesnotexist not found!
abort: no suitable response from remote hg!
@@ -145,7 +145,7 @@
$ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
$ echo "[ui]" >> .hg/hgrc
- $ echo "ssh = $PYTHON \"$TESTDIR/dummyssh\"" >> .hg/hgrc
+ $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc
find outgoing
@@ -162,7 +162,7 @@
find incoming on the remote side
- $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/local
+ $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/local
comparing with ssh://user@dummy/local
searching for changes
changeset: 3:a28a9d1a809c
@@ -175,7 +175,7 @@
find incoming on the remote side (using absolute path)
- $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\""
"ssh://user@dummy/`pwd`"
+ $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
"ssh://user@dummy/`pwd`"
comparing with ssh://user@dummy/$TESTTMP/local
searching for changes
changeset: 3:a28a9d1a809c
@@ -222,7 +222,7 @@
test pushkeys and bookmarks
$ cd ../local
- $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote namespaces
+ $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote namespaces
bookmarks
namespaces
phases
@@ -237,7 +237,7 @@
no changes found
exporting bookmark foo
[1]
- $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote bookmarks
+ $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote bookmarks
foo 1160648e36cec0054048a7edc4110c6f84fde594
$ hg book -f foo
$ hg push --traceback
@@ -272,7 +272,7 @@
> EOF
$ echo '[hooks]' >> ../remote/.hg/hgrc
- $ echo "changegroup.stdout = $PYTHON $TESTTMP/badhook" >> ../remote/.hg/hgrc
+ $ echo "changegroup.stdout = \"$PYTHON\" $TESTTMP/badhook" >>
../remote/.hg/hgrc
$ echo r > r
$ hg ci -A -m z r
@@ -307,7 +307,7 @@
$ hg -R ../remote bookmark test
$ hg -R ../remote bookmarks
* test 4:6c0482d977a3
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
local-bookmarks
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
local-bookmarks
requesting all changes
adding changesets
adding manifests
@@ -334,21 +334,21 @@
Test remote paths with spaces (issue2983):
- $ hg init --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
+ $ hg init --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
$ touch "$TESTTMP/a repo/test"
$ hg -R 'a repo' commit -A -m "test"
adding test
$ hg -R 'a repo' tag tag
- $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
+ $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
73649e48688a
- $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a
repo#noNoNO"
+ $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a
repo#noNoNO"
abort: unknown revision 'noNoNO'!
[255]
Test (non-)escaping of remote paths with spaces when cloning (issue3145):
- $ hg clone --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
+ $ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a
repo"
destination directory: a repo
abort: destination 'a repo' is not empty
[255]
@@ -363,7 +363,7 @@
> export SSH_ORIGINAL_COMMAND
> PYTHONPATH="$PYTHONPATH"
> export PYTHONPATH
- > $PYTHON "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
+ > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
> EOF
$ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo"
@@ -391,7 +391,7 @@
> export SSH_ORIGINAL_COMMAND
> PYTHONPATH="$PYTHONPATH"
> export PYTHONPATH
- > $PYTHON "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
+ > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
> EOF
$ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote"
read-only-local
@@ -440,7 +440,7 @@
> [paths]
> default-push = ssh://user@dummy/remote
> [ui]
- > ssh = $PYTHON "$TESTDIR/dummyssh"
+ > ssh = "$PYTHON" "$TESTDIR/dummyssh"
> [extensions]
> localwrite = localwrite.py
> EOF
@@ -526,11 +526,11 @@
$ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >>
remote/.hg/hgrc
- $ hg -q --config ui.ssh="$PYTHON $TESTDIR/dummyssh" clone
ssh://user@dummy/remote hookout
+ $ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone
ssh://user@dummy/remote hookout
$ cd hookout
$ touch hookfailure
$ hg -q commit -A -m 'remote hook failure'
- $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" push
+ $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" push
pushing to ssh://user@dummy/remote
searching for changes
remote: adding changesets
@@ -551,7 +551,7 @@
> [extensions]
> crash = ${TESTDIR}/crashgetbundler.py
> EOF
- $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" pull
+ $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" pull
pulling from ssh://user@dummy/remote
searching for changes
adding changesets
diff --git a/tests/test-ssh-clone-r.t b/tests/test-ssh-clone-r.t
--- a/tests/test-ssh-clone-r.t
+++ b/tests/test-ssh-clone-r.t
@@ -17,7 +17,7 @@
clone remote via stream
$ for i in 0 1 2 3 4 5 6 7 8; do
- > hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed -r "$i"
ssh://user@dummy/remote test-"$i"
+ > hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed -r "$i"
ssh://user@dummy/remote test-"$i"
> if cd test-"$i"; then
> hg verify
> cd ..
@@ -139,7 +139,7 @@
4 files, 9 changesets, 7 total revisions
$ cd ..
$ cd test-1
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote
pulling from ssh://user@dummy/remote
searching for changes
adding changesets
@@ -153,7 +153,7 @@
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 2 total revisions
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
pulling from ssh://user@dummy/remote
searching for changes
adding changesets
@@ -163,7 +163,7 @@
(run 'hg update' to get a working copy)
$ cd ..
$ cd test-2
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 5 ssh://user@dummy/remote
pulling from ssh://user@dummy/remote
searching for changes
adding changesets
@@ -177,7 +177,7 @@
crosschecking files in changesets and manifests
checking files
1 files, 5 changesets, 3 total revisions
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
pulling from ssh://user@dummy/remote
searching for changes
adding changesets
diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -38,21 +38,21 @@
repo not found error
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/nonexistent
local
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/nonexistent local
remote: abort: repository nonexistent not found!
abort: no suitable response from remote hg!
[255]
non-existent absolute path
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/`pwd`/nonexistent local
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/`pwd`/nonexistent local
remote: abort: repository $TESTTMP/nonexistent not found!
abort: no suitable response from remote hg!
[255]
clone remote via stream
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/remote local-stream
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/remote local-stream
streaming all changes
4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob)
@@ -74,7 +74,7 @@
clone bookmarks via stream
$ hg -R local-stream book mybook
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/local-stream stream2
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" --uncompressed
ssh://user@dummy/local-stream stream2
streaming all changes
4 files to transfer, 602 bytes of data
transferred 602 bytes in * seconds (*) (glob)
@@ -90,7 +90,7 @@
clone remote via pull
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote local
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
local
requesting all changes
adding changesets
adding manifests
@@ -117,14 +117,14 @@
$ hg paths
default = ssh://user@dummy/remote
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\""
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
pulling from ssh://user@dummy/remote
searching for changes
no changes found
pull from wrong ssh URL
- $ hg pull -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/doesnotexist
+ $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/doesnotexist
pulling from ssh://user@dummy/doesnotexist
remote: abort: repository doesnotexist not found!
abort: no suitable response from remote hg!
@@ -139,7 +139,7 @@
$ echo "default-push = ssh://user@dummy/remote" >> .hg/hgrc
$ echo "[ui]" >> .hg/hgrc
- $ echo "ssh = $PYTHON \"$TESTDIR/dummyssh\"" >> .hg/hgrc
+ $ echo "ssh = \"$PYTHON\" \"$TESTDIR/dummyssh\"" >> .hg/hgrc
find outgoing
@@ -156,7 +156,7 @@
find incoming on the remote side
- $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/local
+ $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/local
comparing with ssh://user@dummy/local
searching for changes
changeset: 3:a28a9d1a809c
@@ -169,7 +169,7 @@
find incoming on the remote side (using absolute path)
- $ hg incoming -R ../remote -e "$PYTHON \"$TESTDIR/dummyssh\""
"ssh://user@dummy/`pwd`"
+ $ hg incoming -R ../remote -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
"ssh://user@dummy/`pwd`"
comparing with ssh://user@dummy/$TESTTMP/local
searching for changes
changeset: 3:a28a9d1a809c
@@ -216,7 +216,7 @@
test pushkeys and bookmarks
$ cd ../local
- $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote namespaces
+ $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote namespaces
bookmarks
namespaces
phases
@@ -231,7 +231,7 @@
no changes found
exporting bookmark foo
[1]
- $ hg debugpushkey --config ui.ssh="$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote bookmarks
+ $ hg debugpushkey --config ui.ssh="\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/remote bookmarks
foo 1160648e36cec0054048a7edc4110c6f84fde594
$ hg book -f foo
$ hg push --traceback
@@ -311,7 +311,7 @@
$ hg -R ../remote bookmark test
$ hg -R ../remote bookmarks
* test 4:6c0482d977a3
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
local-bookmarks
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
local-bookmarks
requesting all changes
adding changesets
adding manifests
@@ -338,21 +338,21 @@
Test remote paths with spaces (issue2983):
- $ hg init --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
+ $ hg init --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
$ touch "$TESTTMP/a repo/test"
$ hg -R 'a repo' commit -A -m "test"
adding test
$ hg -R 'a repo' tag tag
- $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
+ $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
73649e48688a
- $ hg id --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a
repo#noNoNO"
+ $ hg id --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a
repo#noNoNO"
abort: unknown revision 'noNoNO'!
[255]
Test (non-)escaping of remote paths with spaces when cloning (issue3145):
- $ hg clone --ssh "$PYTHON \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a repo"
+ $ hg clone --ssh "\"$PYTHON\" \"$TESTDIR/dummyssh\"" "ssh://user@dummy/a
repo"
destination directory: a repo
abort: destination 'a repo' is not empty
[255]
@@ -380,7 +380,7 @@
> export SSH_ORIGINAL_COMMAND
> PYTHONPATH="$PYTHONPATH"
> export PYTHONPATH
- > $PYTHON "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
+ > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" "$TESTTMP/a repo"
> EOF
$ hg id --ssh "sh ssh.sh" "ssh://user@dummy/a repo"
@@ -408,7 +408,7 @@
> export SSH_ORIGINAL_COMMAND
> PYTHONPATH="$PYTHONPATH"
> export PYTHONPATH
- > $PYTHON "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
+ > "$PYTHON" "$TESTDIR/../contrib/hg-ssh" --read-only "$TESTTMP/remote"
> EOF
$ hg clone --ssh "sh ssh.sh" "ssh://user@dummy/$TESTTMP/remote"
read-only-local
@@ -455,7 +455,7 @@
> [paths]
> default-push = ssh://user@dummy/remote
> [ui]
- > ssh = $PYTHON "$TESTDIR/dummyssh"
+ > ssh = "$PYTHON" "$TESTDIR/dummyssh"
> [extensions]
> localwrite = localwrite.py
> EOF
@@ -543,11 +543,11 @@
$ echo "pretxnchangegroup.fail = python:$TESTTMP/failhook:hook" >>
remote/.hg/hgrc
- $ hg -q --config ui.ssh="$PYTHON $TESTDIR/dummyssh" clone
ssh://user@dummy/remote hookout
+ $ hg -q --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" clone
ssh://user@dummy/remote hookout
$ cd hookout
$ touch hookfailure
$ hg -q commit -A -m 'remote hook failure'
- $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" push
+ $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" push
pushing to ssh://user@dummy/remote
searching for changes
remote: adding changesets
@@ -569,7 +569,7 @@
> [extensions]
> crash = ${TESTDIR}/crashgetbundler.py
> EOF
- $ hg --config ui.ssh="$PYTHON $TESTDIR/dummyssh" pull
+ $ hg --config ui.ssh="\"$PYTHON\" $TESTDIR/dummyssh" pull
pulling from ssh://user@dummy/remote
searching for changes
remote: abort: this is an exercise
diff --git a/tests/test-subrepo-relative-path.t
b/tests/test-subrepo-relative-path.t
--- a/tests/test-subrepo-relative-path.t
+++ b/tests/test-subrepo-relative-path.t
@@ -74,7 +74,7 @@
subrepo paths with ssh urls
- $ hg clone -e "$PYTHON \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned
sshclone
+ $ hg clone -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned
sshclone
requesting all changes
adding changesets
adding manifests
@@ -89,7 +89,7 @@
added 1 changesets with 1 changes to 1 files
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg -R sshclone push -e "$PYTHON \"$TESTDIR/dummyssh\""
ssh://user@dummy/`pwd`/cloned
+ $ hg -R sshclone push -e "\"$PYTHON\" \"$TESTDIR/dummyssh\""
ssh://user@dummy/`pwd`/cloned
pushing to ssh://user@dummy/$TESTTMP/cloned
pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub
searching for changes
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -147,13 +147,13 @@
SSH (try to exercise the ssh functionality with a dummy script):
- $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo
uno due tre quattro
+ $ hg debugwireargs --ssh "\"$PYTHON\" $TESTDIR/dummyssh"
ssh://user@dummy/repo uno due tre quattro
uno due tre quattro None
- $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo
eins zwei --four vier
+ $ hg debugwireargs --ssh "\"$PYTHON\" $TESTDIR/dummyssh"
ssh://user@dummy/repo eins zwei --four vier
eins zwei None vier None
- $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo
eins zwei
+ $ hg debugwireargs --ssh "\"$PYTHON\" $TESTDIR/dummyssh"
ssh://user@dummy/repo eins zwei
eins zwei None None None
- $ hg debugwireargs --ssh "$PYTHON $TESTDIR/dummyssh" ssh://user@dummy/repo
eins zwei --five fuenf
+ $ hg debugwireargs --ssh "\"$PYTHON\" $TESTDIR/dummyssh"
ssh://user@dummy/repo eins zwei --five fuenf
eins zwei None None None
Explicitly kill daemons to let the test exit on Windows
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
