2010-03-18 15:46:07 +00:00
|
|
|
|
#!/bin/sh
|
2010-04-16 17:41:05 +00:00
|
|
|
|
# vim: filetype=zsh
|
2010-03-18 15:46:07 +00:00
|
|
|
|
|
|
|
|
|
set -e
|
|
|
|
|
|
2010-04-02 18:34:05 +00:00
|
|
|
|
d00=`pwd`
|
|
|
|
|
while ! [ -f ./all ]; do
|
|
|
|
|
if [ x"`pwd`" = x"/" ]; then
|
|
|
|
|
echo "Cannot find myself."
|
|
|
|
|
echo "Please run this script with the working directory inside a Xonotic checkout."
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
cd ..
|
|
|
|
|
done
|
|
|
|
|
d0=`pwd`
|
|
|
|
|
SELF="$d0/all"
|
|
|
|
|
|
|
|
|
|
# If we are on WINDOWS:
|
|
|
|
|
case "$0" in
|
|
|
|
|
all|*/all)
|
|
|
|
|
case "`uname`" in
|
2010-04-11 10:23:32 +00:00
|
|
|
|
MINGW*|Win*)
|
2010-04-02 18:34:05 +00:00
|
|
|
|
# Windows hates users. So this script has to copy itself elsewhere first...
|
|
|
|
|
tname=
|
2010-04-02 18:35:19 +00:00
|
|
|
|
cp "$SELF" ../all.xonotic.sh
|
2010-04-25 18:21:54 +00:00
|
|
|
|
export WE_HATE_OUR_USERS=1
|
2010-04-02 18:34:05 +00:00
|
|
|
|
exec ../all.xonotic.sh "$@"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
2010-03-29 13:21:24 +00:00
|
|
|
|
msg()
|
|
|
|
|
{
|
2010-03-29 13:22:29 +00:00
|
|
|
|
echo "[1m$*[m"
|
2010-03-29 13:21:24 +00:00
|
|
|
|
}
|
|
|
|
|
|
2010-04-02 18:43:07 +00:00
|
|
|
|
checksum()
|
|
|
|
|
{
|
|
|
|
|
if [ -x /usr/bin/md5sum ]; then
|
|
|
|
|
/usr/bin/md5sum "$@"
|
|
|
|
|
elif [ -x /bin/md5sum ]; then
|
|
|
|
|
/bin/md5sum "$@"
|
|
|
|
|
elif [ -x /usr/bin/cksum ]; then
|
|
|
|
|
/usr/bin/cksum "$@"
|
|
|
|
|
else
|
|
|
|
|
echo "NOCHECKSUM"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self=`checksum "$SELF"`
|
2010-03-29 13:21:24 +00:00
|
|
|
|
checkself()
|
|
|
|
|
{
|
2010-04-02 18:43:07 +00:00
|
|
|
|
self_new=`checksum "$SELF"`
|
2010-03-29 13:21:24 +00:00
|
|
|
|
if [ x"$self" != x"$self_new" ]; then
|
|
|
|
|
msg "./all has changed."
|
|
|
|
|
if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
|
|
|
|
|
msg "Rerunning the requested operation to make sure."
|
|
|
|
|
export XONOTIC_FORBID_RERUN_ALL=1
|
2010-04-02 18:34:05 +00:00
|
|
|
|
exec "$SELF" "$@"
|
2010-03-29 13:21:24 +00:00
|
|
|
|
else
|
2010-04-02 18:34:05 +00:00
|
|
|
|
msg "Please try $SELF update, and then retry your requested operation."
|
2010-03-29 13:21:24 +00:00
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
fi
|
2010-03-29 13:24:49 +00:00
|
|
|
|
return 0
|
2010-03-29 13:21:24 +00:00
|
|
|
|
}
|
2010-03-29 13:17:50 +00:00
|
|
|
|
|
2010-03-26 08:18:04 +00:00
|
|
|
|
verbose()
|
|
|
|
|
{
|
2010-03-29 13:21:24 +00:00
|
|
|
|
msg "+ $*"
|
2010-03-26 08:18:04 +00:00
|
|
|
|
"$@"
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-02 19:25:08 +00:00
|
|
|
|
visible_repo_name()
|
|
|
|
|
{
|
|
|
|
|
case "$1" in
|
|
|
|
|
.)
|
|
|
|
|
echo "the root directory"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "\"$1\""
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-02 19:11:17 +00:00
|
|
|
|
check_mergeconflict()
|
|
|
|
|
{
|
|
|
|
|
if git ls-files -u | grep ' 1 '; then
|
|
|
|
|
echo
|
|
|
|
|
echo "MERGE CONFLICT."
|
|
|
|
|
echo "change into the \"$1\" project directory, and then:"
|
|
|
|
|
echo "- edit the files mentioned above with your favorite editor,"
|
|
|
|
|
echo " and fix the conflicts (marked with <<<<<<< blocks)"
|
|
|
|
|
echo "- for binary files, you can select the files using"
|
|
|
|
|
echo " git checkout --ours or git checkout --theirs"
|
|
|
|
|
echo "- when done with a file, 'git add' the file"
|
|
|
|
|
echo "- when done, 'git commit'"
|
|
|
|
|
echo
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
2010-05-09 17:40:25 +00:00
|
|
|
|
yesno()
|
|
|
|
|
{
|
|
|
|
|
yesno=
|
|
|
|
|
while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
|
|
|
|
|
echo "$1"
|
|
|
|
|
IFS= read -r yesno
|
|
|
|
|
done
|
|
|
|
|
[ x"$yesno" = x"y" ]
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-02 19:11:17 +00:00
|
|
|
|
enter()
|
|
|
|
|
{
|
2010-04-15 09:38:55 +00:00
|
|
|
|
$2 cd "$1"
|
2010-04-02 19:11:17 +00:00
|
|
|
|
check_mergeconflict "$1"
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-26 07:59:06 +00:00
|
|
|
|
repos_urls="
|
2010-05-02 11:06:36 +00:00
|
|
|
|
. | | master
|
|
|
|
|
data/xonotic-data.pk3dir | | master
|
|
|
|
|
data/xonotic-maps.pk3dir | | master
|
|
|
|
|
data/xonotic-music.pk3dir | | master
|
|
|
|
|
data/xonotic-nexcompat.pk3dir | | master
|
2010-05-08 16:45:50 +00:00
|
|
|
|
mediasource | | master
|
2010-05-02 11:06:36 +00:00
|
|
|
|
darkplaces | | div0-stable
|
|
|
|
|
fteqcc | git://github.com/Blub/qclib.git | master
|
|
|
|
|
div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master
|
|
|
|
|
netradiant | | master
|
2010-03-18 15:46:07 +00:00
|
|
|
|
"
|
2010-05-02 11:06:36 +00:00
|
|
|
|
# todo: in darkplaces, change repobranch to div0-stable
|
2010-03-18 15:46:07 +00:00
|
|
|
|
|
2010-05-02 11:06:36 +00:00
|
|
|
|
repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '`
|
|
|
|
|
|
|
|
|
|
base=`git config remote.origin.url`
|
|
|
|
|
base=${base%xonotic.git}
|
|
|
|
|
|
|
|
|
|
repourl()
|
|
|
|
|
{
|
|
|
|
|
t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '`
|
|
|
|
|
if [ -n "$t" ]; then
|
2010-05-08 16:45:50 +00:00
|
|
|
|
case "$t" in
|
|
|
|
|
*://*)
|
|
|
|
|
echo "$t"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
echo "$base$t"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2010-05-02 11:06:36 +00:00
|
|
|
|
else
|
|
|
|
|
if [ x"$1" = x"." ]; then
|
|
|
|
|
echo "$base""xonotic.git"
|
|
|
|
|
else
|
|
|
|
|
echo "$base${1##*/}.git"
|
2010-04-26 12:10:54 +00:00
|
|
|
|
fi
|
2010-05-02 11:06:36 +00:00
|
|
|
|
fi
|
|
|
|
|
}
|
2010-04-26 12:10:54 +00:00
|
|
|
|
|
2010-05-02 11:06:36 +00:00
|
|
|
|
repobranch()
|
|
|
|
|
{
|
|
|
|
|
t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '`
|
|
|
|
|
if [ -n "$t" ]; then
|
|
|
|
|
echo "$t"
|
|
|
|
|
else
|
|
|
|
|
echo "master"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
repos=`for d in $repos; do
|
|
|
|
|
p="${d%dir}"
|
|
|
|
|
if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
|
|
|
|
|
echo "$d"
|
|
|
|
|
fi
|
|
|
|
|
done`
|
2010-03-26 07:59:06 +00:00
|
|
|
|
|
2010-03-18 15:57:21 +00:00
|
|
|
|
if [ "$#" = 0 ]; then
|
|
|
|
|
set -- help
|
|
|
|
|
fi
|
2010-03-18 15:46:07 +00:00
|
|
|
|
cmd=$1
|
|
|
|
|
shift
|
|
|
|
|
|
|
|
|
|
case "$cmd" in
|
2010-03-20 13:20:07 +00:00
|
|
|
|
update|pull)
|
2010-05-09 13:46:17 +00:00
|
|
|
|
allow_pull=true
|
|
|
|
|
if [ x"$1" = x"-N" ]; then
|
|
|
|
|
allow_pull=false
|
|
|
|
|
fi
|
2010-05-02 11:06:36 +00:00
|
|
|
|
for d in $repos; do
|
|
|
|
|
url=`repourl "$d"`
|
|
|
|
|
branch=`repobranch "$d"`
|
2010-03-18 15:46:07 +00:00
|
|
|
|
if [ -d "$d0/$d" ]; then
|
2010-05-09 13:46:17 +00:00
|
|
|
|
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
|
2010-04-10 16:05:46 +00:00
|
|
|
|
|
2010-05-09 13:46:17 +00:00
|
|
|
|
verbose git config core.autocrlf false
|
|
|
|
|
verbose git config core.safecrlf false # we don't NEED that...
|
2010-04-16 17:12:40 +00:00
|
|
|
|
|
2010-05-09 13:46:17 +00:00
|
|
|
|
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
|
2010-04-10 16:05:46 +00:00
|
|
|
|
fi
|
|
|
|
|
|
2010-05-09 13:46:17 +00:00
|
|
|
|
cd "$d00"
|
|
|
|
|
checkself "$cmd" "$@"
|
|
|
|
|
cd "$d0/$d"
|
|
|
|
|
verbose git remote prune origin
|
|
|
|
|
cd "$d0"
|
|
|
|
|
fi
|
2010-03-18 15:46:07 +00:00
|
|
|
|
else
|
2010-03-26 08:18:04 +00:00
|
|
|
|
verbose git clone "$url" "$d0/$d"
|
2010-05-02 11:06:36 +00:00
|
|
|
|
enter "$d0/$d" verbose
|
|
|
|
|
verbose git checkout "$branch"
|
|
|
|
|
cd "$d0"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
;;
|
2010-03-24 14:09:55 +00:00
|
|
|
|
checkout|switch)
|
2010-03-18 15:46:07 +00:00
|
|
|
|
remote=$1
|
|
|
|
|
branch=$2
|
|
|
|
|
if [ -z "$branch" ]; then
|
|
|
|
|
branch=$remote
|
|
|
|
|
remote=origin
|
|
|
|
|
fi
|
|
|
|
|
exists=false
|
|
|
|
|
for d in $repos; do
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/$d" verbose
|
2010-03-18 15:46:07 +00:00
|
|
|
|
if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
|
|
|
|
|
exists=true
|
2010-03-26 08:18:04 +00:00
|
|
|
|
verbose git checkout "$branch"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
|
|
|
|
|
exists=true
|
2010-03-26 08:18:04 +00:00
|
|
|
|
verbose git checkout --track -b "$branch" "$remote/$branch"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
else
|
2010-05-02 11:06:36 +00:00
|
|
|
|
verbose git checkout "`repobranch "$d"`"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
fi
|
2010-04-02 18:14:19 +00:00
|
|
|
|
cd "$d00"
|
2010-04-02 21:14:58 +00:00
|
|
|
|
checkself "$cmd" "$@"
|
2010-04-02 18:14:19 +00:00
|
|
|
|
cd "$d0"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
done
|
2010-03-26 08:18:04 +00:00
|
|
|
|
if ! $exists; then
|
|
|
|
|
echo "The requested branch was not found in any repository."
|
|
|
|
|
fi
|
2010-04-02 18:34:05 +00:00
|
|
|
|
exec "$SELF" branch
|
2010-03-18 15:46:07 +00:00
|
|
|
|
;;
|
|
|
|
|
branch)
|
2010-03-20 13:23:39 +00:00
|
|
|
|
remote=$1
|
|
|
|
|
branch=$2
|
2010-04-05 11:48:23 +00:00
|
|
|
|
srcbranch=$3
|
2010-03-20 13:23:39 +00:00
|
|
|
|
if [ -z "$branch" ]; then
|
|
|
|
|
branch=$remote
|
|
|
|
|
remote=origin
|
|
|
|
|
fi
|
|
|
|
|
if [ -z "$branch" ]; then
|
2010-03-20 13:14:50 +00:00
|
|
|
|
for d in $repos; do
|
2010-04-02 19:11:17 +00:00
|
|
|
|
enter "$d0/$d"
|
2010-03-20 13:14:50 +00:00
|
|
|
|
r=`git symbolic-ref HEAD`
|
|
|
|
|
r=${r#refs/heads/}
|
|
|
|
|
echo "$d is at $r"
|
|
|
|
|
cd "$d0"
|
|
|
|
|
done
|
|
|
|
|
else
|
|
|
|
|
for d in $repos; do
|
2010-04-02 19:25:08 +00:00
|
|
|
|
dv=`visible_repo_name "$d"`
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/$d" verbose
|
2010-04-26 09:10:04 +00:00
|
|
|
|
if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
|
|
|
|
|
echo "Already having this branch in $dv."
|
|
|
|
|
else
|
2010-05-09 17:40:25 +00:00
|
|
|
|
if yesno "Branch in $dv?"; then
|
2010-05-02 11:06:36 +00:00
|
|
|
|
if [ -n "$srcbranch" ]; then
|
|
|
|
|
b=$srcbranch
|
|
|
|
|
else
|
|
|
|
|
b="`repobranch "$d"`"
|
|
|
|
|
fi
|
2010-05-04 05:31:37 +00:00
|
|
|
|
# TODO do this without pushing
|
2010-05-02 11:06:36 +00:00
|
|
|
|
verbose git push "$remote" "$b":"$branch"
|
2010-04-26 09:10:04 +00:00
|
|
|
|
verbose git checkout --track -b "$branch" "$remote/$branch"
|
|
|
|
|
fi
|
2010-03-20 13:14:50 +00:00
|
|
|
|
fi
|
|
|
|
|
cd "$d0"
|
|
|
|
|
done
|
2010-04-02 18:34:05 +00:00
|
|
|
|
"$SELF" branch
|
2010-03-20 13:14:50 +00:00
|
|
|
|
fi
|
2010-03-18 15:46:07 +00:00
|
|
|
|
;;
|
|
|
|
|
branches)
|
|
|
|
|
for d in $repos; do
|
2010-04-02 19:11:17 +00:00
|
|
|
|
enter "$d0/$d"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
echo "In $d:"
|
2010-04-15 09:38:55 +00:00
|
|
|
|
git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
|
|
|
|
|
case "$UPSTREAM" in
|
|
|
|
|
\[*)
|
|
|
|
|
UPSTREAM=${UPSTREAM#\[}
|
|
|
|
|
UPSTREAM=${UPSTREAM%\]}
|
|
|
|
|
UPSTREAM=${UPSTREAM%:*}
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
TEXT="$UPSTREAM $TEXT"
|
|
|
|
|
UPSTREAM=
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
if [ x"$REV" = x"->" ]; then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
|
|
|
|
BRANCH=${BRANCH#remotes/}
|
|
|
|
|
echo -n " $BRANCH"
|
|
|
|
|
if [ -n "$UPSTREAM" ]; then
|
|
|
|
|
echo -n " (tracking $UPSTREAM)"
|
|
|
|
|
fi
|
|
|
|
|
#echo " $TEXT"
|
|
|
|
|
echo
|
|
|
|
|
done
|
2010-03-18 15:46:07 +00:00
|
|
|
|
done
|
|
|
|
|
;;
|
2010-05-04 05:31:37 +00:00
|
|
|
|
branches_short)
|
|
|
|
|
for d in $repos; do
|
|
|
|
|
cd "$d0/$d" # am in a pipe, shouldn't use enter
|
|
|
|
|
git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
|
|
|
|
|
cd "$d0"
|
|
|
|
|
done | {
|
|
|
|
|
branches_list=
|
|
|
|
|
# branches_repos_*=
|
|
|
|
|
while read -r d BRANCH REV UPSTREAM TEXT; do
|
|
|
|
|
case "$UPSTREAM" in
|
|
|
|
|
\[*)
|
|
|
|
|
UPSTREAM=${UPSTREAM#\[}
|
|
|
|
|
UPSTREAM=${UPSTREAM%\]}
|
|
|
|
|
UPSTREAM=${UPSTREAM%:*}
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
TEXT="$UPSTREAM $TEXT"
|
|
|
|
|
UPSTREAM=
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
if [ x"$REV" = x"->" ]; then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
|
|
|
|
BRANCH=${BRANCH#remotes/}
|
|
|
|
|
ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
|
|
|
|
|
branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
|
|
|
|
|
eval "r=\$branches_repos_$ID"
|
|
|
|
|
r="$r $d:$UPSTREAM"
|
|
|
|
|
eval "branches_repos_$ID=\$r"
|
|
|
|
|
done
|
|
|
|
|
echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
|
|
|
|
|
ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
|
|
|
|
|
eval "r=\$branches_repos_$ID"
|
|
|
|
|
echo "$BRANCH: $r"
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
;;
|
2010-04-02 18:49:48 +00:00
|
|
|
|
merge)
|
|
|
|
|
for d in $repos; do
|
2010-04-02 19:25:08 +00:00
|
|
|
|
dv=`visible_repo_name "$d"`
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/$d" verbose
|
2010-04-02 18:49:48 +00:00
|
|
|
|
r=`git symbolic-ref HEAD`
|
|
|
|
|
r=${r#refs/heads/}
|
2010-05-02 11:06:36 +00:00
|
|
|
|
if git log HEAD..origin/"`repobranch "$d"`" | grep .; then
|
2010-04-02 18:49:48 +00:00
|
|
|
|
# we have uncommitted changes
|
2010-05-09 17:40:25 +00:00
|
|
|
|
if yesno "Could merge from \"`repobranch "$d"`\" into \"$r\" in $dv. Do it?"; then
|
2010-05-02 11:06:36 +00:00
|
|
|
|
if ! verbose git merge origin/"`repobranch "$d"`"; then
|
2010-04-02 19:11:17 +00:00
|
|
|
|
check_mergeconflict "$d"
|
|
|
|
|
exit 1 # this should ALWAYS be fatal
|
2010-04-02 18:49:48 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
cd "$d0"
|
|
|
|
|
done
|
|
|
|
|
;;
|
2010-04-11 19:09:32 +00:00
|
|
|
|
push|commit)
|
2010-04-16 17:41:05 +00:00
|
|
|
|
submit=$1
|
2010-03-20 13:20:07 +00:00
|
|
|
|
for d in $repos; do
|
2010-04-02 19:25:08 +00:00
|
|
|
|
dv=`visible_repo_name "$d"`
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/$d" verbose
|
2010-03-20 13:20:07 +00:00
|
|
|
|
r=`git symbolic-ref HEAD`
|
|
|
|
|
r=${r#refs/heads/}
|
2010-04-02 18:09:03 +00:00
|
|
|
|
if git diff HEAD | grep .; then
|
|
|
|
|
# we have uncommitted changes
|
2010-05-09 17:40:25 +00:00
|
|
|
|
if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
|
2010-04-02 18:09:03 +00:00
|
|
|
|
verbose git commit -a
|
|
|
|
|
fi
|
|
|
|
|
fi
|
2010-04-16 17:36:41 +00:00
|
|
|
|
rem=`git config "branch.$r.remote" || echo origin`
|
2010-05-02 11:06:36 +00:00
|
|
|
|
if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
|
2010-05-09 17:40:25 +00:00
|
|
|
|
if yesno "Push \"$r\" in $dv?"; then
|
2010-04-16 17:36:41 +00:00
|
|
|
|
verbose git push "$rem" HEAD
|
2010-03-20 13:23:39 +00:00
|
|
|
|
fi
|
2010-03-20 13:20:07 +00:00
|
|
|
|
fi
|
2010-04-16 17:41:05 +00:00
|
|
|
|
if [ x"$submit" = x"-s" ]; then
|
|
|
|
|
case "$r" in
|
|
|
|
|
*/*)
|
|
|
|
|
verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
2010-03-20 13:20:07 +00:00
|
|
|
|
cd "$d0"
|
|
|
|
|
done
|
|
|
|
|
;;
|
2010-03-24 12:11:30 +00:00
|
|
|
|
compile)
|
2010-04-26 20:48:14 +00:00
|
|
|
|
if [ -n "$WE_HATE_OUR_USERS" ]; then
|
|
|
|
|
TARGETS="sv-debug cl-debug"
|
|
|
|
|
else
|
|
|
|
|
TARGETS="sv-debug cl-debug sdl-debug"
|
|
|
|
|
fi
|
2010-05-06 18:16:46 +00:00
|
|
|
|
case "$1" in
|
|
|
|
|
-c)
|
|
|
|
|
clean=true
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
clean=false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2010-04-26 20:48:14 +00:00
|
|
|
|
case "$1" in
|
|
|
|
|
sdl)
|
|
|
|
|
TARGETS="sdl-debug"
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
glx|agl|wgl)
|
|
|
|
|
TARGETS="cl-debug"
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
dedicated)
|
|
|
|
|
TARGETS="sv-debug"
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2010-03-26 08:18:04 +00:00
|
|
|
|
if [ -z "$MAKEFLAGS" ]; then
|
|
|
|
|
if [ -f /proc/cpuinfo ]; then
|
|
|
|
|
ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
|
|
|
|
|
if [ $ncpus -gt 1 ]; then
|
|
|
|
|
MAKEFLAGS=-j$ncpus
|
2010-03-25 08:18:19 +00:00
|
|
|
|
fi
|
|
|
|
|
fi
|
2010-05-06 18:16:46 +00:00
|
|
|
|
case "`uname`" in
|
|
|
|
|
Linux|*BSD)
|
|
|
|
|
MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2010-05-08 18:54:22 +00:00
|
|
|
|
if [ -n "$WE_HATE_OUR_USERS" ]; then
|
|
|
|
|
MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw"
|
|
|
|
|
fi
|
2010-03-26 08:18:04 +00:00
|
|
|
|
fi
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/fteqcc" verbose
|
2010-05-06 18:16:46 +00:00
|
|
|
|
if $clean; then
|
|
|
|
|
verbose make $MAKEFLAGS clean
|
|
|
|
|
fi
|
2010-03-26 08:18:04 +00:00
|
|
|
|
verbose make $MAKEFLAGS
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/data/xonotic-data.pk3dir" verbose
|
2010-05-06 18:16:46 +00:00
|
|
|
|
if $clean; then
|
|
|
|
|
verbose make $MAKEFLAGS clean
|
|
|
|
|
fi
|
|
|
|
|
verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
|
2010-04-15 09:38:55 +00:00
|
|
|
|
enter "$d0/darkplaces" verbose
|
2010-05-06 18:16:46 +00:00
|
|
|
|
if $clean; then
|
|
|
|
|
verbose make $MAKEFLAGS clean
|
|
|
|
|
fi
|
2010-04-26 20:48:14 +00:00
|
|
|
|
for T in $TARGETS; do
|
2010-05-06 18:16:46 +00:00
|
|
|
|
verbose make $MAKEFLAGS "$@" "$T"
|
2010-04-26 20:48:14 +00:00
|
|
|
|
done
|
2010-03-25 08:18:19 +00:00
|
|
|
|
;;
|
|
|
|
|
run)
|
2010-04-25 18:21:54 +00:00
|
|
|
|
if [ -n "$WE_HATE_OUR_USERS" ]; then
|
|
|
|
|
client=
|
2010-04-26 13:34:12 +00:00
|
|
|
|
export PATH="$d0/misc/buildfiles/w32:$PATH"
|
2010-05-07 07:40:03 +00:00
|
|
|
|
elif [ x"`uname`" = x"Darwin" ]; then
|
|
|
|
|
export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
|
|
|
|
|
client=-sdl
|
2010-04-25 18:21:54 +00:00
|
|
|
|
else
|
|
|
|
|
client=-sdl
|
|
|
|
|
fi
|
2010-03-25 08:18:19 +00:00
|
|
|
|
case "$1" in
|
|
|
|
|
sdl|glx|agl|dedicated)
|
|
|
|
|
client=-$1
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
wgl)
|
|
|
|
|
client=
|
|
|
|
|
shift
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
if ! [ -x "darkplaces/darkplaces$client" ]; then
|
|
|
|
|
if [ -x "darkplaces/darkplaces$client.exe" ]; then
|
|
|
|
|
client=$client.exe
|
|
|
|
|
else
|
|
|
|
|
echo "Client darkplaces/darkplaces$client not found, aborting"
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
fi
|
2010-05-02 11:06:36 +00:00
|
|
|
|
set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
|
|
|
|
|
if [ -n "$USE_GDB" ]; then
|
|
|
|
|
set -- gdb --args "$@"
|
|
|
|
|
fi
|
|
|
|
|
"$@"
|
2010-03-24 12:11:30 +00:00
|
|
|
|
;;
|
2010-03-25 14:40:42 +00:00
|
|
|
|
each|foreach)
|
2010-03-25 14:37:47 +00:00
|
|
|
|
for d in $repos; do
|
2010-05-09 13:46:17 +00:00
|
|
|
|
if verbose cd "$d0/$d"; then
|
|
|
|
|
verbose "$@"
|
|
|
|
|
cd "$d0"
|
|
|
|
|
fi
|
2010-03-25 14:37:47 +00:00
|
|
|
|
done
|
|
|
|
|
;;
|
2010-04-15 09:38:55 +00:00
|
|
|
|
save-patches)
|
|
|
|
|
outfile=$1
|
|
|
|
|
patchdir=`mktemp -d -t save-patches.XXXXXX`
|
|
|
|
|
for d in $repos; do
|
|
|
|
|
enter "$d0/$d" verbose
|
|
|
|
|
git branch -v -v | cut -c 3- | {
|
|
|
|
|
i=0
|
|
|
|
|
while read -r BRANCH REV UPSTREAM TEXT; do
|
|
|
|
|
case "$UPSTREAM" in
|
|
|
|
|
\[*)
|
|
|
|
|
UPSTREAM=${UPSTREAM#\[}
|
|
|
|
|
UPSTREAM=${UPSTREAM%\]}
|
|
|
|
|
UPSTREAM=${UPSTREAM%:*}
|
|
|
|
|
TRACK=true
|
|
|
|
|
;;
|
|
|
|
|
*)
|
2010-05-02 11:06:36 +00:00
|
|
|
|
UPSTREAM=origin/"`repobranch "$d"`"
|
2010-04-15 09:38:55 +00:00
|
|
|
|
TRACK=false
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
if [ x"$REV" = x"->" ]; then
|
|
|
|
|
continue
|
|
|
|
|
fi
|
2010-04-15 09:43:03 +00:00
|
|
|
|
if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then
|
2010-04-15 09:38:55 +00:00
|
|
|
|
echo "$d" > "$patchdir/$i/info.txt"
|
2010-04-15 09:43:03 +00:00
|
|
|
|
echo "$BRANCH" >> "$patchdir/$i/info.txt"
|
2010-04-15 09:38:55 +00:00
|
|
|
|
echo "$UPSTREAM" >> "$patchdir/$i/info.txt"
|
|
|
|
|
echo "$TRACK" >> "$patchdir/$i/info.txt"
|
|
|
|
|
i=$(($i+1))
|
|
|
|
|
else
|
|
|
|
|
rm -rf "$patchdir/$i"
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
}
|
|
|
|
|
done
|
|
|
|
|
( cd "$patchdir" && tar cvzf - . ) > "$outfile"
|
|
|
|
|
rm -rf "$patchdir"
|
|
|
|
|
;;
|
|
|
|
|
restore-patches)
|
|
|
|
|
infile=$1
|
|
|
|
|
patchdir=`mktemp -d -t restore-patches.XXXXXX`
|
|
|
|
|
( cd "$patchdir" && tar xvzf - ) < "$infile"
|
|
|
|
|
# detach the head
|
|
|
|
|
for P in "$patchdir"/*/info.txt; do
|
|
|
|
|
D=${P%/info.txt}
|
|
|
|
|
exec 3<"$P"
|
|
|
|
|
read -r d <&3
|
|
|
|
|
read -r BRANCH <&3
|
|
|
|
|
read -r UPSTREAM <&3
|
|
|
|
|
read -r TRACK <&3
|
|
|
|
|
verbose git checkout HEAD^0
|
|
|
|
|
verbose git branch -D "$BRANCH"
|
|
|
|
|
if [ x"$TRACK" = x"true" ]; then
|
|
|
|
|
verbose git checkout --track -b "$BRANCH" "$UPSTREAM"
|
|
|
|
|
else
|
|
|
|
|
verbose git branch -b "$BRANCH" "$UPSTREAM"
|
|
|
|
|
fi
|
|
|
|
|
verbose git am "$D"
|
|
|
|
|
done
|
|
|
|
|
rm -rf "$patchdir"
|
|
|
|
|
;;
|
2010-04-22 13:56:16 +00:00
|
|
|
|
admin-merge)
|
2010-05-08 12:50:05 +00:00
|
|
|
|
if [ "$#" = 1 ]; then
|
2010-05-08 12:49:01 +00:00
|
|
|
|
set -- "${1%%/*}" "${1#*/}"
|
|
|
|
|
fi
|
2010-04-22 13:56:16 +00:00
|
|
|
|
for d in $repos; do
|
|
|
|
|
enter "$d0/$d" verbose
|
|
|
|
|
git rev-parse "$1/$2" || continue
|
|
|
|
|
# 1. review
|
|
|
|
|
{
|
|
|
|
|
git log HEAD.."$1/$2"
|
|
|
|
|
git diff HEAD..."$1/$2"
|
|
|
|
|
} | less
|
2010-05-09 17:40:25 +00:00
|
|
|
|
if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
|
2010-04-22 13:56:16 +00:00
|
|
|
|
git merge "$1/$2"
|
2010-05-09 17:40:25 +00:00
|
|
|
|
if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
|
2010-04-22 18:40:40 +00:00
|
|
|
|
git push origin HEAD
|
|
|
|
|
git push "$1" :"$2"
|
|
|
|
|
else
|
|
|
|
|
git reset --hard HEAD@{1}
|
|
|
|
|
fi
|
2010-04-22 13:56:16 +00:00
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
;;
|
2010-05-09 17:40:25 +00:00
|
|
|
|
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"
|
|
|
|
|
;;
|
2010-03-18 15:46:07 +00:00
|
|
|
|
*)
|
|
|
|
|
echo "Usage:"
|
2010-04-02 18:34:05 +00:00
|
|
|
|
echo " $SELF pull"
|
2010-04-02 18:49:48 +00:00
|
|
|
|
echo " $SELF merge"
|
2010-04-16 17:41:05 +00:00
|
|
|
|
echo " $SELF push [-s]"
|
2010-04-02 18:34:05 +00:00
|
|
|
|
echo " $SELF branches"
|
2010-04-02 18:49:48 +00:00
|
|
|
|
echo " $SELF branch [<remote>] <branchname>"
|
2010-04-05 11:48:23 +00:00
|
|
|
|
echo " $SELF branch <remote> <branchname> <srcbranchname>"
|
2010-04-02 18:49:48 +00:00
|
|
|
|
echo " $SELF checkout [<remote>] <branchname>"
|
2010-05-06 18:16:46 +00:00
|
|
|
|
echo " $SELF compile [-c] [<client>] <options>"
|
|
|
|
|
echo " $SELF run [<client>] <options>"
|
2010-04-02 18:34:05 +00:00
|
|
|
|
echo " $SELF each <command>"
|
2010-03-18 15:46:07 +00:00
|
|
|
|
;;
|
|
|
|
|
esac
|