diff options
author | Rashed Abdel-Tawab <rashed@linux.com> | 2017-10-24 21:39:21 -0400 |
---|---|---|
committer | Kevin Haggerty <haggertk@lineageos.org> | 2018-11-06 04:27:09 +0100 |
commit | ccde24991f5046c5e3f47d9df33e52ccba744df7 (patch) | |
tree | fb07957a2b1dea04dcc5090522157a3793e3e5d3 /aosp-merger/branches_restore.sh | |
parent | 2e187ce924bdda397632f51c4eb16fde766f5f56 (diff) | |
download | scripts-ccde24991f5046c5e3f47d9df33e52ccba744df7.tar.gz scripts-ccde24991f5046c5e3f47d9df33e52ccba744df7.tar.bz2 scripts-ccde24991f5046c5e3f47d9df33e52ccba744df7.zip |
scripts: Add simplified AOSP merger
Usage: ./lineage/scripts/aosp-merger/aosp-merger.sh [merge|rebase] <oldaosptag> <newaosptag>
Change-Id: I6663e51ee22d7ea262ef634ed5e33c189ee1c2d6
Diffstat (limited to 'aosp-merger/branches_restore.sh')
-rwxr-xr-x | aosp-merger/branches_restore.sh | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/aosp-merger/branches_restore.sh b/aosp-merger/branches_restore.sh new file mode 100755 index 0000000..c10d626 --- /dev/null +++ b/aosp-merger/branches_restore.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# +# Copyright (C) 2017 The LineageOS Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +if [ ! -e "build/envsetup.sh" ]; then + echo "Must run from root of repo" + exit 1 +fi + +TOP="${PWD}" +BRANCHLIST="${TOP}/branches.list" + +cat "${BRANCHLIST}" | while read l; do + set ${l} + PROJECTPATH="${1}" + BRANCH="${2}" + cd "${TOP}/${PROJECTPATH}" + + # Check if we're on this branch already + CURBRANCH=$(git status -b --porcelain | head -1 | awk '{print $2}' | sed 's/\.\.\..*//') + if [ "${CURBRANCH}" == "${BRANCH}" ]; then + echo "#### Project ${PROJECTPATH} is already on branch ${BRANCH} ####" + continue + fi + + # Sanity check + if [[ -n "$(git status --porcelain)" ]]; then + echo -n "#!#! Project ${PROJECTPATH} has uncommitted files, " + echo "not switching to branch ${BRANCH} #!#!" + exit 1 + fi + + echo "#### Project ${PROJECTPATH} Switching to branch ${BRANCH} ####" + git checkout "${BRANCH}" +done |