diff options
author | Bernhard Rosenkraenzer <bero@lindev.ch> | 2014-02-24 09:53:28 +0100 |
---|---|---|
committer | Bernhard Rosenkraenzer <bero@lindev.ch> | 2014-02-24 09:53:28 +0100 |
commit | 76090ddb2fd5a6be905e2ea5b3a969527c61bf47 (patch) | |
tree | 423f36c32d8ab48e6cdb2446ca3cc31fe73c34d2 | |
parent | c7590bdd939775b040183a359f6092bee67d246c (diff) | |
download | scripts-76090ddb2fd5a6be905e2ea5b3a969527c61bf47.tar.gz |
Various updates
Add sync-master script, improve changelog and lco scripts
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
-rwxr-xr-x | changelog | 18 | ||||
-rwxr-xr-x | lco | 6 | ||||
-rwxr-xr-x | sync-master | 19 |
3 files changed, 36 insertions, 7 deletions
@@ -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" @@ -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 |