void test_reset_mixed__reflog_is_correct(void)
{
git_buf buf = GIT_BUF_INIT;
git_annotated_commit *annotated;
const char *exp_msg = "commit: Updating test data so we can test inter-hunk-context";
reflog_check(repo, "HEAD", 9, "*****@*****.**", exp_msg);
reflog_check(repo, "refs/heads/master", 9, "*****@*****.**", exp_msg);
/* Branch not moving, no reflog entry */
cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}"));
cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
reflog_check(repo, "HEAD", 9, "*****@*****.**", exp_msg);
reflog_check(repo, "refs/heads/master", 9, "*****@*****.**", exp_msg);
git_object_free(target);
target = NULL;
/* Moved branch, expect id in message */
cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
git_buf_clear(&buf);
cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target))));
cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL));
reflog_check(repo, "HEAD", 10, NULL, git_buf_cstr(&buf));
reflog_check(repo, "refs/heads/master", 10, NULL, git_buf_cstr(&buf));
git_buf_free(&buf);
/* Moved branch, expect revspec in message */
exp_msg = "reset: moving to HEAD~^{commit}";
cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}"));
cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_MIXED, NULL));
reflog_check(repo, "HEAD", 11, NULL, exp_msg);
reflog_check(repo, "refs/heads/master", 11, NULL, exp_msg);
git_annotated_commit_free(annotated);
}
void test_reset_hard__reflog_is_correct(void)
{
git_buf buf = GIT_BUF_INIT;
git_annotated_commit *annotated;
const char *exp_msg = "commit: Add a file which name should appear before the "
"\"subdir/\" folder while being dealt with by the treewalker";
reflog_check(repo, "HEAD", 3, "*****@*****.**", exp_msg);
reflog_check(repo, "refs/heads/master", 3, "*****@*****.**", exp_msg);
/* Branch not moving, no reflog entry */
cl_git_pass(git_revparse_single(&target, repo, "HEAD^{commit}"));
cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL));
reflog_check(repo, "HEAD", 3, "*****@*****.**", exp_msg);
reflog_check(repo, "refs/heads/master", 3, "*****@*****.**", exp_msg);
git_object_free(target);
/* Moved branch, expect id in message */
cl_git_pass(git_revparse_single(&target, repo, "HEAD~^{commit}"));
cl_git_pass(git_buf_printf(&buf, "reset: moving to %s", git_oid_tostr_s(git_object_id(target))));
cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL));
reflog_check(repo, "HEAD", 4, NULL, git_buf_cstr(&buf));
reflog_check(repo, "refs/heads/master", 4, NULL, git_buf_cstr(&buf));
git_buf_free(&buf);
/* Moved branch, expect revspec in message */
exp_msg = "reset: moving to HEAD~^{commit}";
cl_git_pass(git_annotated_commit_from_revspec(&annotated, repo, "HEAD~^{commit}"));
cl_git_pass(git_reset_from_annotated(repo, annotated, GIT_RESET_HARD, NULL));
reflog_check(repo, "HEAD", 5, NULL, exp_msg);
reflog_check(repo, "refs/heads/master", 5, NULL, exp_msg);
git_annotated_commit_free(annotated);
}
void SyncState::sync()
{
m_timer.restart();
// Set up directory structure, if necessary
std::string tmpPath = cpp3ds::FileSystem::getFilePath("sdmc:/3ds/BrewMan/tmp");
std::string cachePath = cpp3ds::FileSystem::getFilePath("sdmc:/3ds/BrewMan/cache");
std::string installedPath = cpp3ds::FileSystem::getFilePath("sdmc:/3ds/BrewMan/installed");
if (pathExists(tmpPath.c_str(), false))
removeDirectory(tmpPath.c_str());
mkdir(tmpPath.c_str(), 0777);
if (!pathExists(cachePath.c_str(), false))
mkdir(cachePath.c_str(), 0777);
if (!pathExists(installedPath.c_str(), false))
mkdir(installedPath.c_str(), 0777);
// If auto-dated, boot into newest BrewMan
if (autoUpdate())
{
char buf[256];
size_t len;
FILE *src = fopen("sdmc:/3ds/BrewMan/tmp/update.3dsx", "rb");
FILE *dst = fopen("sdmc:/3ds/BrewMan/tmp/update-copy.3dsx", "wb");
while ((len = fread(buf, 1, sizeof(buf), src)) > 0)
fwrite(buf, 1, sizeof(buf), dst);
fclose(src);
fclose(dst);
bootApp("/3ds/BrewMan/tmp/update.3dsx", "");
requestStackClear();
return;
}
git_repository *repo = NULL;
const char *repoUrl = "git://github.com/Repo3DS/ideal-enigma.git";
const std::string path = cpp3ds::FileSystem::getFilePath(REPO_DIR);
git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
setStatus("Fetching git repo...");
int error = git_clone(&repo, repoUrl, path.c_str(), NULL);
if (error < 0)
{
if (error == GIT_EEXISTS) {
error = git_repository_open(&repo, path.c_str());
if (error == 0) {
git_remote *remote;
error = git_remote_lookup(&remote, repo, "origin");
if (error == 0) {
error = git_remote_fetch(remote, NULL, NULL, "pull");
if (error == 0)
{
git_annotated_commit *our_head, *their_heads[1];
if (git_repository_fetchhead_foreach(repo, find_master, NULL) == 0)
{
git_annotated_commit_from_fetchhead(&their_heads[0], repo, "master", repoUrl, &m_git_oid);
git_merge_analysis_t analysis;
git_merge_preference_t prefs;
git_merge_analysis(&analysis, &prefs, repo, (const git_annotated_commit**)their_heads, 1);
if (analysis & GIT_MERGE_ANALYSIS_UP_TO_DATE)
printf("up to date\n");
else if (analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)
{
printf("fast-forwarding\n");
// if (git_merge(repo, (const git_annotated_commit **)their_heads, 1, NULL, NULL) == 0) {
git_reference *ref;
git_reference *newref;
if (git_reference_lookup(&ref, repo, "refs/heads/master") == 0)
git_reference_set_target(&newref, ref, &m_git_oid, "BrewMan pull: Fast-forward");
git_reset_from_annotated(repo, their_heads[0], GIT_RESET_HARD, NULL);
git_reference_free(ref);
git_repository_state_cleanup(repo);
}
git_annotated_commit_free(their_heads[0]);
}
}
}
}
git_repository_free(repo);
const git_error *e = giterr_last();
if (e) {
setStatus(_("Error %d/%d\n%s\nCloning repo again...", error, e->klass, e->message));
if (!removeDirectory(path.c_str())) {
cpp3ds::sleep(cpp3ds::seconds(2.f));
sync();
} else {
setStatus("Repo failure. Please report this error.\nAnd delete /3ds/BrewMan/repo/ and try again.");
}
return;
}
}
const git_error *e = giterr_last();
if (e) {
setStatus(_("Error %d/%d: %s", error, e->klass, e->message));
return;
}
}
setStatus("Everything up-to-date!");
// Give the Title animation time to finish if necessary
while (m_timer.getElapsedTime() < cpp3ds::seconds(5.f))
cpp3ds::sleep(cpp3ds::milliseconds(50));
requestStackClear();
requestStackPush(States::Browse);
}
