Correct corrupted database in multi-project setup

Author: aik099

CHANGELOG.md

@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 - Added support for Terminal with a light theme. To enable specify `light` as a value of `theme` config setting in `~/.svn-buddy/config.json` file.
+- Added the `?` possible value for the `--bugs` options of the `log` command to show revisions without a bug.
 
 ### Changed
 - Show executed SVN commands in real time (when started; how long was executed) in verbose mode (the `-v` flag).
@@ -13,7 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Handle cases, when `svn log ... --use-merge-history ...` command timeout-out.
 - The `merge` command wasn't doing auto-commit, when alternative working directly was specified.
-- The `current revision` highlighting style is now correctly applied to the `Bug-ID` column in the `log` command results. 
+- The `current revision` highlighting style is now correctly applied to the `Bug-ID` column in the `log` command results.
+- Created a semi-automatic migration script for unlinking commits from projects they don't belong.
 
 ## [0.8.0] - 2024-12-18
 ### Added

migrations/20250910_1238_correct_multi_project_commits.php

@@ -0,0 +1,91 @@
+<?php
+
+use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\MigrationContext;
+
+return function (MigrationContext $context) {
+	$db = $context->getDatabase();
+
+	// Get commits, that belong to multiple projects.
+	$sql = 'SELECT cp.Revision, GROUP_CONCAT(cp.ProjectId)
+			FROM CommitProjects cp
+			JOIN Commits c ON c.Revision = cp.Revision
+			GROUP BY cp.Revision
+			HAVING COUNT(*) > 1';
+	$multi_project_commits = $db->fetchPairs($sql);
+
+	if ( !$multi_project_commits ) {
+		return;
+	}
+
+	$to_reparse = array();
+	$revision_log = $context->getrevisionLog();
+
+	$revision_count = count($multi_project_commits);
+	echo sprintf('Found %d commits with multiple projects.', $revision_count) . PHP_EOL;
+
+	foreach ( $multi_project_commits as $revision => $project_ids ) {
+		echo 'Processing ' . $revision . ' revision... ';
+
+		$sql = 'SELECT Id, Path
+				FROM Projects
+				WHERE Id IN (:project_ids)';
+		$project_paths = $db->fetchPairs($sql, array('project_ids' => explode(',', $project_ids)));
+
+		$log = $revision_log
+			->getCommand(
+				'log',
+				array('--revision', $revision, '--xml', '--verbose', '{repository_url}')
+			)
+			->run();
+
+		$projects_found = array();
+
+		// Determine the actual project, where the commit belongs based on its paths.
+		foreach ( $log->logentry->paths->path as $path ) {
+			foreach ( $project_paths as $project_id => $project_path ) {
+				if ( strpos($path, $project_path) === 0 ) {
+					$projects_found[$project_id] = true;
+					break;
+				}
+			}
+		}
+
+		// Leave only projects that were found in the SVN repository.
+		foreach ( array_keys($projects_found) as $project_id ) {
+			unset($project_paths[$project_id]);
+		}
+
+		if ( !$project_paths ) {
+			echo 'Skipped.' . PHP_EOL;
+			continue;
+		}
+
+		// Remove incorrect associations.
+		foreach ( $project_paths as $project_id => $project_path ) {
+			$sql = 'SELECT pa.Id
+					FROM CommitPaths cp
+					JOIN Paths pa ON pa.Id = cp.PathId
+					WHERE cp.Revision = :revision AND pa.ProjectPath = :project_path';
+			$path_id = $db->fetchValue($sql, array('revision' => $revision, 'project_path' => $project_path));
+
+			$sql = 'DELETE FROM CommitPaths
+					WHERE Revision = :revision AND PathId = :path_id';
+			$db->perform($sql, array('revision' => $revision, 'path_id' => $path_id));
+
+			$sql = 'DELETE FROM CommitProjects
+					WHERE Revision = :revision AND ProjectId = :project_id';
+			$db->perform($sql, array('revision' => $revision, 'project_id' => $project_id));
+		}
+
+		echo 'Fixed.' . PHP_EOL;
+		$to_reparse[] = $revision;
+	}
+
+	foreach ( array_chunk($to_reparse, 10) as $to_reparse_chunk ) {
+		echo sprintf(
+			'Run the "%s reparse -r %s" command.' . PHP_EOL,
+			reset($_SERVER['argv']),
+			implode(',', $to_reparse_chunk)
+		);
+	}
+};

src/SVNBuddy/Repository/RevisionLog/Plugin/DatabaseCollectorPlugin/BugsPlugin.php

@@ -421,11 +421,21 @@ public function find(array $criteria, $project_path)
 
 		$project_id = $this->getProject($project_path);
 
-		$sql = 'SELECT DISTINCT cb.Revision
-				FROM CommitBugs cb
-				JOIN CommitProjects cp ON cp.Revision = cb.Revision
-				WHERE cp.ProjectId = :project_id AND cb.Bug IN (:bugs)';
-		$bug_revisions = $this->database->fetchCol($sql, array('project_id' => $project_id, 'bugs' => $criteria));
+		if ( $criteria === array('?') ) {
+			$sql = 'SELECT DISTINCT c.Revision, c.Message
+					FROM Commits c
+					JOIN CommitProjects cp ON cp.Revision = c.Revision
+					LEFT JOIN CommitBugs cb ON cb.Revision = c.Revision
+					WHERE cp.ProjectId = :project_id AND cb.Revision IS NULL';
+			$bug_revisions = $this->database->fetchCol($sql, array('project_id' => $project_id));
+		}
+		else {
+			$sql = 'SELECT DISTINCT cb.Revision
+					FROM CommitBugs cb
+					JOIN CommitProjects cp ON cp.Revision = cb.Revision
+					WHERE cp.ProjectId = :project_id AND cb.Bug IN (:bugs)';
+			$bug_revisions = $this->database->fetchCol($sql, array('project_id' => $project_id, 'bugs' => $criteria));
+		}
 
 		sort($bug_revisions, SORT_NUMERIC);
 

src/SVNBuddy/Repository/RevisionLog/RevisionLog.php

@@ -12,6 +12,7 @@
 
 
 use ConsoleHelpers\ConsoleKit\ConsoleIO;
+use ConsoleHelpers\SVNBuddy\Repository\Connector\Command;
 use ConsoleHelpers\SVNBuddy\Repository\Connector\Connector;
 use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\Plugin\DatabaseCollectorPlugin\IDatabaseCollectorPlugin;
 use ConsoleHelpers\SVNBuddy\Repository\RevisionLog\Plugin\IOverwriteAwarePlugin;
@@ -297,11 +298,11 @@ private function _useRepositoryCollectorPlugins($from_revision, $to_revision, $o
 			$range_end = min($range_start + ($batch_size - 1), $to_revision);
 
 			$command_arguments = str_replace(
-				array('{revision_range}', '{repository_url}'),
-				array($range_start . ':' . $range_end, $this->_repositoryRootUrl),
+				'{revision_range}',
+				$range_start . ':' . $range_end,
 				$log_command_arguments
 			);
-			$command = $this->_repositoryConnector->getCommand('log', $command_arguments);
+			$command = $this->getCommand('log', $command_arguments);
 			$command->setCacheDuration($cache_duration)->setIdleTimeoutRecovery(true);
 			$svn_log = $command->run();
 
@@ -325,6 +326,21 @@ private function _useRepositoryCollectorPlugins($from_revision, $to_revision, $o
 		}
 	}
 
+	/**
+	 * Builds the command.
+	 *
+	 * @param string $name      Command name.
+	 * @param array  $arguments Arguments.
+	 *
+	 * @return Command
+	 */
+	public function getCommand($name, array $arguments)
+	{
+		$arguments = str_replace('{repository_url}', $this->_repositoryRootUrl, $arguments);
+
+		return $this->_repositoryConnector->getCommand($name, $arguments);
+	}
+
 	/**
 	 * Use database collector plugins.
 	 *