]> git.wh0rd.org - home.git/blobdiff - .bin/r
cros-board: update
[home.git] / .bin / r
diff --git a/.bin/r b/.bin/r
index cc26b7b6af132286f6c04589e47ddc7979ae971f..afa9c51e48cc940342c10e887a01d06e1d34b5a4 100755 (executable)
--- a/.bin/r
+++ b/.bin/r
@@ -8,19 +8,10 @@ case $1 in
 esac
 
 case $1 in
-""|-*) ;;
-l)
-       cmd=list
+rb-all)
+       cmd=rebase
        shift
-       ;;
-s)
-       cmd=sync
-       shift
-       ;;
-*)
-       cmd=$1
-       shift
-       acmd=$(git config --get "alias.${cmd}" | sed 's: -.*::')
+       set -- all "$@"
        ;;
 esac
 
@@ -54,7 +45,7 @@ mj_finish() {
 
 repo_root() {
        local root=${PWD}
-       while [[ ! -d ${root}/.repo && ${root} != "/" ]] ; do
+       while [[ ! -d ${root}/.repo && ${root:-/} != "/" ]] ; do
                root=${root%/*}
        done
        echo "${root}"
@@ -64,7 +55,7 @@ process_reviewers() {
        local r arr=()
        for r in ${*//,/ } ; do
                case ${r} in
-               *OWNERS)
+               OWNERS*|*/OWNERS*)
                        local owners=$(
                                awk -F'@' '
                                        ($2 == "chromium.org" || $2 == "google.com") {list = list "," $1}
@@ -87,12 +78,55 @@ process_reviewers() {
        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 :')
+                       # This bash version is still slightly faster than repo!
+                       #exec r forall -j$(getconf _NPROCESSORS_ONLN) -p -c git rb-all
+
+                       eval "$(bash-colors --env | sed 's:^:export :')"
                        root=$(repo_root)
                        mj_init
                        while read -a line ; do
@@ -103,18 +137,10 @@ rebase)
                                        continue
                                fi
                                (
-                               out=$(env _proj=${proj} r rb all . 2>&1)
+                               out=$(r rb-all . 2>&1)
                                if [[ -n ${out} ]] ; then
-                                       while read line ; do
-                                               if [[ ${line} == "# "* ]] ; then
-                                                       line="${line#[#] }"
-                                                       printf '%s### %s%-40s%s: %s\n' \
-                                                               "${BRACKET}" "${GOOD}" "${line%%:*}" "${NORMAL}" "${line#*:}"
-                                               else
-                                                       printf '%s### %s%-40s%s: ERROR: %s\n' \
-                                                               "${BRACKET}" "${BAD}" "${dir}" "${NORMAL}" "${line}"
-                                               fi
-                                       done < <(echo "${out}")
+                                       head=$(printf "%-40s" "${proj}")
+                                       echo "${out}" | sed "s:^:${head} :"
                                fi
                                _mj_child
                                ) &
@@ -122,39 +148,9 @@ rebase)
                        done < <(r l)
                        mj_finish
                        exit 0
-                       #exec r forall -p -c 'r rb all .' </dev/null
                fi
 
-               branches=$(g b | awk '
-                       {
-                               if ($0 ~ "^[*] *[(]no branch[)]") {
-                                       next
-                               } else if ($0 ~ "^[*] *[(](HEAD )?detached (from|at) ") {
-                                       next
-                               } else if ($1 == "*") {
-                                       b = $2
-                               } else {
-                                       list = list $1 " "
-                               }
-                       }
-                       END { print list b }')
-               [[ -z ${branches} ]] && exit 0
-
-               [[ -z ${GOOD} ]] && eval $(bash-colors --env)
-               #echo "${GOOD}### ${PWD}${NORMAL}"
-               # Skip if rebase is in progress.
-               if [[ -e .git/rebase-merge/interactive ]] ; then
-                       echo -e "# ${_proj}: ${WARN}skipping due to active rebase${NORMAL}"
-                       exit 1
-               fi
-               for b in ${branches} ; do
-                       #echo " ${HILITE}### $b${NORMAL}"
-                       g co -q $b || exit 1
-                       if ! r rb -q "$@" ; then
-                               g rb-a
-                       fi
-               done
-               exit 0
+               exec git rb-all -q
        fi
        ;;
 clean)
@@ -231,59 +227,6 @@ sb)
 
        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
-               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=()
-       reviewers=""
-       while [[ $# -gt 0 ]] ; do
-               case $1 in
-               --re)
-                       process_reviewers "$2"
-                       shift
-                       ;;
-               -n|--dry-run|--draft)
-                       git_args+=( $1 )
-                       ;;
-               *)
-                       err "unknown option: $1"
-                       ;;
-               esac
-               shift
-       done
-
-       ref_spec="${branch}:refs/for/${remote_branch}"
-       if [[ -n ${reviewers} ]] ; then
-               reviewers=( ${reviewers//,/ } )
-               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} ${ref_spec} && exit
-       err "could not figure out remote to push to"
-       ;;
-sync)
-       set -- -j16 -c "$@"
-       ;;
 upload)
        args=()
        while [[ $# -gt 0 ]] ; do
@@ -302,9 +245,14 @@ upload)
        ;;
 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 $(find_repo) ${acmd:-${cmd}} "$@"