verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
case ",`repoflags "$d"`," in
*,noautocrlf,*)
- verbose git config --unset core.autocrlf
+ verbose git config --unset core.autocrlf || true
;;
*)
verbose git config core.autocrlf input
zip -0y "$@"
}
+mirrorspeed()
+{
+ # first result is to be ignored, but we use it to check status
+ git ls-remote "$1" refs/heads/master >/dev/null 2>&1 || return 1
+ { time -p git ls-remote "$1" refs/heads/master; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,'
+ # unit: clock ticks (depends on what "time" returns
+}
+
+bestmirror()
+{
+ pre=$1; shift
+ suf=$1; shift
+
+ if ! { time -p true; } >/dev/null 2>&1; then
+ return 1
+ fi
+
+ bestin=
+ bestt=
+ for in in "$@"; do
+ m=$pre$in$suf
+ if t=`mirrorspeed "$m"`; then
+ msg "$m -> $t ticks"
+ if [ -n "$t" ]; then
+ if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then
+ bestin=$in
+ bestt=$t
+ fi
+ fi
+ else
+ msg "$m -> FAIL"
+ fi
+ done
+ if [ -n "$bestin" ]; then
+ msg "Best mirror seems to be $pre$bestin$suf"
+ echo "$bestin"
+ else
+ return 1
+ fi
+}
+
case "$cmd" in
fix_upstream_rebase)
for d in $repos; do
case "$2" in
nl) ;;
de) ;;
+ best) ;;
default) ;;
*)
msg "Invalid location!"
msg "Possible locations for the -l option:"
msg " nl (Netherlands, run by merlijn)"
msg " de (Germany, run by divVerent)"
+ msg " best (find automatically)"
msg " default (currently nl)"
exit 1
;;
fi
shift
done
+ case "$location" in
+ best)
+ newbase=`echo "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
+ case "$newbase" in
+ *\ *)
+ if location=`bestmirror $newbase"xonotic.git" de nl`; then
+ :
+ else
+ location=current
+ fi
+ ;;
+ *)
+ location=current
+ ;;
+ esac
+ ;;
+ esac
case "$location" in
default)
location=
reportecho "$o"
}
for d in $repos; do
+ case "$d" in
+ fteqcc)
+ # sorry, fteqcc repo is managed manually
+ continue
+ ;;
+ esac
enter "$d0/$d" verbose
base="`repobranch "$d"`"
reportecho "In $d:"
reportecho4 "--> test failed, postponed"
fi
else
+ # apply crlf, or other cleanup filters (non-behavioural changes)
+ git reset --hard
+ find . -type f -exec touch {} \;
+ git commit -a --amend -C HEAD || true # don't fail if nothing to commit
+
echo "MERGING"
case ",`repoflags "$d"`," in
*,svn,*)
rmuntracked=true
elif [ x"$X" = x"-D" ]; then
killbranches=true
+ elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+ msg ''
+ msg ' _____'
+ msg ' ,--'\''-\\P/`\\ FFFFFFF'
+ msg ' __/_ B/,-.\\ FFFFFFF'
+ msg ' / _\\ (// O\\\\ FFFFFF'
+ msg '| (O `) _\\._ _)\\ FFFUU'
+ msg '| |___/.^d0~~"\\ \\ UUUU'
+ msg '| |`~'\'' \\ | UUUU'
+ msg '| | __,C>|| UUUU'
+ msg '\\ /_ ,-/,-'\'' | UUUU'
+ msg ' \\\\_ \\_>~'\'' / UUUU-'
+ msg ''
else
- break
+ msg "Unknown arg: $X"
fi
found=true
shift
# music: reduce bitrate
verbose export do_jpeg=true
verbose export jpeg_qual_rgb=80
- verbose export jpeg_qual_a=99
+ verbose export jpeg_qual_a=97
verbose export do_dds=false
verbose export do_ogg=true
verbose export ogg_qual=1