2016-04-02 03:55:54 +00:00
|
|
|
#!/usr/bin/env bash
|
2013-01-15 01:18:40 +00:00
|
|
|
|
2016-04-03 07:23:19 +00:00
|
|
|
(
|
2014-04-14 11:01:27 +00:00
|
|
|
PS1="$"
|
2016-04-03 08:35:51 +00:00
|
|
|
basedir="$(cd "$1" && pwd -P)"
|
2016-04-02 03:55:54 +00:00
|
|
|
workdir="$basedir/work"
|
2018-05-24 18:41:50 +00:00
|
|
|
gitcmd="git -c commit.gpgsign=false -c core.safecrlf=false"
|
|
|
|
|
2013-01-15 01:18:40 +00:00
|
|
|
echo "Rebuilding patch files from current fork state..."
|
2014-04-14 11:01:27 +00:00
|
|
|
|
2013-01-16 17:08:09 +00:00
|
|
|
function cleanupPatches {
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$1"
|
2013-01-16 17:08:09 +00:00
|
|
|
for patch in *.patch; do
|
2016-02-29 23:09:49 +00:00
|
|
|
echo "$patch"
|
2016-04-02 03:55:54 +00:00
|
|
|
gitver=$(tail -n 2 "$patch" | grep -ve "^$" | tail -n 1)
|
2018-05-24 18:41:50 +00:00
|
|
|
diffs=$($gitcmd diff --staged "$patch" | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
|
2013-01-22 02:46:26 +00:00
|
|
|
|
|
|
|
testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
|
|
|
|
if [ "x$testver" != "x" ]; then
|
2016-02-29 23:09:49 +00:00
|
|
|
diffs=$(echo "$diffs" | sed 'N;$!P;$!D;$d')
|
2013-01-22 02:46:26 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "x$diffs" == "x" ] ; then
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd reset HEAD "$patch" >/dev/null
|
|
|
|
$gitcmd checkout -- "$patch" >/dev/null
|
2013-01-16 17:08:09 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
2014-04-14 11:01:27 +00:00
|
|
|
|
2013-01-15 01:18:40 +00:00
|
|
|
function savePatches {
|
|
|
|
what=$1
|
2016-04-02 03:55:54 +00:00
|
|
|
what_name=$(basename "$what")
|
2013-01-15 01:18:40 +00:00
|
|
|
target=$2
|
2016-02-29 23:09:49 +00:00
|
|
|
echo "Formatting patches for $what..."
|
2016-03-22 01:40:18 +00:00
|
|
|
|
|
|
|
cd "$basedir/${what_name}-Patches/"
|
2016-05-12 02:07:46 +00:00
|
|
|
if [ -d "$basedir/$target/.git/rebase-apply" ]; then
|
|
|
|
# in middle of a rebase, be smarter
|
|
|
|
echo "REBASE DETECTED - PARTIAL SAVE"
|
|
|
|
last=$(cat "$basedir/$target/.git/rebase-apply/last")
|
|
|
|
next=$(cat "$basedir/$target/.git/rebase-apply/next")
|
2018-07-15 01:53:17 +00:00
|
|
|
orderedfiles=$(find . -name "*.patch" | sort)
|
2016-05-13 01:37:14 +00:00
|
|
|
for i in $(seq -f "%04g" 1 1 $last)
|
2016-05-12 02:07:46 +00:00
|
|
|
do
|
|
|
|
if [ $i -lt $next ]; then
|
2018-07-15 01:53:17 +00:00
|
|
|
rm $(echo "$orderedfiles{@}" | sed -n "${i}p")
|
2016-05-12 02:07:46 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
else
|
|
|
|
rm -rf *.patch
|
|
|
|
fi
|
2016-03-22 01:40:18 +00:00
|
|
|
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$basedir/$target"
|
2016-03-22 00:46:54 +00:00
|
|
|
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd format-patch --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$basedir"
|
2018-05-24 18:41:50 +00:00
|
|
|
$gitcmd add -A "$basedir/${what_name}-Patches"
|
2016-03-21 17:22:47 +00:00
|
|
|
cleanupPatches "$basedir/${what_name}-Patches"
|
|
|
|
echo " Patches saved for $what to $what_name-Patches/"
|
2013-01-15 01:18:40 +00:00
|
|
|
}
|
2016-03-19 04:11:14 +00:00
|
|
|
|
2016-04-02 03:55:54 +00:00
|
|
|
savePatches "$workdir/Spigot/Spigot-API" "Paper-API"
|
|
|
|
savePatches "$workdir/Spigot/Spigot-Server" "Paper-Server"
|
2018-07-30 21:37:24 +00:00
|
|
|
) || exit 1
|