* Adds a new document type for conflict reviews, with a ballot for the IESG 5742 response to a review request
* Integrated the new document type into the iESG agenda views (including RSS feeds)* Removed the Edit and Add buttons from the document main view.
* Replaced Add with actions appropriate for the document type, such as "Begin IESG Processing" or "Begin IETF Conflict Review", and made most data directly editable on the document's main page, depending on access permissions.
* Removed a manual editing step that the secretariat had to perform when sending conflict review messages. The view now composes the message correctly given the stream.
* Added a pencil icon motif to differentiate fields that are editable.
* Generalized several views and helper functions to use Document instead of (e.g.) IdWrapper
* Generalized reading documents from the repository
* Added a way to get from IdWrapper to the underlying Document to facilitate migrating way from the Wrapper classes* Added many helpers to Document to assist with migrating off IdWrapper
* Minor fixes and other changes
* Fixes to document main view to avoid (silent) template failures.
* Began removing some of the code that is no longer reachable post-migration * Corrected the behavior of the undefer code and added test cases for it
* Improved initial population of notification lists and added the ability to regenerate the initial list
* Made the test code that scans for template coverage more robust
* Deployment notes:
* new setting: CONFLICT_REVIEW_PATH. The associated directory will need to be created
This branch fixes bugs #805, #744 and #812
- Legacy-Id: 4652
Note: SVN reference [4600] has been migrated to Git commit 798e7a50e7
238 lines
7.5 KiB
Bash
Executable file
238 lines
7.5 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
version=0.10
|
|
program=${0##*/}
|
|
progdir=${0%/*}
|
|
if [ "$progdir" = "$program" ]; then progdir="."; fi
|
|
|
|
# ----------------------------------------------------------------------
|
|
function usage() {
|
|
cat <<EOF
|
|
NAME
|
|
$program - Make a release
|
|
|
|
SYNOPSIS
|
|
$program [OPTIONS] VERSION
|
|
|
|
DESCRIPTION
|
|
|
|
Do the sequence of actions necessary to properly produce a release
|
|
branch. This includes updating the project version and committing that
|
|
to the repository, creating a release tag and a release branch if
|
|
needed, and updating the project version again to indicate that any
|
|
further commits are development work. Requires 1 argument: the VERSION
|
|
number (e.g., 1.23).
|
|
|
|
The script uses svn info to retrieve information about the repository
|
|
and path of the current directory, and inspects that to determine
|
|
exactly what to do. If the current path relative to the repository root
|
|
starts with 'trunk', then a new branch is created named
|
|
branch/\$VERSION. If the current path starts with something else
|
|
than 'trunk', it is assumed to be a working branch, and no new branch is
|
|
created. In either case, a copy of the current working copy is created
|
|
in tags/\$VERSION.
|
|
|
|
EOF
|
|
echo -e "OPTIONS"
|
|
if [ "$(uname)" = "Linux" ]; then
|
|
egrep "^[ ]+[-][A-Za-z| -]+\*?\)[ ]+[A-Za-z].+#" $0 | tr -s "\t|" "\t," | sed -r -e 's/\)[ \t]+([A-Z]+)=\$2[^#]*#/=\\1\t/' -e 's/\)[^#]*#/\t/'
|
|
else
|
|
egrep "^[ ]+[-][A-Za-z| -]+\*?\)[ ]+[A-Za-z].+#" $0 | sed 's/\|.*\$2[^#]*#/ /'| sed -E 's/\|.*\)[^#]*#/ /'
|
|
fi
|
|
cat <<EOF
|
|
|
|
AUTHOR
|
|
Written by Henrik Levkowetz, <henrik@levkowetz.com>
|
|
|
|
COPYRIGHT
|
|
Copyright 2007 The IETF Trust.
|
|
|
|
EOF
|
|
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
function die() {
|
|
echo -e "\n$program: error: $*" > /dev/stderr
|
|
exit 1
|
|
}
|
|
|
|
function note() {
|
|
if [ -n "$VERBOSE" ]; then echo -e "$*"; fi
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
function version() {
|
|
echo -e "$program $version"
|
|
}
|
|
|
|
# ----------------------------------------------------------------------
|
|
trap 'echo "$program($LINENO): Command failed with error code $? ([$$] $0 $*)"; exit 1' ERR
|
|
|
|
|
|
# ----------------------------------------------------------------------
|
|
# Option parsing
|
|
|
|
# Options
|
|
shortopts=hnvV
|
|
longopts=help,dry-run,verbose,version
|
|
|
|
# Default values
|
|
MSG=""
|
|
VERFILE=ietf/__init__.py
|
|
SETTINGS=ietf/settings.py
|
|
do=""
|
|
|
|
if [ "$(uname)" = "Linux" ]; then
|
|
args=$(getopt -o "$shortopts" --long "$longopts" -n '$program' -- $SV "$@")
|
|
if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
|
|
eval set -- "$args"
|
|
sed="sed -r"
|
|
else
|
|
# Darwin, BSDs
|
|
args=$(getopt -o$shortopts $SV $*)
|
|
if [ $? != 0 ] ; then die "Terminating..." >&2 ; exit 1 ; fi
|
|
set -- $args
|
|
sed="sed -E"
|
|
fi
|
|
|
|
while true ; do
|
|
case "$1" in
|
|
-h| --help) usage; exit;; # Show this help, then exit
|
|
-m| --message) MSG=$2; shift;; # Specify a commit message
|
|
-n| --dry-run) do="echo";; # Show what would be done
|
|
-v| --verbose) VERBOSE=1;; # Be more talkative
|
|
-V| --version) version; exit;; # Show program version, then exit
|
|
--) shift; break;;
|
|
*) die "Internal error, inconsistent option specification: '$1'";;
|
|
esac
|
|
shift
|
|
done
|
|
|
|
# ----------------------------------------------------------------------
|
|
# The program itself
|
|
|
|
ARGMIN=1
|
|
|
|
if [ $# -lt $ARGMIN ]; then
|
|
usage
|
|
die "$# arguments found, $ARGMIN required"
|
|
fi
|
|
|
|
VER=$1
|
|
|
|
REPO=$(svn info | grep "^Repository Root:" | awk '{ print $3 }')
|
|
RURL=$(svn info | grep "^URL:" | awk '{ print $2 }')
|
|
RDIR=${RURL#$REPO}
|
|
DIR=${RDIR#/}
|
|
if [ -z "$DIR" ]; then
|
|
die "Couldn't find anything to release here"
|
|
elif [ "${DIR%%/*}" = "trunk" ]; then
|
|
SRC="trunk"
|
|
elif [ "${DIR%%/*}" = "branch" ]; then
|
|
tmp=${DIR#*/} # get rid of 'branch/'
|
|
SRC="branch/${tmp%%/*}" # keep first subdir under branch/
|
|
fi
|
|
|
|
note ""
|
|
note "Releasing from $SRC"
|
|
|
|
note "Locating the root of the working copy..."
|
|
while [ "${#DIR}" -gt "${#SRC}" ]; do
|
|
[ "$DIR" = "$prev" ] && die "Internal error"
|
|
cd ..
|
|
#note " now at $PWD"
|
|
prev=$DIR
|
|
DIR=${DIR%/*}
|
|
done
|
|
if [ "$DIR" != "$SRC" ]; then
|
|
die "Couldn't find the root of your '$SRC' working copy"
|
|
fi
|
|
note " $DIR"
|
|
|
|
REPO=${REPO%/} # remove trailing slash
|
|
SRC=${SRC#/} # remove leading slash
|
|
|
|
MAJOR=${VER%.*}
|
|
MINOR=${VER#*.}
|
|
MINOR=${MINOR##0}
|
|
VER="$(printf %d.%02d $MAJOR $MINOR)"
|
|
NEXT=$(( $MINOR + 1 ))
|
|
DEV="$(printf %d.%02d-dev $MAJOR $NEXT)"
|
|
|
|
|
|
note "Checking that changelog information is available"
|
|
changes=$( sed -n "/^ietfdb ($VER.*)/,/^ -- /p" changelog | awk '{ if (line) print line ; line=$0 }' )
|
|
[ "$changes" ] || die "No changelog information for $VER found"
|
|
note "$changes"
|
|
|
|
contributors=$(echo "$changes" | sed 's/\.[ \t\n]/ /'| tr -c "a-z0-9.@-" "\n" | sort | uniq | grep '@' | sed -r -e 's/^\.+//' -e 's/\.+$//' -e 's/^/-c /' || true)
|
|
|
|
note "Set the current time on the release notes in the changelog file"
|
|
sed -r -i -e "1,/^ -- /s/([A-Za-z-]+ <[a-z0-9.-]+@[a-z0-9.-]+> ).*$/\1$(date +'%d %b %Y %H:%M:%S %z')/" changelog
|
|
note " $(grep -m1 "^ -- " changelog)"
|
|
|
|
note "Verifying that version $VER doesn't already exist..."
|
|
$do svn info $REPO/tags/$VER 2>&1 | $do grep -q "Not a valid URL" || die "The tag '$VER' already exists (or there was an error testing for it)."
|
|
note " Ok"
|
|
|
|
note "Committing the changelog..."
|
|
$do svn commit changelog -m "Changelog entry for $VER"
|
|
|
|
note "Verifying there's no uncommitted changes..."
|
|
$do svn st | grep "^[AMGRD] " && die "There seems to be uncommitted changes in this working copy"
|
|
|
|
note "\nUpdating the version info in $VERFILE and making sure'\$Rev\$' is Ok"
|
|
$do sed -i -r -e "/^__version__/s/\"[.0-9]+(-dev)?\"/\"$VER\"/" \
|
|
-e "/^__rev__/s/\".*\"/\"\$Rev:\$\"/" \
|
|
$VERFILE
|
|
|
|
note "\nUpdating the deployment settings in settings.py"
|
|
$do sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = False/' \
|
|
-e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'production'/" \
|
|
$SETTINGS
|
|
|
|
note "\nCommitting version information for version $VER: $MSG"
|
|
$do svn commit $VERFILE $SETTINGS -m "Set version info to release version $VER before branching. $MSG"
|
|
|
|
note "\nCreating new tag 'tags/$VER' from $SRC"
|
|
$do svn cp $REPO/$SRC $REPO/tags/$VER -m "Creating new tag 'tags/$VER' from $SRC"
|
|
|
|
note "\nUpdating version and revision info to indicate that the source and branch aren't releases"
|
|
$do sed -i -r -e "/^__version__/s/\"[0-9.]*\"/\"$DEV\"/" \
|
|
-e "/^__rev__/s/\"\\\$Rev: (.*) \\\$\"/\"\$Rev:\$ (dev) Latest release: Rev. \1 \"/" \
|
|
$VERFILE
|
|
|
|
note "\nUpdating the deployment settings in settings.py to development mode"
|
|
$do sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = True/' \
|
|
-e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'development'/" \
|
|
$SETTINGS
|
|
|
|
note "\nCommitting the updated version and deployment settings"
|
|
$do svn commit $VERFILE $SETTINGS -m "Set version info and settings back to development mode"
|
|
|
|
$do svn update
|
|
|
|
echo "
|
|
Hi,
|
|
|
|
This is an automatic notification about a new datatracker release,
|
|
v$VER, generated when running the mkrelease script.
|
|
|
|
Release notes:
|
|
|
|
$changes
|
|
|
|
The new version is available through SVN checkout, with
|
|
'svn checkout http://svn.tools.ietf.org/svn/tools/ietfdb/tags/$VER'
|
|
|
|
Regards,
|
|
|
|
Henrik
|
|
(via the mkrelease script)
|
|
" > ~/src/db/release-mail-v$VER.txt
|
|
cat ~/src/db/release-mail-v$VER.txt | $do mail -s "New datatracker release: v$VER" -c henrik@levkowetz.com -c glen@amsl.com -c fenner@fenron.net -c rjs@nostrum.com -c housley@vigilsec.com -c cmorgan@amsl.com -c avezza@amsl.com -c amorris@amsl.com -c smccammon@amsl.com -c kmoreland@amsl.com -c stevey@amsl.com -c olau@iola.dk $contributors codesprints@ietf.org
|
|
|
|
$do toolsfeed control changelog /www/tools.ietf.org/tools/atomfeed.xml
|
|
$do toolpush /www/tools.ietf.org/tools/atomfeed.xml
|