Various updates

Add sync-master script, improve changelog and lco scripts

Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

3 files changed, 36 insertions, 7 deletions

diff --git a/changelog b/changelog
index 2067ff2..745cdde 100755
--- a/changelog
+++ b/changelog
@@ -1,6 +1,12 @@
 #!/bin/sh
 . `dirname $0`/common
-[ -d platform/manifest ] || lco platform/manifest
+
+if [ "$1" == "-q" -o "$1" == "--quiet" ]; then
+	VERBOSE=false
+	shift
+else
+	VERBOSE=true
+fi
 
 OLDVER=$1
 if [ -n "$2" ]; then
@@ -21,6 +27,8 @@ else
 	MANIFEST=platform/manifest/default.xml
 fi
 
+lco platform/manifest
+
 defaultrev="`xmllint --format $MANIFEST |grep '<default' |sed -e 's,.* revision=\",,;s,\".*,,'`"
 echo $defaultrev
 
@@ -45,9 +53,11 @@ if [ -e /tmp/changes.list ]; then
 	echo "Changes affect:"
 	cat /tmp/changes.list |while read r; do
 		echo "*** $r: ***"
-		pushd $SRC/$r
-		PAGER=cat git log --oneline android-${OLDVER}..android-${NEWVER}
-		popd
+		if $VERBOSE; then
+			pushd $SRC/$r
+			PAGER=cat git log --oneline android-${OLDVER}..android-${NEWVER}
+			popd &>/dev/null
+		fi
 	done
 else
 	echo "No changes"
diff --git a/lco b/lco
index 0aa5475..89adf0c 100755
--- a/lco
+++ b/lco
@@ -12,14 +12,14 @@ if [ -d $SRC/$TREE ]; then
 	git pull
 	git fetch --all
 	if [ -n "$2" ]; then
-		if echo $2 |grep -q refs/tags/; then
+		if git checkout $2 &>/dev/null; then
+			OK=true
+		elif echo $2 |grep -q refs/tags/; then
 			if git checkout `basename $2`; then
 				OK=true
 			fi
 		elif git checkout -b $2 origin/$2; then
 			OK=true
-		elif git checkout -b $2 origin/$2 2>&1 |grep -q "already exists"; then
-			OK=true
 		fi
 		if ! $OK; then
 			if git checkout `basename $2`; then
diff --git a/sync-master b/sync-master
new file mode 100755
index 0000000..a8a0946
--- /dev/null
+++ b/sync-master
@@ -0,0 +1,19 @@
+#!/bin/sh
+. `dirname $0`/common
+lco platform/manifest linaro-master
+cd $SRC/platform/manifest
+FAILED=""
+grep 'revision="linaro-master"' default.xml |while read r; do
+	P=`echo $r |sed -e 's,.*name=",,;s,".*,,'`
+	lco $P linaro-master
+	cd $SRC/$P
+	git fetch --all
+	if git rebase aosp/master; then
+		git push --force gerrit linaro-master
+	else
+		FAILED="$FAILED $P"
+	fi
+done
+if [ -n "$FAILED" ]; then
+	echo "The following projects need manual merges: $FAILED"
+fi