loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Issue #29 work. Fixed checkout, added more logging.

Browse Source
This commit is contained in:
WrinklyNinja
2013-07-31 09:25:23 +01:00
parent ffaef9e4fa
commit 1e8d903a5f
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/network.cpp
+31 -13
View File
@@ -344,7 +344,7 @@ namespace boss {
}
BOOST_LOG_TRIVIAL(trace) << "Looking up the HEAD revision.";
BOOST_LOG_TRIVIAL(trace) << "Fetching updates from remote.";
//Now pull from the remote repository. This involves a fetch followed by a merge. First perform the fetch.
@@ -352,20 +352,28 @@ namespace boss {
//Open a connection to the remote repository.
BOOST_LOG_TRIVIAL(trace) << "Connecting to remote.";
handle_error(git_remote_connect(remote, GIT_DIRECTION_FETCH));
// Download the files needed. Skipping progress info for now, see <http://libgit2.github.com/libgit2/ex/v0.19.0/network/fetch.html> for an example of how to do that. It uses pthreads, but Boost.Thread should work fine.
BOOST_LOG_TRIVIAL(trace) << "Downloading changes from remote.";
handle_error(git_remote_download(remote, NULL, NULL));
BOOST_LOG_TRIVIAL(info) << "Received " << stats->indexed_objects << " of " << stats->total_objects << " objects in " << stats->received_bytes << " bytes.";
// Disconnect from the remote repository.
BOOST_LOG_TRIVIAL(trace) << "Disconnecting from remote.";
git_remote_disconnect(remote);
// Update references in case they've changed.
BOOST_LOG_TRIVIAL(trace) << "Updating references for remote.";
handle_error(git_remote_update_tips(remote));
// Now start the merging. Not entirely sure what's going on here, but it looks like libgit2's merge API is incomplete, you can create some git_merge_head objects, but can't do anything with them...
@@ -374,6 +382,8 @@ namespace boss {
// The porcelain equivalent is `git checkout FETCH_HEAD masterlist.yaml`
BOOST_LOG_TRIVIAL(trace) << "Setting up checkout parameters.";
char * paths[] = { "masterlist.yaml" };
git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
@@ -381,33 +391,41 @@ namespace boss {
opts.paths.strings = paths;
opts.paths.count = 1;
//First need to find out where FETCH_HEAD is in Git's internal tree structure.
handle_error(git_revparse_single((git_object**)&commit, repo, "FETCH_HEAD"));
//Now we can do the checkout.
handle_error(git_checkout_tree(repo, (git_object*)commit, &opts));
//Whew, that's done. Next, we need to do a looping parsing check / roll-back.
//Next, we need to do a looping checkout / parsing check / roll-back.
bool parsingFailed = false;
unsigned int rollbacks = 0;
char revision[10];
do {
BOOST_LOG_TRIVIAL(trace) << "Getting the Git object for the tree at FETCH_HEAD - " << rollbacks << ".";
//Get the commit hash so that we can report the revision if there is an error.
string filespec = "FETCH_HEAD~" + IntToString(rollbacks) + ":masterlist.yaml";
string filespec = "FETCH_HEAD~" + IntToString(rollbacks);
git_object * mlistObj;
char revision[10];
list<boss::Message> messages;
list<boss::Plugin> plugins;
handle_error(git_revparse_single(&mlistObj, repo, filespec.c_str())); //Check for error val -3.
handle_error(git_revparse_single(&mlistObj, repo, filespec.c_str()));
BOOST_LOG_TRIVIAL(trace) << "Checking out the tree at FETCH_HEAD - " << rollbacks << ".";
//Now we can do the checkout.
handle_error(git_checkout_tree(repo, mlistObj, &opts));
BOOST_LOG_TRIVIAL(trace) << "Getting the hash for the tree.";
const git_oid * mlistOid = git_object_id(mlistObj);
BOOST_LOG_TRIVIAL(trace) << "Converting and recording the first 10 hex characters of the hash.";
git_oid_tostr(&revision[0], 10, mlistOid);
BOOST_LOG_TRIVIAL(trace) << "Freeing the masterlist object.";
git_object_free(mlistObj);
BOOST_LOG_TRIVIAL(trace) << "Testing masterlist parsing.";
//Now try parsing the masterlist.
try {
YAML::Node mlist = YAML::LoadFile(game.MasterlistPath().string());
@@ -443,7 +461,7 @@ namespace boss {
git_remote_free(remote); //Not sure if git_repository_free calls this, so just being safe.
git_repository_free(repo);
return string(revision);
}
}
}