CC=gcc fix for mingw32
[xonotic/xonotic.git] / all
1 #!/bin/sh
2 # vim: filetype=zsh
3
4 set -e
5
6 # I use this in EVERY shell script ;)
7 LF="
8 "
9
10 d00=`pwd`
11 while ! [ -f ./all ]; do
12         if [ x"`pwd`" = x"/" ]; then
13                 echo "Cannot find myself."
14                 echo "Please run this script with the working directory inside a Xonotic checkout."
15                 exit 1
16         fi
17         cd ..
18 done
19 d0=`pwd`
20 SELF="$d0/all"
21
22 # If we are on WINDOWS:
23 case "$0" in
24         all|*/all)
25                 case "`uname`" in
26                         MINGW*|Win*)
27                                 # Windows hates users. So this script has to copy itself elsewhere first...
28                                 tname=
29                                 cp "$SELF" ../all.xonotic.sh
30                                 export WE_HATE_OUR_USERS=1
31                                 exec ../all.xonotic.sh "$@"
32                                 ;;
33                 esac
34                 ;;
35 esac
36
37 msg()
38 {
39         echo "\e[1m$*\e[m"
40 }
41
42 checksum()
43 {
44         if [ -x /usr/bin/md5sum ]; then
45                 /usr/bin/md5sum "$@"
46         elif [ -x /bin/md5sum ]; then
47                 /bin/md5sum "$@"
48         elif [ -x /usr/bin/cksum ]; then
49                 /usr/bin/cksum "$@"
50         else
51                 echo "NOCHECKSUM"
52         fi
53 }
54
55 self=`checksum "$SELF"`
56 checkself()
57 {
58         self_new=`checksum "$SELF"`
59         if [ x"$self" != x"$self_new" ]; then
60                 msg "./all has changed."
61                 if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
62                         msg "Rerunning the requested operation to make sure."
63                         export XONOTIC_FORBID_RERUN_ALL=1
64                         exec "$SELF" "$@"
65                 else
66                         msg "Please try $SELF update, and then retry your requested operation."
67                         exit 1
68                 fi
69         fi
70         return 0
71 }
72
73 verbose()
74 {
75         msg "+ $*"
76         "$@"
77 }
78
79 visible_repo_name()
80 {
81         case "$1" in
82                 .)
83                         echo "the root directory"
84                         ;;
85                 *)
86                         echo "\"$1\""
87                         ;;
88         esac
89 }
90
91 check_mergeconflict()
92 {
93         if git ls-files -u | grep ' 1   '; then
94                 echo
95                 echo "MERGE CONFLICT."
96                 echo "change into the \"$1\" project directory, and then:"
97                 echo "- edit the files mentioned above with your favorite editor,"
98                 echo "  and fix the conflicts (marked with <<<<<<< blocks)"
99                 echo "- for binary files, you can select the files using"
100                 echo "  git checkout --ours or git checkout --theirs"
101                 echo "- when done with a file, 'git add' the file"
102                 echo "- when done, 'git commit'"
103                 echo
104                 exit 1
105         fi
106 }
107
108 yesno()
109 {
110         yesno=
111         while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
112                 eval "$2"
113                 echo "$1"
114                 IFS= read -r yesno
115         done
116         [ x"$yesno" = x"y" ]
117 }
118
119 enter()
120 {
121         $2 cd "$1"
122         check_mergeconflict "$1"
123 }
124
125 repos_urls="
126 .                             |                                                   | master      |
127 data/xonotic-data.pk3dir      |                                                   | master      |
128 data/xonotic-maps.pk3dir      |                                                   | master      |
129 data/xonotic-music.pk3dir     |                                                   | master      |
130 data/xonotic-nexcompat.pk3dir |                                                   | master      |
131 mediasource                   |                                                   | master      |
132 darkplaces                    |                                                   | div0-stable | svn
133 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
134 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
135 netradiant                    |                                                   | master      |
136 "
137 # todo: in darkplaces, change repobranch to div0-stable
138
139 repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
140
141 base=`git config remote.origin.url`
142 case "$base" in
143         */xonotic.git)
144                 base=${base%xonotic.git}
145                 ;;
146         *)
147                 echo "The main repo is not xonotic.git, what have you done?"
148                 exit 1
149                 ;;
150 esac
151
152 repourl()
153 {
154         t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
155         if [ -n "$t" ]; then
156                 case "$t" in
157                         *://*)
158                                 echo "$t"
159                                 ;;
160                         *)
161                                 echo "$base$t"
162                                 ;;
163                 esac
164         else
165                 if [ x"$1" = x"." ]; then
166                         echo "$base""xonotic.git"
167                 else
168                         echo "$base${1##*/}.git"
169                 fi
170         fi
171 }
172
173 repobranch()
174 {
175         t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
176         if [ -n "$t" ]; then
177                 echo "$t"
178         else
179                 echo "master"
180         fi
181 }
182
183 repoflags()
184 {
185         echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
186         echo "$t"
187 }
188
189 repos=`for d in $repos; do
190         p="${d%dir}"
191         if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
192                 echo "$d"
193         fi
194 done`
195
196 if [ "$#" = 0 ]; then
197         set -- help
198 fi
199 cmd=$1
200 shift
201
202 case "$cmd" in
203         update|pull)
204                 allow_pull=true
205                 if [ x"$1" = x"-N" ]; then
206                         allow_pull=false
207                 fi
208                 for d in $repos; do
209                         url=`repourl "$d"`
210                         branch=`repobranch "$d"`
211                         if [ -d "$d0/$d" ]; then
212                                 if $allow_pull; then
213                                         enter "$d0/$d" verbose
214                                         verbose git config remote.origin.url "$url"
215                                         verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
216
217                                         r=`git symbolic-ref HEAD`
218                                         r=${r#refs/heads/}
219                                         if git config branch.$r.remote >/dev/null 2>&1; then
220                                                 if ! verbose git pull; then
221                                                         check_mergeconflict "$d"
222                                                         echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
223                                                         read -r DUMMY
224                                                 fi
225                                         fi
226
227                                         cd "$d00"
228                                         checkself "$cmd" "$@"
229                                         cd "$d0/$d"
230                                         verbose git remote prune origin
231                                         cd "$d0"
232                                 fi
233                         else
234                                 verbose git clone "$url" "$d0/$d"
235                                 enter "$d0/$d" verbose
236                                 verbose git checkout "$branch"
237                                 cd "$d0"
238                         fi
239                 done
240                 ;;
241         checkout|switch)
242                 remote=$1
243                 branch=$2
244                 if [ -z "$branch" ]; then
245                         branch=$remote
246                         remote=origin
247                 fi
248                 exists=false
249                 for d in $repos; do
250                         enter "$d0/$d" verbose
251                         if [ -z "$branch" ]; then
252                                 b=`repobranch "$d"`
253                         else
254                                 b=$branch
255                         fi
256                         if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
257                                 exists=true
258                                 verbose git checkout "$b"
259                         elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
260                                 exists=true
261                                 verbose git checkout --track -b "$b" "$remote/$b"
262                         else
263                                 verbose git checkout "`repobranch "$d"`"
264                         fi
265                         cd "$d00"
266                         checkself "$cmd" "$@"
267                         cd "$d0"
268                 done
269                 if ! $exists; then
270                         echo "The requested branch was not found in any repository."
271                 fi
272                 exec "$SELF" branch
273                 ;;
274         branch)
275                 remote=$1
276                 branch=$2
277                 srcbranch=$3
278                 if [ -z "$branch" ]; then
279                         branch=$remote
280                         remote=origin
281                 fi
282                 if [ -z "$branch" ]; then
283                         for d in $repos; do
284                                 enter "$d0/$d"
285                                 r=`git symbolic-ref HEAD`
286                                 r=${r#refs/heads/}
287                                 echo "$d is at $r"
288                                 cd "$d0"
289                         done
290                 else
291                         for d in $repos; do
292                                 dv=`visible_repo_name "$d"`
293                                 enter "$d0/$d" verbose
294                                 if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
295                                         echo "Already having this branch in $dv."
296                                 else
297                                         if yesno "Branch in $dv?"; then
298                                                 if [ -n "$srcbranch" ]; then
299                                                         b=$srcbranch
300                                                 else
301                                                         b=origin/"`repobranch "$d"`"
302                                                         verbose git fetch origin || true
303                                                 fi
304                                                 # TODO do this without pushing
305                                                 verbose git checkout -b "$branch" "$b"
306                                                 verbose git config "branch.$branch.remote" "$remote"
307                                                 verbose git config "branch.$branch.merge" "refs/heads/$branch"
308                                         fi
309                                 fi
310                                 cd "$d0"
311                         done
312                         "$SELF" branch
313                 fi
314                 ;;
315         branches)
316                 for d in $repos; do
317                         enter "$d0/$d"
318                         echo "In $d:"
319                         git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
320                                 case "$UPSTREAM" in
321                                         \[*)
322                                                 UPSTREAM=${UPSTREAM#\[}
323                                                 UPSTREAM=${UPSTREAM%\]}
324                                                 UPSTREAM=${UPSTREAM%:*}
325                                                 ;;
326                                         *)
327                                                 TEXT="$UPSTREAM $TEXT"
328                                                 UPSTREAM=
329                                                 ;;
330                                 esac
331                                 if [ x"$REV" = x"->" ]; then
332                                         continue
333                                 fi
334                                 BRANCH=${BRANCH#remotes/}
335                                 echo -n "  $BRANCH"
336                                 if [ -n "$UPSTREAM" ]; then
337                                         echo -n " (tracking $UPSTREAM)"
338                                 fi
339                                 #echo " $TEXT"
340                                 echo
341                         done
342                 done
343                 ;;
344         branches_short)
345                 for d in $repos; do
346                         cd "$d0/$d" # am in a pipe, shouldn't use enter
347                         git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
348                         cd "$d0"
349                 done | {
350                         branches_list=
351                         # branches_repos_*=
352                         while read -r d BRANCH REV UPSTREAM TEXT; do
353                                 case "$UPSTREAM" in
354                                         \[*)
355                                                 UPSTREAM=${UPSTREAM#\[}
356                                                 UPSTREAM=${UPSTREAM%\]}
357                                                 UPSTREAM=${UPSTREAM%:*}
358                                                 ;;
359                                         *)
360                                                 TEXT="$UPSTREAM $TEXT"
361                                                 UPSTREAM=
362                                                 ;;
363                                 esac
364                                 if [ x"$REV" = x"->" ]; then
365                                         continue
366                                 fi
367                                 BRANCH=${BRANCH#remotes/}
368                                 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
369                                 branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
370                                 eval "r=\$branches_repos_$ID"
371                                 r="$r $d:$UPSTREAM"
372                                 eval "branches_repos_$ID=\$r"
373                         done
374                         echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
375                                 ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
376                                 eval "r=\$branches_repos_$ID"
377                                 echo "$BRANCH: $r"
378                         done
379                 }
380                 ;;
381         merge)
382                 for d in $repos; do
383                         dv=`visible_repo_name "$d"`
384                         enter "$d0/$d" verbose
385                         r=`git symbolic-ref HEAD`
386                         r=${r#refs/heads/}
387                         if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
388                                 # we have uncommitted changes
389                                 if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
390                                         if ! verbose git merge origin/"`repobranch "$d"`"; then
391                                                 check_mergeconflict "$d"
392                                                 exit 1 # this should ALWAYS be fatal
393                                         fi
394                                 fi
395                         fi
396                         cd "$d0"
397                 done
398                 ;;
399         push|commit)
400                 submit=$1
401                 for d in $repos; do
402                         dv=`visible_repo_name "$d"`
403                         enter "$d0/$d" verbose
404                         r=`git symbolic-ref HEAD`
405                         r=${r#refs/heads/}
406                         if git diff HEAD | grep .; then
407                                 # we have uncommitted changes
408                                 if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
409                                         verbose git commit -a
410                                 fi
411                         fi
412                         rem=`git config "branch.$r.remote" || echo origin`
413                         bra=`git config "branch.$r.merge" || echo "$r"`
414                         upstream="$rem/$bra"
415                         if ! [ git rev-parse "$upstream" ]; then
416                                 upstream="`repobranch "$d"`"
417                         fi
418                         if git log "$upstream".."$r" | grep .; then
419                                 if yesno "Push \"$r\" in $dv?"; then
420                                         verbose git push "$rem" HEAD
421                                 fi
422                         fi
423                         if [ x"$submit" = x"-s" ]; then
424                                 case "$r" in
425                                         */*)
426                                                 verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
427                                                 ;;
428                                 esac
429                         fi
430                         cd "$d0"
431                 done
432                 ;;
433         compile)
434                 if [ -n "$WE_HATE_OUR_USERS" ]; then
435                         TARGETS="sv-debug cl-debug"
436                         if [ -z "$CC" ]; then
437                                 export CC=gcc
438                         fi
439                 else
440                         TARGETS="sv-debug cl-debug sdl-debug"
441                 fi
442                 case "$1" in
443                         -c)
444                                 clean=true
445                                 shift
446                                 ;;
447                         *)
448                                 clean=false
449                                 ;;
450                 esac
451                 case "$1" in
452                         sdl)
453                                 TARGETS="sdl-debug"
454                                 shift
455                                 ;;
456                         glx|agl|wgl)
457                                 TARGETS="cl-debug"
458                                 shift
459                                 ;;
460                         dedicated)
461                                 TARGETS="sv-debug"
462                                 shift
463                                 ;;
464                 esac
465                 if [ -z "$MAKEFLAGS" ]; then
466                         if [ -f /proc/cpuinfo ]; then
467                                 ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
468                                 if [ $ncpus -gt 1 ]; then
469                                         MAKEFLAGS=-j$ncpus
470                                 fi
471                         fi
472                         case "`uname`" in
473                                 Linux|*BSD)
474                                         MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
475                                         ;;
476                         esac
477                         if [ -n "$WE_HATE_OUR_USERS" ]; then
478                                 MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
479                         fi
480                 fi
481                 enter "$d0/fteqcc" verbose
482                 if $clean; then
483                         verbose make $MAKEFLAGS clean
484                 fi
485                 verbose make $MAKEFLAGS
486                 enter "$d0/data/xonotic-data.pk3dir" verbose
487                 if $clean; then
488                         verbose make $MAKEFLAGS clean
489                 fi
490                 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
491                 verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
492                 enter "$d0/darkplaces" verbose
493                 if $clean; then
494                         verbose make $MAKEFLAGS clean
495                 fi
496                 for T in $TARGETS; do
497                         verbose make $MAKEFLAGS "$@" "$T"
498                 done
499                 ;;
500         run)
501                 if [ -n "$WE_HATE_OUR_USERS" ]; then
502                         client=
503                         export PATH="$d0/misc/buildfiles/w32:$PATH"
504                 elif [ x"`uname`" = x"Darwin" ]; then
505                         export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
506                         client=-sdl
507                 else
508                         client=-sdl
509                 fi
510                 case "$1" in
511                         sdl|glx|agl|dedicated)
512                                 client=-$1
513                                 shift
514                                 ;;
515                         wgl)
516                                 client=
517                                 shift
518                                 ;;
519                 esac
520                 if ! [ -x "darkplaces/darkplaces$client" ]; then
521                         if [ -x "darkplaces/darkplaces$client.exe" ]; then
522                                 client=$client.exe
523                         else
524                                 echo "Client darkplaces/darkplaces$client not found, aborting"
525                                 exit 1
526                         fi
527                 fi
528                 set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
529
530                 # if pulseaudio is running: USE IT
531                 if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ]; then
532                         if ps -C pulseaudio >/dev/null; then
533                                 if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
534                                         export SDL_AUDIODRIVER=pulse
535                                 fi
536                         fi
537                 fi
538
539                 if [ -n "$USE_GDB" ]; then
540                         set -- gdb --args "$@"
541                 fi
542                 "$@"
543                 ;;
544         each|foreach)
545                 for d in $repos; do
546                         if verbose cd "$d0/$d"; then
547                                 verbose "$@"
548                                 cd "$d0"
549                         fi
550                 done
551                 ;;
552         save-patches)
553                 outfile=$1
554                 patchdir=`mktemp -d -t save-patches.XXXXXX`
555                 for d in $repos; do
556                         enter "$d0/$d" verbose
557                         git branch -v -v | cut -c 3- | {
558                                 i=0
559                                 while read -r BRANCH REV UPSTREAM TEXT; do
560                                         case "$UPSTREAM" in
561                                                 \[*)
562                                                         UPSTREAM=${UPSTREAM#\[}
563                                                         UPSTREAM=${UPSTREAM%\]}
564                                                         UPSTREAM=${UPSTREAM%:*}
565                                                         TRACK=true
566                                                         ;;
567                                                 *)
568                                                         UPSTREAM=origin/"`repobranch "$d"`"
569                                                         TRACK=false
570                                                         ;;
571                                         esac
572                                         if [ x"$REV" = x"->" ]; then
573                                                 continue
574                                         fi
575                                         if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
576                                                 echo "$d" > "$patchdir/$i/info.txt"
577                                                 echo "$BRANCH" >> "$patchdir/$i/info.txt"
578                                                 echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
579                                                 echo "$TRACK" >> "$patchdir/$i/info.txt"
580                                                 i=$(($i+1))
581                                         else
582                                                 rm -rf "$patchdir/$i"
583                                         fi
584                                 done
585                         }
586                 done
587                 ( cd "$patchdir" && tar cvzf - . ) > "$outfile"
588                 rm -rf "$patchdir"
589                 ;;
590         restore-patches)
591                 infile=$1
592                 patchdir=`mktemp -d -t restore-patches.XXXXXX`
593                 ( cd "$patchdir" && tar xvzf - ) < "$infile"
594                 # detach the head
595                 for P in "$patchdir"/*/info.txt; do
596                         D=${P%/info.txt}
597                         exec 3<"$P"
598                         read -r d <&3
599                         read -r BRANCH <&3
600                         read -r UPSTREAM <&3
601                         read -r TRACK <&3
602                         verbose git checkout HEAD^0
603                         verbose git branch -D "$BRANCH"
604                         if [ x"$TRACK" = x"true" ]; then
605                                 verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
606                         else
607                                 verbose git branch -b "$BRANCH" "$UPSTREAM"
608                         fi
609                         verbose git am "$D"
610                 done
611                 rm -rf "$patchdir"
612                 ;;
613         admin-merge)
614                 if [ "$#" = 1 ]; then
615                         set -- "${1%%/*}" "${1#*/}"
616                 fi
617                 for d in $repos; do
618                         enter "$d0/$d" verbose
619                         git rev-parse "$1/$2" || continue
620                         # 1. review
621                         {
622                                 git log HEAD.."$1/$2"
623                                 git diff HEAD..."$1/$2"
624                         } | less
625                         if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
626                                 git merge "$1/$2"
627                                 if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
628                                         git push origin HEAD
629                                         git push "$1" :"$2"
630                                 else
631                                         git reset --hard HEAD@{1}
632                                 fi
633                         fi
634                 done
635                 ;;
636         admin-merge-2)
637                 t=`mktemp`
638                 report=""
639                 reportecho()
640                 {
641                         report=$report"$*$LF"
642                         echo "$*"
643                 }
644                 reportecho4()
645                 {
646                         report=$report"    $*$LF"
647                         echo "    $*"
648                 }
649                 reportdo4()
650                 {
651                         o=`"$@" | sed 's/^/    /' || true`
652                         reportecho "$o"
653                 }
654                 for d in $repos; do
655                         enter "$d0/$d" verbose
656                         base="`repobranch "$d"`"
657                         reportecho "In $d:"
658                         for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
659                                 case "${ref#refs/remotes/origin/}" in
660                                         "$base")
661                                                 continue
662                                                 ;;
663                                         HEAD|master)
664                                                 continue
665                                                 ;;
666                                 esac
667                                 reportecho "  Branch $ref:"
668                                 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
669                                 if [ -n "$note" ]; then
670                                         reportdo4 echo "$note"
671                                         reportecho4 "--> not merging, already had this one rejected before"
672                                 elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log --color "$base".."$ref"; git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"; } | less -r'; then
673                                         git checkout "$base"
674                                         org=`git rev-parse HEAD`
675                                         if ! git merge "$ref" 2>&1 | tee "$t"; then
676                                                 git reset --hard "$org"
677                                                 git notes --ref "refs/notes/admin-merge" add -m "Merge failed:$LF`cat "$t"`" "$ref"
678                                                 reportdo4 cat "$t"
679                                                 reportecho4 "--> merge failed"
680                                         elif ! "$SELF" compile 2>&1 | tee "$t"; then
681                                                 git reset --hard "$org"
682                                                 git notes --ref "refs/notes/admin-merge" add -m "Compile failed:$LF`cat "$t"`" "$ref"
683                                                 reportdo4 cat "$t"
684                                                 reportecho4 "--> compile failed"
685                                         elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
686                                                 git reset --hard "$org"
687                                                 git notes --ref "refs/notes/admin-merge" add "$ref"
688                                                 note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
689                                                 reportdo4 echo "$note"
690                                                 reportecho4 "--> test failed"
691                                         else
692                                                 case ",`repoflags "$d"`," in
693                                                         *,svn,*)
694                                                                 # we do quite a mess here... luckily we know $org
695                                                                 git pull # svn needs to be current
696                                                                 git rebase -i --onto master "$org"
697                                                                 git svn dcommit --add-author-from
698                                                                 git reset --hard "$org"
699                                                                 ;;
700                                                         *)
701                                                                 git push origin HEAD
702                                                                 ;;
703                                                 esac
704                                                 reportecho4 "--> MERGED"
705                                                 if yesno "Delete original branch \"$ref\"?"; then
706                                                         git push origin :"${ref#refs/remotes/origin/}"
707                                                         reportecho4 "--> branch deleted"
708                                                 fi
709                                         fi
710                                 else
711                                         git notes --ref "refs/notes/admin-merge" add "$ref"
712                                         note=`git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null || true`
713                                         if [ -n "$note" ]; then
714                                                 reportdo4 echo "$note"
715                                                 reportecho4 "--> rejected"
716                                         else
717                                                 reportecho4 "--> postponed"
718                                         fi
719                                 fi
720                                 reportecho ""
721                         done
722                         reportecho ""
723                 done
724                 rm -f "$t"
725                 echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
726                 ;;
727         *)
728                 echo "Usage:"
729                 echo "  $SELF pull"
730                 echo "  $SELF merge"
731                 echo "  $SELF push [-s]"
732                 echo "  $SELF branches"
733                 echo "  $SELF branch [<remote>] <branchname>"
734                 echo "  $SELF branch <remote> <branchname> <srcbranchname>"
735                 echo "  $SELF checkout [<remote>] <branchname>"
736                 echo "  $SELF compile [-c] [<client>] <options>"
737                 echo "  $SELF run [<client>] <options>"
738                 echo "  $SELF each <command>"
739                 ;;
740 esac