fi
}
+yesno()
+{
+ yesno=
+ while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
+ echo "$1"
+ IFS= read -r yesno
+ done
+ [ x"$yesno" = x"y" ]
+}
+
enter()
{
$2 cd "$1"
data/xonotic-maps.pk3dir | | master
data/xonotic-music.pk3dir | | master
data/xonotic-nexcompat.pk3dir | | master
+mediasource | | master
darkplaces | | div0-stable
fteqcc | git://github.com/Blub/qclib.git | master
div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master
{
t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
if [ -n "$t" ]; then
- echo "$t"
+ case "$t" in
+ *://*)
+ echo "$t"
+ ;;
+ *)
+ echo "$base$t"
+ ;;
+ esac
else
if [ x"$1" = x"." ]; then
echo "$base""xonotic.git"
case "$cmd" in
update|pull)
+ allow_pull=true
+ if [ x"$1" = x"-N" ]; then
+ allow_pull=false
+ fi
for d in $repos; do
url=`repourl "$d"`
branch=`repobranch "$d"`
if [ -d "$d0/$d" ]; then
- enter "$d0/$d" verbose
- verbose git config remote.origin.url "$url"
- verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
- # TODO remove this line later
+ if $allow_pull; then
+ enter "$d0/$d" verbose
+ verbose git config remote.origin.url "$url"
+ verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+ # TODO remove this line later
- verbose git config core.autocrlf false
- verbose git config core.safecrlf false # we don't NEED that...
+ verbose git config core.autocrlf false
+ verbose git config core.safecrlf false # we don't NEED that...
- r=`git symbolic-ref HEAD`
- r=${r#refs/heads/}
- if git config branch.$r.remote >/dev/null 2>&1; then
- if ! verbose git pull; then
- check_mergeconflict "$d"
- echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
- read -r DUMMY
+ r=`git symbolic-ref HEAD`
+ r=${r#refs/heads/}
+ if git config branch.$r.remote >/dev/null 2>&1; then
+ if ! verbose git pull; then
+ check_mergeconflict "$d"
+ echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
+ read -r DUMMY
+ fi
fi
- fi
- cd "$d00"
- checkself "$cmd" "$@"
- cd "$d0/$d"
- verbose git remote prune origin
- cd "$d0"
+ cd "$d00"
+ checkself "$cmd" "$@"
+ cd "$d0/$d"
+ verbose git remote prune origin
+ cd "$d0"
+ fi
else
verbose git clone "$url" "$d0/$d"
enter "$d0/$d" verbose
for d in $repos; do
dv=`visible_repo_name "$d"`
enter "$d0/$d" verbose
- a=
if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
echo "Already having this branch in $dv."
else
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Branch in $dv?"
- read -r a
- done
- if [ x"$a" = x"y" ]; then
+ if yesno "Branch in $dv?"; then
if [ -n "$srcbranch" ]; then
b=$srcbranch
else
r=${r#refs/heads/}
if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
# we have uncommitted changes
- a=
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"
- read -r a
- done
- if [ x"$a" = x"y" ]; then
+ if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
if ! verbose git merge origin/"`repobranch "$d"`"; then
check_mergeconflict "$d"
exit 1 # this should ALWAYS be fatal
r=${r#refs/heads/}
if git diff HEAD | grep .; then
# we have uncommitted changes
- a=
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Uncommitted changes in \"$r\" in $dv. Commit?"
- read -r a
- done
- if [ x"$a" = x"y" ]; then
+ if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
verbose git commit -a
fi
fi
rem=`git config "branch.$r.remote" || echo origin`
if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
- a=
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Push \"$r\" in $dv?"
- read -r a
- done
- if [ x"$a" = x"y" ]; then
+ if yesno "Push \"$r\" in $dv?"; then
verbose git push "$rem" HEAD
fi
fi
MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
;;
esac
+ if [ -n "$WE_HATE_OUR_USERS" ]; then
+ MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
+ fi
fi
enter "$d0/fteqcc" verbose
if $clean; then
if [ -n "$WE_HATE_OUR_USERS" ]; then
client=
export PATH="$d0/misc/buildfiles/w32:$PATH"
+ elif [ x"`uname`" = x"Darwin" ]; then
+ export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+ client=-sdl
else
client=-sdl
fi
;;
each|foreach)
for d in $repos; do
- enter "$d0/$d" verbose
- verbose "$@"
- cd "$d0"
+ if verbose cd "$d0/$d"; then
+ verbose "$@"
+ cd "$d0"
+ fi
done
;;
save-patches)
rm -rf "$patchdir"
;;
admin-merge)
+ if [ "$#" = 1 ]; then
+ set -- "${1%%/*}" "${1#*/}"
+ fi
for d in $repos; do
enter "$d0/$d" verbose
git rev-parse "$1/$2" || continue
git log HEAD.."$1/$2"
git diff HEAD..."$1/$2"
} | less
- a=
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
- read -r a
- done
- if [ x"$a" = x"y" ]; then
+ if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
git merge "$1/$2"
- cd "$d0"
- a=
- if ! "$SELF" compile; then
- a=n
- fi
- cd "$d0/$d"
- while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
- echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
- read -r a
- done
- if [ x"$a" = x"y" ]; then
+ if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
git push origin HEAD
git push "$1" :"$2"
else
fi
done
;;
+ admin-merge-2)
+ t=`mktemp`
+ for d in $repos; do
+ enter "$d0/$d" verbose
+ for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
+ case "${ref#refs/remotes/origin/}" in
+ "`repobranch "$d"`")
+ continue
+ ;;
+ HEAD|master)
+ continue
+ ;;
+ esac
+ echo "$ref"
+ if git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null; then
+ echo "Not merging, already had this one"
+ elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD.."$ref"; } | less'; then
+ org=`git rev-parse HEAD`
+ if ! git merge "$ref" 2>&1 | tee "$t"; then
+ git reset --hard "$org"
+ git notes --ref "refs/notes/admin-merge" add -m "Merge failed:
+`cat "$t"`" "$ref"
+ elif ! "$SELF" compile 2>&1 | tee "$t"; then
+ git reset --hard "$org"
+ git notes --ref "refs/notes/admin-merge" add -m "Compile failed:
+`cat "$t"`" "$ref"
+ elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
+ git reset --hard HEAD@{1}
+ git notes --ref "refs/notes/admin-merge" add "$ref"
+ else
+ git push origin HEAD
+ git push origin :"${ref#refs/remotes/origin/}"
+ fi
+ else
+ git reset --hard HEAD@{1}
+ git notes --ref "refs/notes/admin-merge" add "$ref"
+ fi
+ done
+ done
+ rm -f "$t"
+ ;;
*)
echo "Usage:"
echo " $SELF pull"
projects / xonotic / xonotic.git / blobdiff