From 6bc138afcd1880873825fe023916dccd87baa368 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 14 Feb 2021 22:59:45 -0500 Subject: [PATCH] delete cvs commit tooling --- .bin/cvs-import | 36 ----------- .bin/ebuild-bump | 39 ------------ .bin/ec-close | 1 - .bin/ec-comment | 1 - .bin/er-close | 131 --------------------------------------- .bin/er-comment | 1 - .bin/git-cvscommitexport | 2 - 7 files changed, 211 deletions(-) delete mode 100755 .bin/cvs-import delete mode 100755 .bin/ebuild-bump delete mode 120000 .bin/ec-close delete mode 120000 .bin/ec-comment delete mode 100755 .bin/er-close delete mode 120000 .bin/er-comment delete mode 100755 .bin/git-cvscommitexport diff --git a/.bin/cvs-import b/.bin/cvs-import deleted file mode 100755 index d11ad9f..0000000 --- a/.bin/cvs-import +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -set -e - -if [[ $# -eq 0 ]] || [[ $1 == "-h" ]] ; then - echo "Usage: ${0##*/} [more dirs]" - exit 1 -fi - -dir=$1 -if [[ ! -e ${dir} ]] ; then - echo "cvs-import: $1: directory does not exist" 1>&2 - exit 1 -fi -dir=$(realpath "${dir}") - -echo "Importing ${dir} and kids" -cd "${dir}/.." -cvs -Q add "${dir##*/}" - -find_files() { - local depth=$1 - shift - find . -mindepth ${depth} -maxdepth ${depth} \ - '!' '(' -name 'CVS' -o -wholename '*/CVS/*' ')' "$@" -} - -cd "${dir}" -i=1 -while [[ -n $(find_files ${i}) ]] ; do - echo "Importing at depth ${i}" - find_files ${i} -exec cvs -Q add {} + - : $(( i += 1 )) -done - -echo "Done" diff --git a/.bin/ebuild-bump b/.bin/ebuild-bump deleted file mode 100755 index d6655e9..0000000 --- a/.bin/ebuild-bump +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# get "er" shortcut -source ~/.profile.d/gentoo.sh - -cmd="" -case $1 in - -u|--unpack) cmd="unpack";; - -*) echo "error: uknown option $1"; exit 1;; -esac - -src=${1%.ebuild}.ebuild ; shift -dst=${1%.ebuild}.ebuild ; shift - -set -e - -if [[ ! -e $src ]] ; then - echo "source ebuild not found '$src'" 1>&2 - exit 1 -fi - -cp $src $dst - -case $cmd in - u|unpack) commands="clean setup unpack" ;; - *) commands="manifest clean setup unpack compile install" ;; -esac - -ekeyword ~all $dst - -ebuild $dst $commands - -cvs add $dst - -if [[ -z $* ]] ; then - er 'Version bump.' -else - er "Version bump $*." -fi diff --git a/.bin/ec-close b/.bin/ec-close deleted file mode 120000 index fc468e2..0000000 --- a/.bin/ec-close +++ /dev/null @@ -1 +0,0 @@ -er-close \ No newline at end of file diff --git a/.bin/ec-comment b/.bin/ec-comment deleted file mode 120000 index fc468e2..0000000 --- a/.bin/ec-comment +++ /dev/null @@ -1 +0,0 @@ -er-close \ No newline at end of file diff --git a/.bin/er-close b/.bin/er-close deleted file mode 100755 index da75efd..0000000 --- a/.bin/er-close +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash - -. ~/.profile.d/gentoo.sh -. ~/.profile.d/aliases.sh - -op=${0##*/} -ops=( ${op//-/ } ) -op=${ops[0]} -[[ ${op} == "er" ]] && op+=" -q" -tdir="${HOME}/.cache/bugz" -mkdir -p "${tdir}" -find "${tdir}" -mmin +30 -type f -delete - -usage() { - cat <<-EOF - Usage: ${0##*/} [ ...] - EOF - if [[ $# -gt 0 ]] ; then - printf '\nerror: %s\n' "$*" - fi - exit -} - -bugs=() -comments=() -cl_msg= -while [[ $# -ne 0 ]] ; do - bug=$1 - reason=$2 - shift 2 || usage "invalid args" - - if [[ -z ${bug} || -n ${bug//[0-9#]} ]] ; then - usage "invalid bug" - fi - - case ${bug} in - *#*) c=${bug##*#} ;; - *) c=0 ;; - esac - : $(( ++c )) - b=${bug%%#*} - bugs=( "${bugs[@]}" ${b} ) - comments=( "${comments[@]}" "${reason}" ) - - xml="${tdir}/${b}.xml" - # server doesn't support timestamps, so cannot use -N - if [[ ! -s $xml ]] ; then - wget -q -O $xml https://bugs.gentoo.org/${b}?ctype=xml - fi - name=$(xml sel -E utf8 -t -m bugzilla/bug/long_desc -c who -n $xml | \ - head -${c} | tail -1 | grep -o 'name=".*">' | cut -d\" -f2) - if [[ -z ${name} ]] ; then - name=$(xml sel -E utf8 -t -m bugzilla/bug/long_desc -v who -n $xml | \ - head -${c} | tail -1 | cut -d@ -f1) - fi - new_name=$(echo "${name}" | scrub_html | sed "s: [(\"'][^()\"']*[)\"']::g") - if [[ ${new_name} != "${name}" ]] ; then - echo "Normalizing '${name}' to '${new_name}'" - name=${new_name} - fi - - if [[ -n ${cl_msg} ]] ; then - cl_msg+=" " - fi - cl_msg+="${reason} #${bug} by ${name}." -done - -run() { - local opt=$1; shift - printf "'%s' " "$@" - echo - case $opt in - -g) "$@" ;; - esac -} - -doit() { - run "$@" $op "${cl_msg}" || exit 1 - echo - for (( n=0; n < ${#bugs[@]}; ++n )) ; do - b=${bugs[$n]} - c=${comments[$n]} - local msg="Commit message: $c$(printf '\n%s' ${urls})" - - case ${ops[1]} in - close) - run "$@" gbugz -q modify ${b} --fixed -c "\ -should be all set now in the tree; thanks for the report! - -${msg}" - ;; - comment) - run "$@" gbugz -q modify ${b} -c "${msg}" - ;; - esac - done - echo -} - -cvs=$(cvs up) -files=$(echo "$cvs" | awk '$1 ~ /^[MA]/ { print $NF }' | grep -v '^Manifest$') -unk_files=$(echo "$cvs" | awk '$1 !~ /^[MARU]/') -if [[ -n ${unk_files} ]] ; then - echo "unknown files:" - echo "${unk_files}" - exit 1 -fi -urls=$(cvs_gentoo_url ${files} | LC_ALL=C sort -V) - -cmds=$(doit -p) -echo -echo "${cmds}" -printf "\nOk to go? [Y/n/e] " -read g -case ${g} in - e) - t=$(mktemp) - echo "${cmds}" > "${t}" - ${EDITOR:-nano} "${t}" || rm "${t}" - set -e - . "${t}" - rm "${t}" - ;; - ""|y) - echo - doit -g - ;; - *) - exit 1 - ;; -esac diff --git a/.bin/er-comment b/.bin/er-comment deleted file mode 120000 index fc468e2..0000000 --- a/.bin/er-comment +++ /dev/null @@ -1 +0,0 @@ -er-close \ No newline at end of file diff --git a/.bin/git-cvscommitexport b/.bin/git-cvscommitexport deleted file mode 100755 index 76aa7dd..0000000 --- a/.bin/git-cvscommitexport +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec git cvsexportcommit -d $(git config --get cvs.cvsroot) -W "$@" -- 2.39.2