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

p4: Check if p4 object is a file and return early if it isn't #19

Merged
merged 4 commits into from
Mar 21, 2022
Merged

p4: Check if p4 object is a file and return early if it isn't #19

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1a7f7f
check if p4 object is a file
EricTheMagician Mar 4, 2022
dac9cb6
p4: Minor linting in p4-fusion/commands/describe_result.cc
twarit-waikar Mar 21, 2022
fb5a945
p4: Minor linting in p4-fusion/commands/describe_result.cc
twarit-waikar Mar 21, 2022
db3b523
p4: Minor linting in p4-fusion/commands/describe_result.cc
twarit-waikar Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion p4-fusion/commands/describe_result.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,18 @@ void DescribeResult::OutputStat(StrDict* varList)
int DescribeResult::OutputStatPartial(StrDict* varList)
{
std::string indexString = std::to_string(m_FileData.size());
m_FileData.push_back(FileData {});

StrPtr* depotFile = varList->GetVar(("depotFile" + indexString).c_str());
if (!depotFile)
{
// Quick exit if the object returned is not a file
return 0;
}
StrPtr* type = varList->GetVar(("type" + indexString).c_str());
StrPtr* revision = varList->GetVar(("rev" + indexString).c_str());
StrPtr* action = varList->GetVar(("action" + indexString).c_str());

m_FileData.push_back(FileData {});
FileData* fileData = &m_FileData.back();

fileData->depotFile = depotFile->Text();
Expand Down