Skip to content

Commit

Permalink
Merge pull request #104 from PlasticSCM/1004512-fix-warning-unknown-f…
Browse files Browse the repository at this point in the history
…ile-status-AD+LD

Fix warning unknown file status AD+LD
  • Loading branch information
juliomaqueda committed Jan 15, 2024
2 parents ba62d52 + eeb5798 commit ad5f58d
Showing 1 changed file with 8 additions and 8 deletions.
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

0 comments on commit ad5f58d

Please sign in to comment.