Add ProjectName to FPlasticMakeWorkspace and combine project and repo…

…sitory into the repository name for the CreateWorkspace Operation
SRombauts · Oct 31, 2024 · 7518118 · 7518118
1 parent 3c1aba0
commit 7518118
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.h b/Source/PlasticSourceControl/Private/PlasticSourceControlOperations.h
@@ -104,9 +104,9 @@ class FPlasticMakeWorkspace final : public FSourceControlOperationBase
 
 	virtual FText GetInProgressString() const override;
 
-	FString WorkspaceName;
-	FString RepositoryName;
 	FString ServerUrl;
+	FString RepositoryName;
+	FString WorkspaceName;
 	bool bPartialWorkspace = false;
 };
 

diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlWorkspaceCreation.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlWorkspaceCreation.cpp
@@ -26,9 +26,16 @@ void FPlasticSourceControlWorkspaceCreation::MakeWorkspace(const FParameters& In
 void FPlasticSourceControlWorkspaceCreation::LaunchMakeWorkspaceOperation()
 {
 	TSharedRef<FPlasticMakeWorkspace, ESPMode::ThreadSafe> MakeWorkspaceOperation = ISourceControlOperation::Create<FPlasticMakeWorkspace>();
-	MakeWorkspaceOperation->WorkspaceName = WorkspaceParams.WorkspaceName.ToString();
-	MakeWorkspaceOperation->RepositoryName = WorkspaceParams.RepositoryName.ToString();
 	MakeWorkspaceOperation->ServerUrl = WorkspaceParams.ServerUrl.ToString();
+	if (!WorkspaceParams.ProjectName.IsEmpty())
+	{
+		MakeWorkspaceOperation->RepositoryName = FString::Printf(TEXT("%s/%s"), *WorkspaceParams.ProjectName.ToString(), *WorkspaceParams.RepositoryName.ToString());
+	}
+	else
+	{
+		MakeWorkspaceOperation->RepositoryName = WorkspaceParams.RepositoryName.ToString();
+	}
+	MakeWorkspaceOperation->WorkspaceName = WorkspaceParams.WorkspaceName.ToString();
 	MakeWorkspaceOperation->bPartialWorkspace = WorkspaceParams.bCreatePartialWorkspace;
 
 	FPlasticSourceControlProvider& Provider = FPlasticSourceControlModule::Get().GetProvider();

diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlWorkspaceCreation.h b/Source/PlasticSourceControl/Private/PlasticSourceControlWorkspaceCreation.h
@@ -14,9 +14,10 @@ class FPlasticSourceControlWorkspaceCreation
 public:
 	struct FParameters
 	{
-		FText WorkspaceName;
-		FText RepositoryName;
 		FText ServerUrl;
+		FText ProjectName;
+		FText RepositoryName;
+		FText WorkspaceName;
 		bool bCreatePartialWorkspace = false;
 		bool bAutoInitialCommit = true;
 		FText InitialCommitMessage;