1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
|
#!/bin/bash
NEWSVNURL="file:///home/colin/svn-git/soft"
SOFTWARE=
if [ -d ".git" -a -f ".git/config" -a -f ".git/svn/.metadata" ]; then
SOFTWARE=$(grep "fetch = " .git/config | cut -d'=' -f2- | cut -d':' -f1 | sed 's,/trunk,,' | trim)
fi
if [ -z "$SOFTWARE" ]; then
echo "You must run this in a git-svn clone folder." >&2
exit 1
fi
if [ -d ../$SOFTWARE.git ]; then
echo "It seems the converted git repository already exists (../$SOFTWARE.git)"
exit 1
fi
echo -n "Finding UUID for SVN Repository $NEWSVNURL... "
NEWSVNUUID=$(svn info $NEWSVNURL | grep "^Repository UUID:" | sed 's/Repository UUID: //')
echo $NEWSVNUUID
echo -n "Updating SVN Remote config (old value: $(git config svn-remote.svn.url))... "
git config svn-remote.svn.url $NEWSVNURL
echo "done"
echo -n "Updating Internal SVN metadata... "
sed -i "s,reposRoot = .*$,reposRoot = $NEWSVNURL,;s,uuid = .*$,uuid = $NEWSVNUUID," .git/svn/.metadata
echo "done"
echo
echo "OK now the fun stuff beings. You need to find the git commit at which you want to"
echo "start the magiea import. This will typically require some investigation but the"
echo "date will be around February 2011."
echo "I will drop you to a shell. When you are done, simply copy the SHA1 sum and exit."
echo "The commands you like want are 'git log trunk' and 'git show SHA1'"
echo
echo "Press any key to contiue."
read -n 1
bash
echo
echo "OK you're back :)"
echo "What was the SHA1?"
read resetsha1
if [ -z "$resetsha1" ]; then
echo "You did not give any SHA1 sum. I will not reset the git repository and carry on importing"
echo "from it's current state. You can quit this script and start again if this is incorrect."
else
echo "I got SHA1 '$resetsha1'. I hope that's correct".
echo
echo "I will now reset your git trunk and master branches. Is this OK? (press ctrl+c if not)"
read -n 1
git update-ref -m "Rewind SVN Git to pre-Magiea import" refs/remotes/trunk $resetsha1
git checkout master
git reset --hard trunk
fi
echo
echo "I will now run 'svn log' on the software. You should be able to guess the right revision"
echo "to base the import on. When done, simply copy (or remember) the revision number and enter it"
echo "into this script. You will also be able to (optionall) select several other commits which"
echo "you wish to squash into this initial commit."
echo
echo "Press any key to contiue."
read -n 1
svn log $NEWSVNURL/$SOFTWARE | less
echo
echo "OK you're back :)"
echo "What was the initial revision number?"
read revision
revision=$(echo $revision | sed 's/r//g')
revision=$(( $revision + 0 ))
echo "I got revision '$revision'. I hope that's correct".
echo
echo "Do you also want to squash any further commits into our initial commit? Enter them here if so"
read morerevisionsx
morerevisionsx=$(echo $morerevisionsx | trim)
if [ -n "$morerevisionsx" ]; then
for rev in $morerevisionsx; do
rev=$(echo $rev | sed 's/r//g')
rev=$(( $rev + 0 ))
if [ $rev -gt 0 ]; then
morerevisions="$morerevisions $rev"
fi
done
echo
echo "OK, you said you also wanted to squash the following commits:"
echo " $morerevisions"
echo
fi
echo
echo "The next step is the dangerous bit. We will clear out all files in the current"
echo "working copy, run an svn export and then drop you to a shell to investigate the differences"
echo "In that shell you must git add any new files that appear and ensure you are happy with"
echo "the generate state of things."
echo
echo "Continue? (press ctrl+c if not)"
read -n 1
git reset --hard trunk
resetsha1=$(git rev-list --max-count=1 HEAD)
# The below is a "safer" verion of rm -rf * that also deletes hidden files
find . -depth -not -iwholename '.' -not -iwholename "./.git" -not -iwholename "./.git/*" -not -iwholename "./.git/.*" -delete
# We have to create a subversion repository here for the import as we need a repository
# for the svn merging below... svn sucks.
mkdir -p svn-sucks-balls/export
cd svn-sucks-balls/export
svn export --force --ignore-keywords --ignore-externals -r $revision $NEWSVNURL/$SOFTWARE/trunk .
cd ../..
svnadmin create svn-sucks-balls/repo
svnrepo=file://$(pwd)/svn-sucks-balls/repo
svn import -m "Import" svn-sucks-balls/export $svnrepo
svn checkout $svnrepo svn-sucks-balls/checkout
cd svn-sucks-balls/checkout
if [ -n "$morerevisions" ]; then
for rev in $morerevisions; do
svn merge -c $rev --ignore-ancestry --accept theirs-full --allow-mixed-revisions $NEWSVNURL/$SOFTWARE/trunk .
svn commit -m "Merged r$rev"
if [ $? -ne 0 ]; then
echo
echo "Merging in svn revision $rev failed. You need to rethink your import strategy."
echo
exit 1
fi
done
fi
cd ../..
svn export --force $svnrepo .
rm -rf svn-sucks-balls
echo
echo "Dropping you to a shell. Use 'git status', 'git diff' and 'git add'."
echo "DO NOT run 'git commit', I'll do that later for you."
bash
echo
echo "OK you're back :)"
echo "If everything is OK, and you're ready to continue, then hit return."
read -n 1
COMMITTXT=$(mktemp /tmp/commitmsg.XXXXXX)
cat >$COMMITTXT <<EOF
Synthesized commit during git-svn import combining previous Mandriva history with Magiea.
This commit consitsts of the following subversion commits:
EOF
svn log -r 1:$revision $NEWSVNURL/$SOFTWARE >>$COMMITTXT
if [ -n "$morerevisions" ]; then
for rev in $morerevisions; do
svn log -r $rev $NEWSVNURL/$SOFTWARE | tail -n +2 >>$COMMITTXT
done
fi
COMMITDATE=$(svn log -r $revision $NEWSVNURL/$SOFTWARE | head -n2 | tail -n1| cut -d'|' -f3 | cut -d'(' -f1 | trim)
git commit --author="Mageia SVN-Git Migration <svn-git-migration@mageia.org>" --date="$COMMITDATE" --file=$COMMITTXT -a
rm -f $COMMITTXT
echo
echo "OK, looks like we're good to go :)"
echo "Press any key to continue with the subversion import process".
read -n 1
git svn gc
sha1=$(git rev-list --max-count=1 HEAD)
echo
echo -n "Updating trunk branch to include synthesised commit $sha1... "
git update-ref -m "Reset to synthesized commit representing Magiea cleaned import (SVN Git)" refs/remotes/trunk $sha1
echo "done"
echo -n "Faking git-svn metadata to allow continuation... "
printf "0000000: %08x%s\t................" $revision $sha1 | xxd -r -c24 >.git/svn/refs/remotes/trunk/.rev_map.$NEWSVNUUID
echo "done"
# Keep a small log of the sha1's etc.
if [ ! -f ../svn-import.log ]; then
echo "software,startingcommit,startingrevision,otherrevisions,fakecommit" >../svn-import.log
fi
echo "$SOFTWARE,$resetsha1,$revision,$morerevisions,$sha1" >>../svn-import.log
echo "Continuing svn fetch"
if [ -n "$morerevisions" ]; then
for rev in $morerevisions; do
git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):$(( $rev - 1 ))
revision=$rev
done
fi
git svn fetch -A ../authors-transform.txt -r $(( $revision + 1 )):HEAD
git reset --hard trunk
echo
echo "done"
echo
echo "Now creating bare git repository"
git init --bare ../$SOFTWARE.git
git remote rm origin
git remote add origin ../$SOFTWARE.git
#git push --set-upstream master
git push origin master 'refs/remotes/*:refs/heads/*'
pushd ../$SOFTWARE.git
git branch -D trunk
git branch -D origin/master
git for-each-ref --format='%(refname)' refs/heads/tags | cut -d / -f 4 | \
while read ref; do
git tag "$ref" "refs/heads/tags/$ref"
git branch -D "tags/$ref"
done
git gc --aggressive
popd
|
