izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[UEFN] Support multiple projects on the same perforce workspace

Browse Source 
Put guardrails against using URC with multiple projects because it's not supported
#rb wouter.burgers

[CL 34127677 by dave belanger in ue5-main branch]
This commit is contained in:
dave belanger
2024-06-05 12:05:35 -04:00
parent e4f77aa4ba
commit df4bca31d8
6 changed files with 156 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Engine/Source/Developer/SourceControl/Private/SourceControlModule.cpp
View File

@@ -541,6 +541,46 @@ const FSourceControlFilesDeletedDelegate& FSourceControlModule::GetOnFilesDelete
return OnFilesDeleted;
}
void FSourceControlModule::RegisterCustomProjectsDelegate(FSourceControlCustomProjectsDelegate InCustomProjectsDelegate)
{
CustomProjectsDelegate = MoveTemp(InCustomProjectsDelegate);
}
void FSourceControlModule::UnregisterCustomProjectsDelegate()
{
CustomProjectsDelegate = FSourceControlCustomProjectsDelegate();
}
TArray<FSourceControlProjectInfo> FSourceControlModule::GetCustomProjects() const
{
return CustomProjectsDelegate.IsBound() ? CustomProjectsDelegate.Execute() : TArray<FSourceControlProjectInfo>();
}
FString FSourceControlModule::GetSourceControlProjectDir() const
{
{
TArray<FSourceControlProjectInfo> CustomProjects = GetCustomProjects();
if (!CustomProjects.IsEmpty())
{
return CustomProjects[0].ProjectDirectory;
}
}
PRAGMA_DISABLE_DEPRECATION_WARNINGS
if (SourceControlProjectDirDelegate.IsBound())
{
FString ProjectDir = SourceControlProjectDirDelegate.Execute();
if (!ProjectDir.IsEmpty())
{
return ProjectDir;
}
}
PRAGMA_ENABLE_DEPRECATION_WARNINGS
return FPaths::ProjectDir();
}
PRAGMA_DISABLE_DEPRECATION_WARNINGS
void FSourceControlModule::RegisterSourceControlProjectDirDelegate(const FSourceControlProjectDirDelegate& InSourceControlProjectDirDelegate)
{
SourceControlProjectDirDelegate = InSourceControlProjectDirDelegate;
@@ -551,22 +591,17 @@ void FSourceControlModule::UnregisterSourceControlProjectDirDelegate()
SourceControlProjectDirDelegate = FSourceControlProjectDirDelegate();
}
FString FSourceControlModule::GetSourceControlProjectDir() const
{
if (SourceControlProjectDirDelegate.IsBound())
{
FString ProjectDir = SourceControlProjectDirDelegate.Execute();
if (!ProjectDir.IsEmpty())
{
return ProjectDir;
}
}
return FPaths::ProjectDir();
}
bool FSourceControlModule::UsesCustomProjectDir() const
{
if (SourceControlProjectDirDelegate.IsBound())
if (CustomProjectsDelegate.IsBound())
{
TArray<FSourceControlProjectInfo> Projects = CustomProjectsDelegate.Execute();
if (!Projects.IsEmpty())
{
return true;
}
}
else if (SourceControlProjectDirDelegate.IsBound())
{
FString ProjectDir = SourceControlProjectDirDelegate.Execute();
if (!ProjectDir.IsEmpty())
@@ -576,6 +611,7 @@ bool FSourceControlModule::UsesCustomProjectDir() const
}
return false;
}
PRAGMA_ENABLE_DEPRECATION_WARNINGS
FSourceControlFileStatusMonitor& FSourceControlModule::GetSourceControlFileStatusMonitor()
{