Difference between
modified post 5ba7a by Anonymous on Mon 10th Feb 2020 17:52
original post 66d56222 by Anonymous on Fri 7th Feb 2020 17:30
Download diff
Show old version | new version | both versions

#!/bin/ksh93

1	1		#!/bin/ksh93
2	2
3	3		#
4	4		# merge Rauchs Subversion tree into our git,
5	5		# one patch at the time
6	6		#
7	7
8	8		set -o xtrace
9	9		set -o errexit
10	10		set -o pipefail
11	11
12	12		which bunzip2 \|\| exit 1
13	13		which git \|\| exit 1
14	14		which realpath \|\| exit 1
15	15		which svn \|\| exit 1
16	16		which svnadmin \|\| exit 1
17	17		which svnrdump \|\| exit 1
18	18
19	19
20	20		builtin chmod \|\| exit 1
21		-	#builtin grep \|\| exit 1
	21	+	#builtin grep \|\| exit 1 # broken Debian ksh93 package config, grrr...
22	22		#builtin ln \|\| exit 1 # broken Debian ksh93 package config, grrr...
23	23		builtin mkdir \|\| exit 1
24	24		builtin printf \|\| exit 1
25	25		#builtin rm \|\| exit 1 # broken Debian ksh93 package config, grrr...
26	26		builtin wc \|\| exit 1
27	27
28	28
29	29		# clean data from previous run
30		-	rm -Rf gitsvnclone1 svnstore convertedsrc compare_oldnew
	30	+	rm -Rf \
	31	+	'gitsvnclone1' \
31	35
32	36
33	37		# squish locale settings, we need the POSIX defaults
34	38		if [[ "${!LC_*}" != '' ]] ; then
35	39		unset "${!LC_@}"
36	40		fi
37	41		unset LANG
38	42		export LANG='POSIX'
39	43
40	44		typeset -r infile='rauch_svndump20200128.svndump.bz2'
41	45
42	46		typeset -r basedir="$PWD"
43	47		compound svninfo
44	48
45		-	typeset i dummy
	49	+	typeset s dummy
46	50
47	51		[[ ! -f "${infile}" ]] && exit 1
48	52		[[ ! -r "${infile}" ]] && exit 1
49	53
50	54		# create empty SVN repository
51	55		svnadmin create svnstore
52	56		# add dummy hook to allow property changes for "svnrdump load"
53	57		printf '#!/bin/sh\nexit 0\n' >'svnstore/hooks/pre-revprop-change'
54	58		chmod a+x 'svnstore/hooks/pre-revprop-change'
55	59
56	60		bunzip2 -c <"${infile}" \| svnrdump load "file://$basedir/svnstore/"
57	61
58	62		# get HEAD revision (number) from svn repository
59	63		integer svninfo.revision
60	64		svninfo.cmdout="$(svn info "file://$basedir/svnstore")"
61	65		dummy="${svninfo.cmdout/~(E)Revision:[[:space:]]+([[:digit:]]+)/ }"
62	66		(( svninfo.revision=.sh.match[1] ))
63	67
64	68		printf '# Subversion info:\n'
65	69		print -v svninfo
66	70
67	71		mkdir 'gitsvnclone1'
68	72		cd 'gitsvnclone1'
69	73		git svn clone "file://$basedir/svnstore"
70	74
71	75		ls -lad 'svnstore/trunk/projekt/ptxdist/'
72	76
73	77
74	78
75	79		#
76	80		# extract all patches from git repository previously
77	81		# stored by "git svn" there
78	82		#
79	83		cd 'svnstore/trunk/projekt/ptxdist/'
80		-	git format-patch -$(( svninfo.revision+1 ))
	84	+	time git format-patch -$(( svninfo.revision+1 ))
81	85
82	86		# remove patch files which are empty
83		-	for i in *.patch ; do if [[ ! -s "$i" ]] ; then rm -- "$i" ; fi ; done
	87	+	for s in *.patch ; do if [[ ! -s "$s" ]] ; then rm -- "$s" ; fi ; done
84	88
85	89		# list remaining patches
86		-	IFS=$'\n' ; typeset -a patchlist=( $(ls -1ad $PWD/*.patch ) )
	90	+	IFS=$'\n' ; typeset -a patchlist=( $(ls -1ad $PWD/*.patch ) ) ; IFS=$' \t\n'
87	91		printf '\n#### Patches:\n'
88	92		printf '%q\n' "${patchlist[@]}"
89	93		printf '\n#### Number of patches: %d\n' "$(wc -l <<<"$patchlist")"
90	94
91	95
92	96		cd "$basedir"
93	97		mkdir 'convertedsrc'
94	98		cd 'convertedsrc'
95	99
96		-	printf '%s\n' "${patchlist[@]}" \| sort -n \| while read i ; do
	100	+	printf '%s\n' "${patchlist[@]}" \| sort -n \| while read s ; do
97	101		# 1. use "\|\| true" to circumvent -o errexit for now since
98	102		# GNU patch does not support GIT binary patches and returns
99	103		# a non-0 exit code for such patches
100	104		# 2. use --force to avoid interactive queries about GIT binary patches
101		-	patch -p3 --force <"$i" \|\| true
	105	+	patch -p3 --force <"$s" \|\| true
102	106		done
103	107
104	108
105	109		cd "$basedir"
106	110		mkdir 'compare_oldnew'
107	111		cd 'compare_oldnew'
108	112		(mkdir 'old' && cd 'old' && svn export "file://$basedir/svnstore/trunk/projekt/ptxdist")
109	113		mkdir 'new' ; ln -s '../../convertedsrc/ptxdist' 'new/.'
110	114
111	115
112	116		#
113	117		# Check whether the sources differ
114	118		# We exclude binaries here because GNU patch doesn't support GIT binary
115	119		# patches and the previous state skipped them completely. Instead, we let
116	120		# grep(1) filter complains of diff(1) that those files only exists in
117	121		# compare_oldnew/old/ptxdist/ but not in compare_oldnew/new/ptxdist/
118	122		#
119	123		cd "$basedir"
120	124		(diff -r -u 'compare_oldnew/old/ptxdist/' 'compare_oldnew/new/ptxdist/' \|\| true) 2>&1 \|
121	125		grep -E -v '^Only in compare_oldnew/old/.+: (ecu-jobctl-demo\|barebox-image\|bareboxenv\|libEMC\|lin\|.+\.(app\|png\|jpg\|jpeg\|gz\|bin\|iop\|pdf\|so\.[[:digit:]]+.+\|crc\|vtg))$'
122	126
123	127
124	128		printf '# DONE!\n'
125	129		exit 0
126	130		# EOF.
127	131