Adding back support for cherry-picking patches before release

... except I change it to Gerrit changeset numbers.

release.php

@@ -14,9 +14,9 @@ define('CLI', 1);
 #
 
 if (count($argv) < 3) {
-    echo "Usage is ${argv[0]} [version] [branch] [<patchfile>...]";
-    echo "e.g. ${argv[0]} 16.04.3 16.04_STABLE";
-    echo "e.g. ${argv[0]} 15.10.1 15.10_STABLE";
+    echo "Usage is ${argv[0]} [version] [branch] [<changesetnumber>...]\n";
+    echo "e.g. ${argv[0]} 16.04.3 16.04_STABLE\n";
+    echo "e.g. ${argv[0]} 15.10.1 15.10_STABLE 5793 5795\n";
     exit(1);
 }
 
@@ -114,6 +114,36 @@ passthru("git fetch -q mahara");
 passthru("git checkout -b ${BRANCH} mahara/${BRANCH}");
 passthru("git fetch -q -t");
 
+
+// Applying gerrit patches named on the command line
+if (count($argv) > 3) {
+    $successwithpatches = true;
+    for ($i = 3; $i < count($argv); $i++) {
+        $patchno = $argv[$i];
+        $refline = shell_exec("ssh reviews.mahara.org -p 29418 gerrit query --current-patch-set --format=TEXT change:'{$patchno}'| grep ref");
+        if ($refline) {
+            $result = preg_match('#ref: (refs/changes/[/0-9]+)#', $refline, $matches);
+            if ($result) {
+                $return_var = passthru("git fetch ssh://reviews.mahara.org:29418/mahara {$matches[1]} && git cherry-pick FETCH_HEAD");
+                if ($return_var != 0) {
+                    echo "Couldn't cherry-pick Gerrit change number {$patchno}.\n";
+                    $successwithpatches = false;
+                }
+            }
+            else {
+                echo "Couldn't find latest patch number for Gerrit change number {$patchno}.\n";
+                $succesoverall = false;
+            }
+        } else {
+            echo "Couldn't retrieve information about Gerrit change number {$patchno}.\n";
+            $successwithpatches = false;
+        }
+    }
+    if (!$successwithpatches) {
+        exit();
+    }
+}
+
 # Edit ChangeLog
 if (!file_exists("ChangeLog")) {
     echo "The ChangeLog file is missing and this is a stable release. Create an empty file called ChangeLog and commit it.";

release.sh

+#!/bin/bash
+#
+# Builds release tarballs of Mahara at the given version, ready for
+# distribution
+#
+# If you're doing a release which has security fixes, add the names
+# of the patches to the end of the command line, and the script will
+# apply the patches before committing the version bumps and editing
+# the changelog.
+#
+set -e
+
+
+print_usage() {
+    echo "Usage is $0 [version] [branch] [<patchfile>...]"
+    echo "e.g. $0 1.3.5 1.3_STABLE ~/patches/0001-Add-foo-to-bar.patch ~/patches/0002-Fix-big-security-hole.patch"
+    echo "e.g. $0 1.2.8 1.2_STABLE"
+    echo "Patches should be created with git format-patch"
+}
+
+if [ $# -lt 2 ]; then
+    print_usage
+    exit 1
+fi
+
+# Check for git gpg lp-project-upload
+
+if [ ! -x /usr/bin/gpg ] ; then
+  echo "You need to install gpg: apt-get install gnupg"
+  exit 1
+fi
+
+if [ ! -x /usr/bin/git ] ; then
+  echo "You need to install git: apt-get install git-core"
+  exit 1
+fi
+
+if [ ! -x /usr/bin/lp-project-upload ] ; then
+  echo "You need to install lp-project-upload: apt-get install ubuntu-dev-tools (maverick or earlier) or lptools"
+  exit 1
+fi
+
+if [ ! -x /usr/bin/m4 ] ; then
+  echo "You need to install m4: apt-get install m4"
+  exit 1
+fi
+
+GIT_MAJOR=`git --version | cut -d' ' -f 3 | cut -d'.' -f 1`
+GIT_MINOR=`git --version | cut -d' ' -f 3 | cut -d'.' -f 2`
+
+if [ $GIT_MAJOR -lt 1 ] || [ $GIT_MAJOR == 1 -a $GIT_MINOR -lt 6 ] ; then
+  echo "Your version of git is too old. Install git 1.6."
+  exit 1
+fi
+
+# Check all parameters
+
+VERSION=$1
+
+MAJOR=${VERSION%.*}
+REST=${VERSION##*.}
+MINOR=${REST%%[a-z]*}
+MICRO=`echo ${REST} | sed 's/^[0-9]*//g'`
+MICROA=`echo ${MICRO} | sed 's/[^a-z]//g'`
+MICROB=`echo ${MICRO} | sed 's/[a-z]//g'`
+
+BRANCH=$2
+
+drafts=$(ssh $USER@reviews.mahara.org -p 29418 gerrit query is:draft branch:$BRANCH project:mahara "label:Code-Review>=0" "label:Verified>=0" | while read line
+do
+    if [[ "$line" =~ rowCount:.*([0-9]) ]]; then
+        if [[ "${BASH_REMATCH[1]}" != "0" ]]; then
+            echo "1" # we have some draft patches that match
+        fi
+    fi
+done)
+if [[ "$drafts" == "1" ]]; then
+    read -r -p "There are Draft patches that may need to be merged. Do you want to continue with release [y/n]?" response
+    response=${response,,} #to lower
+    if [[ $response =~ ^(yes|y)$ ]]; then
+        echo "Continuing..."
+    else
+        echo "Quitting out"
+        exit 1;
+    fi
+fi
+
+BUILDDIR=`mktemp -d /tmp/mahara.XXXXX`
+CURRENTDIR="`pwd`"
+SCRIPTDIR=$( readlink -f -- "${0%/*}" )
+
+if [ -z "${MAJOR}" ] || [ -z "${MINOR}" ]; then
+    print_usage
+    exit 1
+fi
+
+if [ ! -z "${MICRO}" ] && [ "${BRANCH}" != 'master' ]; then
+    echo "* Micro version is ${MICRO} and this is a stable branch. Stuff may be wrong. *"
+fi
+
+mkdir -p ${BUILDDIR}/mahara
+pushd ${BUILDDIR}/mahara
+
+
+
+# Main Mahara repo to pull from
+#PUBLIC="git@git.mahara.org:mahara/mahara.git"
+PUBLIC="git@github.com:MaharaProject/mahara.git"
+
+echo "Cloning public repository ${PUBLIC} in ${BUILDDIR}/mahara"
+git init
+git remote add -t ${BRANCH} mahara ${PUBLIC}
+git fetch mahara
+git checkout -b ${BRANCH} mahara/${BRANCH}
+git fetch -t
+
+# Apply patch files named on command line
+patch=3
+while [ $patch -le $# ]; do
+    git am ${!patch}
+    patch=$((patch+1))
+done
+
+# Edit ChangeLog
+if [ -z "${MICRO}" ] && [ ! -f "ChangeLog" ]; then
+    echo "The ChangeLog file is missing and this is a stable release. Create an empty file called ChangeLog and commit it."
+    exit 1
+fi
+
+RELEASE="${MAJOR}.${MINOR}${MICRO}"
+
+echo -e "#\n# Please add a description of the major changes in this release, one per line.\n# Don't put a dash or asterisk at the front of each line, they'll get added automatically.\n# Also, don't leave any blank lines at the bottom of this file.\n#\n" > ${CURRENTDIR}/ChangeLog.temp
+sensible-editor ${CURRENTDIR}/ChangeLog.temp
+grep -v "^#" ${CURRENTDIR}/ChangeLog.temp > ${CURRENTDIR}/changes.temp
+
+if [ -f "ChangeLog" ]; then
+    cp ChangeLog ChangeLog.back
+    echo "$RELEASE (`date +%Y-%m-%d`)" > ChangeLog
+    sed 's/^/- /g' ${CURRENTDIR}/changes.temp >> ChangeLog
+    echo >> ChangeLog
+    cat ChangeLog.back >> ChangeLog
+    git add ChangeLog
+fi
+
+
+
+
+# Add a version bump commit for the release
+
+VERSIONFILE=htdocs/lib/version.php
+
+# If there's no 'micro' part of the version number, assume it's a stable release, and
+# bump version by 1.  If it's an unstable release, use 
+if [ -z "${MICRO}" ] || [ "${BRANCH}" != 'master' ]; then
+    OLDVERSION=$(perl -n -e 'print if s/^\$config->version = (\d{10}).*/$1/' < ${VERSIONFILE})
+    NEWVERSION=$(( ${OLDVERSION} + 1 ))
+else
+    NEWVERSION=`date +%Y%m%d`00
+fi
+
+sed "s/\$config->version = [0-9]\{10\};/\$config->version = $NEWVERSION;/" ${VERSIONFILE} > ${VERSIONFILE}.temp
+sed "s/\$config->release = .*/\$config->release = '$RELEASE';/" ${VERSIONFILE}.temp > ${VERSIONFILE}
+
+echo
+git add ${VERSIONFILE}
+git commit -s -m "Version bump for $RELEASE"
+
+
+
+# Tag the version bump commit
+LASTTAG=`git describe --abbrev=0`
+RELEASETAG="`echo $RELEASE | tr '[:lower:]' '[:upper:]'`_RELEASE"
+echo -e "\nTag new version bump commit as '$RELEASETAG'"
+git tag -s ${RELEASETAG} -m "$RELEASE release"
+
+
+# Update the .gitattributes to ignore tests directories
+# First get the location for all phpunit directories
+phpunitdirs=`find ./ -type d -name 'phpunit' | grep 'tests/phpunit' | sed "s_./__"`
+
+for dir in $phpunitdirs
+do
+  parentdir=`dirname "$dir"`
+  # Determine whether the parent directory contains anything other than
+  # phpunit. If not, ignore the whole parent directory.
+  siblings=`find "$parentdir" -maxdepth 1 -mindepth 1 | wc -l`
+  if [ "$siblings" = "1" ]
+  then
+    echo "$parentdir export-ignore" >> .gitattributes
+  else
+    echo "$dir export-ignore" >> .gitattributes
+  fi
+done
+
+# Create tarballs
+
+echo "Creating mahara-${RELEASE}.tar.gz"
+git archive --worktree-attributes --format=tar --prefix=mahara-${VERSION}/ ${RELEASETAG} | gzip -9 > ${CURRENTDIR}/mahara-${RELEASE}.tar.gz
+echo "Creating mahara-${RELEASE}.tar.bz2"
+git archive --worktree-attributes --format=tar --prefix=mahara-${VERSION}/ ${RELEASETAG} | bzip2 -9 > ${CURRENTDIR}/mahara-${RELEASE}.tar.bz2
+echo "Creating mahara-${RELEASE}.zip"
+git archive --worktree-attributes --format=zip --prefix=mahara-${VERSION}/ -9 ${RELEASETAG} > ${CURRENTDIR}/mahara-${RELEASE}.zip
+
+
+
+# Save git changelog
+if [ -n "${LASTTAG}" ] ; then
+    echo "Getting changelog from previous tag ${LASTTAG}"
+    git log --pretty=format:"%s" --no-color --no-merges ${LASTTAG}..${RELEASETAG} > ${CURRENTDIR}/${RELEASETAG}.cl
+else
+    git log --pretty=format:"%s" --no-color --no-merges ${RELEASETAG} > ${CURRENTDIR}/${RELEASETAG}.cl
+fi
+OLDRELEASE=${LASTTAG%_RELEASE}
+
+
+
+# Prepare eduforge release notes
+
+TMP_M4_FILE=/tmp/mahara-releasnotes.m4.tmp
+echo "changecom" > $TMP_M4_FILE
+echo "define(\`__RELEASE__',\`${RELEASE}')dnl" >> $TMP_M4_FILE
+echo "define(\`__OLDRELEASE__',\`${OLDRELEASE}')dnl" >> $TMP_M4_FILE
+echo "define(\`__MAJOR__',\`${MAJOR}')dnl" >> $TMP_M4_FILE
+sed 's/^/ * /g' ${CURRENTDIR}/changes.temp >> ${CURRENTDIR}/changes.eduforge.temp
+echo "define(\`__CHANGES__',\`include(\`${CURRENTDIR}/changes.eduforge.temp')')dnl" >> $TMP_M4_FILE
+
+if [ -z "${MICRO}" ]; then
+    TEMPLATE=releasenotes.stable.template
+else
+    TEMPLATE=releasenotes.${MICROA}.template
+fi
+
+m4 ${TMP_M4_FILE} ${SCRIPTDIR}/${TEMPLATE} > ${CURRENTDIR}/releasenotes-${RELEASE}.txt
+
+
+
+# Second version bump for post-release
+
+NEWVERSION=$(( ${NEWVERSION} + 1 ))
+if [ -z "${MICRO}" ]; then
+    NEWRELEASE="${MAJOR}.$(( ${MINOR} + 1 ))testing"
+else
+    NEWRELEASE="${MAJOR}.${MINOR}${MICROA}$(( ${MICROB} + 1 ))dev"
+fi
+
+sed "s/\$config->version = [0-9]\{10\};/\$config->version = $NEWVERSION;/" ${VERSIONFILE} > ${VERSIONFILE}.temp
+sed "s/\$config->release = .*/\$config->release = '$NEWRELEASE';/" ${VERSIONFILE}.temp > ${VERSIONFILE}
+
+git add ${VERSIONFILE}
+git commit -s -m "Version bump for $NEWRELEASE"
+
+
+
+# Add gerrit repo, for pushing the new security patches, version bump & changelog commits
+GERRIT="ssh://reviews.mahara.org:29418/mahara"
+git remote add gerrit ${GERRIT}
+
+
+# Output commands to push to the remote repository and clean up
+
+CLEANUPSCRIPT=release-${RELEASE}-cleanup.sh
+echo "#!/bin/sh" > ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+echo "set -e" > ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+echo "cd ${BUILDDIR}/mahara" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "git push gerrit ${BRANCH}:refs/heads/${BRANCH}" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "git push gerrit ${RELEASETAG}:refs/tags/${RELEASETAG}" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+echo "gpg --armor --sign --detach-sig ${CURRENTDIR}/mahara-${RELEASE}.tar.gz" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "gpg --armor --sign --detach-sig ${CURRENTDIR}/mahara-${RELEASE}.tar.bz2" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "gpg --armor --sign --detach-sig ${CURRENTDIR}/mahara-${RELEASE}.zip" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+echo "cd ${CURRENTDIR}" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "lp-project-upload mahara ${RELEASE} mahara-${RELEASE}.tar.gz" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "lp-project-upload mahara ${RELEASE} mahara-${RELEASE}.tar.bz2" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "lp-project-upload mahara ${RELEASE} mahara-${RELEASE}.zip" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+echo "echo" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "echo \"All done. Once you've checked that the files were uploaded successfully, run this:\"" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+echo "echo \"  rm -rf ${BUILDDIR}\"" >> ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+chmod 700 ${CURRENTDIR}/${CLEANUPSCRIPT}
+
+
+
+# Clean up
+
+rm ${VERSIONFILE}.temp
+rm ${CURRENTDIR}/ChangeLog.temp
+rm ${CURRENTDIR}/changes.temp
+rm ${CURRENTDIR}/changes.eduforge.temp
+rm ${TMP_M4_FILE}
+
+
+
+
+echo -e "\n\nTarballs, release notes & changelog for Launchpad:\n"
+cd ${CURRENTDIR}
+ls -l mahara-${RELEASE}.tar.gz mahara-${RELEASE}.tar.bz2 mahara-${RELEASE}.zip releasenotes-${RELEASE}.txt ${RELEASETAG}.cl
+
+echo -e "\n1. Check that everything is in order in the ${BUILDDIR}/mahara repository."
+echo -e "\n2. Create the release on launchpad at https://launchpad.net/mahara/+milestone/${RELEASE}"
+echo -e "\n3. Run the commands in ${CLEANUPSCRIPT} to push the changes back to the remote repository and upload the tarballs."