blob: 1542ae702bbb4fcf645713b72c5f3c42f3ff21ac (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
#!/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.
#
usage() {
echo "Usage ${0} <merge|rebase> <oldaosptag> <newaosptag>"
}
# Verify argument count
if [ "$#" -ne 3 ]; then
usage
exit 1
fi
OPERATION="${1}"
OLDTAG="${2}"
NEWTAG="${3}"
if [ "${OPERATION}" != "merge" -a "${OPERATION}" != "rebase" ]; then
usage
exit 1
fi
# Check to make sure this is being run from the top level repo dir
if [ ! -e "build/envsetup.sh" ]; then
echo "Must be run from the top level repo dir"
exit 1
fi
# Source build environment (needed for aospremote)
. build/envsetup.sh
TOP="${ANDROID_BUILD_TOP}"
MERGEDREPOS="${TOP}/merged_repos.txt"
MANIFEST="${TOP}/.repo/manifest.xml"
BRANCH=$(grep "default revision" "${MANIFEST}" \
| sed 's/^ *//g;s/<default revision=\"refs\/heads\///g;s/\"//g')
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
# Build list of LineageOS forked repos
PROJECTPATHS=$(grep "name=\"LineageOS/" "${MANIFEST}" | sed -n 's/.*path="\([^"]\+\)".*/\1/p')
echo "#### Old tag = ${OLDTAG} Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####"
# Make sure manifest and forked repos are in a consistent state
echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then
echo "Path ${PROJECTPATH} has uncommitted changes. Please fix."
exit 1
fi
done
echo "#### Verification complete - no uncommitted changes found ####"
# Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}"
# Sync and detach from current branches
repo sync -d
# Ditch any existing staging branches (across all projects)
repo abandon "${STAGINGBRANCH}"
# Iterate over each forked project
for PROJECTPATH in ${PROJECTPATHS}; do
cd "${TOP}/${PROJECTPATH}"
repo start "${STAGINGBRANCH}" .
aospremote | grep -v "Remote 'aosp' created"
git fetch -q --tags aosp "${NEWTAG}"
PROJECTOPERATION="${OPERATION}"
# Check if we've actually changed anything before attempting to merge
# If we haven't, just "git reset --hard" to the tag
if [[ -z "$(git diff HEAD ${OLDTAG})" ]]; then
git reset --hard "${NEWTAG}"
echo -e "reset\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
continue
fi
# Was there any change upstream? Skip if not.
if [[ -z "$(git diff ${OLDTAG} ${NEWTAG})" ]]; then
echo -e "nochange\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
continue
fi
# Determine whether OLDTAG is an ancestor of NEWTAG
# ie is history consistent.
git merge-base --is-ancestor "${OLDTAG}" "${NEWTAG}"
# If no, force rebase.
if [[ "$?" -eq 1 ]]; then
echo -n "#### Project ${PROJECTPATH} old tag ${OLD} is not an ancestor "
echo "of new tag ${NEWTAG}, forcing rebase ####"
PROJECTOPERATION="rebase"
fi
if [[ "${PROJECTOPERATION}" == "merge" ]]; then
echo "#### Merging ${NEWTAG} into ${PROJECTPATH} ####"
git merge --no-edit --log "${NEWTAG}"
elif [[ "${PROJECTOPERATION}" == "rebase" ]]; then
echo "#### Rebasing ${PROJECTPATH} onto ${NEWTAG} ####"
git rebase --onto "${NEWTAG}" "${OLDTAG}"
fi
CONFLICT=""
if [[ -n "$(git status --porcelain)" ]]; then
CONFLICT="conflict-"
fi
echo -e "${CONFLICT}${PROJECTOPERATION}\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
done
|
