X-Git-Url: https://git.wh0rd.org/?p=home.git;a=blobdiff_plain;f=.bin%2Fr;h=9aa76a868ec1a187e21584f0d1946a1140ea70d1;hp=848378ea2eedcc6abeba8fed90c3f680ce8800d4;hb=0342453cae59711cc452aa428193af7d85394d0f;hpb=64e2994fd8fa22f90bf017c8f5719a6ca7d17b43 diff --git a/.bin/r b/.bin/r index 848378e..9aa76a8 100755 --- a/.bin/r +++ b/.bin/r @@ -8,25 +8,11 @@ case $1 in esac case $1 in -""|-*) ;; -l) - cmd=list - shift - ;; -s) - cmd=sync - shift - ;; rb-all) cmd=rebase shift set -- all "$@" ;; -*) - cmd=$1 - shift - acmd=$(git config --get "alias.${cmd}" | sed 's: -.*::') - ;; esac mj_init() { @@ -239,59 +225,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 @@ -320,4 +253,4 @@ email) ;; esac -exec python2 $(find_repo) ${acmd:-${cmd}} "$@" +exec $(find_repo) ${acmd:-${cmd}} "$@"