// query the details on a parsed commit void test_commit_parse__details0(void) { static const char *commit_ids[] = { "a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */ "9fd738e8f7967c078dceed8190330fc8648ee56a", /* 1 */ "4a202b346bb0fb0db7eff3cffeb3c70babbd2045", /* 2 */ "c47800c7266a2be04c571c04d5a6614691ea99bd", /* 3 */ "8496071c1b46c854b31185ea97743be6a8774479", /* 4 */ "5b5b025afb0b4c913b4c338a42934a3863bf3644", /* 5 */ "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", /* 6 */ }; const size_t commit_count = sizeof(commit_ids) / sizeof(const char *); unsigned int i; for (i = 0; i < commit_count; ++i) { git_oid id; git_commit *commit; const git_signature *author, *committer; const char *message; git_time_t commit_time; unsigned int parents, p; git_commit *parent = NULL, *old_parent = NULL; git_oid_fromstr(&id, commit_ids[i]); cl_git_pass(git_commit_lookup(&commit, g_repo, &id)); message = git_commit_message(commit); author = git_commit_author(commit); committer = git_commit_committer(commit); commit_time = git_commit_time(commit); parents = git_commit_parentcount(commit); cl_assert_equal_s("Scott Chacon", author->name); cl_assert_equal_s("*****@*****.**", author->email); cl_assert_equal_s("Scott Chacon", committer->name); cl_assert_equal_s("*****@*****.**", committer->email); cl_assert(message != NULL); cl_assert(strchr(message, '\n') != NULL); cl_assert(commit_time > 0); cl_assert(parents <= 2); for (p = 0;p < parents;p++) { if (old_parent != NULL) git_commit_free(old_parent); old_parent = parent; cl_git_pass(git_commit_parent(&parent, commit, p)); cl_assert(parent != NULL); cl_assert(git_commit_author(parent) != NULL); // is it really a commit? } git_commit_free(old_parent); git_commit_free(parent); cl_git_fail(git_commit_parent(&parent, commit, parents)); git_commit_free(commit); } }
int git_commit_nth_gen_ancestor( git_commit **ancestor, const git_commit *commit, unsigned int n) { git_commit *current, *parent; int error; assert(ancestor && commit); current = (git_commit *)commit; if (n == 0) return git_commit_lookup( ancestor, commit->object.repo, git_object_id((const git_object *)commit)); while (n--) { error = git_commit_parent(&parent, (git_commit *)current, 0); if (current != commit) git_commit_free(current); if (error < 0) return error; current = parent; } *ancestor = parent; return 0; }
/** * A commit can have multiple parents * n specifies the nth commit, from 0 to `parentCount` */ Commit Commit::parent(unsigned int n) const { git_commit* ret = nullptr; int error = git_commit_parent(&ret, get(), n); Commit comm(ret); throw_on_error(error); return comm; }
int git_commit_nth_gen_ancestor( git_commit **ancestor, const git_commit *commit, unsigned int n) { git_commit *current, *parent = NULL; int error; assert(ancestor && commit); if (git_commit_dup(¤t, (git_commit *)commit) < 0) return -1; if (n == 0) { *ancestor = current; return 0; } while (n--) { error = git_commit_parent(&parent, current, 0); git_commit_free(current); if (error < 0) return error; current = parent; } *ancestor = parent; return 0; }
Rcpp::Reference Commit::parent(unsigned int n) { BEGIN_RCPP git_commit *result; int err = git_commit_parent(&result, commit.get(), n); if (err) throw Rcpp::exception("bad parent number"); return Commit::create(result); END_RCPP }
static int rebase_next_inmemory( git_rebase_operation **out, git_rebase *rebase) { git_commit *current_commit = NULL, *parent_commit = NULL; git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL; git_rebase_operation *operation; git_index *index = NULL; unsigned int parent_count; int error; *out = NULL; operation = git_array_get(rebase->operations, rebase->current); if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || (error = git_commit_tree(¤t_tree, current_commit)) < 0) goto done; if ((parent_count = git_commit_parentcount(current_commit)) > 1) { giterr_set(GITERR_REBASE, "Cannot rebase a merge commit"); error = -1; goto done; } else if (parent_count) { if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 || (error = git_commit_tree(&parent_tree, parent_commit)) < 0) goto done; } if ((error = git_commit_tree(&head_tree, rebase->last_commit)) < 0 || (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0) goto done; if (!rebase->index) { rebase->index = index; index = NULL; } else { if ((error = git_index_read_index(rebase->index, index)) < 0) goto done; } *out = operation; done: git_commit_free(current_commit); git_commit_free(parent_commit); git_tree_free(current_tree); git_tree_free(head_tree); git_tree_free(parent_tree); git_index_free(index); return error; }
/** * Parents of a commit * * @param commit S4 class git_commit * @return list of S4 class git_commit objects */ SEXP git2r_commit_parent_list(SEXP commit) { int err; size_t i, n; SEXP repo; SEXP list = R_NilValue; git_commit *commit_obj = NULL; git_repository *repository = NULL; if (git2r_arg_check_commit(commit)) git2r_error(git2r_err_commit_arg, __func__, "commit"); repo = GET_SLOT(commit, Rf_install("repo")); repository = git2r_repository_open(repo); if (!repository) git2r_error(git2r_err_invalid_repository, __func__, NULL); err = git2r_commit_lookup(&commit_obj, repository, commit); if (GIT_OK != err) goto cleanup; n = git_commit_parentcount(commit_obj); PROTECT(list = allocVector(VECSXP, n)); for (i = 0; i < n; i++) { git_commit *parent = NULL; SEXP item; err = git_commit_parent(&parent, commit_obj, i); if (GIT_OK != err) goto cleanup; SET_VECTOR_ELT(list, i, item = NEW_OBJECT(MAKE_CLASS("git_commit"))); git2r_commit_init(parent, repo, item); git_commit_free(parent); } cleanup: if (commit_obj) git_commit_free(commit_obj); if (repository) git_repository_free(repository); if (R_NilValue != list) UNPROTECT(1); if (GIT_OK != err) git2r_error(git2r_err_from_libgit2, __func__, giterr_last()->message); return list; }
int git_cherry_pick_commit( git_index **out, git_repository *repo, git_commit *cherry_pick_commit, git_commit *our_commit, unsigned int mainline, const git_merge_options *merge_opts) { git_commit *parent_commit = NULL; git_tree *parent_tree = NULL, *our_tree = NULL, *cherry_pick_tree = NULL; int parent = 0, error = 0; assert(out && repo && cherry_pick_commit && our_commit); if (git_commit_parentcount(cherry_pick_commit) > 1) { if (!mainline) return cherry_pick_seterr(cherry_pick_commit, "Mainline branch is not specified but %s is a merge commit"); parent = mainline; } else { if (mainline) return cherry_pick_seterr(cherry_pick_commit, "Mainline branch specified but %s is not a merge commit"); parent = git_commit_parentcount(cherry_pick_commit); } if (parent && ((error = git_commit_parent(&parent_commit, cherry_pick_commit, (parent - 1))) < 0 || (error = git_commit_tree(&parent_tree, parent_commit)) < 0)) goto done; if ((error = git_commit_tree(&cherry_pick_tree, cherry_pick_commit)) < 0 || (error = git_commit_tree(&our_tree, our_commit)) < 0) goto done; error = git_merge_trees(out, repo, parent_tree, our_tree, cherry_pick_tree, merge_opts); done: git_tree_free(parent_tree); git_tree_free(our_tree); git_tree_free(cherry_pick_tree); git_commit_free(parent_commit); return error; }
static VALUE rb_git_commit_parents_GET(VALUE self) { git_commit *commit; git_commit *parent; unsigned int n; VALUE ret_arr, owner; RUGGED_OBJ_UNWRAP(self, git_commit, commit); RUGGED_OBJ_OWNER(self, owner); ret_arr = rb_ary_new(); for (n = 0; (parent = git_commit_parent(commit, n)) != NULL; n++) { rb_ary_store(ret_arr, n, rugged_object_new(owner, (git_object *)parent)); } return ret_arr; }
int luagi_commit_parent( lua_State *L ) { git_commit** commit = checkcommit( L ); unsigned int n = luaL_checkinteger( L, 2 ); // lua to c n--; git_commit** parent = (git_commit**) lua_newuserdata( L, sizeof( git_commit* ) ); int ret = git_commit_parent( parent, *commit, n ); if( ret != 0 ) { lua_pushnil( L ); lua_pushfstring( L, "can't find parent %d: %d", n, ret ); return 2; } ltk_setmetatable( L, LUAGI_COMMIT_FUNCS ); return 1; }
static int handle_caret_parent_syntax(git_object **out, git_object *obj, int n) { git_object *temp_commit = NULL; int error; if (git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT) < 0) return -1; if (n == 0) { *out = temp_commit; return 0; } error = git_commit_parent((git_commit **)out, (git_commit*)temp_commit, n - 1); git_object_free(temp_commit); return error; }
static int handle_caret_parent_syntax(git_object **out, git_object *obj, int n) { git_object *temp_commit = NULL; int error; if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0) return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ? GIT_EINVALIDSPEC : error; if (n == 0) { *out = temp_commit; return 0; } error = git_commit_parent((git_commit **)out, (git_commit*)temp_commit, n - 1); git_object_free(temp_commit); return error; }
/* * call-seq: * commit.parents -> [commit, ...] * * Return the parent(s) of this commit as an array of +Rugged::Commit+ * objects. An array is always returned even when the commit has only * one or zero parents. * * commit.parents #=> => [#<Rugged::Commit:0x108828918>] * root.parents #=> [] */ static VALUE rb_git_commit_parents_GET(VALUE self) { git_commit *commit; git_commit *parent; unsigned int n, parent_count; VALUE ret_arr, owner; int error; Data_Get_Struct(self, git_commit, commit); owner = rugged_owner(self); parent_count = git_commit_parentcount(commit); ret_arr = rb_ary_new2((long)parent_count); for (n = 0; n < parent_count; n++) { error = git_commit_parent(&parent, commit, n); rugged_exception_check(error); rb_ary_push(ret_arr, rugged_object_new(owner, (git_object *)parent)); } return ret_arr; }
/* Helper to find how many files in a commit changed from its nth parent. */ static int match_with_parent(git_commit *commit, int i, git_diff_options *opts) { git_commit *parent; git_tree *a, *b; git_diff *diff; int ndeltas; check_lg2( git_commit_parent(&parent, commit, (size_t)i), "Get parent", NULL); check_lg2(git_commit_tree(&a, parent), "Tree for parent", NULL); check_lg2(git_commit_tree(&b, commit), "Tree for commit", NULL); check_lg2( git_diff_tree_to_tree(&diff, git_commit_owner(commit), a, b, opts), "Checking diff between parent and commit", NULL); ndeltas = (int)git_diff_num_deltas(diff); git_diff_free(diff); git_tree_free(a); git_tree_free(b); git_commit_free(parent); return ndeltas > 0; }
void QGit::commitDiff(QString commitId) { const git_diff_delta *delta = nullptr; git_tree *commit_tree = nullptr; git_tree *parent_tree = nullptr; git_repository *repo = nullptr; git_commit *parent = nullptr; git_commit *commit = nullptr; git_object *obj = nullptr; git_diff *diff = nullptr; QList<QGitCommitDiffParent> parents; QGitSignature commitAuthor, commitCommiter; QDateTime commitTime; QString commitMessage; QGitCommit commitDiff; unsigned int parentCount; int res = 0; QGitError error; try { res = git_repository_open(&repo, m_path.absolutePath().toUtf8().constData()); if (res) { throw QGitError("git_repository_open", res); } if (commitId.isEmpty()) { commitId = QStringLiteral("HEAD"); } res = git_revparse_single(&obj, repo, commitId.toLatin1()); if (res) { throw QGitError("git_revparse_single", res); } res = git_commit_lookup(&commit, repo, git_object_id(obj)); if (res) { throw QGitError("git_commit_lookup", res); } res = git_commit_tree(&commit_tree, commit); if (res) { throw QGitError("git_commit_tree", res); } commitAuthor = QGitSignature(QString::fromUtf8(git_commit_author(commit)->name), QString::fromUtf8(git_commit_author(commit)->email), QDateTime::fromMSecsSinceEpoch(git_commit_author(commit)->when.time * 1000)); commitCommiter = QGitSignature(QString::fromUtf8(git_commit_committer(commit)->name), QString::fromUtf8(git_commit_committer(commit)->email), QDateTime::fromMSecsSinceEpoch(git_commit_committer(commit)->when.time * 1000)); auto time = git_commit_time(commit); auto timeOffset = git_commit_time_offset(commit); commitTime = QDateTime::fromMSecsSinceEpoch(time * 1000); commitTime.setOffsetFromUtc(timeOffset * 60); commitMessage = QString::fromUtf8(git_commit_message(commit)); parentCount = git_commit_parentcount(commit); if (parentCount == 0) { QGitCommitDiffParent item; res = git_diff_tree_to_tree(&diff, repo, nullptr, commit_tree, nullptr); if (res) { throw QGitError("git_diff_tree_to_tree", res); } size_t _count = git_diff_num_deltas(diff); for(size_t c = 0; c < _count; c++) { delta = git_diff_get_delta(diff, c); item.addFile(delta); } git_diff_free(diff); diff = nullptr; parents.append(item); } else { for(unsigned int c = 0; c < parentCount; c++) { res = git_commit_parent(&parent, commit, c); if (res) { throw QGitError("git_commit_parent", res); } char commit_id[41] = {0, }; const git_oid *oid = git_commit_id(parent); git_oid_tostr(commit_id, 41, oid); QGitCommitDiffParent item(commit_id); res = git_commit_tree(&parent_tree, parent); if (res) { throw QGitError("git_commit_tree", res); } res = git_diff_tree_to_tree(&diff, repo, parent_tree, commit_tree, nullptr); if (res) { throw QGitError("git_diff_tree_to_tree", res); } size_t _count = git_diff_num_deltas(diff); for(size_t c = 0; c < _count; c++) { delta = git_diff_get_delta(diff, c); item.addFile(delta); } git_diff_free(diff); diff = nullptr; git_tree_free(parent_tree); parent_tree = nullptr; git_commit_free(parent); parent = nullptr; parents.append(item); } } } catch(const QGitError &ex) { error = ex; } commitDiff = QGitCommit(commitId, parents, commitTime, commitAuthor, commitCommiter, commitMessage); emit commitDiffReply(commitId, commitDiff, error); if (diff) { git_diff_free(diff); diff = nullptr; } if (parent_tree) { git_tree_free(parent_tree); parent_tree = nullptr; } if (parent) { git_commit_free(parent); parent = nullptr; } if (commit_tree) { git_tree_free(commit_tree); commit_tree = nullptr; } if(commit) { git_commit_free(commit); commit = nullptr; } if(obj) { git_object_free(obj); obj = nullptr; } if (repo) { git_repository_free(repo); repo = nullptr; } }
int main (int argc, char** argv) { // ### Opening the Repository // There are a couple of methods for opening a repository, this being the simplest. // There are also [methods][me] for specifying the index file and work tree locations, here // we are assuming they are in the normal places. // // [me]: http://libgit2.github.com/libgit2/#HEAD/group/repository git_repository *repo; if (argc > 1) { git_repository_open(&repo, argv[1]); } else { git_repository_open(&repo, "/opt/libgit2-test/.git"); } // ### SHA-1 Value Conversions // For our first example, we will convert a 40 character hex value to the 20 byte raw SHA1 value. printf("*Hex to Raw*\n"); char hex[] = "fd6e612585290339ea8bf39c692a7ff6a29cb7c3"; // The `git_oid` is the structure that keeps the SHA value. We will use this throughout the example // for storing the value of the current SHA key we're working with. git_oid oid; git_oid_fromstr(&oid, hex); // Once we've converted the string into the oid value, we can get the raw value of the SHA. printf("Raw 20 bytes: [%.20s]\n", (&oid)->id); // Next we will convert the 20 byte raw SHA1 value to a human readable 40 char hex value. printf("\n*Raw to Hex*\n"); char out[41]; out[40] = '\0'; // If you have a oid, you can easily get the hex value of the SHA as well. git_oid_fmt(out, &oid); printf("SHA hex string: %s\n", out); // ### Working with the Object Database // **libgit2** provides [direct access][odb] to the object database. // The object database is where the actual objects are stored in Git. For // working with raw objects, we'll need to get this structure from the // repository. // [odb]: http://libgit2.github.com/libgit2/#HEAD/group/odb git_odb *odb; git_repository_odb(&odb, repo); // #### Raw Object Reading printf("\n*Raw Object Read*\n"); git_odb_object *obj; git_otype otype; const unsigned char *data; const char *str_type; int error; // We can read raw objects directly from the object database if we have the oid (SHA) // of the object. This allows us to access objects without knowing thier type and inspect // the raw bytes unparsed. error = git_odb_read(&obj, odb, &oid); // A raw object only has three properties - the type (commit, blob, tree or tag), the size // of the raw data and the raw, unparsed data itself. For a commit or tag, that raw data // is human readable plain ASCII text. For a blob it is just file contents, so it could be // text or binary data. For a tree it is a special binary format, so it's unlikely to be // hugely helpful as a raw object. data = (const unsigned char *)git_odb_object_data(obj); otype = git_odb_object_type(obj); // We provide methods to convert from the object type which is an enum, to a string // representation of that value (and vice-versa). str_type = git_object_type2string(otype); printf("object length and type: %d, %s\n", (int)git_odb_object_size(obj), str_type); // For proper memory management, close the object when you are done with it or it will leak // memory. git_odb_object_free(obj); // #### Raw Object Writing printf("\n*Raw Object Write*\n"); // You can also write raw object data to Git. This is pretty cool because it gives you // direct access to the key/value properties of Git. Here we'll write a new blob object // that just contains a simple string. Notice that we have to specify the object type as // the `git_otype` enum. git_odb_write(&oid, odb, "test data", sizeof("test data") - 1, GIT_OBJ_BLOB); // Now that we've written the object, we can check out what SHA1 was generated when the // object was written to our database. git_oid_fmt(out, &oid); printf("Written Object: %s\n", out); // ### Object Parsing // libgit2 has methods to parse every object type in Git so you don't have to work directly // with the raw data. This is much faster and simpler than trying to deal with the raw data // yourself. // #### Commit Parsing // [Parsing commit objects][pco] is simple and gives you access to all the data in the commit // - the // author (name, email, datetime), committer (same), tree, message, encoding and parent(s). // [pco]: http://libgit2.github.com/libgit2/#HEAD/group/commit printf("\n*Commit Parsing*\n"); git_commit *commit; git_oid_fromstr(&oid, "f0877d0b841d75172ec404fc9370173dfffc20d1"); error = git_commit_lookup(&commit, repo, &oid); const git_signature *author, *cmtter; const char *message; time_t ctime; unsigned int parents, p; // Each of the properties of the commit object are accessible via methods, including commonly // needed variations, such as `git_commit_time` which returns the author time and `_message` // which gives you the commit message. message = git_commit_message(commit); author = git_commit_author(commit); cmtter = git_commit_committer(commit); ctime = git_commit_time(commit); // The author and committer methods return [git_signature] structures, which give you name, email // and `when`, which is a `git_time` structure, giving you a timestamp and timezone offset. printf("Author: %s (%s)\n", author->name, author->email); // Commits can have zero or more parents. The first (root) commit will have no parents, most commits // will have one, which is the commit it was based on, and merge commits will have two or more. // Commits can technically have any number, though it's pretty rare to have more than two. parents = git_commit_parentcount(commit); for (p = 0;p < parents;p++) { git_commit *parent; git_commit_parent(&parent, commit, p); git_oid_fmt(out, git_commit_id(parent)); printf("Parent: %s\n", out); git_commit_free(parent); } // Don't forget to close the object to prevent memory leaks. You will have to do this for // all the objects you open and parse. git_commit_free(commit); // #### Writing Commits // // libgit2 provides a couple of methods to create commit objects easily as well. There are four // different create signatures, we'll just show one of them here. You can read about the other // ones in the [commit API docs][cd]. // [cd]: http://libgit2.github.com/libgit2/#HEAD/group/commit printf("\n*Commit Writing*\n"); git_oid tree_id, parent_id, commit_id; git_tree *tree; git_commit *parent; // Creating signatures for an authoring identity and time is pretty simple - you will need to have // this to create a commit in order to specify who created it and when. Default values for the name // and email should be found in the `user.name` and `user.email` configuration options. See the `config` // section of this example file to see how to access config values. git_signature_new((git_signature **)&author, "Scott Chacon", "*****@*****.**", 123456789, 60); git_signature_new((git_signature **)&cmtter, "Scott A Chacon", "*****@*****.**", 987654321, 90); // Commit objects need a tree to point to and optionally one or more parents. Here we're creating oid // objects to create the commit with, but you can also use git_oid_fromstr(&tree_id, "28873d96b4e8f4e33ea30f4c682fd325f7ba56ac"); git_tree_lookup(&tree, repo, &tree_id); git_oid_fromstr(&parent_id, "f0877d0b841d75172ec404fc9370173dfffc20d1"); git_commit_lookup(&parent, repo, &parent_id); // Here we actually create the commit object with a single call with all the values we need to create // the commit. The SHA key is written to the `commit_id` variable here. git_commit_create_v( &commit_id, /* out id */ repo, NULL, /* do not update the HEAD */ author, cmtter, NULL, /* use default message encoding */ "example commit", tree, 1, parent); // Now we can take a look at the commit SHA we've generated. git_oid_fmt(out, &commit_id); printf("New Commit: %s\n", out); // #### Tag Parsing // You can parse and create tags with the [tag management API][tm], which functions very similarly // to the commit lookup, parsing and creation methods, since the objects themselves are very similar. // [tm]: http://libgit2.github.com/libgit2/#HEAD/group/tag printf("\n*Tag Parsing*\n"); git_tag *tag; const char *tmessage, *tname; git_otype ttype; // We create an oid for the tag object if we know the SHA and look it up in the repository the same // way that we would a commit (or any other) object. git_oid_fromstr(&oid, "bc422d45275aca289c51d79830b45cecebff7c3a"); error = git_tag_lookup(&tag, repo, &oid); // Now that we have the tag object, we can extract the information it generally contains: the target // (usually a commit object), the type of the target object (usually 'commit'), the name ('v1.0'), // the tagger (a git_signature - name, email, timestamp), and the tag message. git_tag_target((git_object **)&commit, tag); tname = git_tag_name(tag); // "test" ttype = git_tag_type(tag); // GIT_OBJ_COMMIT (otype enum) tmessage = git_tag_message(tag); // "tag message\n" printf("Tag Message: %s\n", tmessage); git_commit_free(commit); // #### Tree Parsing // [Tree parsing][tp] is a bit different than the other objects, in that we have a subtype which is the // tree entry. This is not an actual object type in Git, but a useful structure for parsing and // traversing tree entries. // // [tp]: http://libgit2.github.com/libgit2/#HEAD/group/tree printf("\n*Tree Parsing*\n"); const git_tree_entry *entry; git_object *objt; // Create the oid and lookup the tree object just like the other objects. git_oid_fromstr(&oid, "2a741c18ac5ff082a7caaec6e74db3075a1906b5"); git_tree_lookup(&tree, repo, &oid); // Getting the count of entries in the tree so you can iterate over them if you want to. int cnt = git_tree_entrycount(tree); // 3 printf("tree entries: %d\n", cnt); entry = git_tree_entry_byindex(tree, 0); printf("Entry name: %s\n", git_tree_entry_name(entry)); // "hello.c" // You can also access tree entries by name if you know the name of the entry you're looking for. entry = git_tree_entry_byname(tree, "hello.c"); git_tree_entry_name(entry); // "hello.c" // Once you have the entry object, you can access the content or subtree (or commit, in the case // of submodules) that it points to. You can also get the mode if you want. git_tree_entry_to_object(&objt, repo, entry); // blob // Remember to close the looked-up object once you are done using it git_object_free(objt); // #### Blob Parsing // // The last object type is the simplest and requires the least parsing help. Blobs are just file // contents and can contain anything, there is no structure to it. The main advantage to using the // [simple blob api][ba] is that when you're creating blobs you don't have to calculate the size // of the content. There is also a helper for reading a file from disk and writing it to the db and // getting the oid back so you don't have to do all those steps yourself. // // [ba]: http://libgit2.github.com/libgit2/#HEAD/group/blob printf("\n*Blob Parsing*\n"); git_blob *blob; git_oid_fromstr(&oid, "af7574ea73f7b166f869ef1a39be126d9a186ae0"); git_blob_lookup(&blob, repo, &oid); // You can access a buffer with the raw contents of the blob directly. // Note that this buffer may not be contain ASCII data for certain blobs (e.g. binary files): // do not consider the buffer a NULL-terminated string, and use the `git_blob_rawsize` attribute to // find out its exact size in bytes printf("Blob Size: %ld\n", git_blob_rawsize(blob)); // 8 git_blob_rawcontent(blob); // "content" // ### Revwalking // // The libgit2 [revision walking api][rw] provides methods to traverse the directed graph created // by the parent pointers of the commit objects. Since all commits point back to the commit that // came directly before them, you can walk this parentage as a graph and find all the commits that // were ancestors of (reachable from) a given starting point. This can allow you to create `git log` // type functionality. // // [rw]: http://libgit2.github.com/libgit2/#HEAD/group/revwalk printf("\n*Revwalking*\n"); git_revwalk *walk; git_commit *wcommit; git_oid_fromstr(&oid, "f0877d0b841d75172ec404fc9370173dfffc20d1"); // To use the revwalker, create a new walker, tell it how you want to sort the output and then push // one or more starting points onto the walker. If you want to emulate the output of `git log` you // would push the SHA of the commit that HEAD points to into the walker and then start traversing them. // You can also 'hide' commits that you want to stop at or not see any of their ancestors. So if you // want to emulate `git log branch1..branch2`, you would push the oid of `branch2` and hide the oid // of `branch1`. git_revwalk_new(&walk, repo); git_revwalk_sorting(walk, GIT_SORT_TOPOLOGICAL | GIT_SORT_REVERSE); git_revwalk_push(walk, &oid); const git_signature *cauth; const char *cmsg; // Now that we have the starting point pushed onto the walker, we can start asking for ancestors. It // will return them in the sorting order we asked for as commit oids. // We can then lookup and parse the commited pointed at by the returned OID; // note that this operation is specially fast since the raw contents of the commit object will // be cached in memory while ((git_revwalk_next(&oid, walk)) == 0) { error = git_commit_lookup(&wcommit, repo, &oid); cmsg = git_commit_message(wcommit); cauth = git_commit_author(wcommit); printf("%s (%s)\n", cmsg, cauth->email); git_commit_free(wcommit); } // Like the other objects, be sure to free the revwalker when you're done to prevent memory leaks. // Also, make sure that the repository being walked it not deallocated while the walk is in // progress, or it will result in undefined behavior git_revwalk_free(walk); // ### Index File Manipulation // // The [index file API][gi] allows you to read, traverse, update and write the Git index file // (sometimes thought of as the staging area). // // [gi]: http://libgit2.github.com/libgit2/#HEAD/group/index printf("\n*Index Walking*\n"); git_index *index; unsigned int i, ecount; // You can either open the index from the standard location in an open repository, as we're doing // here, or you can open and manipulate any index file with `git_index_open_bare()`. The index // for the repository will be located and loaded from disk. git_repository_index(&index, repo); // For each entry in the index, you can get a bunch of information including the SHA (oid), path // and mode which map to the tree objects that are written out. It also has filesystem properties // to help determine what to inspect for changes (ctime, mtime, dev, ino, uid, gid, file_size and flags) // All these properties are exported publicly in the `git_index_entry` struct ecount = git_index_entrycount(index); for (i = 0; i < ecount; ++i) { git_index_entry *e = git_index_get(index, i); printf("path: %s\n", e->path); printf("mtime: %d\n", (int)e->mtime.seconds); printf("fs: %d\n", (int)e->file_size); } git_index_free(index); // ### References // // The [reference API][ref] allows you to list, resolve, create and update references such as // branches, tags and remote references (everything in the .git/refs directory). // // [ref]: http://libgit2.github.com/libgit2/#HEAD/group/reference printf("\n*Reference Listing*\n"); // Here we will implement something like `git for-each-ref` simply listing out all available // references and the object SHA they resolve to. git_strarray ref_list; git_reference_list(&ref_list, repo, GIT_REF_LISTALL); const char *refname; git_reference *ref; // Now that we have the list of reference names, we can lookup each ref one at a time and // resolve them to the SHA, then print both values out. for (i = 0; i < ref_list.count; ++i) { refname = ref_list.strings[i]; git_reference_lookup(&ref, repo, refname); switch (git_reference_type(ref)) { case GIT_REF_OID: git_oid_fmt(out, git_reference_oid(ref)); printf("%s [%s]\n", refname, out); break; case GIT_REF_SYMBOLIC: printf("%s => %s\n", refname, git_reference_target(ref)); break; default: fprintf(stderr, "Unexpected reference type\n"); exit(1); } } git_strarray_free(&ref_list); // ### Config Files // // The [config API][config] allows you to list and updatee config values in // any of the accessible config file locations (system, global, local). // // [config]: http://libgit2.github.com/libgit2/#HEAD/group/config printf("\n*Config Listing*\n"); const char *email; int32_t j; git_config *cfg; // Open a config object so we can read global values from it. git_config_open_ondisk(&cfg, "~/.gitconfig"); git_config_get_int32(cfg, "help.autocorrect", &j); printf("Autocorrect: %d\n", j); git_config_get_string(cfg, "user.email", &email); printf("Email: %s\n", email); // Finally, when you're done with the repository, you can free it as well. git_repository_free(repo); return 0; }
QGitCommit QGitCommit::parent(unsigned n) const { git_commit *parent; qGitThrow(git_commit_parent(&parent, data(), n)); return QGitCommit(parent); }
static git_commit* FindFileRecentCommit(git_repository* repository, const CString& path) { CAutoRevwalk walk; if (git_revwalk_new(walk.GetPointer(), repository)) return nullptr; CStringA pathA = CUnicodeUtils::GetUTF8(path); if (pathA.GetLength() >= MAX_PATH) return nullptr; const char *pathC = pathA; char folder[MAX_PATH] = {0}, file[MAX_PATH] = {0}; const char *slash = strrchr(pathC, '/'); if (slash) { strncpy(folder, pathC, slash - pathC + 1); folder[slash - pathC + 1] = '\0'; strcpy(file, slash + 1); } else { folder[0] = '\0'; strcpy(file, pathC); } TreewalkStruct treewalkstruct = { folder, file }; if (git_revwalk_push_head(walk)) return nullptr; git_oid oid; CAutoCommit commit; while (!git_revwalk_next(&oid, walk)) { if (git_commit_lookup(commit.GetPointer(), repository, &oid)) return nullptr; CAutoTree tree; if (git_commit_tree(tree.GetPointer(), commit)) return nullptr; memset(&treewalkstruct.oid.id, 0, sizeof(treewalkstruct.oid.id)); int ret = git_tree_walk(tree, GIT_TREEWALK_PRE, TreewalkCB_FindFileRecentCommit, &treewalkstruct); if (ret < 0 && ret != GIT_EUSER) return nullptr; // check if file not found if (git_oid_iszero(&treewalkstruct.oid)) return nullptr; bool diff = true; // for merge point, check if it is different to all parents, if yes then there are real change in the merge point. // if no parent then of course it is different for (unsigned int i = 0; i < git_commit_parentcount(commit); ++i) { CAutoCommit commit2; if (git_commit_parent(commit2.GetPointer(), commit, i)) return nullptr; CAutoTree tree2; if (git_commit_tree(tree2.GetPointer(), commit2)) return nullptr; TreewalkStruct treewalkstruct2 = { folder, file }; memset(&treewalkstruct2.oid.id, 0, sizeof(treewalkstruct2.oid.id)); int ret = git_tree_walk(tree2, GIT_TREEWALK_PRE, TreewalkCB_FindFileRecentCommit, &treewalkstruct2); if (ret < 0 && ret != GIT_EUSER) return nullptr; if (!git_oid_cmp(&treewalkstruct.oid, &treewalkstruct2.oid)) diff = false; else if (git_revwalk_hide(walk, git_commit_parent_id(commit, i))) return nullptr; } if (diff) break; } return commit.Detach(); }
git_commit * parent(git_commit * commit, int p){ git_commit *parent; git_commit_parent(&parent, commit, p); return parent; }
static int rebase_next_merge( git_rebase_operation **out, git_rebase *rebase) { git_buf path = GIT_BUF_INIT; git_commit *current_commit = NULL, *parent_commit = NULL; git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL; git_index *index = NULL; git_indexwriter indexwriter = GIT_INDEXWRITER_INIT; git_rebase_operation *operation; git_checkout_options checkout_opts; char current_idstr[GIT_OID_HEXSZ]; unsigned int parent_count; int error; *out = NULL; operation = git_array_get(rebase->operations, rebase->current); if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || (error = git_commit_tree(¤t_tree, current_commit)) < 0 || (error = git_repository_head_tree(&head_tree, rebase->repo)) < 0) goto done; if ((parent_count = git_commit_parentcount(current_commit)) > 1) { giterr_set(GITERR_REBASE, "Cannot rebase a merge commit"); error = -1; goto done; } else if (parent_count) { if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 || (error = git_commit_tree(&parent_tree, parent_commit)) < 0) goto done; } git_oid_fmt(current_idstr, &operation->id); normalize_checkout_options_for_apply(&checkout_opts, rebase, current_commit); if ((error = git_indexwriter_init_for_operation(&indexwriter, rebase->repo, &checkout_opts.checkout_strategy)) < 0 || (error = rebase_setupfile(rebase, MSGNUM_FILE, -1, "%" PRIuZ "\n", rebase->current+1)) < 0 || (error = rebase_setupfile(rebase, CURRENT_FILE, -1, "%.*s\n", GIT_OID_HEXSZ, current_idstr)) < 0 || (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0 || (error = git_merge__check_result(rebase->repo, index)) < 0 || (error = git_checkout_index(rebase->repo, index, &checkout_opts)) < 0 || (error = git_indexwriter_commit(&indexwriter)) < 0) goto done; *out = operation; done: git_indexwriter_cleanup(&indexwriter); git_index_free(index); git_tree_free(current_tree); git_tree_free(head_tree); git_tree_free(parent_tree); git_commit_free(parent_commit); git_commit_free(current_commit); git_buf_free(&path); return error; }
static void pass_blame(git_blame *blame, git_blame__origin *origin, uint32_t opt) { git_commit *commit = origin->commit; int i, num_parents; git_blame__origin *sg_buf[16]; git_blame__origin *porigin, **sg_origin = sg_buf; num_parents = git_commit_parentcount(commit); if (!git_oid_cmp(git_commit_id(commit), &blame->options.oldest_commit)) /* Stop at oldest specified commit */ num_parents = 0; else if (opt & GIT_BLAME_FIRST_PARENT && num_parents > 1) /* Limit search to the first parent */ num_parents = 1; if (!num_parents) { git_oid_cpy(&blame->options.oldest_commit, git_commit_id(commit)); goto finish; } else if (num_parents < (int)ARRAY_SIZE(sg_buf)) memset(sg_buf, 0, sizeof(sg_buf)); else sg_origin = (git_blame__origin **) git__calloc(num_parents, sizeof(*sg_origin)); for (i=0; i<num_parents; i++) { git_commit *p; int j, same; if (sg_origin[i]) continue; git_commit_parent(&p, origin->commit, i); porigin = find_origin(blame, p, origin); if (!porigin) continue; if (porigin->blob && origin->blob && !git_oid_cmp(git_blob_id(porigin->blob), git_blob_id(origin->blob))) { pass_whole_blame(blame, origin, porigin); origin_decref(porigin); goto finish; } for (j = same = 0; j<i; j++) if (sg_origin[j] && !git_oid_cmp(git_blob_id(sg_origin[j]->blob), git_blob_id(porigin->blob))) { same = 1; break; } if (!same) sg_origin[i] = porigin; else origin_decref(porigin); } /* Standard blame */ for (i=0; i<num_parents; i++) { git_blame__origin *porigin = sg_origin[i]; if (!porigin) continue; if (!origin->previous) { origin_incref(porigin); origin->previous = porigin; } if (pass_blame_to_parent(blame, origin, porigin)) goto finish; } /* TODO: optionally find moves in parents' files */ /* TODO: optionally find copies in parents' files */ finish: for (i=0; i<num_parents; i++) if (sg_origin[i]) origin_decref(sg_origin[i]); if (sg_origin != sg_buf) git__free(sg_origin); return; }
/** * Prints selected details about the given commit. * * @param wcommit * @param fmt */ void print_commit(git_commit *wcommit, const char *fmt) { char c; int percent = 0; const char *cmsg; int nl; const git_signature *cauth; char oid_str[80]; char t[40]; time_t tt; struct tm tm; const git_oid *woid; const git_oid *toid; woid = git_commit_id(wcommit); toid = git_commit_tree_id(wcommit); cmsg = git_commit_message(wcommit); cauth = git_commit_author(wcommit); tt = cauth->when.time + cauth->when.offset*60; tm = *gmtime(&tt); tm.tm_gmtoff = cauth->when.offset*60; strftime(t,sizeof(t),"%a %d %b %Y %T %z",&tm); while ((c = *fmt++)) { if (!percent) { if (c == '%') { percent = 1; continue; } } else { switch (c) { case 'a': printf("%s <%s>",cauth->name,cauth->email); break; case 'd': printf("%s",t); break; case 'm': { nl = 1; while ((c = *cmsg++)) { if (nl) { printf(" "); nl = 0; } putc(c,stdout); if (c == '\n') nl = 1; } } break; case 'p': { int i; int num_parents = git_commit_parentcount(wcommit); struct optarg prefix; struct optarg suffix; memset(&prefix,0,sizeof(prefix)); memset(&suffix,0,sizeof(suffix)); fmt = sgit_find_optional_arg(&prefix, fmt); fmt = sgit_find_optional_arg(&suffix, fmt); for (i=0;i<num_parents;i++) { git_commit *pcommit; if (git_commit_parent(&pcommit,wcommit,i) == GIT_OK) { int j; for (j=0;j<prefix.len;j++) printf("%c",prefix.start[j]); printf("%s",git_oid_tostr(oid_str,sizeof(oid_str),git_commit_id(pcommit))); for (j=0;j<suffix.len;j++) printf("%c",suffix.start[j]); } } } break; case 'C': printf("%s",git_oid_tostr(oid_str,sizeof(oid_str),woid)); break; case 'T': printf("%s",git_oid_tostr(oid_str,sizeof(oid_str),toid)); break; } percent = 0; continue; } printf("%c",c); } }
void QGit::listCommits(QString object, int length) { QList<QGitCommit> commits; git_repository *repo = nullptr; git_revwalk *walker = nullptr; git_commit *parent = nullptr; git_commit *commit = nullptr; git_diff *diff = nullptr; git_oid oid; int count = 0; int res = 0; QGitError error; try { res = git_repository_open(&repo, m_path.absolutePath().toUtf8().constData()); if (res) { throw QGitError("git_repository_open", res); } res = git_revwalk_new(&walker, repo); if (res) { throw QGitError("git_revwalk_new", res); } if (object.isEmpty()) { res = git_revwalk_push_head(walker); if (res) { length = 0; } } else { res = git_oid_fromstr(&oid, object.toLatin1().constData()); if (res) { throw QGitError("git_oid_fromstr", res); } res = git_revwalk_push(walker, &oid); if (res) { throw QGitError("git_revwalk_push", res); } memset(&oid, 0, sizeof(oid)); git_revwalk_next(&oid, walker); memset(&oid, 0, sizeof(oid)); } while ((!git_revwalk_next(&oid, walker))&&(count < length)) { QGitCommit item; unsigned int parents = 0; QString commit_id; QList<QGitCommitDiffParent> commit_parents; QDateTime commit_time; QGitSignature commit_author; QGitSignature commit_commiter; QString commit_message; res = git_commit_lookup(&commit, repo, &oid); if (res) { throw QGitError("git_commit_lookup", res); } commit_id = QString::fromUtf8(git_oid_tostr_s(&oid)); parents = git_commit_parentcount(commit); for(unsigned int index = 0; index < parents; index++) { git_commit *parent = nullptr; QByteArray parentStr; res = git_commit_parent(&parent, commit, index); if (res) { throw QGitError("git_commit_parent", res); } const git_oid *parent_iod = git_commit_id(parent); parentStr = QByteArray(git_oid_tostr_s(parent_iod)); commit_parents.append(QGitCommitDiffParent(parentStr)); git_commit_free(parent); parent = nullptr; } auto time = git_commit_time(commit); auto timeOffset = git_commit_time_offset(commit); commit_time = QDateTime::fromMSecsSinceEpoch(time * 1000); commit_time.setOffsetFromUtc(timeOffset * 60); QString author_name = QString::fromUtf8(git_commit_author(commit)->name); QString author_email = QString::fromUtf8(git_commit_author(commit)->email); QDateTime author_when = QDateTime::fromMSecsSinceEpoch(git_commit_author(commit)->when.time * 1000); author_when.setOffsetFromUtc(git_commit_author(commit)->when.offset * 60); commit_author = QGitSignature(author_name, author_email, author_when); QString commiter_name = QString::fromUtf8(git_commit_committer(commit)->name); QString commiter_email = QString::fromUtf8(git_commit_committer(commit)->email); QDateTime commiter_when = QDateTime::fromMSecsSinceEpoch(git_commit_committer(commit)->when.time * 1000); commiter_when.setOffsetFromUtc(git_commit_committer(commit)->when.offset * 60); commit_commiter = QGitSignature(commiter_name, commiter_email, commiter_when); commit_message = QString::fromUtf8(git_commit_message(commit)); item = QGitCommit(commit_id, commit_parents, commit_time, commit_author, commit_commiter, commit_message); commits.push_back(item); git_diff_free(diff); diff = nullptr; git_commit_free(parent); parent = nullptr; git_commit_free(commit); commit = nullptr; count++; } } catch(const QGitError &ex) { error = ex; } emit listCommitsReply(commits, error); if (diff) { git_diff_free(diff); diff = nullptr; } if (parent) { git_commit_free(parent); parent = nullptr; } if (walker) { git_revwalk_free(walker); walker = nullptr; } if (repo) { git_repository_free(repo); repo = nullptr; } }