go-utils/sunrise-commit

529 lines
14 KiB
Plaintext
Raw Normal View History

#!/bin/sh
# sunrise-commit -- a Gentoo repository commit helper
# (c) 2010 Michał Górny <gentoo@mgorny.alt.pl>
# Released under the terms of the 3-clause BSD license.
2010-07-13 17:15:51 +02:00
# -- output helpers --
# Output the message to STDERR.
say() {
echo "${@}" >&2
}
2010-07-13 17:15:51 +02:00
# Output the error message and abort the script with non-zero status.
die() {
2010-07-12 11:27:40 +02:00
say "${RED}${@}${RESET}"
exit 1
}
2010-07-13 17:15:51 +02:00
# Output the debug message if --verbose was used.
sayv() {
2010-07-12 11:27:40 +02:00
[ -n "${SC_VERBOSE}" ] && say "${GREEN}${@}${RESET}"
}
2010-07-13 17:15:51 +02:00
# Execute the command and die with simple error message if it fails.
req() {
"${@}" || die "'${@}' failed."
}
# Append the arguments to an IFS-separated list variable whose name was
# passed as the first arg.
array_append() {
local varname
varname=${1}
shift
eval "set -- \${${varname}} \"\${@}\"; ${varname}=\${*}"
}
2010-07-13 17:15:51 +02:00
# -- POSIX compat --
# Check whether 'local' is supported.
local_supported() {
2010-07-13 17:15:51 +02:00
PATH= local test 2>/dev/null
}
2010-07-13 17:15:51 +02:00
# If it is not, declare dummy local() function unsetting the variables.
local_supported || eval 'local() {
2010-07-13 17:15:51 +02:00
unset "${@}"
}'
2010-07-13 17:15:51 +02:00
# -- 'look around' functions --
# See if we're in a repo, and what VCS are we using.
find_repo() {
2010-08-26 00:08:21 +02:00
if svn info >/dev/null 2>&1; then
SC_VCS=svn
2010-08-26 18:54:14 +02:00
elif hg tip >/dev/null 2>&1; then
2010-08-24 22:33:16 +02:00
SC_VCS=hg
elif cvs status -l >/dev/null 2>&1; then
SC_VCS=cvs
else
local remotes
remotes=$(git branch -r 2>/dev/null)
if [ ${?} -ne 127 -a ${?} -ne 128 ]; then
2010-08-26 00:08:21 +02:00
if echo "${remotes}" | grep git-svn >/dev/null 2>&1; then
SC_VCS=git-svn
else
SC_VCS=git
fi
else
die 'Unable to find any familiar repository type (are you inside the repo?).'
fi
fi
sayv "Ok, we're in the ${SC_VCS} working tree. Let's see what I can do around here..."
2010-07-12 14:59:56 +02:00
}
2010-07-13 17:15:51 +02:00
# Check whether a particular directory has been completely removed
# from the repo.
2010-07-12 14:59:56 +02:00
is_whole_dir_removed() {
if [ ${SC_VCS} = svn ]; then
[ "$(svn status --depth=empty -- "${1}" | wc -l)" = 1 ]
2010-07-12 14:59:56 +02:00
elif [ ${SC_VCS%-svn} = git ]; then
[ -z "$(git ls-files -c -- "${1}")" ]
2010-08-24 22:33:16 +02:00
elif [ ${SC_VCS} = hg ]; then
[ -z "$(hg status -madc "${1}")" ]
elif [ ${SC_VCS} = cvs ]; then
[ -z "$(cvs -Q status -R "${1}" 2>/dev/null | grep -e '^File:' | grep -v -e 'Status: Locally Removed$')" ]
fi
}
2010-07-12 13:27:39 +02:00
# Check whether we're having a clean package removal.
is_package_removal() {
local fields list
[ -d profiles ] && fields=1-2 || fields=1
if [ ${SC_VCS%-svn} = git ]; then
2010-07-12 14:59:56 +02:00
list=$(git diff-index --relative --name-only --diff-filter=D HEAD)
2010-08-24 22:33:16 +02:00
elif [ ${SC_VCS} = hg ]; then
list=$(hg status -nr .)
elif [ ${SC_VCS} = cvs ]; then
list=$(cvs -n -q up 2>/dev/null | sed -n -e 's/^R//p')
2010-07-12 14:59:56 +02:00
elif [ ${SC_VCS} = svn ]; then
list=$(svn status -q | sed -n -e 's/^D //p')
2010-07-12 13:27:39 +02:00
fi
2010-07-12 14:59:56 +02:00
list=$(echo "${list}" | cut -d / -f ${fields} | sort | uniq)
2010-07-12 13:27:39 +02:00
# 1) We have to have any removes.
[ -z "${list}" ] && return 1
# Few more checks.
local dir olist
for dir in ${list}; do
# 2) These removes have to remove whole directories.
is_whole_dir_removed ${dir} && array_append olist "${dir}"
2010-07-12 13:27:39 +02:00
done
[ -z "${olist}" ] && return 1
SC_CHANGE_LIST=${olist}
return 0
}
2010-07-13 17:15:51 +02:00
# Look around for ebuilds; determine the scenario we're working on.
find_ebuilds() {
# POSIX is fun -- look for ebuilds in the current directory.
if [ -n "$(find \( -name '*.ebuild' -print -o ! -name '.' -prune \))" ]; then
local stripped
# Get CATEGORY and PN.
stripped=${PWD%/*}
stripped=${stripped%/*}
SC_CP=${PWD#${stripped}/}
SC_SCENARIO=ebuild-commit
sayv "We found ebuilds for ${SC_CP} here."
2010-07-12 13:27:39 +02:00
elif is_package_removal; then
local cplist category pkg rootprefix
# We can either have the category on the list or in PWD.
if [ -d profiles ]; then
category=
else
local stripped
stripped=${PWD%/*}
category=${PWD#${stripped}/}/
fi
SC_CP=
SC_REMOVED_PACKAGE_LIST=
2010-07-12 13:27:39 +02:00
# Now we can have multiple packages around.
for pkg in ${SC_CHANGE_LIST}; do
if [ -z "${category}" ]; then
case ${pkg} in
eclass/*|licenses/*|local/*|profiles/*|scripts/*)
continue
;;
esac
fi
SC_CP=${SC_CP:+${SC_CP}, }${category}${pkg}
array_append SC_REMOVED_PACKAGE_LIST "${category}${pkg}"
2010-07-12 13:27:39 +02:00
done
SC_ROOT=${category:+../}
# Replace with the filtered version, placing all atoms
2010-09-26 10:37:29 +02:00
# relative to SC_ROOT.
SC_CHANGE_LIST=
for pkg in ${SC_REMOVED_PACKAGE_LIST}; do
array_append SC_CHANGE_LIST "${SC_ROOT}${pkg}"
done
local sdir
2010-07-12 13:27:39 +02:00
for sdir in eclass licenses profiles; do
check_for_changes ${SC_ROOT}${sdir} >/dev/null && SC_CHANGE_LIST="${SC_CHANGE_LIST} ${SC_ROOT}${sdir}"
2010-07-12 13:27:39 +02:00
done
SC_SCENARIO=package-removal
sayv "We're removing ${SC_CP}."
else
2010-07-12 13:27:39 +02:00
die 'No familiar scenario found.'
fi
}
2010-07-13 17:15:51 +02:00
# -- VCS helpers --
# Check whether a particular locations have changed, ignoring ChangeLog
# changes.
check_for_changes() {
local output
if [ ${SC_VCS%-svn} = git ]; then
output=$(git diff-index --name-only --relative HEAD -- "${@}")
2010-08-24 22:33:16 +02:00
elif [ ${SC_VCS} = hg ]; then
output=$(hg status -- ${1-.} "${@}")
2010-07-12 14:59:56 +02:00
elif [ ${SC_VCS} = svn ]; then
output=$(svn status -- "${@}")
elif [ ${SC_VCS} = cvs ]; then
# `U' indicates a remote, incomming update.
output=$(cvs -n -q update -R -- "${@}" 2>/dev/null | grep -v -e '^U')
fi
2010-07-12 13:27:39 +02:00
[ -z "${output}" ] && return 1
# We do not care about user mangling ChangeLog, we will reset it anyway.
echo "${output}" | grep -v ChangeLog >/dev/null
}
2010-07-13 17:15:51 +02:00
# Discard any changes to a particular set of files.
vcs_reset() {
if [ ${SC_VCS%-svn} = git ]; then
git checkout HEAD -- "${@}" 2>/dev/null || req rm -f -- "${@}"
2010-08-24 22:33:16 +02:00
elif [ ${SC_VCS} = hg ]; then
[ -n "$(hg status -au "${@}")" ] && req rm -f -- "${@}"
hg revert --no-backup -- "${@}" 2>/dev/null
2010-07-12 14:59:56 +02:00
elif [ ${SC_VCS} = svn ]; then
req rm -f -- "${@}"
svn revert -- "${@}" >/dev/null
elif [ ${SC_VCS} = cvs ]; then
# cvs update -C does exist, but it sometimes doesn't
# work.
req rm -f -- "${@}"
cvs update -- "${@}" >/dev/null 2>&1
fi
}
2010-07-13 17:15:51 +02:00
# Request VCS to provide a verbose status report.
vcs_status() {
if [ ${SC_VCS%-svn} = git ]; then
git status -s -- ${1-.} "${@}"
2010-08-24 22:33:16 +02:00
elif [ ${SC_VCS} = hg ]; then
hg status -- ${1-.} "${@}"
2010-07-12 14:59:56 +02:00
elif [ ${SC_VCS} = svn ]; then
svn status -- "${@}"
elif [ ${SC_VCS} = cvs ]; then
cvs -n -q up -- "${@}" 2>/dev/null | grep -v -e '^U'
2010-07-12 13:27:39 +02:00
fi
}
2010-07-13 17:15:51 +02:00
# Add particular files to the repository.
vcs_add() {
${SC_VCS%-svn} add -- "${@}"
}
2010-07-13 17:15:51 +02:00
# Commit the specified objects using the commit message provided
# as the first argument. Does not return.
2010-07-12 13:27:39 +02:00
vcs_commit() {
local msg
msg=${1}
shift
if [ ${SC_VCS%-svn} = git ]; then
exec git commit -m "${msg}" ${1+-o} -- "${@}"
2010-08-24 22:33:16 +02:00
elif [ ${SC_VCS} = hg ]; then
exec hg commit -m "${msg}" -- ${1-.} "${@}"
2010-07-12 14:59:56 +02:00
elif [ ${SC_VCS} = svn ]; then
exec svn commit -m "${msg}" -- "${@}"
elif [ ${SC_VCS} = cvs ]; then
exec cvs commit -m "${msg}" -- "${@}"
fi
}
2010-07-13 17:15:51 +02:00
# Call VCS to update the working copy to HEAD revision.
vcs_update() {
2010-08-24 22:33:16 +02:00
# Unlike svn, DVCSes don't push the changes to their origins immediately.
# That's why we don't force update to it right here.
2010-10-30 11:48:03 +02:00
if [ ${SC_VCS} = svn ]; then
svn up -- "${@}" || say "Warning: ${SC_VCS} up failed, trying to proceed anyway."
elif [ ${SC_VCS} = cvs ]; then
cvs up -d -P -- "${@}" || say "Warning: ${SC_VCS} up failed, trying to proceed anyway."
fi
}
2010-07-13 17:15:51 +02:00
# Print the help message.
print_help() {
cat <<_EOH_
Synopsis:
sunrise-commit [options] [--] <commit message>
Options:
-?, -h, --help print this message,
-V, --version print version string,
-c, --changelog backwards compat (ignored),
2010-07-12 11:27:40 +02:00
-C, --nocolor disable colorful output,
-d, --noupdate disable updating the repository,
2010-07-12 11:45:15 +02:00
-f, --force force repoman to proceed with the commit,
2010-07-13 12:26:14 +02:00
-m, --noformat do not prepend the commit message with package names,
-q, --quiet backwards compat (ignored),
-t, --trivial trivial changes (do not add a ChangeLog entry),
-v, --verbose enable verbose output.
_EOH_
}
2010-07-13 17:15:51 +02:00
# Request confirmation before committing. Abort if it is not granted.
2010-07-12 13:27:39 +02:00
confirm() {
while true; do
local answ
printf '\n%s' "${WHITE}Commit changes?${RESET} [${BGREEN}Yes${RESET}/${RED}No${RESET}] ${GREEN}" >&2
2010-07-12 13:27:39 +02:00
read answ
printf '%s' "${RESET}"
case "${answ}" in
[yY]|[yY][eE]|[yY][eE][sS])
break
;;
[nN]|[nN][oO])
die 'Aborting.'
;;
*)
say "Your response '${answ}' not understood, try again."
2010-07-12 13:27:39 +02:00
esac
done
}
# Guess what!
main() {
2010-07-13 12:26:14 +02:00
local commitmsg force monochrome noprepend noupdate trivial
unset SC_VERBOSE
2010-07-13 17:15:51 +02:00
# Command-line parsing.
while [ ${#} -gt 0 ]; do
case "${1}" in
2010-07-12 11:15:51 +02:00
--help|-\?|-h)
print_help
exit 0
;;
--version|-V)
2010-08-06 18:13:25 +02:00
echo 'sunrise-commit 0.3_pre1'
exit 0
;;
-c|--changelog)
# Now changelog entries are implicit -- backwards compat.
;;
2010-07-12 11:27:40 +02:00
-C|--nocolor)
monochrome=1
;;
-d|--noupdate)
noupdate=1
;;
2010-07-12 11:45:15 +02:00
-f|--force)
force=1
;;
2010-07-13 12:26:14 +02:00
-m|--noformat)
noprepend=
;;
-q|--quiet)
;;
-t|--trivial)
trivial=1
;;
-v|--verbose)
SC_VERBOSE=1
;;
--)
shift
array_append commitmsg "${@}"
break
;;
2010-07-12 13:47:50 +02:00
-*)
die "Unknown option: ${1}; see --help." >&2
;;
*)
array_append commitmsg "${1}"
;;
esac
shift
done
2010-07-13 17:15:51 +02:00
# Initialize colors.
2010-07-12 11:27:40 +02:00
if [ -n "${monochrome}" ]; then
RESET=
RED=
GREEN=
BGREEN=
YELLOW=
WHITE=
else
local esc
esc=$(printf '\033[')
RESET=${esc}0m
RED="${esc}1;31m"
GREEN=${esc}32m
BGREEN="${esc}1;32m"
YELLOW="${esc}1;33m"
WHITE="${esc}1;37m"
fi
[ -n "${commitmsg}" ] || die 'No commit message provided.'
2010-07-13 17:15:51 +02:00
# Look around.
find_repo
find_ebuilds
case ${SC_SCENARIO} in
2010-07-13 17:15:51 +02:00
# Committing changes within the ebuild directory.
# This includes committing new ebuilds.
ebuild-commit)
check_for_changes || die 'No changes found to commit.'
if [ -z "${noupdate}" ]; then
sayv "Updating the repository..."
vcs_update
fi
2010-08-24 22:33:16 +02:00
# With DVCS repos, we do not do ChangeLogs by default...
# ...at least unless they're already there.
2010-10-28 18:38:49 +02:00
if [ ${SC_VCS#git-} = svn -o ${SC_VCS} = cvs -o -f ChangeLog ]; then
sayv 'Cleaning up the ChangeLog...'
vcs_reset ChangeLog
local bns
# Let's take a lucky guess bugnumbers consist of 4+ digits.
2010-07-12 11:30:54 +02:00
bns=$(echo "${commitmsg}" | grep -o -E '[0-9]{4,}')
# Creating a new ChangeLog? Let's take a look at the commit message.
if [ ! -f ChangeLog ]; then
[ -n "${trivial}" ] && die "Trivial change for an initial commit? You're joking, right?"
# Sunrise-specific checks.
if [ "$(cat ../../profiles/repo_name 2>/dev/null)" = "sunrise" ]; then
[ -z "${bns}" ] && die 'Please supply the bug number in the initial commit message!'
if [ ! -f metadata.xml ]; then
req cp ../../skel.metadata.xml metadata.xml
# Output similar to echangelog.
diff -dup /dev/null metadata.xml
req vcs_add metadata.xml
fi
fi
fi
if [ -z "${trivial}" ]; then
sayv '...and appending to it.'
echangelog "${commitmsg}" || die 'Please correct the problems shown by echangelog.'
echo
fi
if [ -n "${bns}" ]; then
2010-07-12 11:27:40 +02:00
local bn cbn
for bn in ${bns}; do
2010-07-12 11:27:40 +02:00
cbn=#${WHITE}${bn}${NORMAL}
wget -q http://bugs.gentoo.org/show_bug.cgi?id=${bn} -O - | sed -n \
-e "s, *<title>Gentoo Bug \([0-9]*\) - \(.*\)</title>,Bug ${cbn}: ${BGREEN}\2${RESET},p" \
-e "s, *<title>Gentoo \(Invalid Bug ID\)</title>,Bug ${cbn}: ${YELLOW}!! \1${RESET},p"
done
echo
fi
fi
if [ ${SC_VCS} != cvs -o -n "${noupdate}" ]; then
vcs_status
fi
echo
2010-07-13 17:15:51 +02:00
# Since commit 32264c3, repoman supports '--ask' option,
# which requests user confirmation before the commit.
# We like that, because it does it in the right place.
#
# If user is using earlier repoman version, we need to
# request that confirmation ourselves. As we would like
# the user to see 'repoman full' results first, we need
# to call it ourselves. Moreover, it requires Manifest to be
# up-to-date, so we need to call 'repoman manifest' too.
#
# That's pretty sad, because it means we're wasting time
# calling the same repoman functions twice (once manually,
# then within 'repoman commit'). That's why we would be
# happy if user updated his/her Portage, and we'd like to
# encourage him/her to do so -- but we'll have to delay that
# until a new Portage version is released.
local old_repoman
repoman --version -a >/dev/null 2>&1
if [ ${?} -eq 2 ]; then
old_repoman=
#say "${GREEN}Please consider updating portage to newer version.${RESET}"
#say
req repoman manifest
if ! repoman full; then
[ -n "${force}" ] || die 'Please correct the problems shown by repoman.'
fi
2010-07-12 13:27:39 +02:00
confirm
fi
# In CVS, we don't prepend the package name to the commit message.
[ ${SC_VCS} = cvs ] && noprepend=
sayv "Now, let's let repoman do its job..."
2010-07-13 12:26:14 +02:00
exec repoman commit ${old_repoman--a} ${force+-f} -m "${noprepend-${SC_CP}: }${commitmsg}"
;;
2010-07-13 17:15:51 +02:00
# Clean removal of a package set.
2010-07-12 13:27:39 +02:00
package-removal)
vcs_status ${SC_CHANGE_LIST}
echo
local pkg regex
regex=
for pkg in ${SC_REMOVED_PACKAGE_LIST}; do
regex=${regex:+${regex}\|}${pkg}
done
say "${GREEN}Grepping for package references...${RESET}"
# -n is for line numbers, -C would be non-POSIX
if grep -n "${regex}" ${SC_ROOT}*/*/*.ebuild ${SC_ROOT}*/*/metadata.xml ${SC_ROOT}profiles/package.mask 2>/dev/null; then
echo
[ -n "${force}" ] || die 'Please remove the removed package references or use --force.'
else
echo
fi
say "Ready to commit ${WHITE}$(echo ${SC_REMOVED_PACKAGE_LIST} | wc -w)${RESET} package removal(s), with commit message:"
2010-07-12 13:27:39 +02:00
say "${BGREEN}${SC_CP}: ${commitmsg}${RESET}"
confirm
if [ -z "${noupdate}" ]; then
sayv "Updating the repository..."
vcs_update ${SC_CHANGE_LIST}
fi
2010-07-13 12:26:14 +02:00
vcs_commit "${noprepend-${SC_CP}: }${commitmsg}" ${SC_CHANGE_LIST}
2010-07-12 13:27:39 +02:00
;;
esac
}
main "${@}"