- make cvs/svn code look alike for easier comparing them

Author: glensc

scm/eventum-cvs-hook

@@ -25,6 +25,7 @@
 // | Boston, MA 02111-1307, USA.                                          |
 // +----------------------------------------------------------------------+
 // | Authors: João Prado Maia <[email protected]>                             |
+// |          Elan Ruusamäe <[email protected]>                               |
 // +----------------------------------------------------------------------+
 
 // URL to your Eventum installation.
@@ -51,6 +52,10 @@ if (in_array($msg, array('- Imported sources', '- New directory'))) {
     exit(0);
 }
 
+// get the full commit message
+$input = getInput();
+$commit_msg = rtrim(substr($input, strpos($input, 'Log Message:') + strlen('Log Message:') + 1));
+
 // now parse the list of modified files
 $modified_files = array();
 foreach ($args as $file_info) {
@@ -62,11 +67,7 @@ foreach ($args as $file_info) {
     );
 }
 
-// get the full commit message
-$input = getInput();
-$commit_msg = rtrim(substr($input, strpos($input, 'Log Message:') + strlen('Log Message:') + 1));
-
-// parse the commit message and get the first issue number we can find
+// parse the commit message and get all issue numbers we can find
 preg_match_all('/(?:issue|bug) ?:? ?#?(\d+)/i', $commit_msg, $matches);
 
 if (count($matches[1]) > 0) {

scm/eventum-svn-hook

@@ -41,23 +41,10 @@ $eventum_url = 'http://eventum.example.com/';
 //
 // DO NOT CHANGE ANYTHING AFTER THIS LINE
 //
-// save name of this script
-$PROGRAM = basename(array_shift($argv));
 
-if (isset($eventum_url)) {
-    $data = parse_url($eventum_url);
-} else {
-    // legacy
-    $data = array();
-    $data['host'] = $eventum_domain;
-    $data['path'] = $eventum_relative_url;
-    $data['port'] = $eventum_port;
-    $data['scheme'] = 'http';
-}
 
-if (!isset($data['port'])) {
-    $data['port'] = $data['scheme'] == 'https' ? 443 : 80;
-}
+// save name of this script
+$PROGRAM = basename(array_shift($argv));
 
 if (!isset($svnlook)) {
     $svnlook = '/usr/bin/svnlook';
@@ -74,31 +61,30 @@ if ($argc < 3) {
 }
 
 $repos = $argv[1];
-$rev = $argv[2];
-$oldRev = $rev - 1;
+$new_revision = $argv[2];
+$old_revision = $new_revision - 1;
 
 $scm_module = rawurlencode(basename($repos));
 
-$results = array();
-exec($svnlook . ' info ' . $repos . ' -r ' . $rev, $results);
-
+exec($svnlook . ' info ' . $repos . ' -r ' . $new_revision, $results);
 $username = array_shift($results);
 $date = array_shift($results);
-array_shift($results); // ignore file length
+// ignore file length
+array_shift($results);
 
+// get the full commit message
 $commit_msg = join("\n", $results);
-// now we have to strip html-tags from the commit message
-$commit_msg = strip_tags($commit_msg);
 
-$files = array();
-exec($svnlook . ' changed ' . $repos . ' -r ' . $rev, $files);
+// now parse the list of modified files
+$modified_files = array();
+exec($svnlook . ' changed ' . $repos . ' -r ' . $new_revision, $files);
 foreach ($files as $file_info) {
     $pieces = explode('   ', $file_info);
     $filename = $pieces[1];
     $modified_files[] = array(
         'filename'     => $filename,
-        'old_revision' => $oldRev,
-        'new_revision' => $rev
+        'old_revision' => $old_revision,
+        'new_revision' => $new_revision
     );
 }