merge-caf-tag-ginkgo.sh

#!/bin/bash
# CAF tag merge script for caf-ginkgo

# Colors
red=$'\e[1;31m'
grn=$'\e[1;32m'
blu=$'\e[1;34m'
end=$'\e[0m'

REMOTE="ginkgo"
BRANCH="11.0"
VENDOR="trinket"

# fetch tag from user
read -p "Enter the CAF tag you wanna merge: " TAG
echo

# check if the tag is QSSI or vendor
if [[ $TAG = *"QSSI"* ]]; then
	QSSI=true
	echo "${blu}QSSI tag detected!"
else
	QSSI=false
	echo "${blu}Vendor tag detected!"
fi

# fetch all existing repos
echo "${blu}Fetching list of repos to be merged..."
repo forall -c "if [ \"\$REPO_REMOTE\" = \"$REMOTE\" ]; then echo \$REPO_PATH; fi" > .temp 2> /dev/null

# save current dir
cur_dir=$(pwd)

# initialize some files
for file in failed success unchanged; do
	rm -f $file
	touch $file
done

# main
for path in $(cat .temp); do
	echo

	if $QSSI && ! grep -q $path manifest/default.xml; then
		echo "${red}$path not found in QSSI manifest! Skipping..."
		continue
	fi

	if grep -q $path manifest/$VENDOR.xml; then
		echo "${red}$path not found in vendor manifest! Skipping..."
		continue
	fi

	echo "${blu}Merging ${path}..."
	name=$(grep "path=\"$path\"" manifest/$VENDOR.xml manifest/default.xml | sed -e 's/.*name="//' -e 's/".*//')

	cd $path

	if [[ $(git status --porcelain) = *" M "* ]]; then
		# save uncommitted changes that could be important
		git checkout -q -b "staging-$(date -%s)" &> /dev/null
		git commit -a -q -m "Staging $(date)" &> /dev/null
	fi

	# reset HEAD to our branch
	git checkout -q $BRANCH &> /dev/null
	git fetch -q $REMOTE $BRANCH &> /dev/null
	git reset --hard $REMOTE/$BRANCH &> /dev/null

	git fetch -q https://source.codeaurora.org/quic/la/$name $TAG &> /dev/null
	if git merge FETCH_HEAD -q -m "Merge tag '$TAG' into $BRANCH" &> /dev/null; then
		if [[ $(git rev-parse HEAD) != $(git rev-parse $REMOTE/$BRANCH) ]] && [[ $(git diff HEAD $REMOTE/$BRANCH) ]]; then
			echo "$path" >> $cur_dir/success
			echo "${grn}Merging $path succeeded!"
		else
			echo "${end}$path - unchanged"
			echo "$path" >> $cur_dir/unchanged
			git reset --hard $REMOTE/$BRANCH &> /dev/null
		fi
	else
		echo "$path" >> $cur_dir/failed
		echo "${red}$path merging failed!"
	fi

	cd $cur_dir
done

echo -e "$grn \nPushing succeeded repos: $end"
for repo in $(cat success); do
	cd $repo
	echo $repo
	git push -q &> /dev/null
	cd $cur_dir
done

echo -e "$red \nThese repos failed merging: $end"
cat failed

rm -f .temp
echo $end