Fix 'cm checkconnection' to never call it with a --server argument th…

…at creates issues with authentication Use instead the new 'cm checkconnection <repserverspec>' if the version of Plastic is recent enough.
SRombauts · Nov 27, 2024 · 3588a98 · 3588a98
1 parent 21b5058
commit 3588a98
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlUtils.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlUtils.cpp
@@ -354,7 +354,10 @@ bool RunCheckConnection(FString& OutWorkspaceSelector, FString& OutBranchName, F
 	TArray<FString> Parameters;
 	if (PlasticSourceControlUtils::GetWorkspaceInfo(OutWorkspaceSelector, OutBranchName, OutRepositoryName, OutServerUrl, OutErrorMessages))
 	{
-		Parameters.Add(FString::Printf(TEXT("--server=%s"), *OutServerUrl));
+		if ((FPlasticSourceControlModule::Get().GetProvider().GetPlasticScmVersion() >= PlasticSourceControlVersions::CheckConnection))
+		{
+			Parameters.Add(OutServerUrl);
+		}
 	}
 	return PlasticSourceControlUtils::RunCommand(TEXT("checkconnection"), Parameters, TArray<FString>(), OutInfoMessages, OutErrorMessages);
 }

diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlVersions.h b/Source/PlasticSourceControl/Private/PlasticSourceControlVersions.h
@@ -56,4 +56,8 @@ namespace PlasticSourceControlVersions
 	// https://plasticscm.com/download/releasenotes/11.0.16.8445 (2024/02/22)
 	static const FSoftwareVersion WorkingBranch(TEXT("11.0.16.8445"));
 
+	// 11.0.16.9055 checkconnection learned a new optional argument <repserverspec>.
+	// https://plasticscm.com/download/releasenotes/11.0.16.9055 (2024/11/28)
+	static const FSoftwareVersion CheckConnection(TEXT("11.0.16.9055"));
+
 } // namespace PlasticSourceControlVersions