X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fr;h=83816bd0bc68f54c698d89e1d77d0162f39a5397;hb=bc85e5e04184cb992b8398fdf36a41633b95f50e;hp=e951e0531403dee63ec5eda85244429a72f169c0;hpb=17c3071f6b8102516ea3823caddaca8bc3bbe4f3;p=home.git diff --git a/.bin/r b/.bin/r index e951e05..83816bd 100755 --- a/.bin/r +++ b/.bin/r @@ -4,19 +4,14 @@ err() { printf '%b\n' "$*" 1>&2; exit 1; } vr() { echo "$@"; "$@"; } case $1 in -""|-*) ;; -l) - cmd=list - shift - ;; -s) - cmd=sync - shift - ;; -*) - cmd=$1 +-x) set -x; shift;; +esac + +case $1 in +rb-all) + cmd=rebase shift - acmd=$(git config --get "alias.${cmd}" | sed 's: -.*::') + set -- all "$@" ;; esac @@ -50,26 +45,100 @@ mj_finish() { 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 shift if [[ $# -eq 0 ]] ; then + eval "$(bash-colors --env | sed 's:^:export :')" root=$(repo_root) mj_init 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) - [[ -n ${out} ]] && echo -e "${out//[#]/###}" + out=$(r rb-all . 2>&1) + if [[ -n ${out} ]] ; then + head=$(printf "%-40s" "${proj}") + echo "${out}" | sed "s:^:${head} :" + fi _mj_child ) & mj_post_child @@ -79,37 +148,39 @@ rebase) #exec r forall -p -c 'r rb all .' &1) + if [[ -n ${out} ]] ; then + echo "### ${proj}" + echo "${out}" + fi + _mj_child + ) & + mj_post_child + done < <(r l) + mj_finish + exit + ;; +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) @@ -127,7 +198,7 @@ sb-push) # fatal: The remote end hung up unexpectedly mj_init 16 - rlist=$(r list) + rlist=$(r l) tcnt=$(echo "${rlist}" | wc -l) cnt=1 while read line ; do @@ -138,74 +209,31 @@ sb-push) 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 - done < <(r list) - mj_finish - - exit 0 - ;; -g-push) - # For the times when repo is being stupid, push directly to gerrit myself. - if ! branch=$(g symbolic-ref -q HEAD) ; then - err "could not figure out active branch" - fi - branch=${branch#refs/heads/} - if ! remote_branch=$(g cfg --get "branch.${branch}.merge") ; then - err "could not figure out remote branch" - fi - remote_branch=${remote_branch#refs/heads/} - - git_args=() - reviewers="" - while [[ $# -gt 0 ]] ; do - case $1 in - --re) - reviewers=$2 - shift + 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 ;; - -n|--dry-run) - git_args+=( $1 ) + pull) ;; - *) - err "unknown option: $1" + fetch) + mj_child g fetch ${remote}/${proj} refs/sandbox/${USER}/${sync_branch}:refs/remotes/sb/${sync_branch} >/dev/null ;; esac - shift - done - - if [[ -n ${reviewers} ]] ; then - reviewers=( ${reviewers//,/ } ) - git_args+=( "--receive-pack=git receive-pack ${reviewers[*]/#/--reviewer=}" ) - fi + done < <(echo "${rlist}") + mj_finish - for remote in cros-internal cros origin ; do - if g cfg --get "remote.${remote}.url" >/dev/null ; then - vr git push "${git_args[@]}" ${remote} ${branch}:refs/for/${remote_branch} - exit $? - fi - done - err "could not figure out remote to push to" - ;; -sync) - set -- -j16 "$@" + exit 0 ;; upload) args=() 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" ) @@ -213,6 +241,16 @@ upload) done set -- "${args[@]}" ;; +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}'" + ;; esac -exec repo ${acmd:-${cmd}} "$@" +exec $(find_repo) ${acmd:-${cmd}} "$@"