This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5766

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

Authored by durin42 on Jan 30 2019, 6:53 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

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

Summary

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.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

durin42 created this revision.Jan 30 2019, 6:53 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 30 2019, 6:53 PM

Herald added subscribers: mercurial-devel, mjpieters. · View Herald Transcript

Closed by commit rHG41bd254b6de4: tests: make and use a new `svnurlof.py` helper for constructing svn urls (authored by durin42). · Explain WhyJan 30 2019, 7:13 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
A	M	tests/svnurlof.py (17 lines)
M		tests/test-convert-hg-svn.t (6 lines)
M		tests/test-convert-svn-move.t (6 lines)
M		tests/test-convert-svn-source.t (6 lines)
M		tests/test-mq-subrepo-svn.t (13 lines)
M		tests/test-subrepo-svn.t (6 lines)

Commit	Parents	Author	Summary	Date
		Augie Fackler		Jan 30 2019, 6:49 PM

Diff 13610

tests/svnurlof.py

This file was added.

				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

	#require svn svn-bindings			#require svn svn-bindings

	$ filter_svn_output () {			$ filter_svn_output () {
	> egrep -v 'Committing\|Updating\|(^$)' \| sed -e 's/done$//' \|\| true			> egrep -v 'Committing\|Updating\|(^$)' \| sed -e 's/done$//' \|\| true
	> }			> }

	$ cat <<EOF >> $HGRCPATH			$ cat <<EOF >> $HGRCPATH
	> [extensions]			> [extensions]
	> convert =			> convert =
	> mq =			> mq =
	> EOF			> EOF

	$ SVNREPOPATH=`pwd`/svn-repo			$ SVNREPOPATH=`pwd`/svn-repo
	#if windows			$ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
	$ 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

	$ svnadmin create "$SVNREPOPATH"			$ svnadmin create "$SVNREPOPATH"
	$ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF			$ cat > "$SVNREPOPATH"/hooks/pre-revprop-change <<EOF
	> #!/bin/sh			> #!/bin/sh
	>			>
	> REPOS="$1"			> REPOS="$1"
	> REV="$2"			> REV="$2"
	> USER="$3"			> USER="$3"

tests/test-convert-svn-move.t

	#require svn svn-bindings			#require svn svn-bindings

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> convert =			> convert =
	> EOF			> EOF

	$ svnadmin create svn-repo			$ svnadmin create svn-repo
	$ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"			$ svnadmin load -q svn-repo < "$TESTDIR/svn/move.svndump"
	$ SVNREPOPATH=`pwd`/svn-repo			$ SVNREPOPATH=`pwd`/svn-repo
	#if windows			$ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
	$ 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

	Convert trunk and branches			Convert trunk and branches

	$ hg convert --datesort "$SVNREPOURL"/subproject A-hg			$ hg convert --datesort "$SVNREPOURL"/subproject A-hg
	initializing destination A-hg repository			initializing destination A-hg repository
	scanning source...			scanning source...
	sorting...			sorting...
	converting...			converting...

tests/test-convert-svn-source.t

	#require svn svn-bindings			#require svn svn-bindings

	$ filter_svn_output () {			$ filter_svn_output () {
	> egrep -v 'Committing\|Updating\|(^$)' \| sed -e 's/done$//' \|\| true			> egrep -v 'Committing\|Updating\|(^$)' \| sed -e 's/done$//' \|\| true
	> }			> }

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [extensions]			> [extensions]
	> convert =			> convert =
	> [convert]			> [convert]
	> svn.trunk = mytrunk			> svn.trunk = mytrunk
	> EOF			> EOF

	$ svnadmin create svn-repo			$ svnadmin create svn-repo
	$ SVNREPOPATH=`pwd`/svn-repo			$ SVNREPOPATH=`pwd`/svn-repo
	#if windows			$ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
	$ 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
	$ INVALIDREVISIONID=svn:x2147622-4a9f-4db4-a8d3-13562ff547b2/proj%20B/mytrunk@1			$ INVALIDREVISIONID=svn:x2147622-4a9f-4db4-a8d3-13562ff547b2/proj%20B/mytrunk@1
	$ VALIDREVISIONID=svn:a2147622-4a9f-4db4-a8d3-13562ff547b2/proj%20B/mytrunk/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.			Now test that it works with trunk/tags layout, but no branches yet.

	Initial svn import			Initial svn import

	$ mkdir projB			$ mkdir projB

tests/test-mq-subrepo-svn.t

	> }			> }


	handle svn subrepos safely			handle svn subrepos safely

	$ svnadmin create svn-repo-2499			$ svnadmin create svn-repo-2499

	$ SVNREPOPATH=`pwd`/svn-repo-2499/project			$ SVNREPOPATH=`pwd`/svn-repo-2499/project
				$ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
	#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

	$ mkdir -p svn-project-2499/trunk			$ mkdir -p svn-project-2499/trunk
	$ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"			$ svn import -qm 'init project' svn-project-2499 "$SVNREPOURL"

	qnew on repo w/svn subrepo			qnew on repo w/svn subrepo
	$ mkrepo repo-2499-svn-subrepo			$ mkrepo repo-2499-svn-subrepo
	$ svn co "$SVNREPOURL"/trunk sub			$ svn co "$SVNREPOURL"/trunk sub
	Checked out revision 1.			Checked out revision 1.

tests/test-subrepo-svn.t

	#require svn15			#require svn15

	$ SVNREPOPATH=`pwd`/svn-repo			$ SVNREPOPATH=`pwd`/svn-repo
	#if windows			$ SVNREPOURL="`$PYTHON $TESTDIR/svnurlof.py \"$SVNREPOPATH\"`"
	$ 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

	$ filter_svn_output () {			$ filter_svn_output () {
	> egrep -v 'Committing\|Transmitting\|Updating\|(^$)' \|\| true			> egrep -v 'Committing\|Transmitting\|Updating\|(^$)' \|\| true
	> }			> }

	create subversion repo			create subversion repo

	$ WCROOT="`pwd`/svn-wc"			$ WCROOT="`pwd`/svn-wc"

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13610		Jan 30 2019, 6:53 PM	★	★
Diff 2	13613	rHG41bd254b6de42c69a59d67c0ec90c9555f0a8fb0	Jan 30 2019, 6:49 PM	★	★