X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.bin%2Fr;h=641ed64216f64361682698934e69d155acb561f4;hb=c6a724ca581a2ac547cdab694176ace15fbbad8c;hp=90452b239b8609496d0d9e92b225bdbd3af42052;hpb=8a21037ae3ca0d9dc74d9ea9ab515515a311670a;p=home.git

diff --git a/.bin/r b/.bin/r
index 90452b2..641ed64 100755
--- a/.bin/r
+++ b/.bin/r
@@ -3,6 +3,10 @@ g() { git "$@"; }
 err() { printf '%b\n' "$*" 1>&2; exit 1; }
 vr() { echo "$@"; "$@"; }
 
+case $1 in
+-x) set -x; shift;;
+esac
+
 case $1 in
 ""|-*) ;;
 l)
@@ -13,6 +17,11 @@ s)
 	cmd=sync
 	shift
 	;;
+rb-all)
+	cmd=rebase
+	shift
+	set -- all "$@"
+	;;
 *)
 	cmd=$1
 	shift
@@ -50,12 +59,79 @@ 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)
+			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
@@ -67,18 +143,26 @@ rebase)
 			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
@@ -94,6 +178,8 @@ rebase)
 			{
 				if ($0 ~ "^[*] *[(]no branch[)]") {
 					next
+				} else if ($0 ~ "^[*] *[(](HEAD )?detached (from|at) ") {
+					next
 				} else if ($1 == "*") {
 					b = $2
 				} else {
@@ -120,7 +206,36 @@ rebase)
 		exit 0
 	fi
 	;;
-sb-push)
+clean)
+	root=$(repo_root)
+	cd "${root}" || exit 1
+	mj_init
+	while read -a line ; do
+		dir=${line[0]}
+		proj=${line[2]}
+		cd "${root}/${dir}"
+		(
+		out=$(g clean "$@" 2>&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)
@@ -138,7 +253,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
@@ -149,9 +264,18 @@ 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)
+		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
 
 	exit 0
@@ -163,13 +287,15 @@ g-push)
 	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=()
@@ -177,10 +303,10 @@ g-push)
 	while [[ $# -gt 0 ]] ; do
 		case $1 in
 		--re)
-			reviewers=$2
+			process_reviewers "$2"
 			shift
 			;;
-		-n|--dry-run)
+		-n|--dry-run|--draft)
 			git_args+=( $1 )
 			;;
 		*)
@@ -190,33 +316,32 @@ g-push)
 		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)
-	set -- -j16 "$@"
+	set -- -j16 -c "$@"
 	;;
 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" )
@@ -224,6 +349,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 python2 $(find_repo) ${acmd:-${cmd}} "$@"