void test_object_tree_write__subtree(void)
{
// write a hierarchical tree from a memory
git_treebuilder *builder;
git_tree *tree;
git_oid id, bid, subtree_id, id2, id3;
git_oid id_hiearar;
git_oid_fromstr(&id, first_tree);
git_oid_fromstr(&id2, second_tree);
git_oid_fromstr(&id3, third_tree);
git_oid_fromstr(&bid, blob_oid);
//create subtree
cl_git_pass(git_treebuilder_create(&builder, NULL));
cl_git_pass(git_treebuilder_insert(NULL,builder,"new.txt",&bid,0100644));
cl_git_pass(git_treebuilder_write(&subtree_id, g_repo, builder));
git_treebuilder_free(builder);
// create parent tree
cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
cl_git_pass(git_treebuilder_create(&builder, tree));
cl_git_pass(git_treebuilder_insert(NULL,builder,"new",&subtree_id,040000));
cl_git_pass(git_treebuilder_write(&id_hiearar, g_repo, builder));
git_treebuilder_free(builder);
git_tree_free(tree);
cl_assert(git_oid_cmp(&id_hiearar, &id3) == 0);
// check data is correct
cl_git_pass(git_tree_lookup(&tree, g_repo, &id_hiearar));
cl_assert(2 == git_tree_entrycount(tree));
git_tree_free(tree);
}
void test_object_tree_write__from_memory(void)
{
// write a tree from a memory
git_treebuilder *builder;
git_tree *tree;
git_oid id, bid, rid, id2;
git_oid_fromstr(&id, first_tree);
git_oid_fromstr(&id2, second_tree);
git_oid_fromstr(&bid, blob_oid);
//create a second tree from first tree using `git_treebuilder_insert` on REPOSITORY_FOLDER.
cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
cl_git_pass(git_treebuilder_create(&builder, tree));
cl_git_fail(git_treebuilder_insert(NULL, builder, "", &bid, 0100644));
cl_git_fail(git_treebuilder_insert(NULL, builder, "/", &bid, 0100644));
cl_git_fail(git_treebuilder_insert(NULL, builder, "folder/new.txt", &bid, 0100644));
cl_git_pass(git_treebuilder_insert(NULL,builder,"new.txt",&bid,0100644));
cl_git_pass(git_treebuilder_write(&rid, g_repo, builder));
cl_assert(git_oid_cmp(&rid, &id2) == 0);
git_treebuilder_free(builder);
git_tree_free(tree);
}
void test_object_tree_attributes__normalize_attributes_when_creating_a_tree_from_an_existing_one(void)
{
git_repository *repo;
git_treebuilder *builder;
git_oid tid, tid2;
git_tree *tree;
const git_tree_entry *entry;
repo = cl_git_sandbox_init("deprecated-mode.git");
cl_git_pass(git_oid_fromstr(&tid, tree_oid));
cl_git_pass(git_tree_lookup(&tree, repo, &tid));
cl_git_pass(git_treebuilder_create(&builder, tree));
entry = git_treebuilder_get(builder, "old_mode.txt");
cl_assert_equal_i(
GIT_FILEMODE_BLOB,
git_tree_entry_filemode(entry));
cl_git_pass(git_treebuilder_write(&tid2, repo, builder));
git_treebuilder_free(builder);
git_tree_free(tree);
cl_git_pass(git_tree_lookup(&tree, repo, &tid2));
entry = git_tree_entry_byname(tree, "old_mode.txt");
cl_assert_equal_i(
GIT_FILEMODE_BLOB,
git_tree_entry_filemode(entry));
git_tree_free(tree);
cl_git_sandbox_cleanup();
}
static int tree_write(
git_tree **out,
git_repository *repo,
git_tree *source_tree,
const git_oid *object_oid,
const char *treeentry_name,
unsigned int attributes)
{
int error;
git_treebuilder *tb = NULL;
const git_tree_entry *entry;
git_oid tree_oid;
if ((error = git_treebuilder_create(&tb, source_tree)) < 0)
goto cleanup;
if (object_oid) {
if ((error = git_treebuilder_insert(
&entry, tb, treeentry_name, object_oid, attributes)) < 0)
goto cleanup;
} else {
if ((error = git_treebuilder_remove(tb, treeentry_name)) < 0)
goto cleanup;
}
if ((error = git_treebuilder_write(&tree_oid, repo, tb)) < 0)
goto cleanup;
error = git_tree_lookup(out, repo, &tree_oid);
cleanup:
git_treebuilder_free(tb);
return error;
}
int luagi_tree_builder_write( lua_State *L )
{
git_treebuilder** builder = checktreebuilder( L );
git_oid oid;
git_treebuilder_write( &oid, *builder );
return luagi_push_oid( L, &oid );
}
PyObject *
TreeBuilder_write(TreeBuilder *self)
{
int err;
git_oid oid;
err = git_treebuilder_write(&oid, self->repo->repo, self->bld);
if (err < 0)
return Error_set(err);
return git_oid_to_python(&oid);
}
/*
* call-seq:
* builder.write -> oid
*
* Write +builder+'s content as a tree to the repository
* that owns the builder and return the +oid+ for the
* newly created tree.
*/
static VALUE rb_git_treebuilder_write(VALUE self)
{
git_treebuilder *builder;
git_oid written_id;
int error;
Data_Get_Struct(self, git_treebuilder, builder);
error = git_treebuilder_write(&written_id, builder);
rugged_exception_check(error);
return rugged_create_oid(&written_id);
}
void test_object_tree_write__subtree(void)
{
/* write a hierarchical tree from a memory */
git_treebuilder *builder;
git_tree *tree;
git_oid id, bid, subtree_id, id2, id3;
git_oid id_hiearar;
git_oid_fromstr(&id, first_tree);
git_oid_fromstr(&id2, second_tree);
git_oid_fromstr(&id3, third_tree);
git_oid_fromstr(&bid, blob_oid);
/* create subtree */
cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL));
cl_git_pass(git_treebuilder_insert(
NULL, builder, "new.txt", &bid, GIT_FILEMODE_BLOB)); /* -V536 */
cl_git_pass(git_treebuilder_write(&subtree_id, builder));
git_treebuilder_free(builder);
/* create parent tree */
cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
cl_git_pass(git_treebuilder_new(&builder, g_repo, tree));
cl_git_pass(git_treebuilder_insert(
NULL, builder, "new", &subtree_id, GIT_FILEMODE_TREE)); /* -V536 */
cl_git_pass(git_treebuilder_write(&id_hiearar, builder));
git_treebuilder_free(builder);
git_tree_free(tree);
cl_assert(git_oid_cmp(&id_hiearar, &id3) == 0);
/* check data is correct */
cl_git_pass(git_tree_lookup(&tree, g_repo, &id_hiearar));
cl_assert(2 == git_tree_entrycount(tree));
git_tree_free(tree);
}
void test_object_tree_write__filtering(void)
{
git_treebuilder *builder;
int i;
git_oid entry_oid, tree_oid;
git_tree *tree;
git_oid_fromstr(&entry_oid, blob_oid);
cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL));
for (i = 0; _entries[i].filename; ++i)
cl_git_pass(git_treebuilder_insert(NULL,
builder, _entries[i].filename, &entry_oid, _entries[i].attr));
cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder));
cl_assert(git_treebuilder_get(builder, "apple") != NULL);
cl_assert(git_treebuilder_get(builder, "aardvark") != NULL);
cl_assert(git_treebuilder_get(builder, "last") != NULL);
git_treebuilder_filter(builder, treebuilder_filter_prefixed, "apple");
cl_assert_equal_i(4, (int)git_treebuilder_entrycount(builder));
cl_assert(git_treebuilder_get(builder, "apple") == NULL);
cl_assert(git_treebuilder_get(builder, "aardvark") != NULL);
cl_assert(git_treebuilder_get(builder, "last") != NULL);
git_treebuilder_filter(builder, treebuilder_filter_prefixed, "a");
cl_assert_equal_i(2, (int)git_treebuilder_entrycount(builder));
cl_assert(git_treebuilder_get(builder, "aardvark") == NULL);
cl_assert(git_treebuilder_get(builder, "last") != NULL);
cl_git_pass(git_treebuilder_write(&tree_oid, builder));
git_treebuilder_free(builder);
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid));
cl_assert_equal_i(2, (int)git_tree_entrycount(tree));
git_tree_free(tree);
}
static VALUE rb_git_treebuilder_write(VALUE self, VALUE rb_repo)
{
git_treebuilder *builder;
git_repository *repo;
git_oid written_id;
int error;
if (!rb_obj_is_kind_of(rb_repo, rb_cRuggedRepo))
rb_raise(rb_eTypeError, "Expecting a Rugged::Repository instance");
Data_Get_Struct(self, git_treebuilder, builder);
Data_Get_Struct(rb_repo, git_repository, repo);
error = git_treebuilder_write(&written_id, repo, builder);
rugged_exception_check(error);
return rugged_create_oid(&written_id);
}
/* "b=name,t=name", blob_id, tree_id */
static void build_test_tree(
git_oid *out, git_repository *repo, const char *fmt, ...)
{
git_oid *id;
git_treebuilder *builder;
const char *scan = fmt, *next;
char type, delimiter;
git_filemode_t mode = GIT_FILEMODE_BLOB;
git_buf name = GIT_BUF_INIT;
va_list arglist;
cl_git_pass(git_treebuilder_new(&builder, repo, NULL)); /* start builder */
va_start(arglist, fmt);
while (*scan) {
switch (type = *scan++) {
case 't': case 'T': mode = GIT_FILEMODE_TREE; break;
case 'b': case 'B': mode = GIT_FILEMODE_BLOB; break;
default:
cl_assert(type == 't' || type == 'T' || type == 'b' || type == 'B');
}
delimiter = *scan++; /* read and skip delimiter */
for (next = scan; *next && *next != delimiter; ++next)
/* seek end */;
cl_git_pass(git_buf_set(&name, scan, (size_t)(next - scan)));
for (scan = next; *scan && (*scan == delimiter || *scan == ','); ++scan)
/* skip delimiter and optional comma */;
id = va_arg(arglist, git_oid *);
cl_git_pass(git_treebuilder_insert(NULL, builder, name.ptr, id, mode));
}
va_end(arglist);
cl_git_pass(git_treebuilder_write(out, builder));
git_treebuilder_free(builder);
git_buf_free(&name);
}
void test_object_tree_write__from_memory(void)
{
/* write a tree from a memory */
git_treebuilder *builder;
git_tree *tree;
git_oid id, bid, rid, id2;
git_oid_fromstr(&id, first_tree);
git_oid_fromstr(&id2, second_tree);
git_oid_fromstr(&bid, blob_oid);
/* create a second tree from first tree using `git_treebuilder_insert`
* on REPOSITORY_FOLDER.
*/
cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
cl_git_pass(git_treebuilder_new(&builder, g_repo, tree));
cl_git_fail(git_treebuilder_insert(NULL, builder, "",
&bid, GIT_FILEMODE_BLOB));
cl_git_fail(git_treebuilder_insert(NULL, builder, "/",
&bid, GIT_FILEMODE_BLOB));
cl_git_fail(git_treebuilder_insert(NULL, builder, ".git",
&bid, GIT_FILEMODE_BLOB));
cl_git_fail(git_treebuilder_insert(NULL, builder, "..",
&bid, GIT_FILEMODE_BLOB));
cl_git_fail(git_treebuilder_insert(NULL, builder, ".",
&bid, GIT_FILEMODE_BLOB));
cl_git_fail(git_treebuilder_insert(NULL, builder, "folder/new.txt",
&bid, GIT_FILEMODE_BLOB));
cl_git_pass(git_treebuilder_insert(
NULL, builder, "new.txt", &bid, GIT_FILEMODE_BLOB));
cl_git_pass(git_treebuilder_write(&rid, builder));
cl_assert(git_oid_cmp(&rid, &id2) == 0);
git_treebuilder_free(builder);
git_tree_free(tree);
}
/**
* Reads the tree object out of a commit object, or returns an empty tree
* if the commit id is zero.
*/
static int sync_get_tree(git_oid *out,
git_repository *repo,
const git_oid *commit_id)
{
int e = 0;
git_treebuilder *tb = NULL;
git_commit *commit = NULL;
if (git_oid_iszero(commit_id))
{
git_check(git_treebuilder_new(&tb, repo, NULL));
git_check(git_treebuilder_write(out, tb));
}
else
{
git_check(git_commit_lookup(&commit, repo, commit_id));
git_oid_cpy(out, git_commit_tree_id(commit));
}
exit:
if (tb) git_treebuilder_free(tb);
if (commit) git_commit_free(commit);
return e;
}
/*
* And the Lord said: Is this tree properly sorted?
*/
void test_object_tree_write__sorted_subtrees(void)
{
git_treebuilder *builder;
unsigned int i;
int position_c = -1, position_cake = -1, position_config = -1;
struct {
unsigned int attr;
const char *filename;
} entries[] = {
{ 0100644, ".gitattributes" },
{ 0100644, ".gitignore" },
{ 0100644, ".htaccess" },
{ 0100644, "Capfile" },
{ 0100644, "Makefile"},
{ 0100644, "README"},
{ 0040000, "app"},
{ 0040000, "cake"},
{ 0040000, "config"},
{ 0100644, "c"},
{ 0100644, "git_test.txt"},
{ 0100644, "htaccess.htaccess"},
{ 0100644, "index.php"},
{ 0040000, "plugins"},
{ 0040000, "schemas"},
{ 0040000, "ssl-certs"},
{ 0040000, "vendors"}
};
git_oid blank_oid, tree_oid;
memset(&blank_oid, 0x0, sizeof(blank_oid));
cl_git_pass(git_treebuilder_create(&builder, NULL));
for (i = 0; i < ARRAY_SIZE(entries); ++i) {
cl_git_pass(git_treebuilder_insert(NULL,
builder, entries[i].filename, &blank_oid, entries[i].attr));
}
cl_git_pass(git_treebuilder_write(&tree_oid, g_repo, builder));
for (i = 0; i < builder->entries.length; ++i) {
git_tree_entry *entry = git_vector_get(&builder->entries, i);
if (strcmp(entry->filename, "c") == 0)
position_c = i;
if (strcmp(entry->filename, "cake") == 0)
position_cake = i;
if (strcmp(entry->filename, "config") == 0)
position_config = i;
}
cl_assert(position_c != -1);
cl_assert(position_cake != -1);
cl_assert(position_config != -1);
cl_assert(position_c < position_cake);
cl_assert(position_cake < position_config);
git_treebuilder_free(builder);
}
BEGIN_TEST(write2, "write a tree from a memory") git_repository *repo; git_treebuilder *builder; git_tree *tree; git_oid id, bid, rid, id2; must_pass(open_temp_repo(&repo, REPOSITORY_FOLDER)); git_oid_mkstr(&id, first_tree); git_oid_mkstr(&id2, second_tree); git_oid_mkstr(&bid, blob_oid); //create a second tree from first tree using `git_treebuilder_insert` on REPOSITORY_FOLDER. must_pass(git_tree_lookup(&tree, repo, &id)); must_pass(git_treebuilder_create(&builder, tree)); must_pass(git_treebuilder_insert(NULL,builder,"new.txt",&bid,0100644)); must_pass(git_treebuilder_write(&rid,repo,builder)); must_be_true(git_oid_cmp(&rid, &id2) == 0); git_treebuilder_free(builder); git_tree_close(tree); close_temp_repo(repo); END_TEST BEGIN_TEST(write3, "write a hierarchical tree from a memory") git_repository *repo; git_treebuilder *builder; git_tree *tree; git_oid id, bid, subtree_id, id2, id3; git_oid id_hiearar;
void test_core_merge__demo_create_merge_commit(void) {
AGBError * error;
agb_error_new(&error);
// Here we're going to try to use the merge iterator to create a merge commit that contains the right information.
// Note - this version does not recurse into directories. (subtrees)
git_treebuilder * builder;
git_treebuilder_create(&builder, base_tree);
AGBMergeIterator * it = agb_merge__create_iterator(head_tree, branch_tree, base_tree, agb_merge_iterator_options_NONE);
for( ; agb_merge_iterator_is_valid(it) ; agb_merge_iterator_next(it) ) {
AGBMergeEntry * entry = agb_merge_entry_from_iterator(it);
int hasLocalChanged = !agb_git_oid_equal( agb_merge_entry_id(entry,AGB_MERGE_BASE), agb_merge_entry_id(entry,AGB_MERGE_LOCAL) );
int hasRemoteChanged = !agb_git_oid_equal( agb_merge_entry_id(entry,AGB_MERGE_BASE), agb_merge_entry_id(entry,AGB_MERGE_REMOTE) );
printf("-- %s %d %d\n", agb_merge_entry_name(entry), hasLocalChanged, hasRemoteChanged);
if( !hasLocalChanged && !hasRemoteChanged) {
continue;
}
if( hasLocalChanged && !hasRemoteChanged) {
//We want the head version.
if(agb_merge_entry_id(entry,AGB_MERGE_LOCAL) == NULL) {
//TODO: Check error message.
printf("REMOVING %s from tree\n", agb_merge_entry_name(entry) );
git_treebuilder_remove(builder, agb_merge_entry_name(entry) );
continue;
}
//TODO: Check for error
printf("ADDING OR UPDATING %s to tree\n", agb_merge_entry_name(entry) );
int ok = git_treebuilder_insert(NULL, builder, agb_merge_entry_name(entry), agb_merge_entry_id(entry,AGB_MERGE_LOCAL), agb_merge_entry_filemode(entry,AGB_MERGE_LOCAL) );
if(ok!=0) {
printf("Error duting add/update of tree builder: %s\n", giterr_last()->message);
abort();
}
continue;
}
if( !hasLocalChanged && hasRemoteChanged) {
//We want the head version.
if(agb_merge_entry_id(entry,AGB_MERGE_REMOTE) == NULL) {
//TODO: Check error message.
printf("REMOVING %s from tree\n", agb_merge_entry_name(entry) );
git_treebuilder_remove(builder, agb_merge_entry_name(entry) );
continue;
}
//TODO: Check for error
printf("ADDING OR UPDATING %s to tree\n", agb_merge_entry_name(entry) );
int ok = git_treebuilder_insert(NULL, builder, agb_merge_entry_name(entry), agb_merge_entry_id(entry,AGB_MERGE_REMOTE), agb_merge_entry_filemode(entry,AGB_MERGE_REMOTE) );
if(ok!=0) {
printf("Error duting add/update of tree builder: %s\n", giterr_last()->message);
abort();
}
continue;
}
printf("CONFLICT %s in tree\n", agb_merge_entry_name(entry) );
//TODO: CONFLICT - Handle it!
}
// Our tree builder should now be full...
// Lets write it out to a tree
//
//TODO: Check for errors
git_oid new_tree_oid = {};
git_treebuilder_write(&new_tree_oid, repo, builder);
char hexid[GIT_OID_HEXSZ+1];
printf("Tree SHA is %s\n", git_oid_tostr(hexid,GIT_OID_HEXSZ+1, &new_tree_oid));
git_tree * new_tree = NULL;
git_tree_lookup(&new_tree, repo, &new_tree_oid);
// Now we need to create the commit.
const git_commit** parents = (const git_commit**)malloc(sizeof(git_commit*)*2);
parents[0] = head_commit;
parents[1] = branch_commit;
git_signature * author_signature = NULL;
// Time since epoch
// TODO: Get these correctly -
// Could use git_signature_now instead...
{
git_time_t author_time = time(NULL);
int timezone_offset = 0;
int ok;
if((ok=git_signature_new(&author_signature,"Someone","*****@*****.**", author_time, timezone_offset))!=0) {
agb__error_translate(error,"git_signature_new failed",ok);
goto cleanup_error;
}
}
git_oid commit_id;
int ok = git_commit_create(
&commit_id,
repo,
NULL,
author_signature,
author_signature,
"UTF-8",
"An exciting commit",
new_tree,
2, //Two parents
parents
);
if(ok!=0) {
agb__error_translate(error,"git_commit_create failed",ok);
goto cleanup_error;
}
// Then update the refs.
//TODO: Do we need to release this ref?
git_reference * ref;
ok = git_reference_create_matching(
&ref,
repo,
"refs/heads/branch_c",
&commit_id,
1,
NULL,
author_signature,
"merged by libagb");
if(ok!=0) {
agb__error_translate(error,"git_reference_create failed",ok);
goto cleanup_error;
}
git_signature_free(author_signature);
// Now check we got the expected files
cl_assert_equal_c('A', test_core_merge__compare_with_parents_merge_base("branch_c", "created_in_a.txt"));
cl_assert_equal_c('A', test_core_merge__compare_with_parents_merge_base("branch_c", "created_in_b.txt"));
return;
cleanup_error:
printf("ERROR: %s\n",error->message);
if(author_signature) {
git_signature_free(author_signature);
}
cl_fail(error->message);
}
static int write_tree(git_oid *oid, git_index *index, const char *dirname, unsigned int start)
{
git_treebuilder *bld = NULL;
unsigned int i, entries = git_index_entrycount(index);
int error;
size_t dirname_len = strlen(dirname);
const git_tree_cache *cache;
cache = git_tree_cache_get(index->tree, dirname);
if (cache != NULL && cache->entries >= 0){
git_oid_cpy(oid, &cache->oid);
return find_next_dir(dirname, index, start);
}
error = git_treebuilder_create(&bld, NULL);
if (bld == NULL) {
return GIT_ENOMEM;
}
/*
* This loop is unfortunate, but necessary. The index doesn't have
* any directores, so we need to handle that manually, and we
* need to keep track of the current position.
*/
for (i = start; i < entries; ++i) {
git_index_entry *entry = git_index_get(index, i);
char *filename, *next_slash;
/*
* If we've left our (sub)tree, exit the loop and return. The
* first check is an early out (and security for the
* third). The second check is a simple prefix comparison. The
* third check catches situations where there is a directory
* win32/sys and a file win32mmap.c. Without it, the following
* code believes there is a file win32/mmap.c
*/
if (strlen(entry->path) < dirname_len ||
memcmp(entry->path, dirname, dirname_len) ||
(dirname_len > 0 && entry->path[dirname_len] != '/')) {
break;
}
filename = entry->path + dirname_len;
if (*filename == '/')
filename++;
next_slash = strchr(filename, '/');
if (next_slash) {
git_oid sub_oid;
int written;
char *subdir, *last_comp;
subdir = git__strndup(entry->path, next_slash - entry->path);
if (subdir == NULL) {
error = GIT_ENOMEM;
goto cleanup;
}
/* Write out the subtree */
written = write_tree(&sub_oid, index, subdir, i);
if (written < 0) {
error = git__rethrow(written, "Failed to write subtree %s", subdir);
} else {
i = written - 1; /* -1 because of the loop increment */
}
/*
* We need to figure out what we want toinsert
* into this tree. If we're traversing
* deps/zlib/, then we only want to write
* 'zlib' into the tree.
*/
last_comp = strrchr(subdir, '/');
if (last_comp) {
last_comp++; /* Get rid of the '/' */
} else {
last_comp = subdir;
}
error = append_entry(bld, last_comp, &sub_oid, S_IFDIR);
free(subdir);
if (error < GIT_SUCCESS) {
error = git__rethrow(error, "Failed to insert dir");
goto cleanup;
}
} else {
error = append_entry(bld, filename, &entry->oid, entry->mode);
if (error < GIT_SUCCESS) {
error = git__rethrow(error, "Failed to insert file");
}
}
}
error = git_treebuilder_write(oid, index->repository, bld);
if (error < GIT_SUCCESS)
error = git__rethrow(error, "Failed to write tree to db");
cleanup:
git_treebuilder_free(bld);
if (error < GIT_SUCCESS)
return error;
else
return i;
}
int configctl_git_commit(char *path)
{
int rc;
int git_status = -1;
git_oid oid_blob;
git_oid oid_tree;
git_oid oid_commit;
git_blob *blob;
git_tree *tree_cmt;
git_treebuilder *tree_bld;
char *file;
file = get_file(path);
#if 0
// TODO: check if file is changed
__debug("%s", file);
git_diff_stats *stats;
git_diff *diff;
git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
opts.pathspec.strings = &file;
opts.pathspec.count = 1;
rc = git_diff_index_to_workdir(&diff, repo, NULL, &opts);
if(rc)
goto error;
int diff_num = git_diff_num_deltas(diff);
__debug("%d", diff_num);
git_diff_get_stats(&stats, diff);
int x = git_diff_stats_files_changed(stats);
__debug("%d", x);
git_diff_free(diff);
#endif
rc = git_add(file);
if (rc)
goto error;
rc = git_blob_create_fromworkdir(&oid_blob, repo, file);
if (rc)
goto error;
rc = git_blob_lookup(&blob, repo, &oid_blob);
if (rc)
goto error;
rc = git_treebuilder_new(&tree_bld, repo, NULL );
if (0 == rc) {
rc = git_treebuilder_insert(NULL, tree_bld, file, &oid_blob, GIT_FILEMODE_BLOB);
if (!rc) {
rc = git_treebuilder_write(&oid_tree, tree_bld);
if (!rc) {
rc = git_tree_lookup(&tree_cmt, repo, &oid_tree);
if (0 == rc) {
git_commit *commit;
commit = get_last_commit();
git_signature_now(&sign, sign_name, sign_email);
rc = git_commit_create(&oid_commit, repo, "HEAD", sign, sign, NULL,
commit_message, tree_cmt, 1, (const struct git_commit **) &commit);
if (!rc) {
git_status = 0;
__debug("successful git commit");
}
git_tree_free( tree_cmt );
git_commit_free(commit);
git_signature_free(sign);
}
}
}
git_treebuilder_free(tree_bld);
}
git_blob_free( blob );
error:
return git_status;
}
/*
* And the Lord said: Is this tree properly sorted?
*/
void test_object_tree_write__sorted_subtrees(void)
{
git_treebuilder *builder;
git_tree *tree;
unsigned int i;
int position_c = -1, position_cake = -1, position_config = -1;
struct {
unsigned int attr;
const char *filename;
} entries[] = {
{ GIT_FILEMODE_BLOB, ".gitattributes" },
{ GIT_FILEMODE_BLOB, ".gitignore" },
{ GIT_FILEMODE_BLOB, ".htaccess" },
{ GIT_FILEMODE_BLOB, "Capfile" },
{ GIT_FILEMODE_BLOB, "Makefile"},
{ GIT_FILEMODE_BLOB, "README"},
{ GIT_FILEMODE_TREE, "app"},
{ GIT_FILEMODE_TREE, "cake"},
{ GIT_FILEMODE_TREE, "config"},
{ GIT_FILEMODE_BLOB, "c"},
{ GIT_FILEMODE_BLOB, "git_test.txt"},
{ GIT_FILEMODE_BLOB, "htaccess.htaccess"},
{ GIT_FILEMODE_BLOB, "index.php"},
{ GIT_FILEMODE_TREE, "plugins"},
{ GIT_FILEMODE_TREE, "schemas"},
{ GIT_FILEMODE_TREE, "ssl-certs"},
{ GIT_FILEMODE_TREE, "vendors"}
};
git_oid bid, tid, tree_oid;
cl_git_pass(git_oid_fromstr(&bid, blob_oid));
cl_git_pass(git_oid_fromstr(&tid, first_tree));
cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL));
for (i = 0; i < ARRAY_SIZE(entries); ++i) {
git_oid *id = entries[i].attr == GIT_FILEMODE_TREE ? &tid : &bid;
cl_git_pass(git_treebuilder_insert(NULL,
builder, entries[i].filename, id, entries[i].attr));
}
cl_git_pass(git_treebuilder_write(&tree_oid, builder));
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid));
for (i = 0; i < git_tree_entrycount(tree); i++) {
const git_tree_entry *entry = git_tree_entry_byindex(tree, i);
if (strcmp(entry->filename, "c") == 0)
position_c = i;
if (strcmp(entry->filename, "cake") == 0)
position_cake = i;
if (strcmp(entry->filename, "config") == 0)
position_config = i;
}
git_tree_free(tree);
cl_assert(position_c != -1);
cl_assert(position_cake != -1);
cl_assert(position_config != -1);
cl_assert(position_c < position_cake);
cl_assert(position_cake < position_config);
git_treebuilder_free(builder);
}
/**
* Merges two tree objects, producing a third tree.
* The base tree allows the algorithm to distinguish between adds and deletes.
* The algorithm always prefers the item from tree 1 when there is a conflict.
*/
static int sync_merge_trees(git_oid *out,
git_repository *repo,
const git_oid *base_id,
const git_oid *id1,
const git_oid *id2)
{
int e = 0;
git_tree *base_tree = NULL;
git_tree *tree1 = NULL;
git_tree *tree2 = NULL;
git_treebuilder *tb = NULL;
size_t size1, size2;
size_t i1 = 0;
size_t i2 = 0;
const git_tree_entry *e1 = NULL;
const git_tree_entry *e2 = NULL;
enum { ONLY1 = 1, ONLY2 = 2, BOTH = 3 } state = BOTH;
git_check(git_tree_lookup(&base_tree, repo, base_id));
git_check(git_tree_lookup(&tree1, repo, id1));
git_check(git_tree_lookup(&tree2, repo, id2));
git_check(git_treebuilder_new(&tb, repo, NULL));
size1 = git_tree_entrycount(tree1);
size2 = git_tree_entrycount(tree2);
while (1)
{
// Advance to next file:
if (state == ONLY1 || state == BOTH)
{
e1 = i1 < size1 ? git_tree_entry_byindex(tree1, i1++) : NULL;
}
if (state == ONLY2 || state == BOTH)
{
e2 = i2 < size2 ? git_tree_entry_byindex(tree2, i2++) : NULL;
}
// Determine state:
if (e1 && e2)
{
int s = strcmp(git_tree_entry_name(e1), git_tree_entry_name(e2));
state = s < 0 ? ONLY1 :
s > 0 ? ONLY2 :
BOTH;
}
else if (e1 && !e2)
{
state = ONLY1;
}
else if (!e1 && e2)
{
state = ONLY2;
}
else
{
break;
}
// Grab the entry in question:
const git_tree_entry *entry =
(state == ONLY1 || state == BOTH) ? e1 : e2;
const git_tree_entry *base_entry =
git_tree_entry_byname(base_tree, git_tree_entry_name(entry));
// Decide what to do with the entry:
if (state == BOTH && base_entry &&
GIT_OBJ_TREE == git_tree_entry_type(e1) &&
GIT_OBJ_TREE == git_tree_entry_type(e2) &&
GIT_OBJ_TREE == git_tree_entry_type(base_entry))
{
// Merge sub-trees:
git_oid new_tree;
git_check(sync_merge_trees(&new_tree, repo,
git_tree_entry_id(base_entry),
git_tree_entry_id(e1),
git_tree_entry_id(e2)));
git_check(git_treebuilder_insert(NULL, tb,
git_tree_entry_name(e1),
&new_tree,
git_tree_entry_filemode(e1)));
}
else if (state == BOTH && base_entry)
{
if (git_oid_cmp(git_tree_entry_id(base_entry), git_tree_entry_id(e1)))
{
// Entry `e1` has changes, so use that:
git_check(git_treebuilder_insert(NULL, tb,
git_tree_entry_name(e1),
git_tree_entry_id(e1),
git_tree_entry_filemode(e1)));
}
else
{
// Entry `e1` has no changes, so use `e2`:
git_check(git_treebuilder_insert(NULL, tb,
git_tree_entry_name(e2),
git_tree_entry_id(e2),
git_tree_entry_filemode(e2)));
}
}
else if (state == BOTH || !base_entry)
{
// Entry was added, or already present:
git_check(git_treebuilder_insert(NULL, tb,
git_tree_entry_name(entry),
git_tree_entry_id(entry),
git_tree_entry_filemode(entry)));
}
// Otherwise, the entry was deleted.
}
// Write tree:
git_check(git_treebuilder_write(out, tb));
exit:
if (base_tree) git_tree_free(base_tree);
if (tree1) git_tree_free(tree1);
if (tree2) git_tree_free(tree2);
if (tb) git_treebuilder_free(tb);
return e;
}
int
edit_repo(const char *repo_name)
{
int r;
git_repository *repo;
git_oid blob_id;
git_oid oid;
git_oid tree_id;
git_signature *author;
git_time_t time;
git_config *config;
git_index *index;
git_tree *tree;
git_treebuilder *tree_builder;
git_treebuilder *empty_tree_builder;
git_reference *head;
git_commit *commit_parents[1];
char global_config_path[GIT_PATH_MAX];
char out[41];
out[40] = '\0';
// create the repository
r = git_repository_open(&repo, repo_name);
if (r)
printf("error in opening repository\n");
printf("Repo opened\n");
// create a treebuilder
r = git_treebuilder_create(&tree_builder, NULL);
if (r)
printf("error in creting treebuilder\n");
printf("Tree builder created\n");
// ADDING FIRST FILE
// create a blob
r = git_blob_create_fromdisk(&blob_id, repo, "test2");
if (r)
printf("error in creating blob from disk\n");
printf("Blob created\n");
// insert into tree
r = git_treebuilder_insert(NULL, tree_builder, "test1", &blob_id, 0100644);
if (r)
printf("error in inserting into treebuilder\n");
printf("Insert into treebuilder successful\n");
// write the tree to the repo
r = git_treebuilder_write(&oid, repo, tree_builder);
if (r)
printf("error in writing the tree to the repo\n");
printf("Writing the tree to repo successful\n");
// tree lookup
r = git_tree_lookup(&tree, repo, &oid);
if (r)
printf("error in tree lookup\n");
printf("Tree lookup done\n");
// create a author
time = get_time();
r = git_signature_new(&author, "Varun Agrawal", "*****@*****.**", time, -300);
if (r)
printf("error in creating signature\n");
printf("Author signature created\n");
// obtaining the head
r = git_repository_head(&head, repo);
if (r)
printf("error in obtaining the head\n");
r = git_reference_name_to_oid(&oid, repo, git_reference_name(head));
if (r)
printf("error in obtaining the ref id of head\n");
printf("Obtained the head id %s\n", git_oid_tostr(out, 41, &oid));
git_commit_lookup(&commit_parents[0], repo, &oid);
// create a commit
r = git_commit_create( &oid, // object id
repo, // repository
"HEAD", // update reference, this will update the HEAD to this commit
author, // author
author, // committer
NULL, // message encoding, by default UTF-8 is used
"second commit", // message for the commit
tree, // the git_tree object which will be used as the tree for this commit. don't know if NULL is valid
1, // number of parents. Don't know what value should be used here
commit_parents); // array of pointers to the parents(git_commit *parents[])
if (r)
printf("error in creating a commit\n");
printf("Commit created\n");
git_repository_free(repo);
return 0;
}
void test_object_tree_write__removing_and_re_adding_in_treebuilder(void)
{
git_treebuilder *builder;
int i, aardvark_i, apple_i, apple_after_i, apple_extra_i, last_i;
git_oid entry_oid, tree_oid;
git_tree *tree;
cl_git_pass(git_oid_fromstr(&entry_oid, blob_oid));
cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL));
cl_assert_equal_i(0, (int)git_treebuilder_entrycount(builder));
for (i = 0; _entries[i].filename; ++i)
cl_git_pass(git_treebuilder_insert(NULL,
builder, _entries[i].filename, &entry_oid, _entries[i].attr));
cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder));
cl_git_pass(git_treebuilder_remove(builder, "apple"));
cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder));
cl_git_pass(git_treebuilder_remove(builder, "apple_after"));
cl_assert_equal_i(4, (int)git_treebuilder_entrycount(builder));
cl_git_pass(git_treebuilder_insert(
NULL, builder, "before_last", &entry_oid, GIT_FILEMODE_BLOB));
cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder));
/* reinsert apple_after */
cl_git_pass(git_treebuilder_insert(
NULL, builder, "apple_after", &entry_oid, GIT_FILEMODE_BLOB));
cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder));
cl_git_pass(git_treebuilder_remove(builder, "last"));
cl_assert_equal_i(5, (int)git_treebuilder_entrycount(builder));
/* reinsert last */
cl_git_pass(git_treebuilder_insert(
NULL, builder, "last", &entry_oid, GIT_FILEMODE_BLOB));
cl_assert_equal_i(6, (int)git_treebuilder_entrycount(builder));
cl_git_pass(git_treebuilder_insert(
NULL, builder, "apple_extra", &entry_oid, GIT_FILEMODE_BLOB));
cl_assert_equal_i(7, (int)git_treebuilder_entrycount(builder));
cl_git_pass(git_treebuilder_write(&tree_oid, builder));
git_treebuilder_free(builder);
cl_git_pass(git_tree_lookup(&tree, g_repo, &tree_oid));
cl_assert_equal_i(7, (int)git_tree_entrycount(tree));
cl_assert(git_tree_entry_byname(tree, ".first") != NULL);
cl_assert(git_tree_entry_byname(tree, "apple") == NULL);
cl_assert(git_tree_entry_byname(tree, "apple_after") != NULL);
cl_assert(git_tree_entry_byname(tree, "apple_extra") != NULL);
cl_assert(git_tree_entry_byname(tree, "last") != NULL);
aardvark_i = apple_i = apple_after_i = apple_extra_i = last_i = -1;
for (i = 0; i < 7; ++i) {
const git_tree_entry *entry = git_tree_entry_byindex(tree, i);
if (!strcmp(entry->filename, "aardvark"))
aardvark_i = i;
else if (!strcmp(entry->filename, "apple"))
apple_i = i;
else if (!strcmp(entry->filename, "apple_after"))
apple_after_i = i;
else if (!strcmp(entry->filename, "apple_extra"))
apple_extra_i = i;
else if (!strcmp(entry->filename, "last"))
last_i = i;
}
cl_assert_equal_i(-1, apple_i);
cl_assert_equal_i(6, last_i);
cl_assert(aardvark_i < apple_after_i);
cl_assert(apple_after_i < apple_extra_i);
git_tree_free(tree);
}
int
create_repo(const char *repo_name)
{
int r;
git_repository *repo;
git_oid blob_id;
git_oid oid;
git_oid tree_id;
git_signature *author;
git_time_t time;
git_config *config;
git_index *index;
git_tree *tree;
git_treebuilder *tree_builder;
git_treebuilder *empty_tree_builder;
char global_config_path[GIT_PATH_MAX];
// create the repository
r = git_repository_init(&repo, repo_name, 1);
if (r)
printf("error in creating repository\n");
printf("Repo created\n");
// set the repository config
git_config_new(&config);
git_config_find_global(global_config_path, GIT_PATH_MAX);
git_config_add_file_ondisk(config, global_config_path, 1);
//git_config_set_string(config, "name", "Varun Agrawal");
//git_config_set_string(config, "email", "*****@*****.**");
git_repository_set_config(repo, config);
printf("Repo config set\n");
// create a treebuilder
r = git_treebuilder_create(&tree_builder, NULL);
if (r)
printf("error in creting treebuilder\n");
printf("Tree builder created\n");
// ADDING FIRST FILE
// create a blob
r = git_blob_create_fromdisk(&blob_id, repo, "test1");
if (r)
printf("error in creating blob from disk\n");
printf("Blob created\n");
// insert into tree
r = git_treebuilder_insert(NULL, tree_builder, "test1", &blob_id, 0100644);
if (r)
printf("error in inserting into treebuilder\n");
printf("Insert into treebuilder successful\n");
// ADDING SECOND FILE
// create a blob
r = git_blob_create_fromdisk(&blob_id, repo, "test2");
if (r)
printf("error in creating blob from disk\n");
printf("Blob created\n");
// insert into tree
r = git_treebuilder_insert(NULL, tree_builder, "test2", &blob_id, 0100644);
if (r)
printf("error in inserting into treebuilder\n");
printf("Insert into treebuilder successful\n");
// ADDING A EMPTY FOLDER
// create a empty tree
r = git_treebuilder_create(&empty_tree_builder, NULL);
if (r)
printf("error in creting empty treebuilder\n");
printf("Empty Tree builder created\n");
// write the empty tree to the repo
r = git_treebuilder_write(&tree_id, repo, empty_tree_builder);
if (r)
printf("error in writing the empty tree to the repo\n");
printf("Writing the empty tree to repo successful\n");
// insert empty tree into the tree
r = git_treebuilder_insert(NULL, tree_builder, "test_dir", &tree_id, 0040000);
if (r)
printf("error in inserting into treebuilder\n");
printf("Insert into treebuilder successful\n");
// write the tree to the repo
r = git_treebuilder_write(&oid, repo, tree_builder);
if (r)
printf("error in writing the tree to the repo\n");
printf("Writing the tree to repo successful\n");
// tree lookup
r = git_tree_lookup(&tree, repo, &oid);
if (r)
printf("error in tree lookup\n");
printf("Tree lookup done\n");
// create a author
time = get_time();
r = git_signature_new(&author, "Varun Agrawal", "*****@*****.**", time, -300);
if (r)
printf("error in creating signature\n");
printf("Author signature created\n");
// create a commit
r = git_commit_create( &oid, // object id
repo, // repository
"HEAD", // update reference, this will update the HEAD to this commit
author, // author
author, // committer
NULL, // message encoding, by default UTF-8 is used
"first commit", // message for the commit
tree, // the git_tree object which will be used as the tree for this commit. don't know if NULL is valid
0, // number of parents. Don't know what value should be used here
NULL); // array of pointers to the parents(git_commit *parents[])
if (r)
printf("error in creating a commit\n");
printf("Commit created\n");
git_repository_free(repo);
return 0;
}
void test_object_tree_write__cruel_paths(void)
{
static const char *the_paths[] = {
"C:\\",
" : * ? \" \n < > |",
"a\\b",
"\\\\b\a",
":\\",
"COM1",
"foo.aux",
REP1024("1234"), /* 4096 char string */
REP1024("12345678"), /* 8192 char string */
"\xC5\xAA\x6E\xC4\xAD\x63\xC5\x8D\x64\x65\xCC\xBD", /* Ūnĭcōde̽ */
NULL
};
git_treebuilder *builder;
git_tree *tree;
git_oid id, bid, subid;
const char **scan;
int count = 0, i, j;
git_tree_entry *te;
git_oid_fromstr(&bid, blob_oid);
/* create tree */
cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL));
for (scan = the_paths; *scan; ++scan) {
cl_git_pass(git_treebuilder_insert(
NULL, builder, *scan, &bid, GIT_FILEMODE_BLOB));
count++;
}
cl_git_pass(git_treebuilder_write(&id, builder));
git_treebuilder_free(builder);
/* check data is correct */
cl_git_pass(git_tree_lookup(&tree, g_repo, &id));
cl_assert_equal_i(count, git_tree_entrycount(tree));
for (scan = the_paths; *scan; ++scan) {
const git_tree_entry *cte = git_tree_entry_byname(tree, *scan);
cl_assert(cte != NULL);
cl_assert_equal_s(*scan, git_tree_entry_name(cte));
}
for (scan = the_paths; *scan; ++scan) {
cl_git_pass(git_tree_entry_bypath(&te, tree, *scan));
cl_assert_equal_s(*scan, git_tree_entry_name(te));
git_tree_entry_free(te);
}
git_tree_free(tree);
/* let's try longer paths */
cl_git_pass(git_treebuilder_new(&builder, g_repo, NULL));
for (scan = the_paths; *scan; ++scan) {
cl_git_pass(git_treebuilder_insert(
NULL, builder, *scan, &id, GIT_FILEMODE_TREE));
}
cl_git_pass(git_treebuilder_write(&subid, builder));
git_treebuilder_free(builder);
/* check data is correct */
cl_git_pass(git_tree_lookup(&tree, g_repo, &subid));
cl_assert_equal_i(count, git_tree_entrycount(tree));
for (i = 0; i < count; ++i) {
for (j = 0; j < count; ++j) {
git_buf b = GIT_BUF_INIT;
cl_git_pass(git_buf_joinpath(&b, the_paths[i], the_paths[j]));
cl_git_pass(git_tree_entry_bypath(&te, tree, b.ptr));
cl_assert_equal_s(the_paths[j], git_tree_entry_name(te));
git_tree_entry_free(te);
git_buf_free(&b);
}
}
git_tree_free(tree);
}
