Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix warning unknown file status AD+LD #104

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Fix warning unknown file status AD+LD #104

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1b40d
Wrap properly all strings of StateFromStatus() by the TEXT() macro
SRombautsU Jan 10, 2024
eeb5798
Fix Warning: Unknown file status 'AD+LD'
SRombautsU Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions Source/PlasticSourceControl/Private/PlasticSourceControlParsers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,11 @@ static EWorkspaceState StateFromStatus(const FString& InFileStatus, const bool b
{
EWorkspaceState State;

if (InFileStatus == "CH") // Modified but not Checked-Out
if (InFileStatus == TEXT("CH")) // Modified but not Checked-Out
{
State = EWorkspaceState::Changed;
}
else if (InFileStatus == "CO") // Checked-Out with no change, or "don't know" if using on an old version of cm
else if (InFileStatus == TEXT("CO")) // Checked-Out with no change, or "don't know" if using on an old version of cm
{
// Recent version can distinguish between CheckedOut with or with no changes
if (bInUsesCheckedOutChanged)
Expand All @@ -147,7 +147,7 @@ static EWorkspaceState StateFromStatus(const FString& InFileStatus, const bool b
State = EWorkspaceState::CheckedOutChanged; // Older version; need to assume it is changed to retain behavior
}
}
else if (InFileStatus == "CO+CH") // Checked-Out and changed from the new --iscochanged
else if (InFileStatus == TEXT("CO+CH")) // Checked-Out and changed from the new --iscochanged
{
State = EWorkspaceState::CheckedOutChanged; // Recent version; here it's checkedout with changes
}
Expand All @@ -163,23 +163,23 @@ static EWorkspaceState StateFromStatus(const FString& InFileStatus, const bool b
{
State = EWorkspaceState::Replaced;
}
else if (InFileStatus == "AD")
else if (InFileStatus == TEXT("AD"))
{
State = EWorkspaceState::Added;
}
else if ((InFileStatus == "PR") || (InFileStatus == "LM")) // Not Controlled/Not in Depot/Untracked (or Locally Moved/Renamed)
else if ((InFileStatus == TEXT("PR")) || (InFileStatus == TEXT("LM"))) // Not Controlled/Not in Depot/Untracked (or Locally Moved/Renamed)
{
State = EWorkspaceState::Private;
}
else if (InFileStatus == "IG")
else if (InFileStatus == TEXT("IG"))
{
State = EWorkspaceState::Ignored;
}
else if (InFileStatus == "DE")
else if (InFileStatus == TEXT("DE"))
{
State = EWorkspaceState::Deleted; // Deleted (removed from source control)
}
else if (InFileStatus == "LD")
else if (InFileStatus.Contains(TEXT("LD"))) // "LD", "AD+LD"
{
State = EWorkspaceState::LocallyDeleted; // Locally Deleted (ie. missing)
}
Expand Down