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
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
|
#!/bin/bash
#set -x
# used for projects where some files are mainline, some are not
# we get a list of the files/directories out of the project's root.
#
# invocation $0 ${repo_root} ${preupload_files}
#
# Example PREUPLOAD.cfg:
#
# [Hook Scripts]
# mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_partial.sh ${REPO_ROOT} ${PREUPLOAD_FILES}
#
# MainlineFiles.cfg syntax:
#
# ignore comment (#) lines and blank lines
# rest are path prefixes starting at root of the project
# (so OWNERS, not frameworks/av/OWNERS)
#
# path
# INCLUDE path
# EXCLUDE path
#
# 'path' and 'INCLUDE path' are identical -- they both indicate that this path
# is part of mainline
# EXCLUDE indicates that this is not part of mainline,
# so 'foo/' and 'EXCLUDE foo/nope'
# means everything under foo/ is part of mainline EXCEPT foo/nope.
# INCLUDE/EXCLUDE/INCLUDE nested structuring is not supported
#
# matching is purely prefix
# so 'foo' will match 'foo', 'foo.c', 'foo/bar/baz'
# if you want to exclude a directory, best to use a pattern like "foo/"
#
## tunables:
##
DEV_BRANCH=rvc-dev
filelist_file=MainlineFiles.cfg
###
REPO_ROOT=$1; shift
# the rest of the command line is the file list
PREUPLOAD_FILES="$*"
RED=$(tput setaf 1)
NORMAL=$(tput sgr0)
## get the active branch:
## * <localbranch> <shainfo> [goog/master] Fix to handle missing checks on error returned
## strip this down to "master"
##
current=`git branch -vv | grep -P "^\*[^\[]+\[goog/"|sed -e 's/^.*\[//' | sed -e 's/:.*$//'| sed -e 's/^goog\///'`
if [ "${current}" = "" ] ; then
current=unknown
fi
## figure out whether which files are for mainline and which are not
if [ "${PREUPLOAD_FILES}" = "" ] ; then
# empty files? what's up there, i suppose we'll let that go
exit 0
fi
## get the list of files out of the project's root
## figure out which way I'm going ..
## use list of files to scan PREUPLOAD_FILES
## use PREUPLOAD_FILES to scan the list of good/bad from the project root
##
## remember to do an exclude, so I can say
## include/these/files/
## EXCLUDE include/these/files/nested/
##
## and it should all be prefix based stuff...
if [ ! -f ${REPO_ROOT}/${REPO_PATH}/${filelist_file} ] ; then
echo "Poorly Configured project, missing ${filelist_file} in root of project"
exit 1
fi
# is 1st arg a prefix of 2nd arg
beginswith() { case $2 in "$1"*) true;; *) false;; esac; }
exclusions=""
inclusions=""
while read p1 p2
do
# ignore comment lines in the file
# ignore empty lines in the file
if beginswith "#" "${p1}" ; then
# ignore this line
true
elif [ -z "${p1}" ] ; then
# ignore blanks
true
elif [ ${p1} = "EXCLUDE" ] ; then
# add to the exclusion list
if [ ! -z ${p2} ] ; then
exlusions="${exclusions} ${p2}"
fi
elif [ ${p1} = "INCLUDE" ] ; then
# add to the inclusion list
if [ ! -z ${p2} ] ; then
inclusions="${inclusions} ${p2}"
fi
elif [ ! -z ${p1} ] ; then
inclusions="${inclusions} ${p1}"
fi
done < ${REPO_ROOT}/${REPO_PATH}/${filelist_file}
# so we can play with array syntax
#INCLUSIONS=( ${inclusions} )
#EXCLUSIONS=( ${exclusions} )
mainline_yes=""
mainline_no=""
# is it part of the list of mainline files/directories?
for path in ${PREUPLOAD_FILES} ; do
#echo is ${path} a mainline file...
for aprefix in ${inclusions} .. ; do
#echo compare against ${aprefix} ...
if [ "${aprefix}" = ".." ] ; then
mainline_no="${mainline_no} ${path}"
elif beginswith ${aprefix} ${path} ; then
mainline_yes="${mainline_yes} ${path}"
break # on to next uploaded file
fi
done
done
# TODO: audit the yes list to see if some should be moved to the no list
# 3 situations
# -- everything is on mainline (mainline_yes non-empty, other empty)
# -- some is mainline, some is not (files_* both non-empty)
# -- none is mainline (mainline_yes empty, other non_empty
# -- both empty only happens if PREUPLOAD_FILES is empty, covered above
if [ -z "${mainline_yes}" ] ; then
# no mainline files, everything else is non-mainline, let it go
exit 0
fi
result=0
if [ ! -z "${mainline_no}" ] ; then
# mixed bag, suggest (not insist) that developer split them.
result=1
cat - <<EOF
This CL contains files contains both mainline and non-mainline files. Consider separating
them into separate CLs. It may also be appropriate to update the list of mainline
files in ${RED}${REPO_ROOT}/${filelist_file}${NORMAL}.
EOF
echo "===== Mainline files ====="
echo -e ${RED}
echo ${mainline_yes} | sed -e 's/ /
/g'
echo -e ${NORMAL}
echo "===== Non-Mainline files ====="
echo -e ${RED}
echo ${mainline_no} | sed -e 's/ /
/g'
echo -e ${NORMAL}
fi
if [ "${current}" != "${DEV_BRANCH}" ] ; then
# Change is not in the desired mainline dev branch
result=1
#echo -e "${RED}"
cat - <<EOF
You are uploading repo ${RED}${REPO_PATH}${NORMAL} to branch ${RED}${current}${NORMAL}.
The source of truth for ${RED}${REPO_PATH}${NORMAL} is branch ${RED}${DEV_BRANCH}${NORMAL}.
Please upload this change to branch ${RED}${DEV_BRANCH}${NORMAL} unless one or more of
the following apply:
- this is a security bug prohibited from disclosure before the next dessert release.
(moderate security bugs fall into this category).
- this is new functionality prohibitied from disclosure before the next dessert release.
EOF
#echo -e "${NORMAL}"
fi
## since stdout is buffered in a way that complicates the below, we're just going
## to tell the user what they can do to get around this check instead of asking them
## as part of this run of the command.
if [ ${result} != 0 ] ; then
cat - <<EOF
If you are sure you want to proceed uploading to branch ${RED}${current}${NORMAL},
re-run your repo upload command with the '--no-verify' option
EOF
fi
exit ${result}
|
