err() { printf '%b\n' "$*" 1>&2; exit 1; }
vr() { echo "$@"; "$@"; }
+case $1 in
+-x) set -x; shift;;
+esac
+
case $1 in
""|-*) ;;
l)
cmd=sync
shift
;;
+rb-all)
+ cmd=rebase
+ shift
+ set -- all "$@"
+ ;;
*)
cmd=$1
shift
repo_root() {
local root=${PWD}
- while [[ ! -d ${root}/.repo && ${root} != "/" ]] ; do
+ while [[ ! -d ${root}/.repo && ${root:-/} != "/" ]] ; do
root=${root%/*}
done
echo "${root}"
}
+process_reviewers() {
+ local r arr=()
+ for r in ${*//,/ } ; do
+ case ${r} in
+ OWNERS*|*/OWNERS*)
+ local owners=$(
+ awk -F'@' '
+ ($2 == "chromium.org" || $2 == "google.com") {list = list "," $1}
+ END {print substr(list, 2)}
+ ' "${r}"
+ )
+ if [[ -z ${owners} ]] ; then
+ err "cannot find OWNERS list"
+ else
+ echo "Auto setting reviewers to: ${owners}"
+ fi
+ arr+=( ${owners} )
+ ;;
+ *)
+ arr+=( "${r}" )
+ ;;
+ esac
+ done
+ reviewers=$(printf '%s,' "${arr[@]}")
+ reviewers=${reviewers%,}
+}
+
+find_repo() {
+ # Diff projects have diff versions of repo. Find a compatible one.
+ local root=$(repo_root)
+
+ # Use the manifest repo URL.
+ local manifest_dir="${root}/.repo/manifests.git"
+ local d
+
+ # Default to the local repo if it's there.
+ local search=(
+ "${root}/.repo/repo"
+ )
+
+ case $(g --git-dir="${manifest_dir}" config remote.origin.url) in
+ *android*)
+ search+=(
+ /usr/local/src/repo
+ ~/src/repo
+ )
+ ;;
+ *chromium*|*chrome*)
+ search+=(
+ ~/depot_tools
+ ~/chromiumos/depot_tools
+ /usr/local/src/depot_tools
+ ~/src/depot_tools
+ )
+ ;;
+ esac
+ for d in "${search[@]}" ; do
+ if [[ -x ${d}/repo ]] ; then
+ echo "${d}"/repo
+ return
+ fi
+ done
+
+ # Fallback: use $PATH.
+ type -P repo
+}
+
case ${acmd:-${cmd}} in
rebase)
if [[ $1 == "all" ]] ; then
while read -a line ; do
dir=${line[0]}
proj=${line[2]}
- cd "${root}/${dir}"
+ if ! cd "${root}/${dir}" ; then
+ echo "bad ${proj}"
+ continue
+ fi
(
out=$(env _proj=${proj} r rb all . 2>&1)
if [[ -n ${out} ]] ; then
while read line ; do
- if [[ ${line} == "# "* ]] ; then
+ case ${line} in
+ "Fast-forwarded "*) ;;
+ "# "*)
line="${line#[#] }"
printf '%s### %s%-40s%s: %s\n' \
"${BRACKET}" "${GOOD}" "${line%%:*}" "${NORMAL}" "${line#*:}"
- else
- echo "${line}"
- fi
+ ;;
+ *)
+ printf '%s### %s%-40s%s: ERROR: %s\n' \
+ "${BRACKET}" "${BAD}" "${dir}" "${NORMAL}" "${line}"
+ ;;
+ esac
done < <(echo "${out}")
fi
_mj_child
{
if ($0 ~ "^[*] *[(]no branch[)]") {
next
- } else if ($0 ~ "^[*] *[(]detached from ") {
+ } else if ($0 ~ "^[*] *[(](HEAD )?detached (from|at) ") {
next
} else if ($1 == "*") {
b = $2
mj_finish
exit
;;
-sb-push)
+sb)
+ sb_cmd=$1
+ case ${sb_cmd} in
+ pull) ;;
+ push) ;;
+ f|fetch) sb_cmd="fetch" ;;
+ *) err "unknown sandbox command: $1"
+ esac
+
sync_branch="v"
root=$(repo_root)
printf '### (%*i/%i %3i%%) %s\n' \
${#tcnt} $((cnt++)) ${tcnt} $(( cnt * 100 / tcnt )) ${proj}
src="${sync_branch}"
- g l -1 ${src} >& /dev/null || src=
- mj_child g push --force ${remote}/${proj} ${src}:refs/sandbox/${USER}/${sync_branch} >/dev/null
+ case ${sb_cmd} in
+ push)
+ g l -1 ${src} >& /dev/null || src=
+ mj_child g push --force ${remote}/${proj} ${src}:refs/sandbox/${USER}/${sync_branch} >/dev/null
+ ;;
+ pull)
+ ;;
+ fetch)
+ mj_child g fetch ${remote}/${proj} refs/sandbox/${USER}/${sync_branch}:refs/remotes/sb/${sync_branch} >/dev/null
+ ;;
+ esac
done < <(echo "${rlist}")
mj_finish
fi
branch=${branch#refs/heads/}
if ! remote_branch=$(g cfg --get "branch.${branch}.merge") ; then
- err "could not figure out remote branch"
+ echo "could not figure out remote branch; using ${branch}"
+ remote_branch=${branch}
fi
if ! remote=$(g cfg --get "branch.${branch}.remote") ; then
for remote in cros-internal cros origin ; do
g cfg --get "remote.${remote}.url" >/dev/null && break
done
fi
+ review=$(g cfg --get "remote.${remote}.review")
remote_branch=${remote_branch#refs/heads/}
git_args=()
while [[ $# -gt 0 ]] ; do
case $1 in
--re)
- reviewers=$2
+ process_reviewers "$2"
shift
;;
- -n|--dry-run)
+ -n|--dry-run|--draft)
git_args+=( $1 )
;;
*)
shift
done
+ ref_spec="${branch}:refs/for/${remote_branch}"
if [[ -n ${reviewers} ]] ; then
reviewers=( ${reviewers//,/ } )
- git_args+=( "--receive-pack=git receive-pack ${reviewers[*]/#/--reviewer=}" )
+ if [[ ${review} != ssh://* ]] ; then
+ gob_args=$(printf 'r=%s,' "${reviewers[@]}")
+ ref_spec+="%${gob_args%,}"
+ else
+ git_args+=( "--receive-pack=git receive-pack ${reviewers[*]/#/--reviewer=}" )
+ fi
fi
- vr git push "${git_args[@]}" ${remote} ${branch}:refs/for/${remote_branch} && exit
+ vr git push "${git_args[@]}" ${remote} ${ref_spec} && exit
err "could not figure out remote to push to"
;;
sync)
while [[ $# -gt 0 ]] ; do
case $1 in
--re)
- if [[ $2 == *"OWNERS" ]] ; then
- owners=$(awk -F'@' '{list = list "," $1} END {print substr(list, 2)}' "$2")
- if [[ -z ${owners} ]] ; then
- err "cannot find OWNERS list"
- else
- echo "Auto setting reviewers to: ${owners}"
- fi
- args+=( --re "${owners}" )
- shift 2
- continue
- fi
+ process_reviewers "$2"
+ args+=( --re "${reviewers}" )
+ shift 2
+ continue
;;
esac
args+=( "$1" )
;;
email)
email=${1:-${USER}@chromium.org}
+
+ root=$(repo_root)
+ git --git-dir="${root}/.repo/manifests.git" cfg user.email "${email}"
+ git --git-dir="${root}/.repo/repo/.git" cfg user.email "${email}"
+
cmd='forall'
- set -- -c "git cfg user.email ${email}"
+ set -- -c "git cfg user.email '${email}'"
;;
esac
-exec repo ${acmd:-${cmd}} "$@"
+exec python2 $(find_repo) ${acmd:-${cmd}} "$@"
git.wh0rd.org / home.git / blobdiff