SVN: support svn:log revision property changes

Add rudimentary support for svn:log revprop changes to permit SCI to
keep repositories current when you have developers that don't always get
commit messages right first time. Doesn't deal with reopening
"accidentally closed" issues.

Fixes #305

Author: pantsmanuk

SourceSVN/SourceSVN.php

@@ -253,16 +253,21 @@ public function update_config() {
 	public function commit( $p_repo, $p_data ) {
 		if ( preg_match( '/(\d+)/', $p_data, $p_matches ) ) {
 
+			# Detect if there is a svn:log revprop change, assume not
+			$t_revprop = gpc_get_bool( 'revprop', false );
+
 			$t_url = $p_repo->url;
 			$t_revision = $p_matches[1];
 			$t_svnlog_xml = $this->svn_run( "log -v $t_url -r$t_revision --xml", $p_repo );
 
-			if ( SourceChangeset::exists( $p_repo->id, $t_revision ) ) {
-				echo "Revision $t_revision already committed!\n";
-				return null;
+			if ( !$t_revprop ) {
+				if ( SourceChangeset::exists( $p_repo->id, $t_revision ) ) {
+					echo sprintf( plugin_lang_get( 'revision_already_committed' ), $t_revision );
+					return null;
+				}
 			}
 
-			return $this->process_svn_log_xml( $p_repo, $t_svnlog_xml );
+			return $this->process_svn_log_xml( $p_repo, $t_svnlog_xml, $t_revprop );
 		}
 	}
 
@@ -441,9 +446,10 @@ public static function svn_binary( $p_path=null, $p_reset=false ) {
 	 * Parse the svn log output (with --xml option)
 	 * @param SourceRepo SVN repository object
 	 * @param string SVN log (XML formated)
+	 * @param boolean REVPROP change flag
 	 * @return SourceChangeset[] Changesets for the provided input (empty on error)
 	 */
-	private function process_svn_log_xml( $p_repo, $p_svnlog_xml ) {
+	private function process_svn_log_xml( $p_repo, $p_svnlog_xml, $p_revprop = false ) {
 		$t_changesets = array();
 		$t_changeset = null;
 		$t_comments = '';
@@ -530,6 +536,18 @@ private function process_svn_log_xml( $p_repo, $p_svnlog_xml ) {
 			// Save changeset and append to array
 			if( !is_null( $t_changeset) ) {
 				if( !is_blank( $t_changeset->branch ) ) {
+					if( $p_revprop ) {
+						echo plugin_lang_get( 'revprop_detected' );
+						$t_existing_changeset = SourceChangeset::load_by_revision( $p_repo, $t_changeset->revision );
+						$t_changeset->id = $t_existing_changeset->id;
+						$t_changeset->user_id = $t_existing_changeset->user_id;
+						$t_changeset->files = $t_existing_changeset->files;
+						$t_old_bugs = array_unique( Source_Parse_Buglinks( $t_existing_changeset->message ));
+						$t_new_bugs = array_unique( Source_Parse_Buglinks( $t_changeset->message ));
+						if( count( $t_old_bugs ) >= count( $t_new_bugs )) {
+							$t_changeset->__bugs = array_diff( $t_old_bugs, $t_new_bugs );
+						}
+					}
 					$t_changeset->save();
 					$t_changesets[] = $t_changeset;
 				}

SourceSVN/lang/strings_english.txt

@@ -26,3 +26,6 @@ $s_plugin_SourceSVN_winstart = 'SVN: Use Windows `start`<br/><span class="small"
 $s_plugin_SourceSVN_error_path_invalid = 'Path to Subversion binary is invalid, inaccessible or not a directory.';
 $s_plugin_SourceSVN_error_svn_run = 'Failed to execute Subversion.';
 $s_plugin_SourceSVN_error_svn_cmd = 'Subversion execution returned an error: "%1$s".';
+
+$s_plugin_SourceSVN_revision_already_committed = 'Revision %s already committed!';
+$s_plugin_SourceSVN_revprop_detected = '  SVN:LOG revision property change detected.';

SourceSVN/post-revprop-change.tmpl

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Copyright (c) 2014 GGP Systems Limited
+# Licensed under the BSD (3-clause) license
+
+REPOS="$1"
+REV="$2"
+PROP="$4"
+
+if [ "$PROP" = 'svn:log' ]; then
+	URL="http://localhost/mantisbt/plugin.php?page=Source/checkin"
+	PROJECT="Repository Name"
+	API_KEY="xxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+	LOG_FILE=`mktemp /tmp/svn_${PROJECT}_${REV}_log.XXX`
+
+	CURL=/usr/bin/curl
+
+	${CURL} -d "repo_name=${PROJECT}" -d "data=${REV}" -d "revprop=TRUE" -d "api_key=${API_KEY}" ${URL} >> ${LOG_FILE}
+fi

docs/CHANGELOG.md

@@ -18,6 +18,7 @@ Includes all changes and fixes from [1.6.0](#160---2019-01-31).
 
 - GitHub: Use AJAX to automate Webhook creation
   [#302](https://github.com/mantisbt-plugins/source-integration/pull/302)
+- SVN: support SVN:Log revision property changes
 
 ### Changed