kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CTest: Factor out duplicate Git author/committer code 

Factor out date/time format code into FormatDateTime function instead of
duplicating it.
This commit is contained in:
Brad King 2010-12-20 17:16:25 -05:00
parent 307b8a6e69
commit 5992526482
1 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Source/CTest/cmCTestGIT.cxx
View File

@ -503,28 +503,7 @@ private:
this->ParsePerson(this->Line.c_str()+7, author);
this->Rev.Author = author.Name;
this->Rev.EMail = author.EMail;
// Convert the time to a human-readable format that is also easy
// to machine-parse: "CCYY-MM-DD hh:mm:ss".
time_t seconds = static_cast<time_t>(author.Time);
struct tm* t = gmtime(&seconds);
char dt[1024];
sprintf(dt, "%04d-%02d-%02d %02d:%02d:%02d",
t->tm_year+1900, t->tm_mon+1, t->tm_mday,
t->tm_hour, t->tm_min, t->tm_sec);
this->Rev.Date = dt;
// Add the time-zone field "+zone" or "-zone".
char tz[32];
if(author.TimeZone >= 0)
{
sprintf(tz, " +%04ld", author.TimeZone);
}
else
{
sprintf(tz, " -%04ld", -author.TimeZone);
}
this->Rev.Date += tz;
this->Rev.Date = this->FormatDateTime(author);
}
else if(strncmp(this->Line.c_str(), "committer ", 10) == 0)
{
@ -532,28 +511,7 @@ private:
this->ParsePerson(this->Line.c_str()+10, committer);
this->Rev.Committer = committer.Name;
this->Rev.CommitterEMail = committer.EMail;
// Convert the time to a human-readable format that is also easy
// to machine-parse: "CCYY-MM-DD hh:mm:ss".
time_t seconds = static_cast<time_t>(committer.Time);
struct tm* t = gmtime(&seconds);
char dt[1024];
sprintf(dt, "%04d-%02d-%02d %02d:%02d:%02d",
t->tm_year+1900, t->tm_mon+1, t->tm_mday,
t->tm_hour, t->tm_min, t->tm_sec);
this->Rev.CommitDate = dt;
// Add the time-zone field "+zone" or "-zone".
char tz[32];
if(committer.TimeZone >= 0)
{
sprintf(tz, " +%04ld", committer.TimeZone);
}
else
{
sprintf(tz, " -%04ld", -committer.TimeZone);
}
this->Rev.CommitDate += tz;
this->Rev.CommitDate = this->FormatDateTime(committer);
}
}
@ -566,6 +524,32 @@ private:
}
this->Rev.Log += "\n";
}
std::string FormatDateTime(Person const& person)
{
// Convert the time to a human-readable format that is also easy
// to machine-parse: "CCYY-MM-DD hh:mm:ss".
time_t seconds = static_cast<time_t>(person.Time);
struct tm* t = gmtime(&seconds);
char dt[1024];
sprintf(dt, "%04d-%02d-%02d %02d:%02d:%02d",
t->tm_year+1900, t->tm_mon+1, t->tm_mday,
t->tm_hour, t->tm_min, t->tm_sec);
std::string out = dt;
// Add the time-zone field "+zone" or "-zone".
char tz[32];
if(person.TimeZone >= 0)
{
sprintf(tz, " +%04ld", person.TimeZone);
}
else
{
sprintf(tz, " -%04ld", -person.TimeZone);
}
out += tz;
return out;
}
};
char const cmCTestGIT::CommitParser::SectionSep[SectionCount] =