2016-09-27 22:01:08 +03:00
|
|
|
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
|
|
file Copyright.txt or https://cmake.org/licensing for details. */
|
2009-04-22 17:19:06 +04:00
|
|
|
#include "cmCTestGIT.h"
|
|
|
|
|
2016-04-29 17:53:13 +03:00
|
|
|
#include "cmAlgorithms.h"
|
2009-04-22 17:19:06 +04:00
|
|
|
#include "cmCTest.h"
|
2016-08-24 23:01:40 +03:00
|
|
|
#include "cmCTestVC.h"
|
|
|
|
#include "cmProcessTools.h"
|
2009-04-22 17:19:06 +04:00
|
|
|
#include "cmSystemTools.h"
|
|
|
|
|
2014-01-04 09:47:13 +04:00
|
|
|
#include <cmsys/FStream.hxx>
|
2016-04-29 17:53:13 +03:00
|
|
|
#include <cmsys/Process.h>
|
2009-04-22 17:19:06 +04:00
|
|
|
#include <ctype.h>
|
2016-08-24 23:01:40 +03:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2016-04-29 17:53:13 +03:00
|
|
|
#include <time.h>
|
2016-08-24 23:01:40 +03:00
|
|
|
#include <vector>
|
2009-04-22 17:19:06 +04:00
|
|
|
|
2011-02-22 23:47:50 +03:00
|
|
|
static unsigned int cmCTestGITVersion(unsigned int epic, unsigned int major,
|
|
|
|
unsigned int minor, unsigned int fix)
|
|
|
|
{
|
|
|
|
// 1.6.5.0 maps to 10605000
|
2016-05-16 17:34:04 +03:00
|
|
|
return fix + minor * 1000 + major * 100000 + epic * 10000000;
|
2011-02-22 23:47:50 +03:00
|
|
|
}
|
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
cmCTestGIT::cmCTestGIT(cmCTest* ct, std::ostream& log)
|
|
|
|
: cmCTestGlobalVC(ct, log)
|
2009-04-22 17:19:06 +04:00
|
|
|
{
|
|
|
|
this->PriorRev = this->Unknown;
|
2011-02-22 23:47:50 +03:00
|
|
|
this->CurrentGitVersion = 0;
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
cmCTestGIT::~cmCTestGIT()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
class cmCTestGIT::OneLineParser : public cmCTestVC::LineParser
|
2009-04-22 17:19:06 +04:00
|
|
|
{
|
|
|
|
public:
|
2016-05-16 17:34:04 +03:00
|
|
|
OneLineParser(cmCTestGIT* git, const char* prefix, std::string& l)
|
|
|
|
: Line1(l)
|
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
this->SetLog(&git->Log, prefix);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
|
|
|
|
2009-04-22 17:19:06 +04:00
|
|
|
private:
|
|
|
|
std::string& Line1;
|
2016-06-23 02:02:39 +03:00
|
|
|
bool ProcessLine() CM_OVERRIDE
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
// Only the first line is of interest.
|
|
|
|
this->Line1 = this->Line;
|
|
|
|
return false;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
std::string cmCTestGIT::GetWorkingRevision()
|
|
|
|
{
|
|
|
|
// Run plumbing "git rev-list" to get work tree revision.
|
|
|
|
const char* git = this->CommandLineTool.c_str();
|
2016-06-27 23:44:16 +03:00
|
|
|
const char* git_rev_list[] = { git, "rev-list", "-n", "1",
|
|
|
|
"HEAD", "--", CM_NULLPTR };
|
2009-04-22 17:19:06 +04:00
|
|
|
std::string rev;
|
|
|
|
OneLineParser out(this, "rl-out> ", rev);
|
|
|
|
OutputLogger err(this->Log, "rl-err> ");
|
|
|
|
this->RunChild(git_rev_list, &out, &err);
|
|
|
|
return rev;
|
|
|
|
}
|
|
|
|
|
|
|
|
void cmCTestGIT::NoteOldRevision()
|
|
|
|
{
|
|
|
|
this->OldRevision = this->GetWorkingRevision();
|
|
|
|
cmCTestLog(this->CTest, HANDLER_OUTPUT, " Old revision of repository is: "
|
2016-05-16 17:34:04 +03:00
|
|
|
<< this->OldRevision << "\n");
|
2009-04-22 17:19:06 +04:00
|
|
|
this->PriorRev.Rev = this->OldRevision;
|
|
|
|
}
|
|
|
|
|
|
|
|
void cmCTestGIT::NoteNewRevision()
|
|
|
|
{
|
|
|
|
this->NewRevision = this->GetWorkingRevision();
|
|
|
|
cmCTestLog(this->CTest, HANDLER_OUTPUT, " New revision of repository is: "
|
2016-05-16 17:34:04 +03:00
|
|
|
<< this->NewRevision << "\n");
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
|
|
|
|
2010-07-26 19:40:20 +04:00
|
|
|
std::string cmCTestGIT::FindGitDir()
|
|
|
|
{
|
|
|
|
std::string git_dir;
|
|
|
|
|
|
|
|
// Run "git rev-parse --git-dir" to locate the real .git directory.
|
|
|
|
const char* git = this->CommandLineTool.c_str();
|
2016-06-27 23:44:16 +03:00
|
|
|
char const* git_rev_parse[] = { git, "rev-parse", "--git-dir", CM_NULLPTR };
|
2010-07-26 19:40:20 +04:00
|
|
|
std::string git_dir_line;
|
|
|
|
OneLineParser rev_parse_out(this, "rev-parse-out> ", git_dir_line);
|
|
|
|
OutputLogger rev_parse_err(this->Log, "rev-parse-err> ");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->RunChild(git_rev_parse, &rev_parse_out, &rev_parse_err)) {
|
2010-07-26 19:40:20 +04:00
|
|
|
git_dir = git_dir_line;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
|
|
|
if (git_dir.empty()) {
|
2010-07-26 19:40:20 +04:00
|
|
|
git_dir = ".git";
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-07-26 19:40:20 +04:00
|
|
|
|
|
|
|
// Git reports a relative path only when the .git directory is in
|
|
|
|
// the current directory.
|
2016-05-16 17:34:04 +03:00
|
|
|
if (git_dir[0] == '.') {
|
2010-07-26 19:40:20 +04:00
|
|
|
git_dir = this->SourceDirectory + "/" + git_dir;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-07-26 19:40:20 +04:00
|
|
|
#if defined(_WIN32) && !defined(__CYGWIN__)
|
2016-05-16 17:34:04 +03:00
|
|
|
else if (git_dir[0] == '/') {
|
2010-07-26 19:40:20 +04:00
|
|
|
// Cygwin Git reports a full path that Cygwin understands, but we
|
|
|
|
// are a Windows application. Run "cygpath" to get Windows path.
|
|
|
|
std::string cygpath_exe = cmSystemTools::GetFilenamePath(git);
|
|
|
|
cygpath_exe += "/cygpath.exe";
|
2016-05-16 17:34:04 +03:00
|
|
|
if (cmSystemTools::FileExists(cygpath_exe.c_str())) {
|
|
|
|
char const* cygpath[] = { cygpath_exe.c_str(), "-w", git_dir.c_str(),
|
|
|
|
0 };
|
2010-07-26 19:40:20 +04:00
|
|
|
OneLineParser cygpath_out(this, "cygpath-out> ", git_dir_line);
|
|
|
|
OutputLogger cygpath_err(this->Log, "cygpath-err> ");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->RunChild(cygpath, &cygpath_out, &cygpath_err)) {
|
2010-07-26 19:40:20 +04:00
|
|
|
git_dir = git_dir_line;
|
|
|
|
}
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-07-26 19:40:20 +04:00
|
|
|
#endif
|
|
|
|
return git_dir;
|
|
|
|
}
|
|
|
|
|
2010-07-27 19:31:59 +04:00
|
|
|
std::string cmCTestGIT::FindTopDir()
|
|
|
|
{
|
|
|
|
std::string top_dir = this->SourceDirectory;
|
|
|
|
|
|
|
|
// Run "git rev-parse --show-cdup" to locate the top of the tree.
|
|
|
|
const char* git = this->CommandLineTool.c_str();
|
2016-06-27 23:44:16 +03:00
|
|
|
char const* git_rev_parse[] = { git, "rev-parse", "--show-cdup",
|
|
|
|
CM_NULLPTR };
|
2010-07-27 19:31:59 +04:00
|
|
|
std::string cdup;
|
|
|
|
OneLineParser rev_parse_out(this, "rev-parse-out> ", cdup);
|
|
|
|
OutputLogger rev_parse_err(this->Log, "rev-parse-err> ");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->RunChild(git_rev_parse, &rev_parse_out, &rev_parse_err) &&
|
|
|
|
!cdup.empty()) {
|
2010-07-27 19:31:59 +04:00
|
|
|
top_dir += "/";
|
|
|
|
top_dir += cdup;
|
2014-10-15 16:54:05 +04:00
|
|
|
top_dir = cmSystemTools::CollapseFullPath(top_dir);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-07-27 19:31:59 +04:00
|
|
|
return top_dir;
|
|
|
|
}
|
|
|
|
|
2010-06-09 00:37:04 +04:00
|
|
|
bool cmCTestGIT::UpdateByFetchAndReset()
|
2009-04-22 17:19:06 +04:00
|
|
|
{
|
2010-05-04 17:35:27 +04:00
|
|
|
const char* git = this->CommandLineTool.c_str();
|
|
|
|
|
2010-06-09 00:37:04 +04:00
|
|
|
// Use "git fetch" to get remote commits.
|
|
|
|
std::vector<char const*> git_fetch;
|
|
|
|
git_fetch.push_back(git);
|
|
|
|
git_fetch.push_back("fetch");
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
// Add user-specified update options.
|
|
|
|
std::string opts = this->CTest->GetCTestConfiguration("UpdateOptions");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (opts.empty()) {
|
2009-04-22 17:19:06 +04:00
|
|
|
opts = this->CTest->GetCTestConfiguration("GITUpdateOptions");
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2014-02-10 09:21:34 +04:00
|
|
|
std::vector<std::string> args = cmSystemTools::ParseArguments(opts.c_str());
|
2016-05-16 17:34:04 +03:00
|
|
|
for (std::vector<std::string>::const_iterator ai = args.begin();
|
|
|
|
ai != args.end(); ++ai) {
|
2010-06-09 00:37:04 +04:00
|
|
|
git_fetch.push_back(ai->c_str());
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
// Sentinel argument.
|
2016-06-27 23:44:16 +03:00
|
|
|
git_fetch.push_back(CM_NULLPTR);
|
2010-06-09 00:37:04 +04:00
|
|
|
|
|
|
|
// Fetch upstream refs.
|
|
|
|
OutputLogger fetch_out(this->Log, "fetch-out> ");
|
|
|
|
OutputLogger fetch_err(this->Log, "fetch-err> ");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (!this->RunUpdateCommand(&git_fetch[0], &fetch_out, &fetch_err)) {
|
2010-06-09 00:37:04 +04:00
|
|
|
return false;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-06-09 00:37:04 +04:00
|
|
|
|
|
|
|
// Identify the merge head that would be used by "git pull".
|
|
|
|
std::string sha1;
|
|
|
|
{
|
2016-05-16 17:34:04 +03:00
|
|
|
std::string fetch_head = this->FindGitDir() + "/FETCH_HEAD";
|
|
|
|
cmsys::ifstream fin(fetch_head.c_str(), std::ios::in | std::ios::binary);
|
|
|
|
if (!fin) {
|
|
|
|
this->Log << "Unable to open " << fetch_head << "\n";
|
|
|
|
return false;
|
2010-07-26 19:40:20 +04:00
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
std::string line;
|
|
|
|
while (sha1.empty() && cmSystemTools::GetLineFromStream(fin, line)) {
|
|
|
|
this->Log << "FETCH_HEAD> " << line << "\n";
|
|
|
|
if (line.find("\tnot-for-merge\t") == line.npos) {
|
|
|
|
std::string::size_type pos = line.find('\t');
|
|
|
|
if (pos != line.npos) {
|
|
|
|
sha1 = line.substr(0, pos);
|
2010-06-09 00:37:04 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
if (sha1.empty()) {
|
|
|
|
this->Log << "FETCH_HEAD has no upstream branch candidate!\n";
|
|
|
|
return false;
|
2010-07-21 00:57:50 +04:00
|
|
|
}
|
2010-06-09 00:37:04 +04:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
2010-06-09 00:37:04 +04:00
|
|
|
// Reset the local branch to point at that tracked from upstream.
|
2016-06-27 23:44:16 +03:00
|
|
|
char const* git_reset[] = { git, "reset", "--hard", sha1.c_str(),
|
|
|
|
CM_NULLPTR };
|
2010-06-09 00:37:04 +04:00
|
|
|
OutputLogger reset_out(this->Log, "reset-out> ");
|
|
|
|
OutputLogger reset_err(this->Log, "reset-err> ");
|
|
|
|
return this->RunChild(&git_reset[0], &reset_out, &reset_err);
|
2010-06-09 00:12:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
bool cmCTestGIT::UpdateByCustom(std::string const& custom)
|
|
|
|
{
|
|
|
|
std::vector<std::string> git_custom_command;
|
|
|
|
cmSystemTools::ExpandListArgument(custom, git_custom_command, true);
|
|
|
|
std::vector<char const*> git_custom;
|
2016-05-16 17:34:04 +03:00
|
|
|
for (std::vector<std::string>::const_iterator i = git_custom_command.begin();
|
|
|
|
i != git_custom_command.end(); ++i) {
|
2010-06-09 00:12:28 +04:00
|
|
|
git_custom.push_back(i->c_str());
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2016-06-27 23:44:16 +03:00
|
|
|
git_custom.push_back(CM_NULLPTR);
|
2010-06-09 00:12:28 +04:00
|
|
|
|
|
|
|
OutputLogger custom_out(this->Log, "custom-out> ");
|
|
|
|
OutputLogger custom_err(this->Log, "custom-err> ");
|
|
|
|
return this->RunUpdateCommand(&git_custom[0], &custom_out, &custom_err);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool cmCTestGIT::UpdateInternal()
|
|
|
|
{
|
|
|
|
std::string custom = this->CTest->GetCTestConfiguration("GITUpdateCustom");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (!custom.empty()) {
|
2010-06-09 00:12:28 +04:00
|
|
|
return this->UpdateByCustom(custom);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-06-09 00:37:04 +04:00
|
|
|
return this->UpdateByFetchAndReset();
|
2010-06-09 00:12:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
bool cmCTestGIT::UpdateImpl()
|
|
|
|
{
|
2016-05-16 17:34:04 +03:00
|
|
|
if (!this->UpdateInternal()) {
|
2010-06-09 00:12:28 +04:00
|
|
|
return false;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-06-09 00:12:28 +04:00
|
|
|
|
2010-07-27 19:31:59 +04:00
|
|
|
std::string top_dir = this->FindTopDir();
|
2010-06-09 00:12:28 +04:00
|
|
|
const char* git = this->CommandLineTool.c_str();
|
2011-02-22 23:47:50 +03:00
|
|
|
const char* recursive = "--recursive";
|
2016-03-31 19:30:42 +03:00
|
|
|
const char* sync_recursive = "--recursive";
|
2011-02-22 23:47:50 +03:00
|
|
|
|
2016-03-31 19:31:31 +03:00
|
|
|
// Git < 1.6.5 did not support submodule --recursive
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->GetGitVersion() < cmCTestGITVersion(1, 6, 5, 0)) {
|
2016-06-27 23:44:16 +03:00
|
|
|
recursive = CM_NULLPTR;
|
2016-03-31 19:31:31 +03:00
|
|
|
// No need to require >= 1.6.5 if there are no submodules.
|
2016-05-16 17:34:04 +03:00
|
|
|
if (cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str())) {
|
2016-03-31 19:31:31 +03:00
|
|
|
this->Log << "Git < 1.6.5 cannot update submodules recursively\n";
|
2011-02-22 23:47:50 +03:00
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2011-02-22 23:47:50 +03:00
|
|
|
|
2016-03-31 19:30:42 +03:00
|
|
|
// Git < 1.8.1 did not support sync --recursive
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->GetGitVersion() < cmCTestGITVersion(1, 8, 1, 0)) {
|
2016-06-27 23:44:16 +03:00
|
|
|
sync_recursive = CM_NULLPTR;
|
2016-03-31 19:30:42 +03:00
|
|
|
// No need to require >= 1.8.1 if there are no submodules.
|
2016-05-16 17:34:04 +03:00
|
|
|
if (cmSystemTools::FileExists((top_dir + "/.gitmodules").c_str())) {
|
2016-03-31 19:30:42 +03:00
|
|
|
this->Log << "Git < 1.8.1 cannot synchronize submodules recursively\n";
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2016-03-31 19:30:42 +03:00
|
|
|
|
2010-06-09 00:12:28 +04:00
|
|
|
OutputLogger submodule_out(this->Log, "submodule-out> ");
|
|
|
|
OutputLogger submodule_err(this->Log, "submodule-err> ");
|
2016-03-31 19:28:46 +03:00
|
|
|
|
|
|
|
bool ret;
|
|
|
|
|
|
|
|
std::string init_submodules =
|
|
|
|
this->CTest->GetCTestConfiguration("GITInitSubmodules");
|
2016-05-16 17:34:04 +03:00
|
|
|
if (cmSystemTools::IsOn(init_submodules.c_str())) {
|
2016-06-27 23:44:16 +03:00
|
|
|
char const* git_submodule_init[] = { git, "submodule", "init",
|
|
|
|
CM_NULLPTR };
|
2016-03-31 19:28:46 +03:00
|
|
|
ret = this->RunChild(git_submodule_init, &submodule_out, &submodule_err,
|
|
|
|
top_dir.c_str());
|
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
if (!ret) {
|
2016-03-31 19:28:46 +03:00
|
|
|
return false;
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2016-03-31 19:28:46 +03:00
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
char const* git_submodule_sync[] = { git, "submodule", "sync",
|
2016-06-27 23:44:16 +03:00
|
|
|
sync_recursive, CM_NULLPTR };
|
2016-03-31 19:30:42 +03:00
|
|
|
ret = this->RunChild(git_submodule_sync, &submodule_out, &submodule_err,
|
|
|
|
top_dir.c_str());
|
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
if (!ret) {
|
2016-03-31 19:30:42 +03:00
|
|
|
return false;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2016-03-31 19:30:42 +03:00
|
|
|
|
2016-06-27 23:44:16 +03:00
|
|
|
char const* git_submodule[] = { git, "submodule", "update", recursive,
|
|
|
|
CM_NULLPTR };
|
2010-07-27 19:31:59 +04:00
|
|
|
return this->RunChild(git_submodule, &submodule_out, &submodule_err,
|
|
|
|
top_dir.c_str());
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
|
|
|
|
2011-02-22 23:47:50 +03:00
|
|
|
unsigned int cmCTestGIT::GetGitVersion()
|
|
|
|
{
|
2016-05-16 17:34:04 +03:00
|
|
|
if (!this->CurrentGitVersion) {
|
2011-02-22 23:47:50 +03:00
|
|
|
const char* git = this->CommandLineTool.c_str();
|
2016-06-27 23:44:16 +03:00
|
|
|
char const* git_version[] = { git, "--version", CM_NULLPTR };
|
2011-02-22 23:47:50 +03:00
|
|
|
std::string version;
|
|
|
|
OneLineParser version_out(this, "version-out> ", version);
|
|
|
|
OutputLogger version_err(this->Log, "version-err> ");
|
2016-05-16 17:34:04 +03:00
|
|
|
unsigned int v[4] = { 0, 0, 0, 0 };
|
|
|
|
if (this->RunChild(git_version, &version_out, &version_err) &&
|
|
|
|
sscanf(version.c_str(), "git version %u.%u.%u.%u", &v[0], &v[1], &v[2],
|
|
|
|
&v[3]) >= 3) {
|
2011-02-22 23:47:50 +03:00
|
|
|
this->CurrentGitVersion = cmCTestGITVersion(v[0], v[1], v[2], v[3]);
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2011-02-22 23:47:50 +03:00
|
|
|
return this->CurrentGitVersion;
|
|
|
|
}
|
|
|
|
|
2009-04-22 17:19:06 +04:00
|
|
|
/* Diff format:
|
|
|
|
|
|
|
|
:src-mode dst-mode src-sha1 dst-sha1 status\0
|
|
|
|
src-path\0
|
|
|
|
[dst-path\0]
|
|
|
|
|
|
|
|
The format is repeated for every file changed. The [dst-path\0]
|
|
|
|
line appears only for lines with status 'C' or 'R'. See 'git help
|
|
|
|
diff-tree' for details.
|
|
|
|
*/
|
2016-05-16 17:34:04 +03:00
|
|
|
class cmCTestGIT::DiffParser : public cmCTestVC::LineParser
|
2009-04-22 17:19:06 +04:00
|
|
|
{
|
|
|
|
public:
|
2016-05-16 17:34:04 +03:00
|
|
|
DiffParser(cmCTestGIT* git, const char* prefix)
|
|
|
|
: LineParser('\0', false)
|
|
|
|
, GIT(git)
|
|
|
|
, DiffField(DiffFieldNone)
|
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
this->SetLog(&git->Log, prefix);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
typedef cmCTestGIT::Change Change;
|
|
|
|
std::vector<Change> Changes;
|
2016-05-16 17:34:04 +03:00
|
|
|
|
2009-04-22 17:19:06 +04:00
|
|
|
protected:
|
|
|
|
cmCTestGIT* GIT;
|
2016-05-16 17:34:04 +03:00
|
|
|
enum DiffFieldType
|
|
|
|
{
|
|
|
|
DiffFieldNone,
|
|
|
|
DiffFieldChange,
|
|
|
|
DiffFieldSrc,
|
|
|
|
DiffFieldDst
|
|
|
|
};
|
2009-04-22 17:19:06 +04:00
|
|
|
DiffFieldType DiffField;
|
|
|
|
Change CurChange;
|
|
|
|
|
|
|
|
void DiffReset()
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
this->DiffField = DiffFieldNone;
|
|
|
|
this->Changes.clear();
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
2016-06-23 02:02:39 +03:00
|
|
|
bool ProcessLine() CM_OVERRIDE
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
|
|
|
if (this->Line[0] == ':') {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->DiffField = DiffFieldChange;
|
|
|
|
this->CurChange = Change();
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
|
|
|
if (this->DiffField == DiffFieldChange) {
|
2009-04-22 17:19:06 +04:00
|
|
|
// :src-mode dst-mode src-sha1 dst-sha1 status
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->Line[0] != ':') {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->DiffField = DiffFieldNone;
|
|
|
|
return true;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
|
|
|
const char* src_mode_first = this->Line.c_str() + 1;
|
|
|
|
const char* src_mode_last = this->ConsumeField(src_mode_first);
|
2009-04-22 17:19:06 +04:00
|
|
|
const char* dst_mode_first = this->ConsumeSpace(src_mode_last);
|
2016-05-16 17:34:04 +03:00
|
|
|
const char* dst_mode_last = this->ConsumeField(dst_mode_first);
|
2009-04-22 17:19:06 +04:00
|
|
|
const char* src_sha1_first = this->ConsumeSpace(dst_mode_last);
|
2016-05-16 17:34:04 +03:00
|
|
|
const char* src_sha1_last = this->ConsumeField(src_sha1_first);
|
2009-04-22 17:19:06 +04:00
|
|
|
const char* dst_sha1_first = this->ConsumeSpace(src_sha1_last);
|
2016-05-16 17:34:04 +03:00
|
|
|
const char* dst_sha1_last = this->ConsumeField(dst_sha1_first);
|
|
|
|
const char* status_first = this->ConsumeSpace(dst_sha1_last);
|
|
|
|
const char* status_last = this->ConsumeField(status_first);
|
|
|
|
if (status_first != status_last) {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->CurChange.Action = *status_first;
|
|
|
|
this->DiffField = DiffFieldSrc;
|
2016-05-16 17:34:04 +03:00
|
|
|
} else {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->DiffField = DiffFieldNone;
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
} else if (this->DiffField == DiffFieldSrc) {
|
2009-04-22 17:19:06 +04:00
|
|
|
// src-path
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->CurChange.Action == 'C') {
|
2009-04-22 17:19:06 +04:00
|
|
|
// Convert copy to addition of destination.
|
|
|
|
this->CurChange.Action = 'A';
|
|
|
|
this->DiffField = DiffFieldDst;
|
2016-05-16 17:34:04 +03:00
|
|
|
} else if (this->CurChange.Action == 'R') {
|
2009-04-22 17:19:06 +04:00
|
|
|
// Convert rename to deletion of source and addition of destination.
|
|
|
|
this->CurChange.Action = 'D';
|
|
|
|
this->CurChange.Path = this->Line;
|
|
|
|
this->Changes.push_back(this->CurChange);
|
|
|
|
|
|
|
|
this->CurChange = Change('A');
|
|
|
|
this->DiffField = DiffFieldDst;
|
2016-05-16 17:34:04 +03:00
|
|
|
} else {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->CurChange.Path = this->Line;
|
|
|
|
this->Changes.push_back(this->CurChange);
|
|
|
|
this->DiffField = this->DiffFieldNone;
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
} else if (this->DiffField == DiffFieldDst) {
|
2009-04-22 17:19:06 +04:00
|
|
|
// dst-path
|
|
|
|
this->CurChange.Path = this->Line;
|
|
|
|
this->Changes.push_back(this->CurChange);
|
|
|
|
this->DiffField = this->DiffFieldNone;
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
return true;
|
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
const char* ConsumeSpace(const char* c)
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
|
|
|
while (*c && isspace(*c)) {
|
|
|
|
++c;
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
|
|
|
return c;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
|
|
|
const char* ConsumeField(const char* c)
|
|
|
|
{
|
|
|
|
while (*c && !isspace(*c)) {
|
|
|
|
++c;
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
return c;
|
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Commit format:
|
|
|
|
|
|
|
|
commit ...\n
|
|
|
|
tree ...\n
|
|
|
|
parent ...\n
|
|
|
|
author ...\n
|
|
|
|
committer ...\n
|
|
|
|
\n
|
|
|
|
Log message indented by (4) spaces\n
|
|
|
|
(even blank lines have the spaces)\n
|
2010-06-23 17:14:43 +04:00
|
|
|
[[
|
2009-04-22 17:19:06 +04:00
|
|
|
\n
|
|
|
|
[Diff format]
|
2010-06-23 17:14:43 +04:00
|
|
|
OR
|
|
|
|
\0
|
|
|
|
]]
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
The header may have more fields. See 'git help diff-tree'.
|
|
|
|
*/
|
2016-05-16 17:34:04 +03:00
|
|
|
class cmCTestGIT::CommitParser : public cmCTestGIT::DiffParser
|
2009-04-22 17:19:06 +04:00
|
|
|
{
|
|
|
|
public:
|
2016-05-16 17:34:04 +03:00
|
|
|
CommitParser(cmCTestGIT* git, const char* prefix)
|
|
|
|
: DiffParser(git, prefix)
|
|
|
|
, Section(SectionHeader)
|
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
this->Separator = SectionSep[this->Section];
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
private:
|
|
|
|
typedef cmCTestGIT::Revision Revision;
|
2016-05-16 17:34:04 +03:00
|
|
|
enum SectionType
|
|
|
|
{
|
|
|
|
SectionHeader,
|
|
|
|
SectionBody,
|
|
|
|
SectionDiff,
|
|
|
|
SectionCount
|
|
|
|
};
|
2009-04-22 17:19:06 +04:00
|
|
|
static char const SectionSep[SectionCount];
|
|
|
|
SectionType Section;
|
|
|
|
Revision Rev;
|
|
|
|
|
|
|
|
struct Person
|
|
|
|
{
|
|
|
|
std::string Name;
|
|
|
|
std::string EMail;
|
|
|
|
unsigned long Time;
|
|
|
|
long TimeZone;
|
2016-05-16 17:34:04 +03:00
|
|
|
Person()
|
|
|
|
: Name()
|
|
|
|
, EMail()
|
|
|
|
, Time(0)
|
|
|
|
, TimeZone(0)
|
|
|
|
{
|
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
};
|
|
|
|
|
|
|
|
void ParsePerson(const char* str, Person& person)
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
// Person Name <person@domain.com> 1234567890 +0000
|
|
|
|
const char* c = str;
|
2016-05-16 17:34:04 +03:00
|
|
|
while (*c && isspace(*c)) {
|
|
|
|
++c;
|
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
const char* name_first = c;
|
2016-05-16 17:34:04 +03:00
|
|
|
while (*c && *c != '<') {
|
|
|
|
++c;
|
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
const char* name_last = c;
|
2016-05-16 17:34:04 +03:00
|
|
|
while (name_last != name_first && isspace(*(name_last - 1))) {
|
|
|
|
--name_last;
|
|
|
|
}
|
|
|
|
person.Name.assign(name_first, name_last - name_first);
|
2009-04-22 17:19:06 +04:00
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
const char* email_first = *c ? ++c : c;
|
|
|
|
while (*c && *c != '>') {
|
|
|
|
++c;
|
|
|
|
}
|
|
|
|
const char* email_last = *c ? c++ : c;
|
|
|
|
person.EMail.assign(email_first, email_last - email_first);
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
person.Time = strtoul(c, (char**)&c, 10);
|
|
|
|
person.TimeZone = strtol(c, (char**)&c, 10);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
2016-06-23 02:02:39 +03:00
|
|
|
bool ProcessLine() CM_OVERRIDE
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
|
|
|
if (this->Line.empty()) {
|
|
|
|
if (this->Section == SectionBody && this->LineEnd == '\0') {
|
2010-06-23 17:14:43 +04:00
|
|
|
// Skip SectionDiff
|
|
|
|
this->NextSection();
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
this->NextSection();
|
|
|
|
} else {
|
|
|
|
switch (this->Section) {
|
|
|
|
case SectionHeader:
|
|
|
|
this->DoHeaderLine();
|
|
|
|
break;
|
|
|
|
case SectionBody:
|
|
|
|
this->DoBodyLine();
|
|
|
|
break;
|
|
|
|
case SectionDiff:
|
|
|
|
this->DiffParser::ProcessLine();
|
|
|
|
break;
|
|
|
|
case SectionCount:
|
|
|
|
break; // never happens
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
return true;
|
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
void NextSection()
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
|
|
|
this->Section = SectionType((this->Section + 1) % SectionCount);
|
2009-04-22 17:19:06 +04:00
|
|
|
this->Separator = SectionSep[this->Section];
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->Section == SectionHeader) {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->GIT->DoRevision(this->Rev, this->Changes);
|
|
|
|
this->Rev = Revision();
|
|
|
|
this->DiffReset();
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
void DoHeaderLine()
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
// Look for header fields that we need.
|
2016-05-16 17:34:04 +03:00
|
|
|
if (cmHasLiteralPrefix(this->Line.c_str(), "commit ")) {
|
|
|
|
this->Rev.Rev = this->Line.c_str() + 7;
|
|
|
|
} else if (cmHasLiteralPrefix(this->Line.c_str(), "author ")) {
|
2009-04-22 17:19:06 +04:00
|
|
|
Person author;
|
2016-05-16 17:34:04 +03:00
|
|
|
this->ParsePerson(this->Line.c_str() + 7, author);
|
2009-04-22 17:19:06 +04:00
|
|
|
this->Rev.Author = author.Name;
|
2010-05-07 17:17:26 +04:00
|
|
|
this->Rev.EMail = author.EMail;
|
2010-12-21 01:16:25 +03:00
|
|
|
this->Rev.Date = this->FormatDateTime(author);
|
2016-05-16 17:34:04 +03:00
|
|
|
} else if (cmHasLiteralPrefix(this->Line.c_str(), "committer ")) {
|
2010-12-20 23:33:21 +03:00
|
|
|
Person committer;
|
2016-05-16 17:34:04 +03:00
|
|
|
this->ParsePerson(this->Line.c_str() + 10, committer);
|
2010-12-20 23:33:21 +03:00
|
|
|
this->Rev.Committer = committer.Name;
|
|
|
|
this->Rev.CommitterEMail = committer.EMail;
|
2010-12-21 01:16:25 +03:00
|
|
|
this->Rev.CommitDate = this->FormatDateTime(committer);
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
void DoBodyLine()
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
2009-04-22 17:19:06 +04:00
|
|
|
// Commit log lines are indented by 4 spaces.
|
2016-05-16 17:34:04 +03:00
|
|
|
if (this->Line.size() >= 4) {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->Rev.Log += this->Line.substr(4);
|
|
|
|
}
|
2016-05-16 17:34:04 +03:00
|
|
|
this->Rev.Log += "\n";
|
|
|
|
}
|
2010-12-21 01:16:25 +03:00
|
|
|
|
|
|
|
std::string FormatDateTime(Person const& person)
|
2016-05-16 17:34:04 +03:00
|
|
|
{
|
2010-12-21 01:16:25 +03:00
|
|
|
// 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];
|
2016-05-16 17:34:04 +03:00
|
|
|
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);
|
2010-12-21 01:16:25 +03:00
|
|
|
std::string out = dt;
|
|
|
|
|
|
|
|
// Add the time-zone field "+zone" or "-zone".
|
|
|
|
char tz[32];
|
2016-05-16 17:34:04 +03:00
|
|
|
if (person.TimeZone >= 0) {
|
2010-12-21 01:16:25 +03:00
|
|
|
sprintf(tz, " +%04ld", person.TimeZone);
|
2016-05-16 17:34:04 +03:00
|
|
|
} else {
|
2010-12-21 01:16:25 +03:00
|
|
|
sprintf(tz, " -%04ld", -person.TimeZone);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2010-12-21 01:16:25 +03:00
|
|
|
out += tz;
|
|
|
|
return out;
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
};
|
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
char const cmCTestGIT::CommitParser::SectionSep[SectionCount] = { '\n', '\n',
|
|
|
|
'\0' };
|
2009-04-22 17:19:06 +04:00
|
|
|
|
|
|
|
void cmCTestGIT::LoadRevisions()
|
|
|
|
{
|
|
|
|
// Use 'git rev-list ... | git diff-tree ...' to get revisions.
|
|
|
|
std::string range = this->OldRevision + ".." + this->NewRevision;
|
|
|
|
const char* git = this->CommandLineTool.c_str();
|
2016-05-16 17:34:04 +03:00
|
|
|
const char* git_rev_list[] = { git, "rev-list", "--reverse",
|
2016-06-27 23:44:16 +03:00
|
|
|
range.c_str(), "--", CM_NULLPTR };
|
2016-05-16 17:34:04 +03:00
|
|
|
const char* git_diff_tree[] = {
|
|
|
|
git, "diff-tree", "--stdin", "--always", "-z",
|
2016-06-27 23:44:16 +03:00
|
|
|
"-r", "--pretty=raw", "--encoding=utf-8", CM_NULLPTR
|
2016-05-16 17:34:04 +03:00
|
|
|
};
|
2009-04-22 17:19:06 +04:00
|
|
|
this->Log << this->ComputeCommandLine(git_rev_list) << " | "
|
|
|
|
<< this->ComputeCommandLine(git_diff_tree) << "\n";
|
|
|
|
|
|
|
|
cmsysProcess* cp = cmsysProcess_New();
|
|
|
|
cmsysProcess_AddCommand(cp, git_rev_list);
|
|
|
|
cmsysProcess_AddCommand(cp, git_diff_tree);
|
|
|
|
cmsysProcess_SetWorkingDirectory(cp, this->SourceDirectory.c_str());
|
|
|
|
|
|
|
|
CommitParser out(this, "dt-out> ");
|
|
|
|
OutputLogger err(this->Log, "dt-err> ");
|
|
|
|
this->RunProcess(cp, &out, &err);
|
|
|
|
|
|
|
|
// Send one extra zero-byte to terminate the last record.
|
|
|
|
out.Process("", 1);
|
|
|
|
|
|
|
|
cmsysProcess_Delete(cp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void cmCTestGIT::LoadModifications()
|
|
|
|
{
|
|
|
|
const char* git = this->CommandLineTool.c_str();
|
|
|
|
|
2010-02-09 21:31:32 +03:00
|
|
|
// Use 'git update-index' to refresh the index w.r.t. the work tree.
|
2016-06-27 23:44:16 +03:00
|
|
|
const char* git_update_index[] = { git, "update-index", "--refresh",
|
|
|
|
CM_NULLPTR };
|
2010-02-09 21:31:32 +03:00
|
|
|
OutputLogger ui_out(this->Log, "ui-out> ");
|
|
|
|
OutputLogger ui_err(this->Log, "ui-err> ");
|
|
|
|
this->RunChild(git_update_index, &ui_out, &ui_err);
|
|
|
|
|
|
|
|
// Use 'git diff-index' to get modified files.
|
2016-06-27 23:44:16 +03:00
|
|
|
const char* git_diff_index[] = { git, "diff-index", "-z",
|
|
|
|
"HEAD", "--", CM_NULLPTR };
|
2009-04-22 17:19:06 +04:00
|
|
|
DiffParser out(this, "di-out> ");
|
|
|
|
OutputLogger err(this->Log, "di-err> ");
|
|
|
|
this->RunChild(git_diff_index, &out, &err);
|
|
|
|
|
2016-05-16 17:34:04 +03:00
|
|
|
for (std::vector<Change>::const_iterator ci = out.Changes.begin();
|
|
|
|
ci != out.Changes.end(); ++ci) {
|
2009-04-22 17:19:06 +04:00
|
|
|
this->DoModification(PathModified, ci->Path);
|
2016-05-16 17:34:04 +03:00
|
|
|
}
|
2009-04-22 17:19:06 +04:00
|
|
|
}
|