tests: make and use a new `svnurlof.py` helper for constructing svn urls

The previous trick of a Python oneliner and some subshells is too hard
to make portable, and this lets us consolidate some Windows-specific
logic down to a single place.

Differential Revision: https://phab.mercurial-scm.org/D5766

tests/svnurlof.py

@@ -0,0 +1,18 b''
+from __future__ import absolute_import, print_function
+import sys
+
+from mercurial import (
+    pycompat,
+    util,
+)
+
+def main(argv):
+    enc = util.urlreq.quote(pycompat.sysbytes(argv[1]))
+    if pycompat.iswindows:
+        fmt = 'file:///%s'
+    else:
+        fmt = 'file://%s'
+    print(fmt % pycompat.sysstr(enc))
+
+if __name__ == '__main__':
+    main(sys.argv)

tests/test-convert-hg-svn.t

@@ -1,122 +1,118 b''
 #require svn svn-bindings
 
   $ filter_svn_output () {
   >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
   > }
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > convert =
   > mq =
   > EOF
 
   $ SVNREPOPATH=`pwd`/svn-repo
-#if windows
-  $ SVNREPOURL=file:///`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#else
-  $ SVNREPOURL=file://`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#endif
+  $ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
 
   $ svnadmin create "$SVNREPOPATH"
   $ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF
   > #!/bin/sh
   > 
   > REPOS="$1"
   > REV="$2"
   > USER="$3"
   > PROPNAME="$4"
   > ACTION="$5"
   > 
   > if [ "$ACTION" = "M" -a "$PROPNAME" = "svn:log" ]; then exit 0; fi
   > if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-branch" ]; then exit 0; fi
   > if [ "$ACTION" = "A" -a "$PROPNAME" = "hg:convert-rev" ]; then exit 0; fi
   > 
   > echo "Changing prohibited revision property" >&2
   > exit 1
   > EOF
   $ chmod +x "$SVNREPOPATH"/hooks/pre-revprop-change
   $ svn co "$SVNREPOURL" "$SVNREPOPATH"-wc
   Checked out revision 0.
   $ cd "$SVNREPOPATH"-wc
   $ echo a > a
   $ svn add a
   A         a
   $ svn ci -m'added a' a | filter_svn_output
   Adding         a
   Transmitting file data .
   Committed revision 1.
   $ cd ..
 
 initial roundtrip
 
   $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg | grep -v initializing
   scanning source...
   sorting...
   converting...
   0 added a
   $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
   scanning source...
   sorting...
   converting...
 
 second roundtrip should do nothing
 
   $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
   scanning source...
   sorting...
   converting...
   $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
   scanning source...
   sorting...
   converting...
 
 new hg rev
 
   $ hg clone "$SVNREPOPATH"-hg "$SVNREPOPATH"-work
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd "$SVNREPOPATH"-work
   $ echo b > b
   $ hg add b
   $ hg ci -mb
 
 adding an empty revision
 
   $ hg qnew -m emtpy empty
   $ hg qfinish -a
   $ cd ..
 
 echo hg to svn
 
   $ hg --cwd "$SVNREPOPATH"-hg pull -q "$SVNREPOPATH"-work
   $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
   scanning source...
   sorting...
   converting...
   1 b
   0 emtpy
 
 svn back to hg should do nothing
 
   $ hg convert -s svn -d hg "$SVNREPOPATH"-wc "$SVNREPOPATH"-hg
   scanning source...
   sorting...
   converting...
 
 hg back to svn should do nothing
 
   $ hg convert -s hg -d svn "$SVNREPOPATH"-hg "$SVNREPOPATH"-wc
   scanning source...
   sorting...
   converting...
 
 verify which shamap format we are storing and must be able to handle
 
   $ cat svn-repo-hg/.hg/shamap
   svn:????????-????-????-????-????????????@1 ???????????????????????????????????????? (glob)
   svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)
   svn:????????-????-????-????-????????????@2 ???????????????????????????????????????? (glob)
   $ cat svn-repo-wc/.svn/hg-shamap
   ???????????????????????????????????????? 1 (glob)
   ???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)
   ???????????????????????????????????????? svn:????????-????-????-????-????????????@2 (glob)

tests/test-convert-svn-move.t

@@ -1,245 +1,241 b''
 #require svn svn-bindings
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert =
   > EOF
 
   $ svnadmin create svn-repo
   $ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"
   $ SVNREPOPATH=`pwd`/svn-repo
-#if windows
-  $ SVNREPOURL=file:///`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#else
-  $ SVNREPOURL=file://`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#endif
+  $ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
 
 Convert trunk and branches
 
   $ hg convert --datesort "$SVNREPOURL"/subproject A-hg
   initializing destination A-hg repository
   scanning source...
   sorting...
   converting...
   13 createtrunk
   12 moved1
   11 moved1
   10 moved2
   9 changeb and rm d2
   8 changeb and rm d2
   7 moved1again
   6 moved1again
   5 copyfilefrompast
   4 copydirfrompast
   3 add d3
   2 copy dir and remove subdir
   1 add d4old
   0 rename d4old into d4new
 
   $ cd A-hg
   $ hg log -G --template '{rev} {desc|firstline} files: {files}\n'
   o  13 rename d4old into d4new files: d4new/g d4old/g
   |
   o  12 add d4old files: d4old/g
   |
   o  11 copy dir and remove subdir files: d3/d31/e d4/d31/e d4/f
   |
   o  10 add d3 files: d3/d31/e d3/f
   |
   o  9 copydirfrompast files: d2/d
   |
   o  8 copyfilefrompast files: d
   |
   o  7 moved1again files: d1/b d1/c
   |
   | o  6 moved1again files:
   | |
   o |  5 changeb and rm d2 files: d1/b d2/d
   | |
   | o  4 changeb and rm d2 files: b
   | |
   o |  3 moved2 files: d2/d
   | |
   o |  2 moved1 files: d1/b d1/c
   | |
   | o  1 moved1 files: b c
   |
   o  0 createtrunk files:
   
 
 Check move copy records
 
   $ hg st --rev 12:13 --copies
   A d4new/g
     d4old/g
   R d4old/g
 
 Check branches
 
   $ hg branches
   default                       13:* (glob)
   d1                             6:* (glob)
   $ cd ..
 
   $ mkdir test-replace
   $ cd test-replace
   $ svnadmin create svn-repo
   $ svnadmin load -q svn-repo < "$TESTDIR/svn/replace.svndump"
 
 Convert files being replaced by directories
 
   $ hg convert svn-repo hg-repo
   initializing destination hg-repo repository
   scanning source...
   sorting...
   converting...
   6 initial
   5 clobber symlink
   4 clobber1
   3 clobber2
   2 adddb
   1 clobberdir
   0 branch
 
   $ cd hg-repo
 
 Manifest before
 
   $ hg -v manifest -r 1
   644   a
   644   d/b
   644   d2/a
   644 @ dlink
   644 @ dlink2
   644   dlink3
 
 Manifest after clobber1
 
   $ hg -v manifest -r 2
   644   a/b
   644   d/b
   644   d2/a
   644   dlink/b
   644 @ dlink2
   644   dlink3
 
 Manifest after clobber2
 
   $ hg -v manifest -r 3
   644   a/b
   644   d/b
   644   d2/a
   644   dlink/b
   644 @ dlink2
   644 @ dlink3
 
 Manifest after clobberdir
 
   $ hg -v manifest -r 6
   644   a/b
   644   d/b
   644   d2/a
   644   d2/c
   644   dlink/b
   644 @ dlink2
   644 @ dlink3
 
 Try updating
 
   $ hg up -qC default
   $ cd ..
 
 Test convert progress bar
 
   $ cat >> $HGRCPATH <<EOF
   > [progress]
   > assume-tty = 1
   > delay = 0
   > changedelay = 0
   > format = topic bar number
   > refresh = 0
   > width = 60
   > EOF
 
   $ hg convert svn-repo hg-progress
   \r (no-eol) (esc)
   scanning [=====>                                      ] 1/7\r (no-eol) (esc)
   scanning [===========>                                ] 2/7\r (no-eol) (esc)
   scanning [=================>                          ] 3/7\r (no-eol) (esc)
   scanning [========================>                   ] 4/7\r (no-eol) (esc)
   scanning [==============================>             ] 5/7\r (no-eol) (esc)
   scanning [====================================>       ] 6/7\r (no-eol) (esc)
   scanning [===========================================>] 7/7\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [                                          ] 0/7\r (no-eol) (esc)
   getting files [=====>                                 ] 1/6\r (no-eol) (esc)
   getting files [============>                          ] 2/6\r (no-eol) (esc)
   getting files [==================>                    ] 3/6\r (no-eol) (esc)
   getting files [=========================>             ] 4/6\r (no-eol) (esc)
   getting files [===============================>       ] 5/6\r (no-eol) (esc)
   getting files [======================================>] 6/6\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=====>                                    ] 1/7\r (no-eol) (esc)
   scanning paths [                                      ] 0/1\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===========>                              ] 2/7\r (no-eol) (esc)
   scanning paths [                                      ] 0/2\r (no-eol) (esc)
   scanning paths [==================>                   ] 1/2\r (no-eol) (esc)
   getting files [========>                              ] 1/4\r (no-eol) (esc)
   getting files [==================>                    ] 2/4\r (no-eol) (esc)
   getting files [============================>          ] 3/4\r (no-eol) (esc)
   getting files [======================================>] 4/4\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=================>                        ] 3/7\r (no-eol) (esc)
   scanning paths [                                      ] 0/1\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=======================>                  ] 4/7\r (no-eol) (esc)
   scanning paths [                                      ] 0/1\r (no-eol) (esc)
   getting files [======================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [=============================>            ] 5/7\r (no-eol) (esc)
   scanning paths [                                      ] 0/1\r (no-eol) (esc)
   getting files [===>                                   ] 1/8\r (no-eol) (esc)
   getting files [========>                              ] 2/8\r (no-eol) (esc)
   getting files [=============>                         ] 3/8\r (no-eol) (esc)
   getting files [==================>                    ] 4/8\r (no-eol) (esc)
   getting files [=======================>               ] 5/8\r (no-eol) (esc)
   getting files [============================>          ] 6/8\r (no-eol) (esc)
   getting files [=================================>     ] 7/8\r (no-eol) (esc)
   getting files [======================================>] 8/8\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   \r (no-eol) (esc)
   converting [===================================>      ] 6/7\r (no-eol) (esc)
   scanning paths [                                      ] 0/3\r (no-eol) (esc)
   scanning paths [===========>                          ] 1/3\r (no-eol) (esc)
   scanning paths [========================>             ] 2/3\r (no-eol) (esc)
   getting files [===>                                   ] 1/8\r (no-eol) (esc)
   getting files [========>                              ] 2/8\r (no-eol) (esc)
   getting files [=============>                         ] 3/8\r (no-eol) (esc)
   getting files [==================>                    ] 4/8\r (no-eol) (esc)
   getting files [=======================>               ] 5/8\r (no-eol) (esc)
   getting files [============================>          ] 6/8\r (no-eol) (esc)
   getting files [=================================>     ] 7/8\r (no-eol) (esc)
   getting files [======================================>] 8/8\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
   initializing destination hg-progress repository
   scanning source...
   sorting...
   converting...
   6 initial
   5 clobber symlink
   4 clobber1
   3 clobber2
   2 adddb
   1 clobberdir
   0 branch
 
   $ cd ..

tests/test-convert-svn-source.t

@@ -1,324 +1,320 b''
 #require svn svn-bindings
 
   $ filter_svn_output () {
   >     egrep -v 'Committing|Updating|(^$)' | sed -e 's/done$//' || true
   > }
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
   > convert =
   > [convert]
   > svn.trunk = mytrunk
   > EOF
 
   $ svnadmin create svn-repo
   $ SVNREPOPATH=`pwd`/svn-repo
-#if windows
-  $ SVNREPOURL=file:///`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#else
-  $ SVNREPOURL=file://`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#endif
+  $ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
   $ INVALIDREVISIONID=svn:x2147622-4a9f-4db4-a8d3-13562ff547b2/proj%20B/mytrunk@1
   $ VALIDREVISIONID=svn:a2147622-4a9f-4db4-a8d3-13562ff547b2/proj%20B/mytrunk/mytrunk@1
 
 Now test that it works with trunk/tags layout, but no branches yet.
 
 Initial svn import
 
   $ mkdir projB
   $ cd projB
   $ mkdir mytrunk
   $ mkdir tags
   $ cd ..
 
   $ svn import -m "init projB" projB "$SVNREPOURL/proj%20B" | filter_svn_output | sort
   Adding         projB/mytrunk
   Adding         projB/tags
   Committed revision 1.
 
 Update svn repository
 
   $ svn co "$SVNREPOURL/proj%20B/mytrunk" B | filter_svn_output
   Checked out revision 1.
   $ cd B
   $ echo hello > 'letter .txt'
   $ svn add 'letter .txt' | filter_svn_output
   A         letter .txt
   $ svn ci -m hello | filter_svn_output
   Adding         letter .txt
   Transmitting file data .
   Committed revision 2.
 
   $ svn-safe-append.py world 'letter .txt'
   $ svn ci -m world | filter_svn_output
   Sending        letter .txt
   Transmitting file data .
   Committed revision 3.
 
   $ svn copy -m "tag v0.1" "$SVNREPOURL/proj%20B/mytrunk" "$SVNREPOURL/proj%20B/tags/v0.1" | filter_svn_output
   Committed revision 4.
 
   $ svn-safe-append.py 'nice day today!' 'letter .txt'
   $ svn ci -m "nice day" | filter_svn_output
   Sending        letter .txt
   Transmitting file data .
   Committed revision 5.
   $ cd ..
 
 Convert to hg once and also test localtimezone option
 
 NOTE: This doesn't check all time zones -- it merely determines that
 the configuration option is taking effect.
 
 An arbitrary (U.S.) time zone is used here.  TZ=US/Hawaii is selected
 since it does not use DST (unlike other U.S. time zones) and is always
 a fixed difference from UTC.
 
   $ TZ=US/Hawaii hg convert --config convert.localtimezone=True "$SVNREPOURL/proj%20B" B-hg
   initializing destination B-hg repository
   scanning source...
   sorting...
   converting...
   3 init projB
   2 hello
   1 world
   0 nice day
   updating tags
 
 Update svn repository again
 
   $ cd B
   $ svn-safe-append.py "see second letter" 'letter .txt'
   $ echo "nice to meet you" > letter2.txt
   $ svn add letter2.txt | filter_svn_output
   A         letter2.txt
   $ svn ci -m "second letter" | filter_svn_output
   Sending        letter .txt
   Adding         letter2.txt
   Transmitting file data ..
   Committed revision 6.
 
   $ svn copy -m "tag v0.2" "$SVNREPOURL/proj%20B/mytrunk" "$SVNREPOURL/proj%20B/tags/v0.2" | filter_svn_output
   Committed revision 7.
 
   $ svn-safe-append.py "blah-blah-blah" letter2.txt
   $ svn ci -m "work in progress" | filter_svn_output
   Sending        letter2.txt
   Transmitting file data .
   Committed revision 8.
   $ cd ..
 
   $ hg convert -s svn "$SVNREPOURL/proj%20B/non-existent-path" dest
   initializing destination dest repository
   abort: no revision found in module /proj B/non-existent-path
   [255]
 
 ########################################
 
 Test incremental conversion
 
   $ TZ=US/Hawaii hg convert --config convert.localtimezone=True "$SVNREPOURL/proj%20B" B-hg
   scanning source...
   sorting...
   converting...
   1 second letter
   0 work in progress
   updating tags
 
   $ cd B-hg
   $ hg log -G --template '{rev} {desc|firstline} date: {date|date} files: {files}\n'
   o  7 update tags date: * +0000 files: .hgtags (glob)
   |
   o  6 work in progress date: * -1000 files: letter2.txt (glob)
   |
   o  5 second letter date: * -1000 files: letter .txt letter2.txt (glob)
   |
   o  4 update tags date: * +0000 files: .hgtags (glob)
   |
   o  3 nice day date: * -1000 files: letter .txt (glob)
   |
   o  2 world date: * -1000 files: letter .txt (glob)
   |
   o  1 hello date: * -1000 files: letter .txt (glob)
   |
   o  0 init projB date: * -1000 files: (glob)
   
   $ hg tags -q
   tip
   v0.2
   v0.1
   $ cd ..
 
 Test filemap
   $ echo 'include letter2.txt' > filemap
   $ hg convert --filemap filemap "$SVNREPOURL/proj%20B/mytrunk" fmap
   initializing destination fmap repository
   scanning source...
   sorting...
   converting...
   5 init projB
   4 hello
   3 world
   2 nice day
   1 second letter
   0 work in progress
   $ hg -R fmap branch -q
   default
   $ hg log -G -R fmap --template '{rev} {desc|firstline} files: {files}\n'
   o  1 work in progress files: letter2.txt
   |
   o  0 second letter files: letter2.txt
   
 Convert with --full adds and removes files that didn't change
 
   $ cd B
   $ echo >> "letter .txt"
   $ svn ci -m 'nothing' | filter_svn_output
   Sending        letter .txt
   Transmitting file data .
   Committed revision 9.
   $ cd ..
 
   $ echo 'rename letter2.txt letter3.txt' > filemap
   $ hg convert --filemap filemap --full "$SVNREPOURL/proj%20B/mytrunk" fmap
   scanning source...
   sorting...
   converting...
   0 nothing
   $ hg -R fmap st --change tip
   A letter .txt
   A letter3.txt
   R letter2.txt
 
 test invalid splicemap1
 
   $ cat > splicemap <<EOF
   > $INVALIDREVISIONID $VALIDREVISIONID
   > EOF
   $ hg convert --splicemap splicemap "$SVNREPOURL/proj%20B/mytrunk" smap
   initializing destination smap repository
   abort: splicemap entry svn:x2147622-4a9f-4db4-a8d3-13562ff547b2/proj%20B/mytrunk@1 is not a valid revision identifier
   [255]
 
 Test stop revision
   $ hg convert --rev 1 "$SVNREPOURL/proj%20B/mytrunk" stoprev
   initializing destination stoprev repository
   scanning source...
   sorting...
   converting...
   0 init projB
   $ hg -R stoprev branch -q
   default
 
 Check convert_revision extra-records.
 This is also the only place testing more than one extra field in a revision.
 
   $ cd stoprev
   $ hg tip --debug | grep extra
   extra:       branch=default
   extra:       convert_revision=svn:........-....-....-....-............/proj B/mytrunk@1 (re)
   $ cd ..
 
 Test converting empty heads (issue3347).
 Also tests getting logs directly without debugsvnlog.
 
   $ svnadmin create svn-empty
   $ svnadmin load -q svn-empty < "$TESTDIR/svn/empty.svndump"
   $ hg --config convert.svn.trunk= --config convert.svn.debugsvnlog=0 convert svn-empty
   assuming destination svn-empty-hg
   initializing destination svn-empty-hg repository
   scanning source...
   sorting...
   converting...
   1 init projA
   0 adddir
   $ hg --config convert.svn.trunk= convert "$SVNREPOURL/../svn-empty/trunk"
   assuming destination trunk-hg
   initializing destination trunk-hg repository
   scanning source...
   sorting...
   converting...
   1 init projA
   0 adddir
 
 Test that a too-new repository format is properly rejected:
   $ mv svn-empty/format format
   $ echo 999 > svn-empty/format
 It's important that this command explicitly specify svn, otherwise it
 can have surprising side effects (like falling back to a perforce
 depot that can be seen from the test environment and slurping from that.)
   $ hg convert --source-type svn svn-empty this-will-fail
   initializing destination this-will-fail repository
   file:/*/$TESTTMP/svn-empty does not look like a Subversion repository to libsvn version 1.*.* (glob)
   abort: svn-empty: missing or unsupported repository
   [255]
   $ mv format svn-empty/format
 
 enable svn subrepos
 
   $ cat >> $HGRCPATH <<EOF
   > [subrepos]
   > svn:allowed = true
   > EOF
 
 try converting when we have an svn subrepo and a merge in hg superrepo (issue5657)
 
   $ cd "$TESTTMP"
   $ hg init withmerge
   $ cd withmerge
   $ echo "subrepo = [svn]$SVNREPOURL" >.hgsub
   $ hg add .hgsub
   $ svn checkout "$SVNREPOURL" subrepo | sort
   A    subrepo/proj B
   A    subrepo/proj B/mytrunk
   A    subrepo/proj B/mytrunk/letter .txt
   A    subrepo/proj B/mytrunk/letter2.txt
   A    subrepo/proj B/tags
   A    subrepo/proj B/tags/v0.1
   A    subrepo/proj B/tags/v0.1/letter .txt
   A    subrepo/proj B/tags/v0.2
   A    subrepo/proj B/tags/v0.2/letter .txt
   A    subrepo/proj B/tags/v0.2/letter2.txt
   Checked out revision 9.
   $ hg ci -m "Adding svn subrepo"
   $ touch file1.txt
   $ hg add file1.txt
   $ hg ci -m "Adding file1"
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ touch file2.txt
   $ hg add file2.txt
   $ hg ci -m "Adding file2"
   created new head
   $ hg merge 1
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   $ hg ci -m "merged"
   $ cd ..
   $ hg --config extensions.convert= convert withmerge withmerge-converted
   initializing destination withmerge-converted repository
   scanning source...
   sorting...
   converting...
   3 Adding svn subrepo
   2 Adding file1
   1 Adding file2
   0 merged
   $ cd withmerge-converted
   $ hg up | sort
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   A    subrepo/proj B
   A    subrepo/proj B/mytrunk
   A    subrepo/proj B/mytrunk/letter .txt
   A    subrepo/proj B/mytrunk/letter2.txt
   A    subrepo/proj B/tags
   A    subrepo/proj B/tags/v0.1
   A    subrepo/proj B/tags/v0.1/letter .txt
   A    subrepo/proj B/tags/v0.2
   A    subrepo/proj B/tags/v0.2/letter .txt
   A    subrepo/proj B/tags/v0.2/letter2.txt
   Checked out revision 9.
   $ ls
   file1.txt
   file2.txt
   subrepo

tests/test-mq-subrepo-svn.t

@@ -1,63 +1,52 b''
 #require svn13
 
   $ cat <<EOF >> $HGRCPATH
   > [extensions]
   > mq =
   > [diff]
   > nodates = 1
   > [subrepos]
   > allowed = true
   > svn:allowed = true
   > EOF
 
 fn to create new repository, and cd into it
   $ mkrepo() {
   >     hg init $1
   >     cd $1
   >     hg qinit
   > }
 
 
 handle svn subrepos safely
 
   $ svnadmin create svn-repo-2499
 
   $ SVNREPOPATH=`pwd`/svn-repo-2499/project
-
-#if py3
-  $ pathquoted=`"$PYTHON" -c "import sys, urllib.parse; sys.stdout.write(urllib.parse.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#else
-  $ pathquoted=`"$PYTHON" -c "import sys, urllib; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#endif
-
-#if windows
-  $ SVNREPOURL=file:///$pathquoted
-#else
-  $ SVNREPOURL=file://$pathquoted
-#endif
+  $ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
 
   $ mkdir -p svn-project-2499/trunk
   $ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"
 
 qnew on repo w/svn subrepo
   $ mkrepo repo-2499-svn-subrepo
   $ svn co "$SVNREPOURL"/trunk sub
   Checked out revision 1.
   $ echo 'sub = [svn]sub' >> .hgsub
   $ hg add .hgsub
   $ hg status -S -X '**/format'
   A .hgsub
   $ hg qnew -m0 0.diff
   $ cd sub
   $ echo a > a
   $ svn add a
   A         a
   $ svn st
   A*    a (glob)
   $ cd ..
   $ hg status -S        # doesn't show status for svn subrepos (yet)
   $ hg qnew -m1 1.diff
   abort: uncommitted changes in subrepository "sub"
   [255]
 
   $ cd ..

tests/test-subrepo-svn.t

@@ -1,690 +1,686 b''
 #require svn15
 
   $ SVNREPOPATH=`pwd`/svn-repo
-#if windows
-  $ SVNREPOURL=file:///`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#else
-  $ SVNREPOURL=file://`"$PYTHON" -c "import urllib, sys; sys.stdout.write(urllib.quote(sys.argv[1]))" "$SVNREPOPATH"`
-#endif
+  $ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
 
   $ filter_svn_output () {
   >     egrep -v 'Committing|Transmitting|Updating|(^$)' || true
   > }
 
 create subversion repo
 
   $ WCROOT="`pwd`/svn-wc"
   $ svnadmin create svn-repo
   $ svn co "$SVNREPOURL" svn-wc
   Checked out revision 0.
   $ cd svn-wc
   $ mkdir src
   $ echo alpha > src/alpha
   $ svn add src
   A         src
   A         src/alpha
   $ mkdir externals
   $ echo other > externals/other
   $ svn add externals
   A         externals
   A         externals/other
   $ svn ci -qm 'Add alpha'
   $ svn up -q
   $ echo "externals -r1 $SVNREPOURL/externals" > extdef
   $ svn propset -F extdef svn:externals src
   property 'svn:externals' set on 'src'
   $ svn ci -qm 'Setting externals'
   $ cd ..
 
 create hg repo
 
   $ mkdir sub
   $ cd sub
   $ hg init t
   $ cd t
 
 first revision, no sub
 
   $ echo a > a
   $ hg ci -Am0
   adding a
 
 add first svn sub with leading whitespaces
 
   $ echo "s =        [svn]       $SVNREPOURL/src" >> .hgsub
   $ echo "subdir/s = [svn]       $SVNREPOURL/src" >> .hgsub
   $ svn co --quiet "$SVNREPOURL"/src s
   $ mkdir subdir
   $ svn co --quiet "$SVNREPOURL"/src subdir/s
   $ hg add .hgsub
 
 svn subrepo is disabled by default
 
   $ hg ci -m1
   abort: svn subrepos not allowed
   (see 'hg help config.subrepos' for details)
   [255]
 
 so enable it
 
   $ cat >> $HGRCPATH <<EOF
   > [subrepos]
   > svn:allowed = true
   > EOF
 
   $ hg ci -m1
 
 make sure we avoid empty commits (issue2445)
 
   $ hg sum
   parent: 1:* tip (glob)
    1
   branch: default
   commit: (clean)
   update: (current)
   phases: 2 draft
   $ hg ci -moops
   nothing changed
   [1]
 
 debugsub
 
   $ hg debugsub
   path s
    source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2
   path subdir/s
    source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2
 
 change file in svn and hg, commit
 
   $ echo a >> a
   $ echo alpha >> s/alpha
   $ hg sum
   parent: 1:* tip (glob)
    1
   branch: default
   commit: 1 modified, 1 subrepos
   update: (current)
   phases: 2 draft
   $ hg commit --subrepos -m 'Message!' | filter_svn_output
   committing subrepository s
   Sending*s/alpha (glob)
   Committed revision 3.
   Fetching external item into '*s/externals'* (glob)
   External at revision 1.
   At revision 3.
   $ hg debugsub
   path s
    source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 3
   path subdir/s
    source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2
 
 missing svn file, commit should fail
 
   $ rm s/alpha
   $ hg commit --subrepos -m 'abort on missing file'
   committing subrepository s
   abort: cannot commit missing svn entries (in subrepository "s")
   [255]
   $ svn revert s/alpha > /dev/null
 
 add an unrelated revision in svn and update the subrepo to without
 bringing any changes.
 
   $ svn mkdir "$SVNREPOURL/unrelated" -qm 'create unrelated'
   $ svn up -q s
   $ hg sum
   parent: 2:* tip (glob)
    Message!
   branch: default
   commit: (clean)
   update: (current)
   phases: 3 draft
 
   $ echo a > s/a
 
 should be empty despite change to s/a
 
   $ hg st
 
 add a commit from svn
 
   $ cd "$WCROOT/src"
   $ svn up -q
   $ echo xyz >> alpha
   $ svn propset svn:mime-type 'text/xml' alpha
   property 'svn:mime-type' set on 'alpha'
   $ svn ci -qm 'amend a from svn'
   $ cd ../../sub/t
 
 this commit from hg will fail
 
   $ echo zzz >> s/alpha
   $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
   committing subrepository s
   abort: svn:*Commit failed (details follow): (glob)
   [255]
   $ svn revert -q s/alpha
 
 this commit fails because of meta changes
 
   $ svn propset svn:mime-type 'text/html' s/alpha
   property 'svn:mime-type' set on 's/alpha'
   $ (hg ci --subrepos -m 'amend alpha from hg' 2>&1; echo "[$?]") | grep -vi 'out of date'
   committing subrepository s
   abort: svn:*Commit failed (details follow): (glob)
   [255]
   $ svn revert -q s/alpha
 
 this commit fails because of externals changes
 
   $ echo zzz > s/externals/other
   $ hg ci --subrepos -m 'amend externals from hg'
   committing subrepository s
   abort: cannot commit svn externals (in subrepository "s")
   [255]
   $ hg diff --subrepos -r 1:2 | grep -v diff
   --- a/.hgsubstate	Thu Jan 01 00:00:00 1970 +0000
   +++ b/.hgsubstate	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,2 +1,2 @@
   -2 s
   +3 s
    2 subdir/s
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    a
   +a
   $ svn revert -q s/externals/other
 
 this commit fails because of externals meta changes
 
   $ svn propset svn:mime-type 'text/html' s/externals/other
   property 'svn:mime-type' set on 's/externals/other'
   $ hg ci --subrepos -m 'amend externals from hg'
   committing subrepository s
   abort: cannot commit svn externals (in subrepository "s")
   [255]
   $ svn revert -q s/externals/other
 
 clone
 
   $ cd ..
   $ hg clone t tc
   updating to branch default
   A    tc/s/alpha
    U   tc/s
   
   Fetching external item into 'tc/s/externals'* (glob)
   A    tc/s/externals/other
   Checked out external at revision 1.
   
   Checked out revision 3.
   A    tc/subdir/s/alpha
    U   tc/subdir/s
   
   Fetching external item into 'tc/subdir/s/externals'* (glob)
   A    tc/subdir/s/externals/other
   Checked out external at revision 1.
   
   Checked out revision 2.
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd tc
 
 debugsub in clone
 
   $ hg debugsub
   path s
    source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 3
   path subdir/s
    source   file:/*/$TESTTMP/svn-repo/src (glob)
    revision 2
 
 verify subrepo is contained within the repo directory
 
   $ "$PYTHON" -c "from __future__ import print_function; import os.path; print(os.path.exists('s'))"
   True
 
 update to nullrev (must delete the subrepo)
 
   $ hg up null
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ ls
 
 Check hg update --clean
   $ cd "$TESTTMP/sub/t"
   $ cd s
   $ echo c0 > alpha
   $ echo c1 > f1
   $ echo c1 > f2
   $ svn add f1 -q
   $ svn status | sort
   
   ? *    a (glob)
   ? *    f2 (glob)
   A *    f1 (glob)
   M *    alpha (glob)
   Performing status on external item at 'externals'* (glob)
   X *    externals (glob)
   $ cd ../..
   $ hg -R t update -C
   
   Fetching external item into 't/s/externals'* (glob)
   Checked out external at revision 1.
   
   Checked out revision 3.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd t/s
   $ svn status | sort
   
   ? *    a (glob)
   ? *    f1 (glob)
   ? *    f2 (glob)
   Performing status on external item at 'externals'* (glob)
   X *    externals (glob)
 
 Sticky subrepositories, no changes
   $ cd "$TESTTMP/sub/t"
   $ hg id -n
   2
   $ cd s
   $ svnversion
   3
   $ cd ..
   $ hg update 1
   U    *s/alpha (glob)
   
   Fetching external item into '*s/externals'* (glob)
   Checked out external at revision 1.
   
   Checked out revision 2.
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   1
   $ cd s
   $ svnversion
   2
   $ cd ..
 
 Sticky subrepositories, file changes
   $ touch s/f1
   $ cd s
   $ svn add f1
   A         f1
   $ cd ..
   $ hg id -n
   1+
   $ cd s
   $ svnversion
   2M
   $ cd ..
   $ hg update tip
    subrepository s diverged (local revision: 2, remote revision: 3)
   (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
    subrepository sources for s differ
   use (l)ocal source (2) or (r)emote source (3)? l
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   2+
   $ cd s
   $ svnversion
   2M
   $ cd ..
   $ hg update --clean tip
   U    *s/alpha (glob)
   
   Fetching external item into '*s/externals'* (glob)
   Checked out external at revision 1.
   
   Checked out revision 3.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Sticky subrepository, revision updates
   $ hg id -n
   2
   $ cd s
   $ svnversion
   3
   $ cd ..
   $ cd s
   $ svn update -qr 1
   $ cd ..
   $ hg update 1
    subrepository s diverged (local revision: 3, remote revision: 2)
   (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
    subrepository sources for s differ (in checked out version)
   use (l)ocal source (1) or (r)emote source (2)? l
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   1+
   $ cd s
   $ svnversion
   1
   $ cd ..
 
 Sticky subrepository, file changes and revision updates
   $ touch s/f1
   $ cd s
   $ svn add f1
   A         f1
   $ svnversion
   1M
   $ cd ..
   $ hg id -n
   1+
   $ hg update tip
    subrepository s diverged (local revision: 3, remote revision: 3)
   (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
    subrepository sources for s differ
   use (l)ocal source (1) or (r)emote source (3)? l
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   2+
   $ cd s
   $ svnversion
   1M
   $ cd ..
 
 Sticky repository, update --clean
   $ hg update --clean tip | grep -v 's[/\]externals[/\]other'
   U    *s/alpha (glob)
    U   *s (glob)
   
   Fetching external item into '*s/externals'* (glob)
   Checked out external at revision 1.
   
   Checked out revision 3.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   2
   $ cd s
   $ svnversion
   3
   $ cd ..
 
 Test subrepo already at intended revision:
   $ cd s
   $ svn update -qr 2
   $ cd ..
   $ hg update 1
    subrepository s diverged (local revision: 3, remote revision: 2)
   (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id -n
   1+
   $ cd s
   $ svnversion
   2
   $ cd ..
 
 Test case where subversion would fail to update the subrepo because there
 are unknown directories being replaced by tracked ones (happens with rebase).
 
   $ cd "$WCROOT/src"
   $ mkdir dir
   $ echo epsilon.py > dir/epsilon.py
   $ svn add dir
   A         dir
   A         dir/epsilon.py
   $ svn ci -qm 'Add dir/epsilon.py'
   $ cd ../..
   $ hg init rebaserepo
   $ cd rebaserepo
   $ svn co -r5 --quiet "$SVNREPOURL"/src s
   $ echo "s =        [svn]       $SVNREPOURL/src" >> .hgsub
   $ hg add .hgsub
   $ hg ci -m addsub
   $ echo a > a
   $ hg add .
   adding a
   $ hg ci -m adda
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ svn up -qr6 s
   $ hg ci -m updatesub
   created new head
   $ echo pyc > s/dir/epsilon.pyc
   $ hg up 1
   D    *s/dir (glob)
   
   Fetching external item into '*s/externals'* (glob)
   Checked out external at revision 1.
   
   Checked out revision 5.
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up -q 2
 
 Modify one of the externals to point to a different path so we can
 test having obstructions when switching branches on checkout:
   $ hg checkout tip
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo "obstruct =        [svn]       $SVNREPOURL/externals" >> .hgsub
   $ svn co -r5 --quiet "$SVNREPOURL"/externals obstruct
   $ hg commit -m 'Start making obstructed working copy'
   $ hg book other
   $ hg co -r 'p1(tip)'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark other)
   $ echo "obstruct =        [svn]       $SVNREPOURL/src" >> .hgsub
   $ svn co -r5 --quiet "$SVNREPOURL"/src obstruct
   $ hg commit -m 'Other branch which will be obstructed'
   created new head
 
 Switching back to the head where we have another path mapped to the
 same subrepo should work if the subrepo is clean.
   $ hg co other
   A    *obstruct/other (glob)
   Checked out revision 1.
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark other)
 
 This is surprising, but is also correct based on the current code:
   $ echo "updating should (maybe) fail" > obstruct/other
   $ hg co tip
   abort: uncommitted changes
   (commit or update --clean to discard changes)
   [255]
 
 Point to a Subversion branch which has since been deleted and recreated
 First, create that condition in the repository.
 
   $ hg ci --subrepos -m cleanup | filter_svn_output
   committing subrepository obstruct
   Sending        obstruct/other
   Committed revision 7.
   At revision 7.
   $ svn mkdir -qm "baseline" $SVNREPOURL/trunk
   $ svn copy -qm "initial branch" $SVNREPOURL/trunk $SVNREPOURL/branch
   $ svn co --quiet "$SVNREPOURL"/branch tempwc
   $ cd tempwc
   $ echo "something old" > somethingold
   $ svn add somethingold
   A         somethingold
   $ svn ci -qm 'Something old'
   $ svn rm -qm "remove branch" $SVNREPOURL/branch
   $ svn copy -qm "recreate branch" $SVNREPOURL/trunk $SVNREPOURL/branch
   $ svn up -q
   $ echo "something new" > somethingnew
   $ svn add somethingnew
   A         somethingnew
   $ svn ci -qm 'Something new'
   $ cd ..
   $ rm -rf tempwc
   $ svn co "$SVNREPOURL/branch"@10 recreated
   A    recreated/somethingold
   Checked out revision 10.
   $ echo "recreated =        [svn]       $SVNREPOURL/branch" >> .hgsub
   $ hg ci -m addsub
   $ cd recreated
   $ svn up -q
   $ cd ..
   $ hg ci -m updatesub
   $ hg up -r-2
   D    *recreated/somethingnew (glob)
   A    *recreated/somethingold (glob)
   Checked out revision 10.
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (leaving bookmark other)
   $ test -f recreated/somethingold
 
 Test archive
 
   $ hg archive -S ../archive-all --debug --config progress.debug=true
   archiving: 0/2 files (0.00%)
   archiving: .hgsub 1/2 files (50.00%)
   archiving: .hgsubstate 2/2 files (100.00%)
   archiving (obstruct): 0/1 files (0.00%)
   archiving (obstruct): 1/1 files (100.00%)
   archiving (recreated): 0/1 files (0.00%)
   archiving (recreated): 1/1 files (100.00%)
   archiving (s): 0/2 files (0.00%)
   archiving (s): 1/2 files (50.00%)
   archiving (s): 2/2 files (100.00%)
 
   $ hg archive -S ../archive-exclude --debug --config progress.debug=true -X **old
   archiving: 0/2 files (0.00%)
   archiving: .hgsub 1/2 files (50.00%)
   archiving: .hgsubstate 2/2 files (100.00%)
   archiving (obstruct): 0/1 files (0.00%)
   archiving (obstruct): 1/1 files (100.00%)
   archiving (recreated): 0 files
   archiving (s): 0/2 files (0.00%)
   archiving (s): 1/2 files (50.00%)
   archiving (s): 2/2 files (100.00%)
   $ find ../archive-exclude | sort
   ../archive-exclude
   ../archive-exclude/.hg_archival.txt
   ../archive-exclude/.hgsub
   ../archive-exclude/.hgsubstate
   ../archive-exclude/obstruct
   ../archive-exclude/obstruct/other
   ../archive-exclude/s
   ../archive-exclude/s/alpha
   ../archive-exclude/s/dir
   ../archive-exclude/s/dir/epsilon.py
 
 Test forgetting files, not implemented in svn subrepo, used to
 traceback
 
   $ hg forget 'notafile*'
   notafile*: $ENOENT$
   [1]
 
 Test a subrepo referencing a just moved svn path. Last commit rev will
 be different from the revision, and the path will be different as
 well.
 
   $ cd "$WCROOT"
   $ svn up > /dev/null
   $ mkdir trunk/subdir branches
   $ echo a > trunk/subdir/a
   $ svn add trunk/subdir branches
   A         trunk/subdir
   A         trunk/subdir/a
   A         branches
   $ svn ci -qm addsubdir
   $ svn cp -qm branchtrunk $SVNREPOURL/trunk $SVNREPOURL/branches/somebranch
   $ cd ..
 
   $ hg init repo2
   $ cd repo2
   $ svn co $SVNREPOURL/branches/somebranch/subdir
   A    subdir/a
   Checked out revision 15.
   $ echo "subdir = [svn] $SVNREPOURL/branches/somebranch/subdir" > .hgsub
   $ hg add .hgsub
   $ hg ci -m addsub
   $ hg up null
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg up
   A    *subdir/a (glob)
   Checked out revision 15.
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 Test sanitizing ".hg/hgrc" in subrepo
 
   $ cd sub/t
   $ hg update -q -C tip
   $ cd s
   $ mkdir .hg
   $ echo '.hg/hgrc in svn repo' > .hg/hgrc
   $ mkdir -p sub/.hg
   $ echo 'sub/.hg/hgrc in svn repo' > sub/.hg/hgrc
   $ svn add .hg sub
   A         .hg
   A         .hg/hgrc
   A         sub
   A         sub/.hg
   A         sub/.hg/hgrc
   $ svn ci -qm 'add .hg/hgrc to be sanitized at hg update'
   $ svn up -q
   $ cd ..
   $ hg commit -S -m 'commit with svn revision including .hg/hgrc'
   $ grep ' s$' .hgsubstate
   16 s
   $ cd ..
 
   $ hg -R tc pull -u -q 2>&1 | sort
   warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/.hg'
   warning: removing potentially hostile 'hgrc' in '$TESTTMP/sub/tc/s/sub/.hg'
   $ cd tc
   $ grep ' s$' .hgsubstate
   16 s
   $ test -f s/.hg/hgrc
   [1]
   $ test -f s/sub/.hg/hgrc
   [1]
 
 Test that sanitizing is omitted in meta data area:
 
   $ mkdir s/.svn/.hg
   $ echo '.hg/hgrc in svn metadata area' > s/.svn/.hg/hgrc
   $ hg update -q -C '.^1'
 
   $ cd ../..
 
 SEC: test for ssh exploit
 
   $ hg init ssh-vuln
   $ cd ssh-vuln
   $ echo "s = [svn]$SVNREPOURL/src" >> .hgsub
   $ svn co --quiet "$SVNREPOURL"/src s
   $ hg add .hgsub
   $ hg ci -m1
   $ echo "s = [svn]svn+ssh://-oProxyCommand=touch%20owned%20nested" > .hgsub
   $ hg ci -m2
   $ cd ..
   $ hg clone ssh-vuln ssh-vuln-clone
   updating to branch default
   abort: potentially unsafe url: 'svn+ssh://-oProxyCommand=touch owned nested' (in subrepository "s")
   [255]
 
 also check that a percent encoded '-' (%2D) doesn't work
 
   $ cd ssh-vuln
   $ echo "s = [svn]svn+ssh://%2DoProxyCommand=touch%20owned%20nested" > .hgsub
   $ hg ci -m3
   $ cd ..
   $ rm -r ssh-vuln-clone
   $ hg clone ssh-vuln ssh-vuln-clone
   updating to branch default
   abort: potentially unsafe url: 'svn+ssh://-oProxyCommand=touch owned nested' (in subrepository "s")
   [255]
 
 also check that hiding the attack in the username doesn't work:
 
   $ cd ssh-vuln
   $ echo "s = [svn]svn+ssh://%2DoProxyCommand=[e-mail]/nested" > .hgsub
   $ hg ci -m3
   $ cd ..
   $ rm -r ssh-vuln-clone
   $ hg clone ssh-vuln ssh-vuln-clone
   updating to branch default
   abort: potentially unsafe url: 'svn+ssh://-oProxyCommand=touch owned [e-mail]/nested' (in subrepository "s")
   [255]