ccde24991f
Usage: ./lineage/scripts/aosp-merger/aosp-merger.sh [merge|rebase] <oldaosptag> <newaosptag> Change-Id: I6663e51ee22d7ea262ef634ed5e33c189ee1c2d6
69 lines
2.2 KiB
Bash
Executable File
69 lines
2.2 KiB
Bash
Executable File
#!/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.
|
|
#
|
|
#####
|
|
# Rebase your local working branches onto a new "upstream" branch.
|
|
# Local branch list is defined in branches.list
|
|
# (and can be created with branches_save.sh)
|
|
# If the upstream branch doesn't exist (eg perhaps in lineage-sdk),
|
|
# simply switch the working branch instead.
|
|
|
|
if [ ! -e "build/envsetup.sh" ]; then
|
|
echo "Must run from root of repo"
|
|
exit 1
|
|
fi
|
|
|
|
if [ "$#" -ne 1 ]; then
|
|
echo "Usage ${0} <branch to rebase on top of>"
|
|
exit 1
|
|
fi
|
|
REBASEONTO="${1}"
|
|
|
|
TOP="${PWD}"
|
|
BRANCHLIST="${TOP}/branches.list"
|
|
|
|
cat "${BRANCHLIST}" | while read l; do
|
|
set ${l}
|
|
PROJECTPATH="${1}"
|
|
BRANCH="${2}"
|
|
NEWBRANCH="${2}-rebase"
|
|
cd "${TOP}/${PROJECTPATH}"
|
|
|
|
# Sanity check
|
|
[[ -n "$(git status --porcelain)" ]]; then
|
|
echo -n "!!!! Project ${PROJECTPATH} has uncommitted files, "
|
|
echo "not switching to branch ${BRANCH} (skipping) !!!!"
|
|
continue
|
|
fi
|
|
|
|
# Check the $REBASEONTO branch actually exists
|
|
git show-ref "refs/heads/${REBASEONTO}" >/dev/null
|
|
if [ "$?" -ne 0 ]; then
|
|
# Nope
|
|
echo -n "#### Project ${PROJECTPATH} branch ${REBASEONTO} does not exist, "
|
|
echo "switching to ${BRANCH} instead ####"
|
|
git checkout "${BRANCH}"
|
|
else
|
|
echo "#### Creating ${PROJECTPATH} branch ${NEWBRANCH} from ${BRANCH} ####"
|
|
repo abandon "${NEWBRANCH}" .
|
|
repo start "${NEWBRANCH}" .
|
|
git reset --hard "${BRANCH}"
|
|
echo -n "#### Project ${PROJECTPATH} Rebasing branch ${NEWBRANCH} "
|
|
echo "on top of ${REBASEONTO} ####"
|
|
git rebase --onto "${REBASEONTO}"
|
|
fi
|
|
done
|