From 2508cc66eb91597b12dc19721d9cea1f06e72107 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 18 Nov 2012 21:38:08 -0700 Subject: [PATCH 01/38] Rename ref and reflog apis for consistency --- include/git2/pack.h | 20 ++++++----- include/git2/reflog.h | 24 ++++++------- include/git2/refs.h | 49 ++++++++++++++------------- src/branch.c | 2 +- src/clone.c | 2 +- src/notes.c | 2 +- src/pack-objects.c | 3 +- src/reflog.c | 18 +++++----- src/refs.c | 46 ++++++++++++------------- src/remote.c | 6 ++-- src/repository.c | 18 +++++----- src/reset.c | 6 ++-- src/revparse.c | 12 +++---- src/revwalk.c | 2 +- src/stash.c | 8 ++--- src/submodule.c | 6 ++-- src/tag.c | 8 ++--- src/transports/local.c | 2 +- src/transports/smart_protocol.c | 2 +- tests-clar/checkout/index.c | 2 +- tests-clar/clone/network.c | 4 +-- tests-clar/commit/commit.c | 2 +- tests-clar/commit/write.c | 6 ++-- tests-clar/object/tag/write.c | 10 +++--- tests-clar/refs/branches/create.c | 6 ++-- tests-clar/refs/branches/delete.c | 8 ++--- tests-clar/refs/branches/foreach.c | 4 +-- tests-clar/refs/branches/ishead.c | 6 ++-- tests-clar/refs/crashes.c | 2 +- tests-clar/refs/create.c | 22 ++++++------ tests-clar/refs/delete.c | 2 +- tests-clar/refs/foreachglob.c | 2 +- tests-clar/refs/lookup.c | 2 +- tests-clar/refs/overwrite.c | 44 ++++++++++++------------ tests-clar/refs/read.c | 18 +++++----- tests-clar/refs/reflog/reflog.c | 2 +- tests-clar/refs/rename.c | 24 ++++++------- tests-clar/refs/revparse.c | 4 +-- tests-clar/refs/unicode.c | 4 +-- tests-clar/repo/head.c | 8 ++--- tests-clar/repo/init.c | 2 +- tests-clar/repo/repo_helpers.c | 2 +- tests-clar/reset/soft.c | 12 +++---- tests-clar/revwalk/signatureparsing.c | 4 +-- tests-clar/stash/drop.c | 4 +-- tests-clar/stash/save.c | 2 +- tests-clar/status/worktree.c | 2 +- 47 files changed, 226 insertions(+), 220 deletions(-) diff --git a/include/git2/pack.h b/include/git2/pack.h index 94d5fc6a1..585cffef6 100644 --- a/include/git2/pack.h +++ b/include/git2/pack.h @@ -38,8 +38,9 @@ GIT_EXTERN(int) git_packbuilder_new(git_packbuilder **out, git_repository *repo) * * @param pb The packbuilder * @param n Number of threads to spawn + * @return number of actual threads to be used */ -GIT_EXTERN(void) git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n); +GIT_EXTERN(unsigned int) git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n); /** * Insert a single object @@ -48,12 +49,12 @@ GIT_EXTERN(void) git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n * commits followed by trees and blobs. * * @param pb The packbuilder - * @param oid The oid of the commit - * @param oid The name; might be NULL + * @param id The oid of the commit + * @param name The name; might be NULL * * @return 0 or an error code */ -GIT_EXTERN(int) git_packbuilder_insert(git_packbuilder *pb, const git_oid *oid, const char *name); +GIT_EXTERN(int) git_packbuilder_insert(git_packbuilder *pb, const git_oid *id, const char *name); /** * Insert a root tree object @@ -61,11 +62,11 @@ GIT_EXTERN(int) git_packbuilder_insert(git_packbuilder *pb, const git_oid *oid, * This will add the tree as well as all referenced trees and blobs. * * @param pb The packbuilder - * @param oid The oid of the root tree + * @param id The oid of the root tree * * @return 0 or an error code */ -GIT_EXTERN(int) git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *oid); +GIT_EXTERN(int) git_packbuilder_insert_tree(git_packbuilder *pb, const git_oid *id); /** * Write the new pack and the corresponding index to path @@ -82,15 +83,17 @@ GIT_EXTERN(int) git_packbuilder_write(git_packbuilder *pb, const char *file); * * @param pb the packbuilder * @param cb the callback to call with each packed object's buffer - * @param data the callback's data + * @param payload the callback's data * @return 0 or an error code */ -GIT_EXTERN(int) git_packbuilder_foreach(git_packbuilder *pb, int (*cb)(void *buf, size_t size, void *data), void *data); +typedef int (*git_packbuilder_foreach_cb)(void *buf, size_t size, void *payload); +GIT_EXTERN(int) git_packbuilder_foreach(git_packbuilder *pb, git_packbuilder_foreach_cb cb, void *payload); /** * Get the total number of objects the packbuilder will write out * * @param pb the packbuilder + * @return */ GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); @@ -98,6 +101,7 @@ GIT_EXTERN(uint32_t) git_packbuilder_object_count(git_packbuilder *pb); * Get the number of objects the packbuilder has already written out * * @param pb the packbuilder + * @return */ GIT_EXTERN(uint32_t) git_packbuilder_written(git_packbuilder *pb); diff --git a/include/git2/reflog.h b/include/git2/reflog.h index 72e1f1753..45dff2165 100644 --- a/include/git2/reflog.h +++ b/include/git2/reflog.h @@ -30,11 +30,11 @@ GIT_BEGIN_DECL * The reflog must be freed manually by using * git_reflog_free(). * - * @param reflog pointer to reflog + * @param out pointer to reflog * @param ref reference to read the reflog for * @return 0 or an error code */ -GIT_EXTERN(int) git_reflog_read(git_reflog **reflog, git_reference *ref); +GIT_EXTERN(int) git_reflog_read(git_reflog **out, const git_reference *ref); /** * Write an existing in-memory reflog object back to disk @@ -51,12 +51,12 @@ GIT_EXTERN(int) git_reflog_write(git_reflog *reflog); * `msg` is optional and can be NULL. * * @param reflog an existing reflog object - * @param new_oid the OID the reference is now pointing to + * @param id the OID the reference is now pointing to * @param committer the signature of the committer * @param msg the reflog message * @return 0 or an error code */ -GIT_EXTERN(int) git_reflog_append(git_reflog *reflog, const git_oid *new_oid, const git_signature *committer, const char *msg); +GIT_EXTERN(int) git_reflog_append(git_reflog *reflog, const git_oid *id, const git_signature *committer, const char *msg); /** * Rename the reflog for the given reference @@ -64,10 +64,10 @@ GIT_EXTERN(int) git_reflog_append(git_reflog *reflog, const git_oid *new_oid, co * The reflog to be renamed is expected to already exist * * @param ref the reference - * @param new_name the new name of the reference + * @param name the new name of the reference * @return 0 or an error code */ -GIT_EXTERN(int) git_reflog_rename(git_reference *ref, const char *new_name); +GIT_EXTERN(int) git_reflog_rename(git_reference *ref, const char *name); /** * Delete the reflog for the given reference @@ -83,7 +83,7 @@ GIT_EXTERN(int) git_reflog_delete(git_reference *ref); * @param reflog the previously loaded reflog * @return the number of log entries */ -GIT_EXTERN(unsigned int) git_reflog_entrycount(git_reflog *reflog); +GIT_EXTERN(size_t) git_reflog_entrycount(git_reflog *reflog); /** * Lookup an entry by its index @@ -126,7 +126,7 @@ GIT_EXTERN(int) git_reflog_drop( * @param entry a reflog entry * @return the old oid */ -GIT_EXTERN(const git_oid *) git_reflog_entry_oidold(const git_reflog_entry *entry); +GIT_EXTERN(const git_oid *) git_reflog_entry_id_old(const git_reflog_entry *entry); /** * Get the new oid @@ -134,7 +134,7 @@ GIT_EXTERN(const git_oid *) git_reflog_entry_oidold(const git_reflog_entry *entr * @param entry a reflog entry * @return the new oid at this time */ -GIT_EXTERN(const git_oid *) git_reflog_entry_oidnew(const git_reflog_entry *entry); +GIT_EXTERN(const git_oid *) git_reflog_entry_id_new(const git_reflog_entry *entry); /** * Get the committer of this entry @@ -142,15 +142,15 @@ GIT_EXTERN(const git_oid *) git_reflog_entry_oidnew(const git_reflog_entry *entr * @param entry a reflog entry * @return the committer */ -GIT_EXTERN(git_signature *) git_reflog_entry_committer(const git_reflog_entry *entry); +GIT_EXTERN(const git_signature *) git_reflog_entry_committer(const git_reflog_entry *entry); /** - * Get the log msg + * Get the log message * * @param entry a reflog entry * @return the log msg */ -GIT_EXTERN(char *) git_reflog_entry_msg(const git_reflog_entry *entry); +GIT_EXTERN(const char *) git_reflog_entry_message(const git_reflog_entry *entry); /** * Free the reflog diff --git a/include/git2/refs.h b/include/git2/refs.h index bc3f44482..4e5a691e6 100644 --- a/include/git2/refs.h +++ b/include/git2/refs.h @@ -29,12 +29,12 @@ GIT_BEGIN_DECL * See `git_reference_create_symbolic()` for documentation about valid * reference names. * - * @param reference_out pointer to the looked-up reference + * @param out pointer to the looked-up reference * @param repo the repository to look up the reference * @param name the long name for the reference (e.g. HEAD, refs/heads/master, refs/tags/v0.1.0, ...) - * @return 0 or an error code + * @return 0 or an error code (ENOTFOUND, EINVALIDSPEC) */ -GIT_EXTERN(int) git_reference_lookup(git_reference **reference_out, git_repository *repo, const char *name); +GIT_EXTERN(int) git_reference_lookup(git_reference **out, git_repository *repo, const char *name); /** * Lookup a reference by name and resolve immediately to OID. @@ -43,12 +43,13 @@ GIT_EXTERN(int) git_reference_lookup(git_reference **reference_out, git_reposito * through to the object id that it refers to. This avoids having to * allocate or free any `git_reference` objects for simple situations. * - * @param oid Pointer to oid to be filled in + * @param out Pointer to oid to be filled in * @param repo The repository in which to look up the reference * @param name The long name for the reference - * @return 0 on success, -1 if name could not be resolved + * @return 0 on success, -1 if name could not be resolved (EINVALIDSPEC, + * ENOTFOUND, etc) */ -GIT_EXTERN(int) git_reference_name_to_oid( +GIT_EXTERN(int) git_reference_name_to_id( git_oid *out, git_repository *repo, const char *name); /** @@ -73,14 +74,14 @@ GIT_EXTERN(int) git_reference_name_to_oid( * This function will return an error if a reference already exists with the * given name unless `force` is true, in which case it will be overwritten. * - * @param ref_out Pointer to the newly created reference + * @param out Pointer to the newly created reference * @param repo Repository where that reference will live * @param name The name of the reference * @param target The target of the reference * @param force Overwrite existing references - * @return 0 or an error code + * @return 0 or an error code (EEXISTS, EINVALIDSPEC) */ -GIT_EXTERN(int) git_reference_create_symbolic(git_reference **ref_out, git_repository *repo, const char *name, const char *target, int force); +GIT_EXTERN(int) git_reference_symbolic_create(git_reference **out, git_repository *repo, const char *name, const char *target, int force); /** * Create a new direct reference. @@ -105,14 +106,14 @@ GIT_EXTERN(int) git_reference_create_symbolic(git_reference **ref_out, git_repos * This function will return an error if a reference already exists with the * given name unless `force` is true, in which case it will be overwritten. * - * @param ref_out Pointer to the newly created reference + * @param out Pointer to the newly created reference * @param repo Repository where that reference will live * @param name The name of the reference * @param id The object id pointed to by the reference. * @param force Overwrite existing references - * @return 0 or an error code + * @return 0 or an error code (EINVALIDSPEC, EEXISTS) */ -GIT_EXTERN(int) git_reference_create_oid(git_reference **ref_out, git_repository *repo, const char *name, const git_oid *id, int force); +GIT_EXTERN(int) git_reference_create(git_reference **out, git_repository *repo, const char *name, const git_oid *id, int force); /** * Get the OID pointed to by a direct reference. @@ -127,7 +128,7 @@ GIT_EXTERN(int) git_reference_create_oid(git_reference **ref_out, git_repository * @param ref The reference * @return a pointer to the oid if available, NULL otherwise */ -GIT_EXTERN(const git_oid *) git_reference_oid(git_reference *ref); +GIT_EXTERN(const git_oid *) git_reference_target(const git_reference *ref); /** * Get full name to the reference pointed to by a symbolic reference. @@ -137,7 +138,7 @@ GIT_EXTERN(const git_oid *) git_reference_oid(git_reference *ref); * @param ref The reference * @return a pointer to the name if available, NULL otherwise */ -GIT_EXTERN(const char *) git_reference_target(git_reference *ref); +GIT_EXTERN(const char *) git_reference_symbolic_target(const git_reference *ref); /** * Get the type of a reference. @@ -147,7 +148,7 @@ GIT_EXTERN(const char *) git_reference_target(git_reference *ref); * @param ref The reference * @return the type */ -GIT_EXTERN(git_ref_t) git_reference_type(git_reference *ref); +GIT_EXTERN(git_ref_t) git_reference_type(const git_reference *ref); /** * Get the full name of a reference. @@ -157,7 +158,7 @@ GIT_EXTERN(git_ref_t) git_reference_type(git_reference *ref); * @param ref The reference * @return the full name for the ref */ -GIT_EXTERN(const char *) git_reference_name(git_reference *ref); +GIT_EXTERN(const char *) git_reference_name(const git_reference *ref); /** * Resolve a symbolic reference to a direct reference. @@ -175,7 +176,7 @@ GIT_EXTERN(const char *) git_reference_name(git_reference *ref); * @param ref The reference * @return 0 or an error code */ -GIT_EXTERN(int) git_reference_resolve(git_reference **resolved_ref, git_reference *ref); +GIT_EXTERN(int) git_reference_resolve(git_reference **out, const git_reference *ref); /** * Get the repository where a reference resides. @@ -183,7 +184,7 @@ GIT_EXTERN(int) git_reference_resolve(git_reference **resolved_ref, git_referenc * @param ref The reference * @return a pointer to the repo */ -GIT_EXTERN(git_repository *) git_reference_owner(git_reference *ref); +GIT_EXTERN(git_repository *) git_reference_owner(const git_reference *ref); /** * Set the symbolic target of a reference. @@ -194,9 +195,9 @@ GIT_EXTERN(git_repository *) git_reference_owner(git_reference *ref); * * @param ref The reference * @param target The new target for the reference - * @return 0 or an error code + * @return 0 or an error code (EINVALIDSPEC) */ -GIT_EXTERN(int) git_reference_set_target(git_reference *ref, const char *target); +GIT_EXTERN(int) git_reference_symbolic_set_target(git_reference *ref, const char *target); /** * Set the OID target of a reference. @@ -209,7 +210,7 @@ GIT_EXTERN(int) git_reference_set_target(git_reference *ref, const char *target) * @param id The new target OID for the reference * @return 0 or an error code */ -GIT_EXTERN(int) git_reference_set_oid(git_reference *ref, const git_oid *id); +GIT_EXTERN(int) git_reference_set_target(git_reference *ref, const git_oid *id); /** * Rename an existing reference. @@ -231,12 +232,12 @@ GIT_EXTERN(int) git_reference_set_oid(git_reference *ref, const git_oid *id); * the reflog if it exists. * * @param ref The reference to rename - * @param new_name The new name for the reference + * @param name The new name for the reference * @param force Overwrite an existing reference - * @return 0 or an error code + * @return 0 or an error code (EINVALIDSPEC, EEXISTS) * */ -GIT_EXTERN(int) git_reference_rename(git_reference *ref, const char *new_name, int force); +GIT_EXTERN(int) git_reference_rename(git_reference *ref, const char *name, int force); /** * Delete an existing reference. diff --git a/src/branch.c b/src/branch.c index c6173caca..87ee7084f 100644 --- a/src/branch.c +++ b/src/branch.c @@ -77,7 +77,7 @@ int git_branch_create( if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) goto cleanup; - error = git_reference_create_oid(&branch, repository, + error = git_reference_create(&branch, repository, git_buf_cstr(&canonical_branch_name), git_object_id(commit), force); if (!error) diff --git a/src/clone.c b/src/clone.c index 9ef6f8100..ea644dd11 100644 --- a/src/clone.c +++ b/src/clone.c @@ -122,7 +122,7 @@ static int reference_matches_remote_head( if (git_buf_len(&head_info->branchname) > 0) return 0; - if (git_reference_name_to_oid( + if (git_reference_name_to_id( &oid, head_info->repo, reference_name) < 0) { diff --git a/src/notes.c b/src/notes.c index 81e4e5073..75848465e 100644 --- a/src/notes.c +++ b/src/notes.c @@ -406,7 +406,7 @@ static int retrieve_note_tree_and_commit( if ((error = normalize_namespace(notes_ref, repo)) < 0) return error; - if ((error = git_reference_name_to_oid(&oid, repo, *notes_ref)) < 0) + if ((error = git_reference_name_to_id(&oid, repo, *notes_ref)) < 0) return error; if (git_commit_lookup(commit_out, repo, &oid) < 0) diff --git a/src/pack-objects.c b/src/pack-objects.c index a146dc048..5db4bc9ae 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -136,10 +136,11 @@ on_error: return -1; } -void git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n) +unsigned int git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n) { assert(pb); pb->nr_threads = n; + return pb->nr_threads; } static void rehash(git_packbuilder *pb) diff --git a/src/reflog.c b/src/reflog.c index 7b07c6a9f..72a34f695 100644 --- a/src/reflog.c +++ b/src/reflog.c @@ -10,7 +10,7 @@ #include "filebuf.h" #include "signature.h" -static int reflog_init(git_reflog **reflog, git_reference *ref) +static int reflog_init(git_reflog **reflog, const git_reference *ref) { git_reflog *log; @@ -180,7 +180,7 @@ void git_reflog_free(git_reflog *reflog) git__free(reflog); } -static int retrieve_reflog_path(git_buf *path, git_reference *ref) +static int retrieve_reflog_path(git_buf *path, const git_reference *ref) { return git_buf_join_n(path, '/', 3, git_reference_owner(ref)->path_repository, GIT_REFLOG_DIR, ref->name); @@ -201,7 +201,7 @@ static int create_new_reflog_file(const char *filepath) return p_close(fd); } -int git_reflog_read(git_reflog **reflog, git_reference *ref) +int git_reflog_read(git_reflog **reflog, const git_reference *ref) { int error = -1; git_buf log_path = GIT_BUF_INIT; @@ -405,10 +405,10 @@ int git_reflog_delete(git_reference *ref) return error; } -unsigned int git_reflog_entrycount(git_reflog *reflog) +size_t git_reflog_entrycount(git_reflog *reflog) { assert(reflog); - return (unsigned int)reflog->entries.length; + return reflog->entries.length; } const git_reflog_entry * git_reflog_entry_byindex(git_reflog *reflog, size_t idx) @@ -425,25 +425,25 @@ const git_reflog_entry * git_reflog_entry_byindex(git_reflog *reflog, size_t idx return git_vector_get(&reflog->entries, pos); } -const git_oid * git_reflog_entry_oidold(const git_reflog_entry *entry) +const git_oid * git_reflog_entry_id_old(const git_reflog_entry *entry) { assert(entry); return &entry->oid_old; } -const git_oid * git_reflog_entry_oidnew(const git_reflog_entry *entry) +const git_oid * git_reflog_entry_id_new(const git_reflog_entry *entry) { assert(entry); return &entry->oid_cur; } -git_signature * git_reflog_entry_committer(const git_reflog_entry *entry) +const git_signature * git_reflog_entry_committer(const git_reflog_entry *entry) { assert(entry); return entry->committer; } -char * git_reflog_entry_msg(const git_reflog_entry *entry) +const char * git_reflog_entry_message(const git_reflog_entry *entry) { assert(entry); return entry->msg; diff --git a/src/refs.c b/src/refs.c index 97c97563e..1aaf4f60f 100644 --- a/src/refs.c +++ b/src/refs.c @@ -1074,7 +1074,7 @@ int git_reference_lookup(git_reference **ref_out, return git_reference_lookup_resolved(ref_out, repo, name, 0); } -int git_reference_name_to_oid( +int git_reference_name_to_id( git_oid *out, git_repository *repo, const char *name) { int error; @@ -1083,7 +1083,7 @@ int git_reference_name_to_oid( if ((error = git_reference_lookup_resolved(&ref, repo, name, -1)) < 0) return error; - git_oid_cpy(out, git_reference_oid(ref)); + git_oid_cpy(out, git_reference_target(ref)); git_reference_free(ref); return 0; } @@ -1153,7 +1153,7 @@ int git_reference_lookup_resolved( /** * Getters */ -git_ref_t git_reference_type(git_reference *ref) +git_ref_t git_reference_type(const git_reference *ref) { assert(ref); @@ -1172,19 +1172,19 @@ int git_reference_is_packed(git_reference *ref) return !!(ref->flags & GIT_REF_PACKED); } -const char *git_reference_name(git_reference *ref) +const char *git_reference_name(const git_reference *ref) { assert(ref); return ref->name; } -git_repository *git_reference_owner(git_reference *ref) +git_repository *git_reference_owner(const git_reference *ref) { assert(ref); return ref->owner; } -const git_oid *git_reference_oid(git_reference *ref) +const git_oid *git_reference_target(const git_reference *ref) { assert(ref); @@ -1194,7 +1194,7 @@ const git_oid *git_reference_oid(git_reference *ref) return &ref->target.oid; } -const char *git_reference_target(git_reference *ref) +const char *git_reference_symbolic_target(const git_reference *ref) { assert(ref); @@ -1204,7 +1204,7 @@ const char *git_reference_target(git_reference *ref) return ref->target.symbolic; } -int git_reference_create_symbolic( +int git_reference_symbolic_create( git_reference **ref_out, git_repository *repo, const char *name, @@ -1231,7 +1231,7 @@ int git_reference_create_symbolic( /* set the target; this will normalize the name automatically * and write the reference on disk */ - if (git_reference_set_target(ref, target) < 0) { + if (git_reference_symbolic_set_target(ref, target) < 0) { git_reference_free(ref); return -1; } @@ -1244,7 +1244,7 @@ int git_reference_create_symbolic( return 0; } -int git_reference_create_oid( +int git_reference_create( git_reference **ref_out, git_repository *repo, const char *name, @@ -1270,7 +1270,7 @@ int git_reference_create_oid( ref->flags |= GIT_REF_OID; /* set the oid; this will write the reference on disk */ - if (git_reference_set_oid(ref, id) < 0) { + if (git_reference_set_target(ref, id) < 0) { git_reference_free(ref); return -1; } @@ -1292,7 +1292,7 @@ int git_reference_create_oid( * We do not repack packed references because of performance * reasons. */ -int git_reference_set_oid(git_reference *ref, const git_oid *id) +int git_reference_set_target(git_reference *ref, const git_oid *id) { git_odb *odb = NULL; @@ -1328,7 +1328,7 @@ int git_reference_set_oid(git_reference *ref, const git_oid *id) * a pack. We just change the target in memory * and overwrite the file on disk. */ -int git_reference_set_target(git_reference *ref, const char *target) +int git_reference_symbolic_set_target(git_reference *ref, const char *target) { char normalized[GIT_REFNAME_MAX]; @@ -1397,10 +1397,10 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force) * Finally we can create the new reference. */ if (ref->flags & GIT_REF_SYMBOLIC) { - result = git_reference_create_symbolic( + result = git_reference_symbolic_create( NULL, ref->owner, new_name, ref->target.symbolic, force); } else { - result = git_reference_create_oid( + result = git_reference_create( NULL, ref->owner, new_name, &ref->target.oid, force); } @@ -1444,10 +1444,10 @@ rollback: * Try to create the old reference again, ignore failures */ if (ref->flags & GIT_REF_SYMBOLIC) - git_reference_create_symbolic( + git_reference_symbolic_create( NULL, ref->owner, ref->name, ref->target.symbolic, 0); else - git_reference_create_oid( + git_reference_create( NULL, ref->owner, ref->name, &ref->target.oid, 0); /* The reference is no longer packed */ @@ -1457,7 +1457,7 @@ rollback: return -1; } -int git_reference_resolve(git_reference **ref_out, git_reference *ref) +int git_reference_resolve(git_reference **ref_out, const git_reference *ref) { if (ref->flags & GIT_REF_OID) return git_reference_lookup(ref_out, ref->owner, ref->name); @@ -1797,7 +1797,7 @@ int git_reference__update(git_repository *repo, const git_oid *oid, const char * * a new reference and that's it */ if (res == GIT_ENOTFOUND) { giterr_clear(); - return git_reference_create_oid(NULL, repo, ref_name, oid, 1); + return git_reference_create(NULL, repo, ref_name, oid, 1); } if (res < 0) @@ -1810,7 +1810,7 @@ int git_reference__update(git_repository *repo, const git_oid *oid, const char * const char *sym_target; /* The target pointed at by this reference */ - sym_target = git_reference_target(ref); + sym_target = git_reference_symbolic_target(ref); /* resolve the reference to the target it points to */ res = git_reference_resolve(&aux, ref); @@ -1822,7 +1822,7 @@ int git_reference__update(git_repository *repo, const git_oid *oid, const char * */ if (res == GIT_ENOTFOUND) { giterr_clear(); - res = git_reference_create_oid(NULL, repo, sym_target, oid, 1); + res = git_reference_create(NULL, repo, sym_target, oid, 1); git_reference_free(ref); return res; } @@ -1840,7 +1840,7 @@ int git_reference__update(git_repository *repo, const git_oid *oid, const char * /* ref is made to point to `oid`: ref is either the original reference, * or the target of the symbolic reference we've looked up */ - res = git_reference_set_oid(ref, oid); + res = git_reference_set_target(ref, oid); git_reference_free(ref); return res; } @@ -1923,7 +1923,7 @@ static int reference_target(git_object **object, git_reference *ref) { const git_oid *oid; - oid = git_reference_oid(ref); + oid = git_reference_target(ref); return git_object_lookup(object, git_reference_owner(ref), oid, GIT_OBJ_ANY); } diff --git a/src/remote.c b/src/remote.c index 4a4d160eb..063e5186a 100644 --- a/src/remote.c +++ b/src/remote.c @@ -695,7 +695,7 @@ int git_remote_update_tips(git_remote *remote) head = (git_remote_head *)refs.contents[0]; if (!strcmp(head->name, GIT_HEAD_FILE)) { - if (git_reference_create_oid(&ref, remote->repo, GIT_FETCH_HEAD_FILE, &head->oid, 1) < 0) + if (git_reference_create(&ref, remote->repo, GIT_FETCH_HEAD_FILE, &head->oid, 1) < 0) goto on_error; i = 1; @@ -735,7 +735,7 @@ int git_remote_update_tips(git_remote *remote) if (git_vector_insert(&update_heads, head) < 0) goto on_error; - error = git_reference_name_to_oid(&old, remote->repo, refname.ptr); + error = git_reference_name_to_id(&old, remote->repo, refname.ptr); if (error < 0 && error != GIT_ENOTFOUND) goto on_error; @@ -746,7 +746,7 @@ int git_remote_update_tips(git_remote *remote) continue; /* In autotag mode, don't overwrite any locally-existing tags */ - error = git_reference_create_oid(&ref, remote->repo, refname.ptr, &head->oid, !autotag); + error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, !autotag); if (error < 0 && error != GIT_EEXISTS) goto on_error; diff --git a/src/repository.c b/src/repository.c index deab77192..1642f4570 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1231,7 +1231,7 @@ int git_repository_head_detached(git_repository *repo) return 0; } - exists = git_odb_exists(odb, git_reference_oid(ref)); + exists = git_odb_exists(odb, git_reference_target(ref)); git_reference_free(ref); return exists; @@ -1250,7 +1250,7 @@ int git_repository_head(git_reference **head_out, git_repository *repo) return 0; } - error = git_reference_lookup_resolved(head_out, repo, git_reference_target(head), -1); + error = git_reference_lookup_resolved(head_out, repo, git_reference_symbolic_target(head), -1); git_reference_free(head); return error == GIT_ENOTFOUND ? GIT_EORPHANEDHEAD : error; @@ -1305,7 +1305,7 @@ int git_repository_is_empty(git_repository *repo) goto cleanup; if (!(error = strcmp( - git_reference_target(head), + git_reference_symbolic_target(head), GIT_REFS_HEADS_DIR "master") == 0)) goto cleanup; @@ -1531,11 +1531,11 @@ int git_repository_set_head( if (!error) { if (git_reference_is_branch(ref)) - error = git_reference_create_symbolic(&new_head, repo, GIT_HEAD_FILE, git_reference_name(ref), 1); + error = git_reference_symbolic_create(&new_head, repo, GIT_HEAD_FILE, git_reference_name(ref), 1); else - error = git_repository_set_head_detached(repo, git_reference_oid(ref)); + error = git_repository_set_head_detached(repo, git_reference_target(ref)); } else if (looks_like_a_branch(refname)) - error = git_reference_create_symbolic(&new_head, repo, GIT_HEAD_FILE, refname, 1); + error = git_reference_symbolic_create(&new_head, repo, GIT_HEAD_FILE, refname, 1); git_reference_free(ref); git_reference_free(new_head); @@ -1559,7 +1559,7 @@ int git_repository_set_head_detached( if ((error = git_object_peel(&peeled, object, GIT_OBJ_COMMIT)) < 0) goto cleanup; - error = git_reference_create_oid(&new_head, repo, GIT_HEAD_FILE, git_object_id(peeled), 1); + error = git_reference_create(&new_head, repo, GIT_HEAD_FILE, git_object_id(peeled), 1); cleanup: git_object_free(object); @@ -1581,10 +1581,10 @@ int git_repository_detach_head( if ((error = git_repository_head(&old_head, repo)) < 0) return error; - if ((error = git_object_lookup(&object, repo, git_reference_oid(old_head), GIT_OBJ_COMMIT)) < 0) + if ((error = git_object_lookup(&object, repo, git_reference_target(old_head), GIT_OBJ_COMMIT)) < 0) goto cleanup; - error = git_reference_create_oid(&new_head, repo, GIT_HEAD_FILE, git_reference_oid(old_head), 1); + error = git_reference_create(&new_head, repo, GIT_HEAD_FILE, git_reference_target(old_head), 1); cleanup: git_object_free(object); diff --git a/src/reset.c b/src/reset.c index 8f470b26a..928a2bc8c 100644 --- a/src/reset.c +++ b/src/reset.c @@ -41,14 +41,14 @@ static int update_head(git_repository *repo, git_object *commit) if ((error = git_reference_lookup(&head, repo, GIT_HEAD_FILE)) < 0) goto cleanup; - if ((error = git_reference_create_oid( + if ((error = git_reference_create( &target, repo, - git_reference_target(head), + git_reference_symbolic_target(head), git_object_id(commit), 0)) < 0) goto cleanup; } else { - if ((error = git_reference_set_oid(head, git_object_id(commit))) < 0) + if ((error = git_reference_set_target(head, git_object_id(commit))) < 0) goto cleanup; } diff --git a/src/revparse.c b/src/revparse.c index 6b49402c4..79900c4cc 100644 --- a/src/revparse.c +++ b/src/revparse.c @@ -140,7 +140,7 @@ static int revparse_lookup_object(git_object **out, git_repository *repo, const error = disambiguate_refname(&ref, repo, spec); if (!error) { - error = git_object_lookup(out, repo, git_reference_oid(ref), GIT_OBJ_ANY); + error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY); git_reference_free(ref); return error; } @@ -203,7 +203,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out, for (i = 0; i < numentries; i++) { entry = git_reflog_entry_byindex(reflog, i); - msg = git_reflog_entry_msg(entry); + msg = git_reflog_entry_message(entry); if (regexec(&preg, msg, 2, regexmatches, 0)) continue; @@ -263,7 +263,7 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, unsigned i } entry = git_reflog_entry_byindex(reflog, identifier); - git_oid_cpy(oid, git_reflog_entry_oidnew(entry)); + git_oid_cpy(oid, git_reflog_entry_id_new(entry)); error = 0; goto cleanup; @@ -278,7 +278,7 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, unsigned i if (commit_time.time - identifier > 0) continue; - git_oid_cpy(oid, git_reflog_entry_oidnew(entry)); + git_oid_cpy(oid, git_reflog_entry_id_new(entry)); error = 0; goto cleanup; } @@ -306,7 +306,7 @@ static int retrieve_revobject_from_reflog(git_object **out, git_reference **base } if (position == 0) { - error = git_object_lookup(out, repo, git_reference_oid(ref), GIT_OBJ_ANY); + error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY); goto cleanup; } @@ -632,7 +632,7 @@ static int object_from_reference(git_object **object, git_reference *reference) if (git_reference_resolve(&resolved, reference) < 0) return -1; - error = git_object_lookup(object, reference->owner, git_reference_oid(resolved), GIT_OBJ_ANY); + error = git_object_lookup(object, reference->owner, git_reference_target(resolved), GIT_OBJ_ANY); git_reference_free(resolved); return error; diff --git a/src/revwalk.c b/src/revwalk.c index 4fff238ca..236c94502 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -559,7 +559,7 @@ static int push_ref(git_revwalk *walk, const char *refname, int hide) { git_oid oid; - if (git_reference_name_to_oid(&oid, walk->repo, refname) < 0) + if (git_reference_name_to_id(&oid, walk->repo, refname) < 0) return -1; return push_commit(walk, &oid, hide); diff --git a/src/stash.c b/src/stash.c index b74429aca..89e5ff330 100644 --- a/src/stash.c +++ b/src/stash.c @@ -98,7 +98,7 @@ static int retrieve_base_commit_and_message( "%s: ", git_reference_name(head) + strlen(GIT_REFS_HEADS_DIR)); - if (git_commit_lookup(b_commit, repo, git_reference_oid(head)) < 0) + if (git_commit_lookup(b_commit, repo, git_reference_target(head)) < 0) goto cleanup; if (append_commit_description(stash_message, *b_commit) < 0) @@ -436,7 +436,7 @@ static int update_reflog( git_reflog *reflog = NULL; int error; - if ((error = git_reference_create_oid(&stash, repo, GIT_REFS_STASH_FILE, w_commit_oid, 1)) < 0) + if ((error = git_reference_create(&stash, repo, GIT_REFS_STASH_FILE, w_commit_oid, 1)) < 0) goto cleanup; if ((error = git_reflog_read(&reflog, stash)) < 0) @@ -603,8 +603,8 @@ int git_stash_foreach( entry = git_reflog_entry_byindex(reflog, i); if (callback(i, - git_reflog_entry_msg(entry), - git_reflog_entry_oidnew(entry), + git_reflog_entry_message(entry), + git_reflog_entry_id_new(entry), payload)) { error = GIT_EUSER; goto cleanup; diff --git a/src/submodule.c b/src/submodule.c index 6eb1c52f7..6093ff960 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -695,7 +695,7 @@ int git_submodule_open( /* if we have opened the submodule successfully, let's grab the HEAD OID */ if (!error && !(submodule->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID)) { - if (!git_reference_name_to_oid( + if (!git_reference_name_to_id( &submodule->wd_oid, *subrepo, GIT_HEAD_FILE)) submodule->flags |= GIT_SUBMODULE_STATUS__WD_OID_VALID; else @@ -1316,7 +1316,7 @@ static int lookup_head_remote(git_buf *url, git_repository *repo) /* remote should refer to something like refs/remotes/ORIGIN/BRANCH */ if (git_reference_type(remote) != GIT_REF_SYMBOLIC || - git__prefixcmp(git_reference_target(remote), GIT_REFS_REMOTES_DIR) != 0) + git__prefixcmp(git_reference_symbolic_target(remote), GIT_REFS_REMOTES_DIR) != 0) { giterr_set(GITERR_SUBMODULE, "Cannot resolve relative URL when HEAD is not symbolic"); @@ -1324,7 +1324,7 @@ static int lookup_head_remote(git_buf *url, git_repository *repo) goto cleanup; } - scan = tgt = git_reference_target(remote) + strlen(GIT_REFS_REMOTES_DIR); + scan = tgt = git_reference_symbolic_target(remote) + strlen(GIT_REFS_REMOTES_DIR); while (*scan && (*scan != '/' || (scan > tgt && scan[-1] != '\\'))) scan++; /* find non-escaped slash to end ORIGIN name */ diff --git a/src/tag.c b/src/tag.c index 13369d9fb..c39119c22 100644 --- a/src/tag.c +++ b/src/tag.c @@ -188,7 +188,7 @@ static int retrieve_tag_reference_oid( if (git_buf_joinpath(ref_name_out, GIT_REFS_TAGS_DIR, tag_name) < 0) return -1; - return git_reference_name_to_oid(oid, repo, ref_name_out->ptr); + return git_reference_name_to_id(oid, repo, ref_name_out->ptr); } static int write_tag_annotation( @@ -267,7 +267,7 @@ static int git_tag_create__internal( } else git_oid_cpy(oid, git_object_id(target)); - error = git_reference_create_oid(&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite); + error = git_reference_create(&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite); git_reference_free(new_ref); git_buf_free(&ref_name); @@ -358,7 +358,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu return -1; } - error = git_reference_create_oid(&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite); + error = git_reference_create(&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite); git_reference_free(new_ref); git_buf_free(&ref_name); @@ -409,7 +409,7 @@ static int tags_cb(const char *ref, void *data) if (git__prefixcmp(ref, GIT_REFS_TAGS_DIR) != 0) return 0; /* no tag */ - if (git_reference_name_to_oid(&oid, d->repo, ref) < 0) + if (git_reference_name_to_id(&oid, d->repo, ref) < 0) return -1; return d->cb(ref, &oid, d->cb_data); diff --git a/src/transports/local.c b/src/transports/local.c index 46c9218c7..caac46ea2 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -48,7 +48,7 @@ static int add_ref(transport_local *t, const char *name) head->name = git__strdup(name); GITERR_CHECK_ALLOC(head->name); - if (git_reference_name_to_oid(&head->oid, t->repo, name) < 0) { + if (git_reference_name_to_id(&head->oid, t->repo, name) < 0) { git__free(head->name); git__free(head); return -1; diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index e24eb2783..06424cb17 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -188,7 +188,7 @@ static int fetch_setup_walk(git_revwalk **out, git_repository *repo) if (git_reference_type(ref) == GIT_REF_SYMBOLIC) continue; - if (git_revwalk_push(walk, git_reference_oid(ref)) < 0) + if (git_revwalk_push(walk, git_reference_target(ref)) < 0) goto on_error; git_reference_free(ref); diff --git a/tests-clar/checkout/index.c b/tests-clar/checkout/index.c index c7b19dba6..b6d637223 100644 --- a/tests-clar/checkout/index.c +++ b/tests-clar/checkout/index.c @@ -247,7 +247,7 @@ void test_checkout_index__options_dir_modes(void) git_oid oid; git_commit *commit; - cl_git_pass(git_reference_name_to_oid(&oid, g_repo, "refs/heads/dir")); + cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir")); cl_git_pass(git_commit_lookup(&commit, g_repo, &oid)); reset_index_to_treeish((git_object *)commit); diff --git a/tests-clar/clone/network.c b/tests-clar/clone/network.c index def5214c3..4759b607a 100644 --- a/tests-clar/clone/network.c +++ b/tests-clar/clone/network.c @@ -74,7 +74,7 @@ void test_clone_network__empty_repository(void) cl_git_pass(git_reference_lookup(&head, g_repo, GIT_HEAD_FILE)); cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_target(head)); + cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); git_reference_free(head); } @@ -129,7 +129,7 @@ void test_clone_network__can_checkout_a_cloned_repo(void) cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_target(head)); + cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); cl_assert_equal_i(true, checkout_progress_cb_was_called); cl_assert_equal_i(true, fetch_progress_cb_was_called); diff --git a/tests-clar/commit/commit.c b/tests-clar/commit/commit.c index 4cedcea1d..8f071ff94 100644 --- a/tests-clar/commit/commit.c +++ b/tests-clar/commit/commit.c @@ -37,7 +37,7 @@ void test_commit_commit__create_unexisting_update_ref(void) NULL, "some msg", tree, 1, (const git_commit **) &commit)); cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/foo/bar")); - cl_assert(!git_oid_cmp(&oid, git_reference_oid(ref))); + cl_assert(!git_oid_cmp(&oid, git_reference_target(ref))); git_tree_free(tree); git_commit_free(commit); diff --git a/tests-clar/commit/write.c b/tests-clar/commit/write.c index 6d628096e..7b9868b89 100644 --- a/tests-clar/commit/write.c +++ b/tests-clar/commit/write.c @@ -112,10 +112,10 @@ void test_commit_write__root(void) /* First we need to update HEAD so it points to our non-existant branch */ cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD")); cl_assert(git_reference_type(head) == GIT_REF_SYMBOLIC); - head_old = git__strdup(git_reference_target(head)); + head_old = git__strdup(git_reference_symbolic_target(head)); cl_assert(head_old != NULL); - cl_git_pass(git_reference_set_target(head, branch_name)); + cl_git_pass(git_reference_symbolic_set_target(head, branch_name)); cl_git_pass(git_commit_create_v( &commit_id, /* out id */ @@ -140,7 +140,7 @@ void test_commit_write__root(void) cl_git_pass(git_commit_lookup(&commit, g_repo, &commit_id)); cl_assert(git_commit_parentcount(commit) == 0); cl_git_pass(git_reference_lookup(&branch, g_repo, branch_name)); - branch_oid = git_reference_oid(branch); + branch_oid = git_reference_target(branch); cl_git_pass(git_oid_cmp(branch_oid, &commit_id)); cl_assert(!strcmp(git_commit_message(commit), root_commit_message)); } diff --git a/tests-clar/object/tag/write.c b/tests-clar/object/tag/write.c index 10d04797f..3e1100399 100644 --- a/tests-clar/object/tag/write.c +++ b/tests-clar/object/tag/write.c @@ -58,7 +58,7 @@ void test_object_tag_write__basic(void) cl_assert_equal_s(git_tag_message(tag), tagger_message); cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/the-tag")); - cl_assert(git_oid_cmp(git_reference_oid(ref_tag), &tag_id) == 0); + cl_assert(git_oid_cmp(git_reference_target(ref_tag), &tag_id) == 0); cl_git_pass(git_reference_delete(ref_tag)); git_tag_free(tag); @@ -103,7 +103,7 @@ void test_object_tag_write__replace(void) cl_git_pass(git_object_lookup(&target, g_repo, &target_id, GIT_OBJ_COMMIT)); cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/e90810b")); - git_oid_cpy(&old_tag_id, git_reference_oid(ref_tag)); + git_oid_cpy(&old_tag_id, git_reference_target(ref_tag)); git_reference_free(ref_tag); /* create signature */ @@ -122,8 +122,8 @@ void test_object_tag_write__replace(void) git_signature_free(tagger); cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/e90810b")); - cl_assert(git_oid_cmp(git_reference_oid(ref_tag), &tag_id) == 0); - cl_assert(git_oid_cmp(git_reference_oid(ref_tag), &old_tag_id) != 0); + cl_assert(git_oid_cmp(git_reference_target(ref_tag), &tag_id) == 0); + cl_assert(git_oid_cmp(git_reference_target(ref_tag), &old_tag_id) != 0); git_reference_free(ref_tag); } @@ -150,7 +150,7 @@ void test_object_tag_write__lightweight(void) cl_assert(git_oid_cmp(&object_id, &target_id) == 0); cl_git_pass(git_reference_lookup(&ref_tag, g_repo, "refs/tags/light-tag")); - cl_assert(git_oid_cmp(git_reference_oid(ref_tag), &target_id) == 0); + cl_assert(git_oid_cmp(git_reference_target(ref_tag), &target_id) == 0); cl_git_pass(git_tag_delete(g_repo, "light-tag")); diff --git a/tests-clar/refs/branches/create.c b/tests-clar/refs/branches/create.c index 5ecb42848..51db04b31 100644 --- a/tests-clar/refs/branches/create.c +++ b/tests-clar/refs/branches/create.c @@ -47,7 +47,7 @@ void test_refs_branches_create__can_create_a_local_branch(void) retrieve_known_commit(&target, repo); cl_git_pass(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); - cl_git_pass(git_oid_cmp(git_reference_oid(branch), git_object_id(target))); + cl_git_pass(git_oid_cmp(git_reference_target(branch), git_object_id(target))); } void test_refs_branches_create__can_not_create_a_branch_if_its_name_collide_with_an_existing_one(void) @@ -62,7 +62,7 @@ void test_refs_branches_create__can_force_create_over_an_existing_branch(void) retrieve_known_commit(&target, repo); cl_git_pass(git_branch_create(&branch, repo, "br2", target, 1)); - cl_git_pass(git_oid_cmp(git_reference_oid(branch), git_object_id(target))); + cl_git_pass(git_oid_cmp(git_reference_target(branch), git_object_id(target))); cl_assert_equal_s("refs/heads/br2", git_reference_name(branch)); } @@ -72,7 +72,7 @@ void test_refs_branches_create__creating_a_branch_targeting_a_tag_dereferences_i retrieve_target_from_oid(&target, repo, "b25fa35b38051e4ae45d4222e795f9df2e43f1d1"); cl_git_pass(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); - cl_git_pass(git_oid_streq(git_reference_oid(branch), "e90810b8df3e80c413d903f631643c716887138d")); + cl_git_pass(git_oid_streq(git_reference_target(branch), "e90810b8df3e80c413d903f631643c716887138d")); } void test_refs_branches_create__can_not_create_a_branch_pointing_to_a_non_commit_object(void) diff --git a/tests-clar/refs/branches/delete.c b/tests-clar/refs/branches/delete.c index 75271a21c..18430367c 100644 --- a/tests-clar/refs/branches/delete.c +++ b/tests-clar/refs/branches/delete.c @@ -14,7 +14,7 @@ void test_refs_branches_delete__initialize(void) cl_git_pass(git_repository_open(&repo, "testrepo.git")); cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_reference_create_oid(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0)); + cl_git_pass(git_reference_create(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0)); } void test_refs_branches_delete__cleanup(void) @@ -35,7 +35,7 @@ void test_refs_branches_delete__can_not_delete_a_branch_pointed_at_by_HEAD(void) /* Ensure HEAD targets the local master branch */ cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); - cl_assert(strcmp("refs/heads/master", git_reference_target(head)) == 0); + cl_assert(strcmp("refs/heads/master", git_reference_symbolic_target(head)) == 0); git_reference_free(head); cl_git_pass(git_branch_lookup(&branch, repo, "master", GIT_BRANCH_LOCAL)); @@ -71,7 +71,7 @@ void test_refs_branches_delete__can_delete_a_branch_pointed_at_by_detached_HEAD( cl_git_pass(git_reference_lookup(&head, repo, GIT_HEAD_FILE)); cl_assert_equal_i(GIT_REF_SYMBOLIC, git_reference_type(head)); - cl_assert_equal_s("refs/heads/master", git_reference_target(head)); + cl_assert_equal_s("refs/heads/master", git_reference_symbolic_target(head)); git_reference_free(head); /* Detach HEAD and make it target the commit that "master" points to */ @@ -107,4 +107,4 @@ void test_refs_branches_delete__deleting_a_branch_removes_related_configuration_ assert_config_entry_existence(repo, "branch.track-local.remote", false); assert_config_entry_existence(repo, "branch.track-local.merge", false); -} \ No newline at end of file +} diff --git a/tests-clar/refs/branches/foreach.c b/tests-clar/refs/branches/foreach.c index dfa04395b..96a5bc2b9 100644 --- a/tests-clar/refs/branches/foreach.c +++ b/tests-clar/refs/branches/foreach.c @@ -12,7 +12,7 @@ void test_refs_branches_foreach__initialize(void) cl_git_pass(git_repository_open(&repo, "testrepo.git")); cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_reference_create_oid(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0)); + cl_git_pass(git_reference_create(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0)); } void test_refs_branches_foreach__cleanup(void) @@ -119,7 +119,7 @@ void test_refs_branches_foreach__retrieve_remote_symbolic_HEAD_when_present(void }; git_reference_free(fake_remote); - cl_git_pass(git_reference_create_symbolic(&fake_remote, repo, "refs/remotes/nulltoken/HEAD", "refs/remotes/nulltoken/master", 0)); + cl_git_pass(git_reference_symbolic_create(&fake_remote, repo, "refs/remotes/nulltoken/HEAD", "refs/remotes/nulltoken/master", 0)); assert_retrieval(GIT_BRANCH_REMOTE, 3); diff --git a/tests-clar/refs/branches/ishead.c b/tests-clar/refs/branches/ishead.c index 2ab488f22..dfcf1b5f1 100644 --- a/tests-clar/refs/branches/ishead.c +++ b/tests-clar/refs/branches/ishead.c @@ -98,9 +98,9 @@ void test_refs_branches_ishead__only_direct_references_are_considered(void) git_repository_free(repo); repo = cl_git_sandbox_init("testrepo.git"); - cl_git_pass(git_reference_create_symbolic(&linked, repo, "refs/heads/linked", "refs/heads/master", 0)); - cl_git_pass(git_reference_create_symbolic(&super, repo, "refs/heads/super", "refs/heads/linked", 0)); - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/super", 1)); + cl_git_pass(git_reference_symbolic_create(&linked, repo, "refs/heads/linked", "refs/heads/master", 0)); + cl_git_pass(git_reference_symbolic_create(&super, repo, "refs/heads/super", "refs/heads/linked", 0)); + cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/heads/super", 1)); cl_assert_equal_i(false, git_branch_is_head(linked)); cl_assert_equal_i(false, git_branch_is_head(super)); diff --git a/tests-clar/refs/crashes.c b/tests-clar/refs/crashes.c index e1b289ace..9fb5ff627 100644 --- a/tests-clar/refs/crashes.c +++ b/tests-clar/refs/crashes.c @@ -7,7 +7,7 @@ void test_refs_crashes__double_free(void) const char *REFNAME = "refs/heads/xxx"; cl_git_pass(git_repository_open(&repo, cl_fixture("testrepo.git"))); - cl_git_pass(git_reference_create_symbolic(&ref, repo, REFNAME, "refs/heads/master", 0)); + cl_git_pass(git_reference_symbolic_create(&ref, repo, REFNAME, "refs/heads/master", 0)); cl_git_pass(git_reference_lookup(&ref2, repo, REFNAME)); cl_git_pass(git_reference_delete(ref)); /* reference is gone from disk, so reloading it will fail */ diff --git a/tests-clar/refs/create.c b/tests-clar/refs/create.c index bf234bc60..bef9bfd24 100644 --- a/tests-clar/refs/create.c +++ b/tests-clar/refs/create.c @@ -36,7 +36,7 @@ void test_refs_create__symbolic(void) git_buf_free(&ref_path); /* Create and write the new symbolic reference */ - cl_git_pass(git_reference_create_symbolic(&new_reference, g_repo, new_head_tracker, current_head_target, 0)); + cl_git_pass(git_reference_symbolic_create(&new_reference, g_repo, new_head_tracker, current_head_target, 0)); /* Ensure the reference can be looked-up... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker)); @@ -49,7 +49,7 @@ void test_refs_create__symbolic(void) cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); /* ...and that it points to the current master tip */ - cl_assert(git_oid_cmp(&id, git_reference_oid(resolved_ref)) == 0); + cl_assert(git_oid_cmp(&id, git_reference_target(resolved_ref)) == 0); git_reference_free(looked_up_ref); git_reference_free(resolved_ref); @@ -58,7 +58,7 @@ void test_refs_create__symbolic(void) cl_git_pass(git_reference_lookup(&looked_up_ref, repo2, new_head_tracker)); cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref)); - cl_assert(git_oid_cmp(&id, git_reference_oid(resolved_ref)) == 0); + cl_assert(git_oid_cmp(&id, git_reference_target(resolved_ref)) == 0); git_repository_free(repo2); @@ -79,10 +79,10 @@ void test_refs_create__deep_symbolic(void) git_oid_fromstr(&id, current_master_tip); cl_git_pass(git_buf_joinpath(&ref_path, g_repo->path_repository, new_head_tracker)); - cl_git_pass(git_reference_create_symbolic(&new_reference, g_repo, new_head_tracker, current_head_target, 0)); + cl_git_pass(git_reference_symbolic_create(&new_reference, g_repo, new_head_tracker, current_head_target, 0)); cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head_tracker)); cl_git_pass(git_reference_resolve(&resolved_ref, looked_up_ref)); - cl_assert(git_oid_cmp(&id, git_reference_oid(resolved_ref)) == 0); + cl_assert(git_oid_cmp(&id, git_reference_target(resolved_ref)) == 0); git_reference_free(new_reference); git_reference_free(looked_up_ref); @@ -106,7 +106,7 @@ void test_refs_create__oid(void) cl_git_pass(git_buf_joinpath(&ref_path, g_repo->path_repository, new_head)); /* Create and write the new object id reference */ - cl_git_pass(git_reference_create_oid(&new_reference, g_repo, new_head, &id, 0)); + cl_git_pass(git_reference_create(&new_reference, g_repo, new_head, &id, 0)); /* Ensure the reference can be looked-up... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, new_head)); @@ -115,14 +115,14 @@ void test_refs_create__oid(void) cl_assert_equal_s(looked_up_ref->name, new_head); /* ...and that it points to the current master tip */ - cl_assert(git_oid_cmp(&id, git_reference_oid(looked_up_ref)) == 0); + cl_assert(git_oid_cmp(&id, git_reference_target(looked_up_ref)) == 0); git_reference_free(looked_up_ref); /* Similar test with a fresh new repository */ cl_git_pass(git_repository_open(&repo2, "testrepo")); cl_git_pass(git_reference_lookup(&looked_up_ref, repo2, new_head)); - cl_assert(git_oid_cmp(&id, git_reference_oid(looked_up_ref)) == 0); + cl_assert(git_oid_cmp(&id, git_reference_target(looked_up_ref)) == 0); git_repository_free(repo2); @@ -142,7 +142,7 @@ void test_refs_create__oid_unknown(void) git_oid_fromstr(&id, "deadbeef3f795b2b4353bcce3a527ad0a4f7f644"); /* Create and write the new object id reference */ - cl_git_fail(git_reference_create_oid(&new_reference, g_repo, new_head, &id, 0)); + cl_git_fail(git_reference_create(&new_reference, g_repo, new_head, &id, 0)); /* Ensure the reference can't be looked-up... */ cl_git_fail(git_reference_lookup(&looked_up_ref, g_repo, new_head)); @@ -156,9 +156,9 @@ void test_refs_create__propagate_eexists(void) /* Make sure it works for oid and for symbolic both */ git_oid_fromstr(&oid, current_master_tip); - error = git_reference_create_oid(&ref, g_repo, current_head_target, &oid, false); + error = git_reference_create(&ref, g_repo, current_head_target, &oid, false); cl_assert(error == GIT_EEXISTS); - error = git_reference_create_symbolic(&ref, g_repo, "HEAD", current_head_target, false); + error = git_reference_symbolic_create(&ref, g_repo, "HEAD", current_head_target, false); cl_assert(error == GIT_EEXISTS); } diff --git a/tests-clar/refs/delete.c b/tests-clar/refs/delete.c index 912f41456..cc5ab3940 100644 --- a/tests-clar/refs/delete.c +++ b/tests-clar/refs/delete.c @@ -62,7 +62,7 @@ void test_refs_delete__packed_only(void) git_oid_fromstr(&id, current_master_tip); /* Create and write the new object id reference */ - cl_git_pass(git_reference_create_oid(&ref, g_repo, new_ref, &id, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, new_ref, &id, 0)); git_reference_free(ref); /* Lookup the reference */ diff --git a/tests-clar/refs/foreachglob.c b/tests-clar/refs/foreachglob.c index 8ecce9cfe..88516ddce 100644 --- a/tests-clar/refs/foreachglob.c +++ b/tests-clar/refs/foreachglob.c @@ -12,7 +12,7 @@ void test_refs_foreachglob__initialize(void) cl_git_pass(git_repository_open(&repo, "testrepo.git")); cl_git_pass(git_oid_fromstr(&id, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644")); - cl_git_pass(git_reference_create_oid(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0)); + cl_git_pass(git_reference_create(&fake_remote, repo, "refs/remotes/nulltoken/master", &id, 0)); } void test_refs_foreachglob__cleanup(void) diff --git a/tests-clar/refs/lookup.c b/tests-clar/refs/lookup.c index 71ab1b7b8..11fd68f90 100644 --- a/tests-clar/refs/lookup.c +++ b/tests-clar/refs/lookup.c @@ -36,7 +36,7 @@ void test_refs_lookup__oid(void) { git_oid tag, expected; - cl_git_pass(git_reference_name_to_oid(&tag, g_repo, "refs/tags/point_to_blob")); + cl_git_pass(git_reference_name_to_id(&tag, g_repo, "refs/tags/point_to_blob")); cl_git_pass(git_oid_fromstr(&expected, "1385f264afb75a56a5bec74243be9b367ba4ca08")); cl_assert(git_oid_cmp(&tag, &expected) == 0); } diff --git a/tests-clar/refs/overwrite.c b/tests-clar/refs/overwrite.c index 410e39a84..ebe72069c 100644 --- a/tests-clar/refs/overwrite.c +++ b/tests-clar/refs/overwrite.c @@ -27,25 +27,25 @@ void test_refs_overwrite__symbolic(void) git_reference *ref, *branch_ref; /* The target needds to exist and we need to check the name has changed */ - cl_git_pass(git_reference_create_symbolic(&branch_ref, g_repo, ref_branch_name, ref_master_name, 0)); - cl_git_pass(git_reference_create_symbolic(&ref, g_repo, ref_name, ref_branch_name, 0)); + cl_git_pass(git_reference_symbolic_create(&branch_ref, g_repo, ref_branch_name, ref_master_name, 0)); + cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_branch_name, 0)); git_reference_free(ref); /* Ensure it points to the right place*/ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); - cl_assert_equal_s(git_reference_target(ref), ref_branch_name); + cl_assert_equal_s(git_reference_symbolic_target(ref), ref_branch_name); git_reference_free(ref); /* Ensure we can't create it unless we force it to */ - cl_git_fail(git_reference_create_symbolic(&ref, g_repo, ref_name, ref_master_name, 0)); - cl_git_pass(git_reference_create_symbolic(&ref, g_repo, ref_name, ref_master_name, 1)); + cl_git_fail(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0)); + cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 1)); git_reference_free(ref); /* Ensure it points to the right place */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); - cl_assert_equal_s(git_reference_target(ref), ref_master_name); + cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name); git_reference_free(ref); git_reference_free(branch_ref); @@ -59,26 +59,26 @@ void test_refs_overwrite__object_id(void) cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); /* Create it */ - cl_git_pass(git_reference_create_oid(&ref, g_repo, ref_name, &id, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 0)); git_reference_free(ref); cl_git_pass(git_reference_lookup(&ref, g_repo, ref_test_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); /* Ensure we can't overwrite unless we force it */ - cl_git_fail(git_reference_create_oid(&ref, g_repo, ref_name, &id, 0)); - cl_git_pass(git_reference_create_oid(&ref, g_repo, ref_name, &id, 1)); + cl_git_fail(git_reference_create(&ref, g_repo, ref_name, &id, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 1)); git_reference_free(ref); /* Ensure it has been overwritten */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); - cl_assert(!git_oid_cmp(&id, git_reference_oid(ref))); + cl_assert(!git_oid_cmp(&id, git_reference_target(ref))); git_reference_free(ref); } @@ -91,19 +91,19 @@ void test_refs_overwrite__object_id_with_symbolic(void) cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); - cl_git_pass(git_reference_create_oid(&ref, g_repo, ref_name, &id, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 0)); git_reference_free(ref); - cl_git_fail(git_reference_create_symbolic(&ref, g_repo, ref_name, ref_master_name, 0)); - cl_git_pass(git_reference_create_symbolic(&ref, g_repo, ref_name, ref_master_name, 1)); + cl_git_fail(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0)); + cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 1)); git_reference_free(ref); /* Ensure it points to the right place */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); cl_assert(git_reference_type(ref) & GIT_REF_SYMBOLIC); - cl_assert_equal_s(git_reference_target(ref), ref_master_name); + cl_assert_equal_s(git_reference_symbolic_target(ref), ref_master_name); git_reference_free(ref); } @@ -116,21 +116,21 @@ void test_refs_overwrite__symbolic_with_object_id(void) cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); git_reference_free(ref); /* Create the symbolic ref */ - cl_git_pass(git_reference_create_symbolic(&ref, g_repo, ref_name, ref_master_name, 0)); + cl_git_pass(git_reference_symbolic_create(&ref, g_repo, ref_name, ref_master_name, 0)); git_reference_free(ref); /* It shouldn't overwrite unless we tell it to */ - cl_git_fail(git_reference_create_oid(&ref, g_repo, ref_name, &id, 0)); - cl_git_pass(git_reference_create_oid(&ref, g_repo, ref_name, &id, 1)); + cl_git_fail(git_reference_create(&ref, g_repo, ref_name, &id, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, ref_name, &id, 1)); git_reference_free(ref); /* Ensure it points to the right place */ cl_git_pass(git_reference_lookup(&ref, g_repo, ref_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - cl_assert(!git_oid_cmp(git_reference_oid(ref), &id)); + cl_assert(!git_oid_cmp(git_reference_target(ref), &id)); git_reference_free(ref); } diff --git a/tests-clar/refs/read.c b/tests-clar/refs/read.c index b867c9722..c10a540c0 100644 --- a/tests-clar/refs/read.c +++ b/tests-clar/refs/read.c @@ -37,7 +37,7 @@ void test_refs_read__loose_tag(void) cl_assert(git_reference_is_packed(reference) == 0); cl_assert_equal_s(reference->name, loose_tag_ref_name); - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_oid(reference), GIT_OBJ_ANY)); + cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJ_ANY)); cl_assert(object != NULL); cl_assert(git_object_type(object) == GIT_OBJ_TAG); @@ -77,7 +77,7 @@ void test_refs_read__symbolic(void) cl_git_pass(git_reference_resolve(&resolved_ref, reference)); cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_oid(resolved_ref), GIT_OBJ_ANY)); + cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJ_ANY)); cl_assert(object != NULL); cl_assert(git_object_type(object) == GIT_OBJ_COMMIT); @@ -105,7 +105,7 @@ void test_refs_read__nested_symbolic(void) cl_git_pass(git_reference_resolve(&resolved_ref, reference)); cl_assert(git_reference_type(resolved_ref) == GIT_REF_OID); - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_oid(resolved_ref), GIT_OBJ_ANY)); + cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(resolved_ref), GIT_OBJ_ANY)); cl_assert(object != NULL); cl_assert(git_object_type(object) == GIT_OBJ_COMMIT); @@ -129,13 +129,13 @@ void test_refs_read__head_then_master(void) cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE)); cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_git_pass(git_oid_cmp(git_reference_oid(comp_base_ref), git_reference_oid(resolved_ref))); + cl_git_pass(git_oid_cmp(git_reference_target(comp_base_ref), git_reference_target(resolved_ref))); git_reference_free(reference); git_reference_free(resolved_ref); cl_git_pass(git_reference_lookup(&reference, g_repo, current_head_target)); cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_git_pass(git_oid_cmp(git_reference_oid(comp_base_ref), git_reference_oid(resolved_ref))); + cl_git_pass(git_oid_cmp(git_reference_target(comp_base_ref), git_reference_target(resolved_ref))); git_reference_free(reference); git_reference_free(resolved_ref); @@ -151,7 +151,7 @@ void test_refs_read__master_then_head(void) cl_git_pass(git_reference_lookup(&reference, g_repo, GIT_HEAD_FILE)); cl_git_pass(git_reference_resolve(&resolved_ref, reference)); - cl_git_pass(git_oid_cmp(git_reference_oid(master_ref), git_reference_oid(resolved_ref))); + cl_git_pass(git_oid_cmp(git_reference_target(master_ref), git_reference_target(resolved_ref))); git_reference_free(reference); git_reference_free(resolved_ref); @@ -170,7 +170,7 @@ void test_refs_read__packed(void) cl_assert(git_reference_is_packed(reference)); cl_assert_equal_s(reference->name, packed_head_name); - cl_git_pass(git_object_lookup(&object, g_repo, git_reference_oid(reference), GIT_OBJ_ANY)); + cl_git_pass(git_object_lookup(&object, g_repo, git_reference_target(reference), GIT_OBJ_ANY)); cl_assert(object != NULL); cl_assert(git_object_type(object) == GIT_OBJ_COMMIT); @@ -200,7 +200,7 @@ void test_refs_read__chomped(void) cl_git_pass(git_reference_lookup(&test, g_repo, "refs/heads/test")); cl_git_pass(git_reference_lookup(&chomped, g_repo, "refs/heads/chomped")); - cl_git_pass(git_oid_cmp(git_reference_oid(test), git_reference_oid(chomped))); + cl_git_pass(git_oid_cmp(git_reference_target(test), git_reference_target(chomped))); git_reference_free(test); git_reference_free(chomped); @@ -212,7 +212,7 @@ void test_refs_read__trailing(void) cl_git_pass(git_reference_lookup(&test, g_repo, "refs/heads/test")); cl_git_pass(git_reference_lookup(&trailing, g_repo, "refs/heads/trailing")); - cl_git_pass(git_oid_cmp(git_reference_oid(test), git_reference_oid(trailing))); + cl_git_pass(git_oid_cmp(git_reference_target(test), git_reference_target(trailing))); git_reference_free(trailing); cl_git_pass(git_reference_lookup(&trailing, g_repo, "FETCH_HEAD")); diff --git a/tests-clar/refs/reflog/reflog.c b/tests-clar/refs/reflog/reflog.c index 09b935692..4c3d0dab7 100644 --- a/tests-clar/refs/reflog/reflog.c +++ b/tests-clar/refs/reflog/reflog.c @@ -46,7 +46,7 @@ void test_refs_reflog_reflog__append_then_read(void) /* Create a new branch pointing at the HEAD */ git_oid_fromstr(&oid, current_master_tip); - cl_git_pass(git_reference_create_oid(&ref, g_repo, new_ref, &oid, 0)); + cl_git_pass(git_reference_create(&ref, g_repo, new_ref, &oid, 0)); cl_git_pass(git_signature_now(&committer, "foo", "foo@bar")); diff --git a/tests-clar/refs/rename.c b/tests-clar/refs/rename.c index 19bf875cd..ec5c12507 100644 --- a/tests-clar/refs/rename.c +++ b/tests-clar/refs/rename.c @@ -201,7 +201,7 @@ void test_refs_rename__force_loose_packed(void) /* An existing reference... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_head_name)); - git_oid_cpy(&oid, git_reference_oid(looked_up_ref)); + git_oid_cpy(&oid, git_reference_target(looked_up_ref)); /* Can be force-renamed to the name of another existing reference. */ cl_git_pass(git_reference_rename(looked_up_ref, packed_test_head_name, 1)); @@ -210,7 +210,7 @@ void test_refs_rename__force_loose_packed(void) /* Check we actually renamed it */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, packed_test_head_name)); cl_assert_equal_s(looked_up_ref->name, packed_test_head_name); - cl_assert(!git_oid_cmp(&oid, git_reference_oid(looked_up_ref))); + cl_assert(!git_oid_cmp(&oid, git_reference_target(looked_up_ref))); git_reference_free(looked_up_ref); /* And that the previous one doesn't exist any longer */ @@ -225,7 +225,7 @@ void test_refs_rename__force_loose(void) /* An existing reference... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, "refs/heads/br2")); - git_oid_cpy(&oid, git_reference_oid(looked_up_ref)); + git_oid_cpy(&oid, git_reference_target(looked_up_ref)); /* Can be force-renamed to the name of another existing reference. */ cl_git_pass(git_reference_rename(looked_up_ref, "refs/heads/test", 1)); @@ -234,7 +234,7 @@ void test_refs_rename__force_loose(void) /* Check we actually renamed it */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, "refs/heads/test")); cl_assert_equal_s(looked_up_ref->name, "refs/heads/test"); - cl_assert(!git_oid_cmp(&oid, git_reference_oid(looked_up_ref))); + cl_assert(!git_oid_cmp(&oid, git_reference_target(looked_up_ref))); git_reference_free(looked_up_ref); /* And that the previous one doesn't exist any longer */ @@ -253,17 +253,17 @@ void test_refs_rename__overwrite(void) cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); /* Create loose references */ - cl_git_pass(git_reference_create_oid(&ref_one, g_repo, ref_one_name, &id, 0)); - cl_git_pass(git_reference_create_oid(&ref_two, g_repo, ref_two_name, &id, 0)); + cl_git_pass(git_reference_create(&ref_one, g_repo, ref_one_name, &id, 0)); + cl_git_pass(git_reference_create(&ref_two, g_repo, ref_two_name, &id, 0)); /* Pack everything */ cl_git_pass(git_reference_packall(g_repo)); /* Attempt to create illegal reference */ - cl_git_fail(git_reference_create_oid(&ref_one_new, g_repo, ref_one_name_new, &id, 0)); + cl_git_fail(git_reference_create(&ref_one_new, g_repo, ref_one_name_new, &id, 0)); /* Illegal reference couldn't be created so this is supposed to fail */ cl_git_fail(git_reference_lookup(&ref_one_new, g_repo, ref_one_name_new)); @@ -284,10 +284,10 @@ void test_refs_rename__prefix(void) cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); /* Create loose references */ - cl_git_pass(git_reference_create_oid(&ref_two, g_repo, ref_two_name, &id, 0)); + cl_git_pass(git_reference_create(&ref_two, g_repo, ref_two_name, &id, 0)); /* An existing reference... */ cl_git_pass(git_reference_lookup(&looked_up_ref, g_repo, ref_two_name)); @@ -316,10 +316,10 @@ void test_refs_rename__move_up(void) cl_git_pass(git_reference_lookup(&ref, g_repo, ref_master_name)); cl_assert(git_reference_type(ref) & GIT_REF_OID); - git_oid_cpy(&id, git_reference_oid(ref)); + git_oid_cpy(&id, git_reference_target(ref)); /* Create loose references */ - cl_git_pass(git_reference_create_oid(&ref_two, g_repo, ref_two_name_new, &id, 0)); + cl_git_pass(git_reference_create(&ref_two, g_repo, ref_two_name_new, &id, 0)); git_reference_free(ref_two); /* An existing reference... */ diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c index a1f0dbf2b..3698b5197 100644 --- a/tests-clar/refs/revparse.c +++ b/tests-clar/refs/revparse.c @@ -468,11 +468,11 @@ void test_refs_revparse__issue_994(void) cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_reference_create_oid( + cl_git_pass(git_reference_create( &with_at, repo, "refs/remotes/origin/bim_with_3d@11296", - git_reference_oid(head), + git_reference_target(head), 0)); cl_git_pass(git_revparse_single(&target, repo, "origin/bim_with_3d@11296")); diff --git a/tests-clar/refs/unicode.c b/tests-clar/refs/unicode.c index fbe95b19f..424ee6405 100644 --- a/tests-clar/refs/unicode.c +++ b/tests-clar/refs/unicode.c @@ -27,14 +27,14 @@ void test_refs_unicode__create_and_lookup(void) /* Create the reference */ cl_git_pass(git_reference_lookup(&ref0, repo, master)); - cl_git_pass(git_reference_create_oid(&ref1, repo, REFNAME, git_reference_oid(ref0), 0)); + cl_git_pass(git_reference_create(&ref1, repo, REFNAME, git_reference_target(ref0), 0)); cl_assert(strcmp(REFNAME, git_reference_name(ref1)) == 0); /* Lookup the reference in a different instance of the repository */ cl_git_pass(git_repository_open(&repo2, "testrepo.git")); cl_git_pass(git_reference_lookup(&ref2, repo2, REFNAME)); - cl_assert(git_oid_cmp(git_reference_oid(ref1), git_reference_oid(ref2)) == 0); + cl_assert(git_oid_cmp(git_reference_target(ref1), git_reference_target(ref2)) == 0); cl_assert(strcmp(REFNAME, git_reference_name(ref2)) == 0); git_reference_free(ref0); diff --git a/tests-clar/repo/head.c b/tests-clar/repo/head.c index 1c1e905c4..a9f5cfc58 100644 --- a/tests-clar/repo/head.c +++ b/tests-clar/repo/head.c @@ -26,7 +26,7 @@ void test_repo_head__head_detached(void) cl_assert_equal_i(true, git_repository_head_detached(repo)); /* take the reop back to it's original state */ - cl_git_pass(git_reference_create_symbolic(&ref, repo, "HEAD", "refs/heads/master", 1)); + cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", 1)); git_reference_free(ref); cl_assert_equal_i(false, git_repository_head_detached(repo)); @@ -44,7 +44,7 @@ void test_repo_head__head_orphan(void) /* take the repo back to it's original state */ - cl_git_pass(git_reference_create_symbolic(&ref, repo, "HEAD", "refs/heads/master", 1)); + cl_git_pass(git_reference_symbolic_create(&ref, repo, "HEAD", "refs/heads/master", 1)); cl_assert(git_repository_head_orphan(repo) == 0); git_reference_free(ref); @@ -94,7 +94,7 @@ static void assert_head_is_correctly_detached(void) cl_git_pass(git_repository_head(&head, repo)); - cl_git_pass(git_object_lookup(&commit, repo, git_reference_oid(head), GIT_OBJ_COMMIT)); + cl_git_pass(git_object_lookup(&commit, repo, git_reference_target(head), GIT_OBJ_COMMIT)); git_object_free(commit); git_reference_free(head); @@ -156,7 +156,7 @@ void test_repo_head__detach_head_Fails_if_HEAD_and_point_to_a_non_commitish(void { git_reference *head; - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/tags/point_to_blob", 1)); + cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, "refs/tags/point_to_blob", 1)); cl_git_fail(git_repository_detach_head(repo)); diff --git a/tests-clar/repo/init.c b/tests-clar/repo/init.c index f29f54091..3b14c97f2 100644 --- a/tests-clar/repo/init.c +++ b/tests-clar/repo/init.c @@ -353,7 +353,7 @@ void test_repo_init__extended_1(void) cl_git_pass(git_reference_lookup(&ref, _repo, "HEAD")); cl_assert(git_reference_type(ref) == GIT_REF_SYMBOLIC); - cl_assert_equal_s("refs/heads/development", git_reference_target(ref)); + cl_assert_equal_s("refs/heads/development", git_reference_symbolic_target(ref)); git_reference_free(ref); cl_git_pass(git_remote_load(&remote, _repo, "origin")); diff --git a/tests-clar/repo/repo_helpers.c b/tests-clar/repo/repo_helpers.c index 19ab38ee3..74902e439 100644 --- a/tests-clar/repo/repo_helpers.c +++ b/tests-clar/repo/repo_helpers.c @@ -7,7 +7,7 @@ void make_head_orphaned(git_repository* repo, const char *target) { git_reference *head; - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, target, 1)); + cl_git_pass(git_reference_symbolic_create(&head, repo, GIT_HEAD_FILE, target, 1)); git_reference_free(head); } diff --git a/tests-clar/reset/soft.c b/tests-clar/reset/soft.c index 7914d4666..9ebd63763 100644 --- a/tests-clar/reset/soft.c +++ b/tests-clar/reset/soft.c @@ -24,7 +24,7 @@ static void assert_reset_soft(bool should_be_detached) { git_oid oid; - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); + cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); cl_git_fail(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO)); retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO); @@ -35,7 +35,7 @@ static void assert_reset_soft(bool should_be_detached) cl_assert(git_repository_head_detached(repo) == should_be_detached); - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); + cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); cl_git_pass(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO)); } @@ -56,7 +56,7 @@ void test_reset_soft__resetting_to_the_commit_pointed_at_by_the_Head_does_not_ch git_oid oid; char raw_head_oid[GIT_OID_HEXSZ + 1]; - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); + cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); git_oid_fmt(raw_head_oid, &oid); raw_head_oid[GIT_OID_HEXSZ] = '\0'; @@ -64,7 +64,7 @@ void test_reset_soft__resetting_to_the_commit_pointed_at_by_the_Head_does_not_ch cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT)); - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); + cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); cl_git_pass(git_oid_streq(&oid, raw_head_oid)); } @@ -78,7 +78,7 @@ void test_reset_soft__resetting_to_a_tag_sets_the_Head_to_the_peeled_commit(void cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT)); cl_assert(git_repository_head_detached(repo) == false); - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); + cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); cl_git_pass(git_oid_streq(&oid, KNOWN_COMMIT_IN_BARE_REPO)); } @@ -110,7 +110,7 @@ void test_reset_soft__resetting_against_an_orphaned_head_repo_makes_the_head_no_ cl_assert_equal_i(false, git_repository_head_orphan(repo)); cl_git_pass(git_reference_lookup(&head, repo, NON_EXISTING_HEAD)); - cl_assert_equal_i(0, git_oid_streq(git_reference_oid(head), KNOWN_COMMIT_IN_BARE_REPO)); + cl_assert_equal_i(0, git_oid_streq(git_reference_target(head), KNOWN_COMMIT_IN_BARE_REPO)); git_reference_free(head); } diff --git a/tests-clar/revwalk/signatureparsing.c b/tests-clar/revwalk/signatureparsing.c index cf1d31e43..4f29dd14d 100644 --- a/tests-clar/revwalk/signatureparsing.c +++ b/tests-clar/revwalk/signatureparsing.c @@ -31,10 +31,10 @@ void test_revwalk_signatureparsing__do_not_choke_when_name_contains_angle_bracke */ cl_git_pass(git_reference_lookup(&ref, _repo, "refs/heads/haacked")); - git_revwalk_push(_walk, git_reference_oid(ref)); + git_revwalk_push(_walk, git_reference_target(ref)); cl_git_pass(git_revwalk_next(&commit_oid, _walk)); - cl_git_pass(git_commit_lookup(&commit, _repo, git_reference_oid(ref))); + cl_git_pass(git_commit_lookup(&commit, _repo, git_reference_target(ref))); signature = git_commit_committer(commit); cl_assert_equal_s("Yu V. Bin Haacked", signature->email); diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c index 9d1aeda70..26b571736 100644 --- a/tests-clar/stash/drop.c +++ b/tests-clar/stash/drop.c @@ -95,7 +95,7 @@ void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) cl_git_pass(git_reflog_read(&reflog, stash)); entry = git_reflog_entry_byindex(reflog, 1); - git_oid_cpy(&oid, git_reflog_entry_oidold(entry)); + git_oid_cpy(&oid, git_reflog_entry_id_old(entry)); count = git_reflog_entrycount(reflog); git_reflog_free(reflog); @@ -105,7 +105,7 @@ void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) cl_git_pass(git_reflog_read(&reflog, stash)); entry = git_reflog_entry_byindex(reflog, 0); - cl_assert_equal_i(0, git_oid_cmp(&oid, git_reflog_entry_oidold(entry))); + cl_assert_equal_i(0, git_oid_cmp(&oid, git_reflog_entry_id_old(entry))); cl_assert_equal_i(count - 1, git_reflog_entrycount(reflog)); git_reflog_free(reflog); diff --git a/tests-clar/stash/save.c b/tests-clar/stash/save.c index 4eaf2a3c1..f8b427814 100644 --- a/tests-clar/stash/save.c +++ b/tests-clar/stash/save.c @@ -193,7 +193,7 @@ void test_stash_save__cannot_stash_against_an_unborn_branch(void) git_reference *head; cl_git_pass(git_reference_lookup(&head, repo, "HEAD")); - cl_git_pass(git_reference_set_target(head, "refs/heads/unborn")); + cl_git_pass(git_reference_symbolic_set_target(head, "refs/heads/unborn")); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_stash_save(&stash_tip_oid, repo, signature, NULL, GIT_STASH_DEFAULT)); diff --git a/tests-clar/status/worktree.c b/tests-clar/status/worktree.c index c154179b0..04e3ef112 100644 --- a/tests-clar/status/worktree.c +++ b/tests-clar/status/worktree.c @@ -482,7 +482,7 @@ static void fill_index_wth_head_entries(git_repository *repo, git_index *index) git_commit *commit; git_tree *tree; - cl_git_pass(git_reference_name_to_oid(&oid, repo, "HEAD")); + cl_git_pass(git_reference_name_to_id(&oid, repo, "HEAD")); cl_git_pass(git_commit_lookup(&commit, repo, &oid)); cl_git_pass(git_commit_tree(&tree, commit)); From cfbe4be3fb639d96587974794fe437ace0c383c4 Mon Sep 17 00:00:00 2001 From: Vicent Marti Date: Sat, 17 Nov 2012 19:54:47 -0800 Subject: [PATCH 02/38] More external API cleanup Conflicts: src/branch.c tests-clar/refs/branches/create.c --- CMakeLists.txt | 2 +- include/git2/attr.h | 4 +- include/git2/blob.h | 32 ++++++++++---- include/git2/branch.h | 14 +++---- include/git2/checkout.h | 8 +++- include/git2/clone.h | 4 +- include/git2/commit.h | 35 +++++++++------- include/git2/diff.h | 31 +++++++------- include/git2/object.h | 2 +- src/blob.c | 6 +-- src/branch.c | 19 ++------- src/checkout.c | 2 +- src/clone.c | 10 ++--- src/commit.c | 53 +++++++++++------------ src/commit.h | 4 +- src/diff_output.c | 26 ++++++------ src/diff_output.h | 6 +-- src/index.c | 2 +- src/object.c | 6 +-- src/transports/local.c | 2 +- tests-clar/clone/network.c | 6 +-- tests-clar/diff/blob.c | 36 ++++++++-------- tests-clar/diff/diff_helpers.c | 12 +++--- tests-clar/diff/diff_helpers.h | 12 +++--- tests-clar/diff/index.c | 4 +- tests-clar/diff/rename.c | 6 +-- tests-clar/diff/tree.c | 30 ++++++------- tests-clar/diff/workdir.c | 70 +++++++++++++++---------------- tests-clar/object/blob/filter.c | 4 +- tests-clar/object/blob/write.c | 2 +- tests-clar/pack/packbuilder.c | 2 +- tests-clar/refs/branches/create.c | 37 ++++------------ 32 files changed, 239 insertions(+), 250 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17e4ff2de..fc530773d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ IF (BUILD_CLAR) ADD_CUSTOM_COMMAND( OUTPUT ${CLAR_PATH}/clar_main.c ${CLAR_PATH}/clar.h - COMMAND ${PYTHON_EXECUTABLE} clar -vtap . + COMMAND ${PYTHON_EXECUTABLE} clar . DEPENDS ${CLAR_PATH}/clar ${SRC_TEST} WORKING_DIRECTORY ${CLAR_PATH} ) diff --git a/include/git2/attr.h b/include/git2/attr.h index 2de9f4b0e..b1a7e0eb6 100644 --- a/include/git2/attr.h +++ b/include/git2/attr.h @@ -183,6 +183,8 @@ GIT_EXTERN(int) git_attr_get_many( size_t num_attr, const char **names); +typedef int (*git_attr_foreach_cb)(const char *name, const char *value, void *payload); + /** * Loop over all the git attributes for a path. * @@ -204,7 +206,7 @@ GIT_EXTERN(int) git_attr_foreach( git_repository *repo, uint32_t flags, const char *path, - int (*callback)(const char *name, const char *value, void *payload), + git_attr_foreach_cb callback, void *payload); /** diff --git a/include/git2/blob.h b/include/git2/blob.h index f0719f15d..a68c78b5a 100644 --- a/include/git2/blob.h +++ b/include/git2/blob.h @@ -68,6 +68,17 @@ GIT_INLINE(void) git_blob_free(git_blob *blob) git_object_free((git_object *) blob); } +/** + * Get the id of a blob. + * + * @param blob a previously loaded blob. + * @return SHA1 hash for this blob. + */ +GIT_INLINE(const git_oid *) git_blob_id(const git_blob *blob) +{ + return git_object_id((const git_object *)blob); +} + /** * Get a read-only buffer with the raw content of a blob. @@ -88,32 +99,35 @@ GIT_EXTERN(const void *) git_blob_rawcontent(git_blob *blob); * @param blob pointer to the blob * @return size on bytes */ -GIT_EXTERN(size_t) git_blob_rawsize(git_blob *blob); +GIT_EXTERN(git_off_t) git_blob_rawsize(git_blob *blob); /** * Read a file from the working folder of a repository * and write it to the Object Database as a loose blob * - * @param oid return the id of the written blob + * @param id return the id of the written blob * @param repo repository where the blob will be written. * this repository cannot be bare - * @param path file from which the blob will be created, + * @param relative_path file from which the blob will be created, * relative to the repository's working dir * @return 0 or an error code */ -GIT_EXTERN(int) git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *path); +GIT_EXTERN(int) git_blob_create_fromworkdir(git_oid *id, git_repository *repo, const char *relative_path); /** * Read a file from the filesystem and write its content * to the Object Database as a loose blob * - * @param oid return the id of the written blob + * @param id return the id of the written blob * @param repo repository where the blob will be written. * this repository can be bare or not * @param path file from which the blob will be created * @return 0 or an error code */ -GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *oid, git_repository *repo, const char *path); +GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *id, git_repository *repo, const char *path); + + +typedef int (*git_blob_chunk_cb)(char *content, size_t max_length, void *payload); /** * Write a loose blob to the Object Database from a @@ -141,7 +155,7 @@ GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *oid, git_repository *repo, con * - When an error occurs, the callback should return -1. * * - * @param oid Return the id of the written blob + * @param id Return the id of the written blob * * @param repo repository where the blob will be written. * This repository can be bare or not. @@ -152,10 +166,10 @@ GIT_EXTERN(int) git_blob_create_fromdisk(git_oid *oid, git_repository *repo, con * @return GIT_SUCCESS or an error code */ GIT_EXTERN(int) git_blob_create_fromchunks( - git_oid *oid, + git_oid *id, git_repository *repo, const char *hintpath, - int (*source_cb)(char *content, size_t max_length, void *payload), + git_blob_chunk_cb callback, void *payload); /** diff --git a/include/git2/branch.h b/include/git2/branch.h index f06609a51..c9ae9cc5d 100644 --- a/include/git2/branch.h +++ b/include/git2/branch.h @@ -29,7 +29,7 @@ GIT_BEGIN_DECL * * The returned reference must be freed by the user. * - * @param branch_out Pointer where to store the underlying reference. + * @param out Pointer where to store the underlying reference. * * @param branch_name Name for the branch; this name is * validated for consistency. It should also not conflict with @@ -47,10 +47,10 @@ GIT_BEGIN_DECL * pointing to the provided target commit. */ GIT_EXTERN(int) git_branch_create( - git_reference **branch_out, + git_reference **out, git_repository *repo, const char *branch_name, - const git_object *target, + const git_commit *target, int force); /** @@ -113,7 +113,7 @@ GIT_EXTERN(int) git_branch_move( * * The generated reference must be freed by the user. * - * @param branch_out pointer to the looked-up branch reference + * @param out pointer to the looked-up branch reference * * @param repo the repository to look up the branch * @@ -127,7 +127,7 @@ GIT_EXTERN(int) git_branch_move( * exists, otherwise an error code. */ GIT_EXTERN(int) git_branch_lookup( - git_reference **branch_out, + git_reference **out, git_repository *repo, const char *branch_name, git_branch_t branch_type); @@ -136,7 +136,7 @@ GIT_EXTERN(int) git_branch_lookup( * Return the reference supporting the remote tracking branch, * given a local branch reference. * - * @param tracking_out Pointer where to store the retrieved + * @param out Pointer where to store the retrieved * reference. * * @param branch Current underlying reference of the branch. @@ -145,7 +145,7 @@ GIT_EXTERN(int) git_branch_lookup( * reference exists, otherwise an error code. */ GIT_EXTERN(int) git_branch_tracking( - git_reference **tracking_out, + git_reference **out, git_reference *branch); /** diff --git a/include/git2/checkout.h b/include/git2/checkout.h index 27ecc7102..bd988db2c 100644 --- a/include/git2/checkout.h +++ b/include/git2/checkout.h @@ -146,8 +146,12 @@ typedef enum { * Checkout options structure * * Use zeros to indicate default settings. + * This needs to be initialized with the `GIT_CHECKOUT_OPTS_INIT` macro: + * + * git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT; */ typedef struct git_checkout_opts { + unsigned int version; unsigned int checkout_strategy; /** default will be a dry run */ int disable_filters; /** don't apply filters like CRLF conversion */ @@ -182,6 +186,8 @@ typedef struct git_checkout_opts { git_strarray paths; } git_checkout_opts; +#define GIT_CHECKOUT_OPTS_INIT {1, 0} + /** * Updates files in the index and the working tree to match the content of the * commit pointed at by HEAD. @@ -223,7 +229,7 @@ GIT_EXTERN(int) git_checkout_index( */ GIT_EXTERN(int) git_checkout_tree( git_repository *repo, - git_object *treeish, + const git_object *treeish, git_checkout_opts *opts); /** @} */ diff --git a/include/git2/clone.h b/include/git2/clone.h index 7d8d32118..2a0272339 100644 --- a/include/git2/clone.h +++ b/include/git2/clone.h @@ -42,9 +42,9 @@ GIT_EXTERN(int) git_clone( git_repository **out, const char *origin_url, const char *workdir_path, + git_checkout_opts *checkout_opts, git_transfer_progress_callback fetch_progress_cb, - void *fetch_progress_payload, - git_checkout_opts *checkout_opts); + void *fetch_progress_payload); /** * Create a bare clone of a remote repository. diff --git a/include/git2/commit.h b/include/git2/commit.h index a159b79e1..872f691ce 100644 --- a/include/git2/commit.h +++ b/include/git2/commit.h @@ -76,7 +76,10 @@ GIT_INLINE(void) git_commit_free(git_commit *commit) * @param commit a previously loaded commit. * @return object identity for the commit. */ -GIT_EXTERN(const git_oid *) git_commit_id(git_commit *commit); +GIT_INLINE(const git_oid *) git_commit_id(const git_commit *commit) +{ + return git_object_id((const git_object *)commit); +} /** * Get the encoding for the message of a commit, @@ -88,7 +91,7 @@ GIT_EXTERN(const git_oid *) git_commit_id(git_commit *commit); * @param commit a previously loaded commit. * @return NULL, or the encoding */ -GIT_EXTERN(const char *) git_commit_message_encoding(git_commit *commit); +GIT_EXTERN(const char *) git_commit_message_encoding(const git_commit *commit); /** * Get the full message of a commit. @@ -96,7 +99,7 @@ GIT_EXTERN(const char *) git_commit_message_encoding(git_commit *commit); * @param commit a previously loaded commit. * @return the message of a commit */ -GIT_EXTERN(const char *) git_commit_message(git_commit *commit); +GIT_EXTERN(const char *) git_commit_message(const git_commit *commit); /** * Get the commit time (i.e. committer time) of a commit. @@ -104,7 +107,7 @@ GIT_EXTERN(const char *) git_commit_message(git_commit *commit); * @param commit a previously loaded commit. * @return the time of a commit */ -GIT_EXTERN(git_time_t) git_commit_time(git_commit *commit); +GIT_EXTERN(git_time_t) git_commit_time(const git_commit *commit); /** * Get the commit timezone offset (i.e. committer's preferred timezone) of a commit. @@ -112,7 +115,7 @@ GIT_EXTERN(git_time_t) git_commit_time(git_commit *commit); * @param commit a previously loaded commit. * @return positive or negative timezone offset, in minutes from UTC */ -GIT_EXTERN(int) git_commit_time_offset(git_commit *commit); +GIT_EXTERN(int) git_commit_time_offset(const git_commit *commit); /** * Get the committer of a commit. @@ -120,7 +123,7 @@ GIT_EXTERN(int) git_commit_time_offset(git_commit *commit); * @param commit a previously loaded commit. * @return the committer of a commit */ -GIT_EXTERN(const git_signature *) git_commit_committer(git_commit *commit); +GIT_EXTERN(const git_signature *) git_commit_committer(const git_commit *commit); /** * Get the author of a commit. @@ -128,7 +131,7 @@ GIT_EXTERN(const git_signature *) git_commit_committer(git_commit *commit); * @param commit a previously loaded commit. * @return the author of a commit */ -GIT_EXTERN(const git_signature *) git_commit_author(git_commit *commit); +GIT_EXTERN(const git_signature *) git_commit_author(const git_commit *commit); /** * Get the tree pointed to by a commit. @@ -137,7 +140,7 @@ GIT_EXTERN(const git_signature *) git_commit_author(git_commit *commit); * @param commit a previously loaded commit. * @return 0 or an error code */ -GIT_EXTERN(int) git_commit_tree(git_tree **tree_out, git_commit *commit); +GIT_EXTERN(int) git_commit_tree(git_tree **tree_out, const git_commit *commit); /** * Get the id of the tree pointed to by a commit. This differs from @@ -147,7 +150,7 @@ GIT_EXTERN(int) git_commit_tree(git_tree **tree_out, git_commit *commit); * @param commit a previously loaded commit. * @return the id of tree pointed to by commit. */ -GIT_EXTERN(const git_oid *) git_commit_tree_oid(git_commit *commit); +GIT_EXTERN(const git_oid *) git_commit_tree_id(const git_commit *commit); /** * Get the number of parents of this commit @@ -155,17 +158,17 @@ GIT_EXTERN(const git_oid *) git_commit_tree_oid(git_commit *commit); * @param commit a previously loaded commit. * @return integer of count of parents */ -GIT_EXTERN(unsigned int) git_commit_parentcount(git_commit *commit); +GIT_EXTERN(unsigned int) git_commit_parentcount(const git_commit *commit); /** * Get the specified parent of the commit. * - * @param parent Pointer where to store the parent commit + * @param out Pointer where to store the parent commit * @param commit a previously loaded commit. * @param n the position of the parent (from 0 to `parentcount`) * @return 0 or an error code */ -GIT_EXTERN(int) git_commit_parent(git_commit **parent, git_commit *commit, unsigned int n); +GIT_EXTERN(int) git_commit_parent(git_commit **out, git_commit *commit, unsigned int n); /** * Get the oid of a specified parent for a commit. This is different from @@ -176,7 +179,7 @@ GIT_EXTERN(int) git_commit_parent(git_commit **parent, git_commit *commit, unsig * @param n the position of the parent (from 0 to `parentcount`) * @return the id of the parent, NULL on error. */ -GIT_EXTERN(const git_oid *) git_commit_parent_oid(git_commit *commit, unsigned int n); +GIT_EXTERN(const git_oid *) git_commit_parent_id(git_commit *commit, unsigned int n); /** * Get the commit object that is the th generation ancestor @@ -204,7 +207,7 @@ GIT_EXTERN(int) git_commit_nth_gen_ancestor( * The message will not be cleaned up. This can be achieved * through `git_message_prettify()`. * - * @param oid Pointer where to store the OID of the + * @param id Pointer where to store the OID of the * newly created commit * * @param repo Repository where to store the commit @@ -245,7 +248,7 @@ GIT_EXTERN(int) git_commit_nth_gen_ancestor( * the given reference will be updated to point to it */ GIT_EXTERN(int) git_commit_create( - git_oid *oid, + git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, @@ -273,7 +276,7 @@ GIT_EXTERN(int) git_commit_create( * @see git_commit_create */ GIT_EXTERN(int) git_commit_create_v( - git_oid *oid, + git_oid *id, git_repository *repo, const char *update_ref, const git_signature *author, diff --git a/include/git2/diff.h b/include/git2/diff.h index 47bfa5f69..f925cbe39 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -106,6 +106,7 @@ typedef enum { * - max_size: maximum blob size to diff, above this treated as binary */ typedef struct { + unsigned int version; /**< version for the struct */ uint32_t flags; /**< defaults to GIT_DIFF_NORMAL */ uint16_t context_lines; /**< defaults to 3 */ uint16_t interhunk_lines; /**< defaults to 0 */ @@ -186,7 +187,7 @@ typedef struct { /** * When iterating over a diff, callback that will be made per file. */ -typedef int (*git_diff_file_fn)( +typedef int (*git_diff_file_cb)( void *cb_data, const git_diff_delta *delta, float progress); @@ -204,7 +205,7 @@ typedef struct { /** * When iterating over a diff, callback that will be made per hunk. */ -typedef int (*git_diff_hunk_fn)( +typedef int (*git_diff_hunk_cb)( void *cb_data, const git_diff_delta *delta, const git_diff_range *range, @@ -215,20 +216,20 @@ typedef int (*git_diff_hunk_fn)( * Line origin constants. * * These values describe where a line came from and will be passed to - * the git_diff_data_fn when iterating over a diff. There are some + * the git_diff_data_cb when iterating over a diff. There are some * special origin constants at the end that are used for the text * output callbacks to demarcate lines that are actually part of * the file or hunk headers. */ typedef enum { - /* These values will be sent to `git_diff_data_fn` along with the line */ + /* These values will be sent to `git_diff_data_cb` along with the line */ GIT_DIFF_LINE_CONTEXT = ' ', GIT_DIFF_LINE_ADDITION = '+', GIT_DIFF_LINE_DELETION = '-', GIT_DIFF_LINE_ADD_EOFNL = '\n', /**< Removed line w/o LF & added one with */ GIT_DIFF_LINE_DEL_EOFNL = '\0', /**< LF was removed at end of file */ - /* The following values will only be sent to a `git_diff_data_fn` when + /* The following values will only be sent to a `git_diff_data_cb` when * the content of a diff is being formatted (eg. through * git_diff_print_patch() or git_diff_print_compact(), for instance). */ @@ -245,7 +246,7 @@ typedef enum { * of text. This uses some extra GIT_DIFF_LINE_... constants for output * of lines of file and hunk headers. */ -typedef int (*git_diff_data_fn)( +typedef int (*git_diff_data_cb)( void *cb_data, const git_diff_delta *delta, const git_diff_range *range, @@ -474,9 +475,9 @@ GIT_EXTERN(int) git_diff_find_similar( GIT_EXTERN(int) git_diff_foreach( git_diff_list *diff, void *cb_data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn line_cb); + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb line_cb); /** * Iterate over a diff generating text output like "git diff --name-status". @@ -492,7 +493,7 @@ GIT_EXTERN(int) git_diff_foreach( GIT_EXTERN(int) git_diff_print_compact( git_diff_list *diff, void *cb_data, - git_diff_data_fn print_cb); + git_diff_data_cb print_cb); /** * Look up the single character abbreviation for a delta status code. @@ -528,7 +529,7 @@ GIT_EXTERN(char) git_diff_status_char(git_delta_t status); GIT_EXTERN(int) git_diff_print_patch( git_diff_list *diff, void *cb_data, - git_diff_data_fn print_cb); + git_diff_data_cb print_cb); /** * Query how many diff records are there in a diff list. @@ -680,7 +681,7 @@ GIT_EXTERN(int) git_diff_patch_get_line_in_hunk( GIT_EXTERN(int) git_diff_patch_print( git_diff_patch *patch, void *cb_data, - git_diff_data_fn print_cb); + git_diff_data_cb print_cb); /** * Get the content of a patch as a single diff text. @@ -719,9 +720,9 @@ GIT_EXTERN(int) git_diff_blobs( git_blob *new_blob, const git_diff_options *options, void *cb_data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn line_cb); + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb line_cb); GIT_END_DECL diff --git a/include/git2/object.h b/include/git2/object.h index fd6ae95c1..69af392a0 100644 --- a/include/git2/object.h +++ b/include/git2/object.h @@ -184,7 +184,7 @@ GIT_EXTERN(size_t) git_object__size(git_otype type); */ GIT_EXTERN(int) git_object_peel( git_object **peeled, - git_object *object, + const git_object *object, git_otype target_type); /** @} */ diff --git a/src/blob.c b/src/blob.c index 76d265faa..b168df137 100644 --- a/src/blob.c +++ b/src/blob.c @@ -19,10 +19,10 @@ const void *git_blob_rawcontent(git_blob *blob) return blob->odb_object->raw.data; } -size_t git_blob_rawsize(git_blob *blob) +git_off_t git_blob_rawsize(git_blob *blob) { assert(blob); - return blob->odb_object->raw.len; + return (git_off_t)blob->odb_object->raw.len; } int git_blob__getbuf(git_buf *buffer, git_blob *blob) @@ -205,7 +205,7 @@ static int blob_create_internal(git_oid *oid, git_repository *repo, const char * return error; } -int git_blob_create_fromfile(git_oid *oid, git_repository *repo, const char *path) +int git_blob_create_fromworkdir(git_oid *oid, git_repository *repo, const char *path) { git_buf full_path = GIT_BUF_INIT; const char *workdir; diff --git a/src/branch.c b/src/branch.c index 87ee7084f..5d7d443dc 100644 --- a/src/branch.c +++ b/src/branch.c @@ -44,12 +44,6 @@ cleanup: return error; } -static int create_error_invalid(const char *msg) -{ - giterr_set(GITERR_INVALID, "Cannot create branch - %s", msg); - return -1; -} - static int not_a_local_branch(git_reference *ref) { giterr_set(GITERR_INVALID, "Reference '%s' is not a local branch.", git_reference_name(ref)); @@ -60,31 +54,26 @@ int git_branch_create( git_reference **ref_out, git_repository *repository, const char *branch_name, - const git_object *target, + const git_commit *commit, int force) { - git_object *commit = NULL; git_reference *branch = NULL; git_buf canonical_branch_name = GIT_BUF_INIT; int error = -1; - assert(branch_name && target && ref_out); - assert(git_object_owner(target) == repository); - - if (git_object_peel(&commit, (git_object *)target, GIT_OBJ_COMMIT) < 0) - return create_error_invalid("The given target does not resolve to a commit"); + assert(branch_name && commit && ref_out); + assert(git_object_owner((const git_object *)commit) == repository); if (git_buf_joinpath(&canonical_branch_name, GIT_REFS_HEADS_DIR, branch_name) < 0) goto cleanup; error = git_reference_create(&branch, repository, - git_buf_cstr(&canonical_branch_name), git_object_id(commit), force); + git_buf_cstr(&canonical_branch_name), git_commit_id(commit), force); if (!error) *ref_out = branch; cleanup: - git_object_free(commit); git_buf_free(&canonical_branch_name); return error; } diff --git a/src/checkout.c b/src/checkout.c index c4e4f999a..a3166bfa5 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -693,7 +693,7 @@ cleanup: int git_checkout_tree( git_repository *repo, - git_object *treeish, + const git_object *treeish, git_checkout_opts *opts) { int error = 0; diff --git a/src/clone.c b/src/clone.c index ea644dd11..c90d85466 100644 --- a/src/clone.c +++ b/src/clone.c @@ -28,18 +28,18 @@ static int create_branch( const git_oid *target, const char *name) { - git_object *head_obj = NULL; + git_commit *head_obj = NULL; git_reference *branch_ref; int error; /* Find the target commit */ - if ((error = git_object_lookup(&head_obj, repo, target, GIT_OBJ_ANY)) < 0) + if ((error = git_commit_lookup(&head_obj, repo, target)) < 0) return error; /* Create the new branch */ error = git_branch_create(&branch_ref, repo, name, head_obj, 0); - git_object_free(head_obj); + git_commit_free(head_obj); if (!error) *branch = branch_ref; @@ -381,9 +381,9 @@ int git_clone( git_repository **out, const char *origin_url, const char *workdir_path, + git_checkout_opts *checkout_opts, git_transfer_progress_callback fetch_progress_cb, - void *fetch_progress_payload, - git_checkout_opts *checkout_opts) + void *fetch_progress_payload) { assert(out && origin_url && workdir_path); diff --git a/src/commit.c b/src/commit.c index b66978aff..4072518ff 100644 --- a/src/commit.c +++ b/src/commit.c @@ -22,18 +22,18 @@ static void clear_parents(git_commit *commit) { unsigned int i; - for (i = 0; i < commit->parent_oids.length; ++i) { - git_oid *parent = git_vector_get(&commit->parent_oids, i); + for (i = 0; i < commit->parent_ids.length; ++i) { + git_oid *parent = git_vector_get(&commit->parent_ids, i); git__free(parent); } - git_vector_clear(&commit->parent_oids); + git_vector_clear(&commit->parent_ids); } void git_commit__free(git_commit *commit) { clear_parents(commit); - git_vector_free(&commit->parent_oids); + git_vector_free(&commit->parent_ids); git_signature_free(commit->author); git_signature_free(commit->committer); @@ -43,11 +43,6 @@ void git_commit__free(git_commit *commit) git__free(commit); } -const git_oid *git_commit_id(git_commit *c) -{ - return git_object_id((git_object *)c); -} - int git_commit_create_v( git_oid *oid, git_repository *repo, @@ -141,26 +136,26 @@ int git_commit__parse_buffer(git_commit *commit, const void *data, size_t len) const char *buffer = data; const char *buffer_end = (const char *)data + len; - git_oid parent_oid; + git_oid parent_id; - git_vector_init(&commit->parent_oids, 4, NULL); + git_vector_init(&commit->parent_ids, 4, NULL); - if (git_oid__parse(&commit->tree_oid, &buffer, buffer_end, "tree ") < 0) + if (git_oid__parse(&commit->tree_id, &buffer, buffer_end, "tree ") < 0) goto bad_buffer; /* * TODO: commit grafts! */ - while (git_oid__parse(&parent_oid, &buffer, buffer_end, "parent ") == 0) { - git_oid *new_oid; + while (git_oid__parse(&parent_id, &buffer, buffer_end, "parent ") == 0) { + git_oid *new_id; - new_oid = git__malloc(sizeof(git_oid)); - GITERR_CHECK_ALLOC(new_oid); + new_id = git__malloc(sizeof(git_oid)); + GITERR_CHECK_ALLOC(new_id); - git_oid_cpy(new_oid, &parent_oid); + git_oid_cpy(new_id, &parent_id); - if (git_vector_insert(&commit->parent_oids, new_oid) < 0) + if (git_vector_insert(&commit->parent_ids, new_id) < 0) return -1; } @@ -214,7 +209,7 @@ int git_commit__parse(git_commit *commit, git_odb_object *obj) } #define GIT_COMMIT_GETTER(_rvalue, _name, _return) \ - _rvalue git_commit_##_name(git_commit *commit) \ + _rvalue git_commit_##_name(const git_commit *commit) \ {\ assert(commit); \ return _return; \ @@ -226,34 +221,34 @@ GIT_COMMIT_GETTER(const char *, message, commit->message) GIT_COMMIT_GETTER(const char *, message_encoding, commit->message_encoding) GIT_COMMIT_GETTER(git_time_t, time, commit->committer->when.time) GIT_COMMIT_GETTER(int, time_offset, commit->committer->when.offset) -GIT_COMMIT_GETTER(unsigned int, parentcount, (unsigned int)commit->parent_oids.length) -GIT_COMMIT_GETTER(const git_oid *, tree_oid, &commit->tree_oid); +GIT_COMMIT_GETTER(unsigned int, parentcount, (unsigned int)commit->parent_ids.length) +GIT_COMMIT_GETTER(const git_oid *, tree_id, &commit->tree_id); -int git_commit_tree(git_tree **tree_out, git_commit *commit) +int git_commit_tree(git_tree **tree_out, const git_commit *commit) { assert(commit); - return git_tree_lookup(tree_out, commit->object.repo, &commit->tree_oid); + return git_tree_lookup(tree_out, commit->object.repo, &commit->tree_id); } -const git_oid *git_commit_parent_oid(git_commit *commit, unsigned int n) +const git_oid *git_commit_parent_id(git_commit *commit, unsigned int n) { assert(commit); - return git_vector_get(&commit->parent_oids, n); + return git_vector_get(&commit->parent_ids, n); } int git_commit_parent(git_commit **parent, git_commit *commit, unsigned int n) { - const git_oid *parent_oid; + const git_oid *parent_id; assert(commit); - parent_oid = git_commit_parent_oid(commit, n); - if (parent_oid == NULL) { + parent_id = git_commit_parent_id(commit, n); + if (parent_id == NULL) { giterr_set(GITERR_INVALID, "Parent %u does not exist", n); return GIT_ENOTFOUND; } - return git_commit_lookup(parent, commit->object.repo, parent_oid); + return git_commit_lookup(parent, commit->object.repo, parent_id); } int git_commit_nth_gen_ancestor( diff --git a/src/commit.h b/src/commit.h index d9f492862..1d1dc0ddb 100644 --- a/src/commit.h +++ b/src/commit.h @@ -17,8 +17,8 @@ struct git_commit { git_object object; - git_vector parent_oids; - git_oid tree_oid; + git_vector parent_ids; + git_oid tree_id; git_signature *author; git_signature *committer; diff --git a/src/diff_output.c b/src/diff_output.c index 46a9e02bf..5c887cd7e 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -441,9 +441,9 @@ static void diff_context_init( git_repository *repo, const git_diff_options *opts, void *data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn data_cb) + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb data_cb) { memset(ctxt, 0, sizeof(diff_context)); @@ -905,9 +905,9 @@ static int diff_patch_line_cb( int git_diff_foreach( git_diff_list *diff, void *cb_data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn data_cb) + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb data_cb) { int error = 0; diff_context ctxt; @@ -951,7 +951,7 @@ int git_diff_foreach( typedef struct { git_diff_list *diff; - git_diff_data_fn print_cb; + git_diff_data_cb print_cb; void *cb_data; git_buf *buf; } diff_print_info; @@ -1030,7 +1030,7 @@ static int print_compact( int git_diff_print_compact( git_diff_list *diff, void *cb_data, - git_diff_data_fn print_cb) + git_diff_data_cb print_cb) { int error; git_buf buf = GIT_BUF_INIT; @@ -1211,7 +1211,7 @@ static int print_patch_line( int git_diff_print_patch( git_diff_list *diff, void *cb_data, - git_diff_data_fn print_cb) + git_diff_data_cb print_cb) { int error; git_buf buf = GIT_BUF_INIT; @@ -1251,9 +1251,9 @@ int git_diff_blobs( git_blob *new_blob, const git_diff_options *options, void *cb_data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn data_cb) + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb data_cb) { int error; git_repository *repo; @@ -1518,7 +1518,7 @@ static int print_to_buffer_cb( int git_diff_patch_print( git_diff_patch *patch, void *cb_data, - git_diff_data_fn print_cb) + git_diff_data_cb print_cb) { int error; git_buf temp = GIT_BUF_INIT; diff --git a/src/diff_output.h b/src/diff_output.h index f74dd3a71..8d7b5e472 100644 --- a/src/diff_output.h +++ b/src/diff_output.h @@ -27,9 +27,9 @@ typedef struct { git_repository *repo; git_diff_list *diff; const git_diff_options *opts; - git_diff_file_fn file_cb; - git_diff_hunk_fn hunk_cb; - git_diff_data_fn data_cb; + git_diff_file_cb file_cb; + git_diff_hunk_cb hunk_cb; + git_diff_data_cb data_cb; void *cb_data; int cb_error; git_diff_range cb_range; diff --git a/src/index.c b/src/index.c index 128dd18cf..350d3632b 100644 --- a/src/index.c +++ b/src/index.c @@ -580,7 +580,7 @@ static int index_entry_init(git_index_entry **entry_out, git_index *index, const */ /* write the blob to disk and get the oid */ - if ((error = git_blob_create_fromfile(&oid, INDEX_OWNER(index), rel_path)) < 0) + if ((error = git_blob_create_fromworkdir(&oid, INDEX_OWNER(index), rel_path)) < 0) return error; entry = git__calloc(1, sizeof(git_index_entry)); diff --git a/src/object.c b/src/object.c index 3d953039c..f71ee48d3 100644 --- a/src/object.c +++ b/src/object.c @@ -334,7 +334,7 @@ static int dereference_object(git_object **dereferenced, git_object *obj) int git_object_peel( git_object **peeled, - git_object *object, + const git_object *object, git_otype target_type) { git_object *source, *deref = NULL; @@ -342,9 +342,9 @@ int git_object_peel( assert(object && peeled); if (git_object_type(object) == target_type) - return git_object__dup(peeled, object); + return git_object__dup(peeled, (git_object *)object); - source = object; + source = (git_object *)object; while (!dereference_object(&deref, source)) { diff --git a/src/transports/local.c b/src/transports/local.c index caac46ea2..51544416d 100644 --- a/src/transports/local.c +++ b/src/transports/local.c @@ -306,7 +306,7 @@ static int local_download_pack( if (git_odb_exists(odb, &oid)) continue; if (!git_object_lookup((git_object**)&commit, t->repo, &oid, GIT_OBJ_COMMIT)) { - const git_oid *tree_oid = git_commit_tree_oid(commit); + const git_oid *tree_oid = git_commit_tree_id(commit); git_commit_free(commit); /* Add the commit and its tree */ diff --git a/tests-clar/clone/network.c b/tests-clar/clone/network.c index 4759b607a..d519e458b 100644 --- a/tests-clar/clone/network.c +++ b/tests-clar/clone/network.c @@ -109,7 +109,7 @@ static void fetch_progress(const git_transfer_progress *stats, void *payload) void test_clone_network__can_checkout_a_cloned_repo(void) { - git_checkout_opts opts = {0}; + git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT; git_buf path = GIT_BUF_INIT; git_reference *head; bool checkout_progress_cb_was_called = false, @@ -121,8 +121,8 @@ void test_clone_network__can_checkout_a_cloned_repo(void) cl_set_cleanup(&cleanup_repository, "./default-checkout"); - cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./default-checkout", - &fetch_progress, &fetch_progress_cb_was_called, &opts)); + cl_git_pass(git_clone(&g_repo, LIVE_REPO_URL, "./default-checkout", &opts, + &fetch_progress, &fetch_progress_cb_was_called)); cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt")); cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&path))); diff --git a/tests-clar/diff/blob.c b/tests-clar/diff/blob.c index a9ebcc207..cbef0f313 100644 --- a/tests-clar/diff/blob.c +++ b/tests-clar/diff/blob.c @@ -59,7 +59,7 @@ void test_diff_blob__can_compare_text_blobs(void) /* diff on tests/resources/attr/root_test1 */ cl_git_pass(git_diff_blobs( - a, b, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + a, b, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -74,7 +74,7 @@ void test_diff_blob__can_compare_text_blobs(void) /* diff on tests/resources/attr/root_test2 */ memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - b, c, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + b, c, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -89,7 +89,7 @@ void test_diff_blob__can_compare_text_blobs(void) /* diff on tests/resources/attr/root_test3 */ memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - a, c, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + a, c, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -103,7 +103,7 @@ void test_diff_blob__can_compare_text_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - c, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + c, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -125,7 +125,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) git_blob *e = NULL; cl_git_pass(git_diff_blobs( - d, e, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + d, e, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_DELETED]); @@ -140,7 +140,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - d, e, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + d, e, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_ADDED]); @@ -155,7 +155,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - alien, NULL, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + alien, NULL, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.files_binary); @@ -166,7 +166,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - NULL, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + NULL, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.files_binary); @@ -186,21 +186,21 @@ static void assert_identical_blobs_comparison(diff_expects *expected) void test_diff_blob__can_compare_identical_blobs(void) { cl_git_pass(git_diff_blobs( - d, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(0, expected.files_binary); assert_identical_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - NULL, NULL, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + NULL, NULL, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(0, expected.files_binary); assert_identical_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - alien, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + alien, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert(expected.files_binary > 0); assert_identical_blobs_comparison(&expected); @@ -226,14 +226,14 @@ void test_diff_blob__can_compare_two_binary_blobs(void) cl_git_pass(git_blob_lookup_prefix(&heart, g_repo, &h_oid, 4)); cl_git_pass(git_diff_blobs( - alien, heart, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + alien, heart, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); assert_binary_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - heart, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + heart, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); assert_binary_blobs_comparison(&expected); @@ -243,14 +243,14 @@ void test_diff_blob__can_compare_two_binary_blobs(void) void test_diff_blob__can_compare_a_binary_blob_and_a_text_blob(void) { cl_git_pass(git_diff_blobs( - alien, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + alien, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); assert_binary_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - d, alien, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + d, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); assert_binary_blobs_comparison(&expected); } @@ -291,7 +291,7 @@ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) /* Test with default inter-hunk-context (not set) => default is 0 */ cl_git_pass(git_diff_blobs( - old_d, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + old_d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(2, expected.hunks); @@ -299,7 +299,7 @@ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) opts.interhunk_lines = 0; memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - old_d, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + old_d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(2, expected.hunks); @@ -307,7 +307,7 @@ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) opts.interhunk_lines = 1; memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - old_d, d, &opts, &expected, diff_file_fn, diff_hunk_fn, diff_line_fn)); + old_d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, expected.hunks); diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index 992c87d4c..96a921350 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -21,7 +21,7 @@ git_tree *resolve_commit_oid_to_tree( return tree; } -int diff_file_fn( +int diff_file_cb( void *cb_data, const git_diff_delta *delta, float progress) @@ -42,7 +42,7 @@ int diff_file_fn( return 0; } -int diff_hunk_fn( +int diff_hunk_cb( void *cb_data, const git_diff_delta *delta, const git_diff_range *range, @@ -61,7 +61,7 @@ int diff_hunk_fn( return 0; } -int diff_line_fn( +int diff_line_cb( void *cb_data, const git_diff_delta *delta, const git_diff_range *range, @@ -104,9 +104,9 @@ int diff_line_fn( int diff_foreach_via_iterator( git_diff_list *diff, void *data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn line_cb) + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb line_cb) { size_t d, num_d = git_diff_num_deltas(diff); diff --git a/tests-clar/diff/diff_helpers.h b/tests-clar/diff/diff_helpers.h index 6ff493d49..b5c36d64e 100644 --- a/tests-clar/diff/diff_helpers.h +++ b/tests-clar/diff/diff_helpers.h @@ -20,19 +20,19 @@ typedef struct { int line_dels; } diff_expects; -extern int diff_file_fn( +extern int diff_file_cb( void *cb_data, const git_diff_delta *delta, float progress); -extern int diff_hunk_fn( +extern int diff_hunk_cb( void *cb_data, const git_diff_delta *delta, const git_diff_range *range, const char *header, size_t header_len); -extern int diff_line_fn( +extern int diff_line_cb( void *cb_data, const git_diff_delta *delta, const git_diff_range *range, @@ -43,8 +43,8 @@ extern int diff_line_fn( extern int diff_foreach_via_iterator( git_diff_list *diff, void *data, - git_diff_file_fn file_cb, - git_diff_hunk_fn hunk_cb, - git_diff_data_fn line_cb); + git_diff_file_cb file_cb, + git_diff_hunk_cb hunk_cb, + git_diff_data_cb line_cb); extern void diff_print(FILE *fp, git_diff_list *diff); diff --git a/tests-clar/diff/index.c b/tests-clar/diff/index.c index 4b96bfa09..e89260217 100644 --- a/tests-clar/diff/index.c +++ b/tests-clar/diff/index.c @@ -35,7 +35,7 @@ void test_diff_index__0(void) cl_git_pass(git_diff_index_to_tree(&diff, g_repo, a, NULL, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); /* to generate these values: * - cd to tests/resources/status, @@ -63,7 +63,7 @@ void test_diff_index__0(void) cl_git_pass(git_diff_index_to_tree(&diff, g_repo, b, NULL, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); /* to generate these values: * - cd to tests/resources/status, diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c index 1ea2e3fc9..ee6a1816b 100644 --- a/tests-clar/diff/rename.c +++ b/tests-clar/diff/rename.c @@ -55,7 +55,7 @@ void test_diff_rename__match_oid(void) */ memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(4, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); @@ -69,7 +69,7 @@ void test_diff_rename__match_oid(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); @@ -91,7 +91,7 @@ void test_diff_rename__match_oid(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index 8e8939976..6eb5826e4 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -37,7 +37,7 @@ void test_diff_tree__0(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(5, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); @@ -59,7 +59,7 @@ void test_diff_tree__0(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, c, b, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(2, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -94,17 +94,18 @@ void test_diff_tree__options(void) int test_ab_or_cd[] = { 0, 0, 0, 0, 1, 1, 1, 1, 1 }; git_diff_options test_options[] = { /* a vs b tests */ - { GIT_DIFF_NORMAL, 1, 1, NULL, NULL, {0} }, - { GIT_DIFF_NORMAL, 3, 1, NULL, NULL, {0} }, - { GIT_DIFF_REVERSE, 2, 1, NULL, NULL, {0} }, - { GIT_DIFF_FORCE_TEXT, 2, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_NORMAL, 1, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_NORMAL, 3, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_REVERSE, 2, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_FORCE_TEXT, 2, 1, NULL, NULL, {0} }, /* c vs d tests */ - { GIT_DIFF_NORMAL, 3, 1, NULL, NULL, {0} }, - { GIT_DIFF_IGNORE_WHITESPACE, 3, 1, NULL, NULL, {0} }, - { GIT_DIFF_IGNORE_WHITESPACE_CHANGE, 3, 1, NULL, NULL, {0} }, - { GIT_DIFF_IGNORE_WHITESPACE_EOL, 3, 1, NULL, NULL, {0} }, - { GIT_DIFF_IGNORE_WHITESPACE | GIT_DIFF_REVERSE, 1, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_NORMAL, 3, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_IGNORE_WHITESPACE, 3, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_IGNORE_WHITESPACE_CHANGE, 3, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_IGNORE_WHITESPACE_EOL, 3, 1, NULL, NULL, {0} }, + { 1, GIT_DIFF_IGNORE_WHITESPACE | GIT_DIFF_REVERSE, 1, 1, NULL, NULL, {0} }, }; + /* to generate these values: * - cd to tests/resources/attr, * - mv .gitted .git @@ -112,6 +113,7 @@ void test_diff_tree__options(void) * - mv .git .gitted */ #define EXPECT_STATUS_ADM(ADDS,DELS,MODS) { 0, ADDS, DELS, MODS, 0, 0, 0, 0, 0 } + diff_expects test_expects[] = { /* a vs b tests */ { 5, 0, EXPECT_STATUS_ADM(3, 0, 2), 4, 0, 0, 51, 2, 46, 3 }, @@ -146,7 +148,7 @@ void test_diff_tree__options(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, c, d, &opts)); cl_git_pass(git_diff_foreach( - diff, &actual, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &actual, diff_file_cb, diff_hunk_cb, diff_line_cb)); expected = &test_expects[i]; cl_assert_equal_i(actual.files, expected->files); @@ -190,7 +192,7 @@ void test_diff_tree__bare(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); @@ -240,7 +242,7 @@ void test_diff_tree__merge(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff1, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff1, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(6, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index a4dbe37ff..87013135d 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -33,10 +33,10 @@ void test_diff_workdir__to_index(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); /* to generate these values: * - cd to tests/resources/status, @@ -101,10 +101,10 @@ void test_diff_workdir__to_tree(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(14, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -137,10 +137,10 @@ void test_diff_workdir__to_tree(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(15, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); @@ -174,10 +174,10 @@ void test_diff_workdir__to_tree(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(16, exp.files); cl_assert_equal_i(5, exp.file_status[GIT_DELTA_ADDED]); @@ -223,9 +223,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, NULL, NULL)); + diff, &exp, diff_file_cb, NULL, NULL)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); cl_assert_equal_i(13, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -246,9 +246,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, NULL, NULL)); + diff, &exp, diff_file_cb, NULL, NULL)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -269,9 +269,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, NULL, NULL)); + diff, &exp, diff_file_cb, NULL, NULL)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -292,9 +292,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, NULL, NULL)); + diff, &exp, diff_file_cb, NULL, NULL)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); cl_assert_equal_i(2, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -331,10 +331,10 @@ void test_diff_workdir__filemode_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); @@ -354,10 +354,10 @@ void test_diff_workdir__filemode_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); @@ -390,7 +390,7 @@ void test_diff_workdir__filemode_changes_with_filemode_false(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); @@ -406,7 +406,7 @@ void test_diff_workdir__filemode_changes_with_filemode_false(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); @@ -450,10 +450,10 @@ void test_diff_workdir__head_index_and_workdir_all_differ(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff_i2t, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff_i2t, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -471,10 +471,10 @@ void test_diff_workdir__head_index_and_workdir_all_differ(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff_w2i, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff_w2i, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff_w2i, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff_w2i, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -494,10 +494,10 @@ void test_diff_workdir__head_index_and_workdir_all_differ(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff_i2t, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff_i2t, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -536,10 +536,10 @@ void test_diff_workdir__eof_newline_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -563,10 +563,10 @@ void test_diff_workdir__eof_newline_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -590,10 +590,10 @@ void test_diff_workdir__eof_newline_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -792,7 +792,7 @@ void test_diff_workdir__submodules(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); + diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); /* the following differs from "git diff 873585" by one "untracked" file * because the diff list includes the "not_submodule/" directory which diff --git a/tests-clar/object/blob/filter.c b/tests-clar/object/blob/filter.c index 0b87b2b46..4b058049a 100644 --- a/tests-clar/object/blob/filter.c +++ b/tests-clar/object/blob/filter.c @@ -14,7 +14,7 @@ static const char *g_raw[NUM_TEST_OBJECTS] = { "foo\nbar\rboth\r\nreversed\n\ragain\nproblems\r", "123\n\000\001\002\003\004abc\255\254\253\r\n" }; -static int g_len[NUM_TEST_OBJECTS] = { -1, -1, -1, -1, -1, 17 }; +static git_off_t g_len[NUM_TEST_OBJECTS] = { -1, -1, -1, -1, -1, 17 }; static git_text_stats g_stats[NUM_TEST_OBJECTS] = { { 0, 0, 0, 0, 0, 0 }, { 0, 0, 2, 0, 6, 0 }, @@ -65,7 +65,7 @@ void test_object_blob_filter__unfiltered(void) for (i = 0; i < NUM_TEST_OBJECTS; i++) { cl_git_pass(git_blob_lookup(&blob, g_repo, &g_oids[i])); - cl_assert((size_t)g_len[i] == git_blob_rawsize(blob)); + cl_assert(g_len[i] == git_blob_rawsize(blob)); cl_assert(memcmp(git_blob_rawcontent(blob), g_raw[i], g_len[i]) == 0); git_blob_free(blob); } diff --git a/tests-clar/object/blob/write.c b/tests-clar/object/blob/write.c index 6d4cbab4f..203bc67c1 100644 --- a/tests-clar/object/blob/write.c +++ b/tests-clar/object/blob/write.c @@ -33,7 +33,7 @@ void test_object_blob_write__can_create_a_blob_in_a_standard_repo_from_a_file_lo { repo = cl_git_sandbox_init(WORKDIR); - assert_blob_creation(WORKDIR "/test.txt", "test.txt", &git_blob_create_fromfile); + assert_blob_creation(WORKDIR "/test.txt", "test.txt", &git_blob_create_fromworkdir); } void test_object_blob_write__can_create_a_blob_in_a_standard_repo_from_a_absolute_filepath_pointing_outside_of_the_working_directory(void) diff --git a/tests-clar/pack/packbuilder.c b/tests-clar/pack/packbuilder.c index 1ec768d6b..b450be6b6 100644 --- a/tests-clar/pack/packbuilder.c +++ b/tests-clar/pack/packbuilder.c @@ -67,7 +67,7 @@ static void seed_packbuilder(void) git_object *obj; cl_git_pass(git_object_lookup(&obj, _repo, o, GIT_OBJ_COMMIT)); cl_git_pass(git_packbuilder_insert_tree(_packbuilder, - git_commit_tree_oid((git_commit *)obj))); + git_commit_tree_id((git_commit *)obj))); git_object_free(obj); } } diff --git a/tests-clar/refs/branches/create.c b/tests-clar/refs/branches/create.c index 51db04b31..5a43ef204 100644 --- a/tests-clar/refs/branches/create.c +++ b/tests-clar/refs/branches/create.c @@ -2,7 +2,7 @@ #include "refs.h" static git_repository *repo; -static git_object *target; +static git_commit *target; static git_reference *branch; void test_refs_branches_create__initialize(void) @@ -27,17 +27,17 @@ void test_refs_branches_create__cleanup(void) cl_fixture_cleanup("testrepo.git"); } -static void retrieve_target_from_oid(git_object **object_out, git_repository *repo, const char *sha) +static void retrieve_target_from_oid(git_commit **out, git_repository *repo, const char *sha) { git_oid oid; cl_git_pass(git_oid_fromstr(&oid, sha)); - cl_git_pass(git_object_lookup(object_out, repo, &oid, GIT_OBJ_ANY)); + cl_git_pass(git_commit_lookup(out, repo, &oid)); } -static void retrieve_known_commit(git_object **object, git_repository *repo) +static void retrieve_known_commit(git_commit **commit, git_repository *repo) { - retrieve_target_from_oid(object, repo, "e90810b8df3e80c413d903f631643c716887138d"); + retrieve_target_from_oid(commit, repo, "e90810b8df3e80c413d903f631643c716887138d"); } #define NEW_BRANCH_NAME "new-branch-on-the-block" @@ -47,7 +47,7 @@ void test_refs_branches_create__can_create_a_local_branch(void) retrieve_known_commit(&target, repo); cl_git_pass(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_object_id(target))); + cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); } void test_refs_branches_create__can_not_create_a_branch_if_its_name_collide_with_an_existing_one(void) @@ -62,29 +62,6 @@ void test_refs_branches_create__can_force_create_over_an_existing_branch(void) retrieve_known_commit(&target, repo); cl_git_pass(git_branch_create(&branch, repo, "br2", target, 1)); - cl_git_pass(git_oid_cmp(git_reference_target(branch), git_object_id(target))); + cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target))); cl_assert_equal_s("refs/heads/br2", git_reference_name(branch)); } - -void test_refs_branches_create__creating_a_branch_targeting_a_tag_dereferences_it_to_its_commit(void) -{ - /* b25fa35 is a tag, pointing to another tag which points to a commit */ - retrieve_target_from_oid(&target, repo, "b25fa35b38051e4ae45d4222e795f9df2e43f1d1"); - - cl_git_pass(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); - cl_git_pass(git_oid_streq(git_reference_target(branch), "e90810b8df3e80c413d903f631643c716887138d")); -} - -void test_refs_branches_create__can_not_create_a_branch_pointing_to_a_non_commit_object(void) -{ - /* 53fc32d is the tree of commit e90810b */ - retrieve_target_from_oid(&target, repo, "53fc32d17276939fc79ed05badaef2db09990016"); - - cl_git_fail(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); - git_object_free(target); - - /* 521d87c is an annotated tag pointing to a blob */ - retrieve_target_from_oid(&target, repo, "521d87c1ec3aef9824daf6d96cc0ae3710766d91"); - - cl_git_fail(git_branch_create(&branch, repo, NEW_BRANCH_NAME, target, 0)); -} From bac695b58c3b013a3ebbfc1909f8adb9967492f8 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 18 Nov 2012 22:20:26 -0700 Subject: [PATCH 03/38] Examples: fix reference names --- examples/diff.c | 2 +- examples/general.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/diff.c b/examples/diff.c index 38231d219..c569b8664 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -30,7 +30,7 @@ static int resolve_to_tree( git_reference_resolve(&resolved, ref); git_reference_free(ref); if (resolved) { - git_object_lookup(&obj, repo, git_reference_oid(resolved), GIT_OBJ_ANY); + git_object_lookup(&obj, repo, git_reference_target(resolved), GIT_OBJ_ANY); git_reference_free(resolved); } } diff --git a/examples/general.c b/examples/general.c index 9ccb4c56e..70152d7e0 100644 --- a/examples/general.c +++ b/examples/general.c @@ -405,12 +405,12 @@ int main (int argc, char** argv) switch (git_reference_type(ref)) { case GIT_REF_OID: - git_oid_fmt(out, git_reference_oid(ref)); + git_oid_fmt(out, git_reference_target(ref)); printf("%s [%s]\n", refname, out); break; case GIT_REF_SYMBOLIC: - printf("%s => %s\n", refname, git_reference_target(ref)); + printf("%s => %s\n", refname, git_reference_symbolic_target(ref)); break; default: fprintf(stderr, "Unexpected reference type\n"); From 3f63cc9e6d7674d1499a4f8f0e4db9eba385c864 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Sun, 18 Nov 2012 22:20:47 -0700 Subject: [PATCH 04/38] Examples: fix clone api --- examples/network/clone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/network/clone.c b/examples/network/clone.c index 30a4944c2..a718f3084 100644 --- a/examples/network/clone.c +++ b/examples/network/clone.c @@ -72,7 +72,7 @@ int do_clone(git_repository *repo, int argc, char **argv) checkout_opts.progress_payload = &pd; // Do the clone - error = git_clone(&cloned_repo, url, path, &fetch_progress, &pd, &checkout_opts); + error = git_clone(&cloned_repo, url, path, &checkout_opts, &fetch_progress, &pd); printf("\n"); if (error != 0) { const git_error *err = giterr_last(); From 824cb2d5e587f13b596933b991c7d8568422946a Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 12:13:52 -0800 Subject: [PATCH 05/38] Updates to reset.h --- include/git2/reset.h | 25 ++++++++++++++++++------- include/git2/types.h | 7 ------- src/reset.c | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/include/git2/reset.h b/include/git2/reset.h index cdcfb7671..b5fc4a6cb 100644 --- a/include/git2/reset.h +++ b/include/git2/reset.h @@ -15,17 +15,27 @@ */ GIT_BEGIN_DECL +/** + * Kinds of reset operation + */ +typedef enum { + GIT_RESET_SOFT = 1, /** Move the head to the given commit */ + GIT_RESET_MIXED = 2, /** SOFT plus reset index to the commit */ + GIT_RESET_HARD = 3, /** MIXED plus changes in working tree discarded */ +} git_reset_t; + /** * Sets the current head to the specified commit oid and optionally * resets the index and working tree to match. * - * When specifying a Soft kind of reset, the head will be moved to the commit. + * SOFT reset means the head will be moved to the commit. * - * Specifying a Mixed kind of reset will trigger a Soft reset and the index will - * be replaced with the content of the commit tree. + * MIXED reset will trigger a SOFT reset, plus the index will be replaced + * with the content of the commit tree. * - * Specifying a Hard kind of reset will trigger a Mixed reset and the working - * directory will be replaced with the content of the index. + * HARD reset will trigger a MIXED reset and the working directory will be + * replaced with the content of the index. (Untracked and ignored files + * will be left alone, however.) * * TODO: Implement remaining kinds of resets. * @@ -38,9 +48,10 @@ GIT_BEGIN_DECL * * @param reset_type Kind of reset operation to perform. * - * @return GIT_SUCCESS or an error code + * @return 0 on success or an error code < 0 */ -GIT_EXTERN(int) git_reset(git_repository *repo, git_object *target, git_reset_type reset_type); +GIT_EXTERN(int) git_reset( + git_repository *repo, git_object *target, git_reset_t reset_type); /** @} */ GIT_END_DECL diff --git a/include/git2/types.h b/include/git2/types.h index 58cbaecc5..256296444 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -175,13 +175,6 @@ typedef enum { GIT_BRANCH_REMOTE = 2, } git_branch_t; -/** Kinds of reset operation. */ -typedef enum { - GIT_RESET_SOFT = 1, - GIT_RESET_MIXED = 2, - GIT_RESET_HARD = 3, -} git_reset_type; - /** Valid modes for index and tree entries. */ typedef enum { GIT_FILEMODE_NEW = 0000000, diff --git a/src/reset.c b/src/reset.c index 928a2bc8c..d410a8806 100644 --- a/src/reset.c +++ b/src/reset.c @@ -63,7 +63,7 @@ cleanup: int git_reset( git_repository *repo, git_object *target, - git_reset_type reset_type) + git_reset_t reset_type) { git_object *commit = NULL; git_index *index = NULL; From e120123e369a036cd40b8f085cebd55463466796 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 14:01:46 -0800 Subject: [PATCH 06/38] API review / update for tree.h --- examples/general.c | 4 +- include/git2/tree.h | 209 +++++++++++++++++++--------------- src/index.c | 2 +- src/iterator.c | 2 +- src/notes.c | 10 +- src/pack-objects.c | 2 +- src/tree.c | 34 +++--- tests-clar/object/tree/walk.c | 12 +- 8 files changed, 154 insertions(+), 121 deletions(-) diff --git a/examples/general.c b/examples/general.c index 70152d7e0..c4ff21d8b 100644 --- a/examples/general.c +++ b/examples/general.c @@ -261,8 +261,8 @@ int main (int argc, char** argv) 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); + size_t cnt = git_tree_entrycount(tree); // 3 + printf("tree entries: %d\n", (int)cnt); entry = git_tree_entry_byindex(tree, 0); printf("Entry name: %s\n", git_tree_entry_name(entry)); // "hello.c" diff --git a/include/git2/tree.h b/include/git2/tree.h index 527f81819..d20141052 100644 --- a/include/git2/tree.h +++ b/include/git2/tree.h @@ -24,14 +24,15 @@ GIT_BEGIN_DECL /** * Lookup a tree object from the repository. * - * @param tree pointer to the looked up tree - * @param repo the repo to use when locating the tree. - * @param id identity of the tree to locate. + * @param out Pointer to the looked up tree + * @param repo The repo to use when locating the tree. + * @param id Identity of the tree to locate. * @return 0 or an error code */ -GIT_INLINE(int) git_tree_lookup(git_tree **tree, git_repository *repo, const git_oid *id) +GIT_INLINE(int) git_tree_lookup( + git_tree **out, git_repository *repo, const git_oid *id) { - return git_object_lookup((git_object **)tree, repo, id, GIT_OBJ_TREE); + return git_object_lookup((git_object **)out, repo, id, GIT_OBJ_TREE); } /** @@ -47,53 +48,30 @@ GIT_INLINE(int) git_tree_lookup(git_tree **tree, git_repository *repo, const git * @return 0 or an error code */ GIT_INLINE(int) git_tree_lookup_prefix( - git_tree **tree, + git_tree **out, git_repository *repo, const git_oid *id, size_t len) { - return git_object_lookup_prefix((git_object **)tree, repo, id, len, GIT_OBJ_TREE); + return git_object_lookup_prefix( + (git_object **)out, repo, id, len, GIT_OBJ_TREE); } /** * Close an open tree * - * This is a wrapper around git_object_free() + * You can no longer use the git_tree pointer after this call. * - * IMPORTANT: - * It *is* necessary to call this method when you stop - * using a tree. Failure to do so will cause a memory leak. + * IMPORTANT: You MUST call this method when you stop using a tree to + * release memory. Failure to do so will cause a memory leak. * - * @param tree the tree to close + * @param tree The tree to close */ GIT_INLINE(void) git_tree_free(git_tree *tree) { - git_object_free((git_object *) tree); + git_object_free((git_object *)tree); } -/** - * Free a tree entry - * - * IMPORTANT: This function is only needed for tree - * entries owned by the user, such as the ones returned - * by `git_tree_entry_dup`. - * - * @param entry The entry to free - */ -GIT_EXTERN(void) git_tree_entry_free(git_tree_entry *entry); - -/** - * Duplicate a tree entry - * - * Create a copy of a tree entry. The returned copy is owned - * by the user, and must be freed manually with - * `git_tree_entry_free`. - * - * @param entry A tree entry to duplicate - * @return a copy of the original entry - */ -GIT_EXTERN(git_tree_entry *) git_tree_entry_dup(const git_tree_entry *entry); - /** * Get the id of a tree. * @@ -108,44 +86,87 @@ GIT_EXTERN(const git_oid *) git_tree_id(const git_tree *tree); * @param tree a previously loaded tree. * @return the number of entries in the tree */ -GIT_EXTERN(unsigned int) git_tree_entrycount(const git_tree *tree); +GIT_EXTERN(size_t) git_tree_entrycount(const git_tree *tree); /** * Lookup a tree entry by its filename * + * This returns a git_tree_entry that is owned by the git_tree. You don't + * have to free it, but you must not use it after the git_tree is released. + * * @param tree a previously loaded tree. * @param filename the filename of the desired entry * @return the tree entry; NULL if not found */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byname(git_tree *tree, const char *filename); +GIT_EXTERN(const git_tree_entry *) git_tree_entry_byname( + git_tree *tree, const char *filename); /** * Lookup a tree entry by its position in the tree * + * This returns a git_tree_entry that is owned by the git_tree. You don't + * have to free it, but you must not use it after the git_tree is released. + * * @param tree a previously loaded tree. * @param idx the position in the entry list * @return the tree entry; NULL if not found */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex(git_tree *tree, size_t idx); +GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex( + git_tree *tree, size_t idx); /** * Lookup a tree entry by SHA value. * + * This returns a git_tree_entry that is owned by the git_tree. You don't + * have to free it, but you must not use it after the git_tree is released. + * * Warning: this must examine every entry in the tree, so it is not fast. * * @param tree a previously loaded tree. * @param oid the sha being looked for * @return the tree entry; NULL if not found */ -GIT_EXTERN(const git_tree_entry *) git_tree_entry_byoid(git_tree *tree, const git_oid *oid); +GIT_EXTERN(const git_tree_entry *) git_tree_entry_byoid( + git_tree *tree, const git_oid *oid); /** - * Get the UNIX file attributes of a tree entry + * Retrieve a tree entry contained in a tree or in any of its subtrees, + * given its relative path. * - * @param entry a tree entry - * @return filemode as an integer + * Unlike the other lookup functions, the returned tree entry is owned by + * the user and must be freed explicitly with `git_tree_entry_free()`. + * + * @param out Pointer where to store the tree entry + * @param root Previously loaded tree which is the root of the relative path + * @param subtree_path Path to the contained entry + * @return 0 on success; GIT_ENOTFOUND if the path does not exist */ -GIT_EXTERN(git_filemode_t) git_tree_entry_filemode(const git_tree_entry *entry); +GIT_EXTERN(int) git_tree_entry_bypath( + git_tree_entry **out, + git_tree *root, + const char *path); + +/** + * Duplicate a tree entry + * + * Create a copy of a tree entry. The returned copy is owned by the user, + * and must be freed explicitly with `git_tree_entry_free()`. + * + * @param entry A tree entry to duplicate + * @return a copy of the original entry or NULL on error (alloc failure) + */ +GIT_EXTERN(git_tree_entry *) git_tree_entry_dup(const git_tree_entry *entry); + +/** + * Free a user-owned tree entry + * + * IMPORTANT: This function is only needed for tree entries owned by the + * user, such as the ones returned by `git_tree_entry_dup()` or + * `git_tree_entry_bypath()`. + * + * @param entry The entry to free + */ +GIT_EXTERN(void) git_tree_entry_free(git_tree_entry *entry); /** * Get the filename of a tree entry @@ -171,9 +192,19 @@ GIT_EXTERN(const git_oid *) git_tree_entry_id(const git_tree_entry *entry); */ GIT_EXTERN(git_otype) git_tree_entry_type(const git_tree_entry *entry); +/** + * Get the UNIX file attributes of a tree entry + * + * @param entry a tree entry + * @return filemode as an integer + */ +GIT_EXTERN(git_filemode_t) git_tree_entry_filemode(const git_tree_entry *entry); + /** * Convert a tree entry to the git_object it points too. * + * You must call `git_object_free()` on the object when you are done with it. + * * @param object pointer to the converted object * @param repo repository where to lookup the pointed object * @param entry a tree entry @@ -187,21 +218,21 @@ GIT_EXTERN(int) git_tree_entry_to_object( /** * Create a new tree builder. * - * The tree builder can be used to create or modify - * trees in memory and write them as tree objects to the - * database. + * The tree builder can be used to create or modify trees in memory and + * write them as tree objects to the database. * - * If the `source` parameter is not NULL, the tree builder - * will be initialized with the entries of the given tree. + * If the `source` parameter is not NULL, the tree builder will be + * initialized with the entries of the given tree. * - * If the `source` parameter is NULL, the tree builder will - * have no entries and will have to be filled manually. + * If the `source` parameter is NULL, the tree builder will start with no + * entries and will have to be filled manually. * - * @param builder_p Pointer where to store the tree builder + * @param out Pointer where to store the tree builder * @param source Source tree to initialize the builder (optional) * @return 0 on success; error code otherwise */ -GIT_EXTERN(int) git_treebuilder_create(git_treebuilder **builder_p, const git_tree *source); +GIT_EXTERN(int) git_treebuilder_create( + git_treebuilder **out, const git_tree *source); /** * Clear all the entires in the builder @@ -231,7 +262,8 @@ GIT_EXTERN(void) git_treebuilder_free(git_treebuilder *bld); * @param filename Name of the entry * @return pointer to the entry; NULL if not found */ -GIT_EXTERN(const git_tree_entry *) git_treebuilder_get(git_treebuilder *bld, const char *filename); +GIT_EXTERN(const git_tree_entry *) git_treebuilder_get( + git_treebuilder *bld, const char *filename); /** * Add or update an entry to the builder @@ -239,17 +271,17 @@ GIT_EXTERN(const git_tree_entry *) git_treebuilder_get(git_treebuilder *bld, con * Insert a new entry for `filename` in the builder with the * given attributes. * - * if an entry named `filename` already exists, its attributes + * If an entry named `filename` already exists, its attributes * will be updated with the given ones. * - * The optional pointer `entry_out` can be used to retrieve a - * pointer to the newly created/updated entry. + * The optional pointer `out` can be used to retrieve a pointer to + * the newly created/updated entry. Pass NULL if you do not need it. * * No attempt is being made to ensure that the provided oid points * to an existing git object in the object database, nor that the * attributes make sense regarding the type of the pointed at object. * - * @param entry_out Pointer to store the entry (optional) + * @param out Pointer to store the entry (optional) * @param bld Tree builder * @param filename Filename of the entry * @param id SHA1 oid of the entry @@ -259,7 +291,7 @@ GIT_EXTERN(const git_tree_entry *) git_treebuilder_get(git_treebuilder *bld, con * @return 0 or an error code */ GIT_EXTERN(int) git_treebuilder_insert( - const git_tree_entry **entry_out, + const git_tree_entry **out, git_treebuilder *bld, const char *filename, const git_oid *id, @@ -271,63 +303,52 @@ GIT_EXTERN(int) git_treebuilder_insert( * @param bld Tree builder * @param filename Filename of the entry to remove */ -GIT_EXTERN(int) git_treebuilder_remove(git_treebuilder *bld, const char *filename); +GIT_EXTERN(int) git_treebuilder_remove( + git_treebuilder *bld, const char *filename); + +typedef int (*git_treebuilder_filter_cb)( + const git_tree_entry *entry, void *payload); /** * Filter the entries in the tree * - * The `filter` callback will be called for each entry - * in the tree with a pointer to the entry and the - * provided `payload`: if the callback returns 1, the - * entry will be filtered (removed from the builder). + * The `filter` callback will be called for each entry in the tree with a + * pointer to the entry and the provided `payload`; if the callback returns + * non-zero, the entry will be filtered (removed from the builder). * * @param bld Tree builder * @param filter Callback to filter entries + * @param payload Extra data to pass to filter */ GIT_EXTERN(void) git_treebuilder_filter( git_treebuilder *bld, - int (*filter)(const git_tree_entry *, void *), + git_treebuilder_filter_cb filter, void *payload); /** * Write the contents of the tree builder as a tree object * - * The tree builder will be written to the given `repo`, and - * it's identifying SHA1 hash will be stored in the `oid` - * pointer. + * The tree builder will be written to the given `repo`, and its + * identifying SHA1 hash will be stored in the `id` pointer. * - * @param oid Pointer where to store the written OID - * @param repo Repository where to store the object + * @param id Pointer to store the OID of the newly written tree + * @param repo Repository in which to store the object * @param bld Tree builder to write * @return 0 or an error code */ -GIT_EXTERN(int) git_treebuilder_write(git_oid *oid, git_repository *repo, git_treebuilder *bld); +GIT_EXTERN(int) git_treebuilder_write( + git_oid *id, git_repository *repo, git_treebuilder *bld); -/** - * Retrieve a tree entry contained in a tree or in any - * of its subtrees, given its relative path. - * - * The returned tree entry is owned by the user and must - * be freed manually with `git_tree_entry_free`. - * - * @param entry Pointer where to store the tree entry - * @param root A previously loaded tree which will be the root of the relative path - * @param subtree_path Path to the contained entry - * @return 0 on success; GIT_ENOTFOUND if the path does not exist - */ -GIT_EXTERN(int) git_tree_entry_bypath( - git_tree_entry **entry, - git_tree *root, - const char *path); /** Callback for the tree traversal method */ -typedef int (*git_treewalk_cb)(const char *root, const git_tree_entry *entry, void *payload); +typedef int (*git_treewalk_cb)( + const char *root, const git_tree_entry *entry, void *payload); /** Tree traversal modes */ -enum git_treewalk_mode { +typedef enum { GIT_TREEWALK_PRE = 0, /* Pre-order */ GIT_TREEWALK_POST = 1, /* Post-order */ -}; +} git_treewalk_mode; /** * Traverse the entries in a tree and its subtrees in @@ -344,12 +365,16 @@ enum git_treewalk_mode { * walk. * * @param tree The tree to walk - * @param callback Function to call on each tree entry * @param mode Traversal mode (pre or post-order) + * @param callback Function to call on each tree entry * @param payload Opaque pointer to be passed on each callback * @return 0 or an error code */ -GIT_EXTERN(int) git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payload); +GIT_EXTERN(int) git_tree_walk( + git_tree *tree, + git_treewalk_mode mode, + git_treewalk_cb callback, + void *payload); /** @} */ diff --git a/src/index.c b/src/index.c index 350d3632b..971fec9fa 100644 --- a/src/index.c +++ b/src/index.c @@ -1603,7 +1603,7 @@ int git_index_read_tree(git_index *index, git_tree *tree) { git_index_clear(index); - return git_tree_walk(tree, read_tree_cb, GIT_TREEWALK_POST, index); + return git_tree_walk(tree, GIT_TREEWALK_POST, read_tree_cb, index); } git_repository *git_index_owner(const git_index *index) diff --git a/src/iterator.c b/src/iterator.c index ee83a4fda..ec3c08ee7 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -85,7 +85,7 @@ struct tree_iterator_frame { tree_iterator_frame *next, *prev; git_tree *tree; char *start; - unsigned int index; + size_t index; }; typedef struct { diff --git a/src/notes.c b/src/notes.c index 75848465e..95ff0170a 100644 --- a/src/notes.c +++ b/src/notes.c @@ -19,11 +19,11 @@ static int find_subtree_in_current_level( const char *annotated_object_sha, int fanout) { - unsigned int i; + size_t i; const git_tree_entry *entry; *out = NULL; - + if (parent == NULL) return GIT_ENOTFOUND; @@ -34,12 +34,12 @@ static int find_subtree_in_current_level( continue; if (S_ISDIR(git_tree_entry_filemode(entry)) - && strlen(git_tree_entry_name(entry)) == 2 + && strlen(git_tree_entry_name(entry)) == 2 && !strncmp(git_tree_entry_name(entry), annotated_object_sha + fanout, 2)) return git_tree_lookup(out, repo, git_tree_entry_id(entry)); /* Not a DIR, so do we have an already existing blob? */ - if (!strcmp(git_tree_entry_name(entry), annotated_object_sha + fanout)) + if (!strcmp(git_tree_entry_name(entry), annotated_object_sha + fanout)) return GIT_EEXISTS; } @@ -71,7 +71,7 @@ static int find_subtree_r(git_tree **out, git_tree *root, static int find_blob(git_oid *blob, git_tree *tree, const char *target) { - unsigned int i; + size_t i; const git_tree_entry *entry; for (i=0; ientries.length; + return tree->entries.length; } static int tree_error(const char *str) @@ -694,7 +695,10 @@ on_error: return -1; } -void git_treebuilder_filter(git_treebuilder *bld, int (*filter)(const git_tree_entry *, void *), void *payload) +void git_treebuilder_filter( + git_treebuilder *bld, + git_treebuilder_filter_cb filter, + void *payload) { unsigned int i; @@ -855,23 +859,27 @@ static int tree_walk( return error; } -int git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payload) +int git_tree_walk( + git_tree *tree, + git_treewalk_mode mode, + git_treewalk_cb callback, + void *payload) { int error = 0; git_buf root_path = GIT_BUF_INIT; switch (mode) { - case GIT_TREEWALK_POST: - error = tree_walk(tree, callback, &root_path, payload, false); - break; + case GIT_TREEWALK_POST: + error = tree_walk(tree, callback, &root_path, payload, false); + break; - case GIT_TREEWALK_PRE: - error = tree_walk(tree, callback, &root_path, payload, true); - break; + case GIT_TREEWALK_PRE: + error = tree_walk(tree, callback, &root_path, payload, true); + break; - default: - giterr_set(GITERR_INVALID, "Invalid walking mode for tree walk"); - return -1; + default: + giterr_set(GITERR_INVALID, "Invalid walking mode for tree walk"); + return -1; } git_buf_free(&root_path); diff --git a/tests-clar/object/tree/walk.c b/tests-clar/object/tree/walk.c index 58b0bca4c..b7af4924d 100644 --- a/tests-clar/object/tree/walk.c +++ b/tests-clar/object/tree/walk.c @@ -38,11 +38,11 @@ void test_object_tree_walk__0(void) cl_git_pass(git_tree_lookup(&tree, g_repo, &id)); ct = 0; - cl_git_pass(git_tree_walk(tree, treewalk_count_cb, GIT_TREEWALK_PRE, &ct)); + cl_git_pass(git_tree_walk(tree, GIT_TREEWALK_PRE, treewalk_count_cb, &ct)); cl_assert_equal_i(3, ct); ct = 0; - cl_git_pass(git_tree_walk(tree, treewalk_count_cb, GIT_TREEWALK_POST, &ct)); + cl_git_pass(git_tree_walk(tree, GIT_TREEWALK_POST, treewalk_count_cb, &ct)); cl_assert_equal_i(3, ct); git_tree_free(tree); @@ -83,21 +83,21 @@ void test_object_tree_walk__1(void) ct = 0; cl_assert_equal_i( - GIT_EUSER, git_tree_walk(tree, treewalk_stop_cb, GIT_TREEWALK_PRE, &ct)); + GIT_EUSER, git_tree_walk(tree, GIT_TREEWALK_PRE, treewalk_stop_cb, &ct)); cl_assert_equal_i(2, ct); ct = 0; cl_assert_equal_i( - GIT_EUSER, git_tree_walk(tree, treewalk_stop_cb, GIT_TREEWALK_POST, &ct)); + GIT_EUSER, git_tree_walk(tree, GIT_TREEWALK_POST, treewalk_stop_cb, &ct)); cl_assert_equal_i(2, ct); cl_assert_equal_i( GIT_EUSER, git_tree_walk( - tree, treewalk_stop_immediately_cb, GIT_TREEWALK_PRE, NULL)); + tree, GIT_TREEWALK_PRE, treewalk_stop_immediately_cb, NULL)); cl_assert_equal_i( GIT_EUSER, git_tree_walk( - tree, treewalk_stop_immediately_cb, GIT_TREEWALK_POST, NULL)); + tree, GIT_TREEWALK_POST, treewalk_stop_immediately_cb, NULL)); git_tree_free(tree); } From eecc80502975df5ef3aa9027d1b8b929cd6181bd Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 14:03:05 -0800 Subject: [PATCH 07/38] Update callback fn ptr for git_reference_foreach As part of API review, use a typedef for the callback fn ptr. --- include/git2/refs.h | 8 +++++++- src/refs.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/git2/refs.h b/include/git2/refs.h index 4e5a691e6..c92646115 100644 --- a/include/git2/refs.h +++ b/include/git2/refs.h @@ -288,6 +288,8 @@ GIT_EXTERN(int) git_reference_packall(git_repository *repo); */ GIT_EXTERN(int) git_reference_list(git_strarray *array, git_repository *repo, unsigned int list_flags); +typedef int (*git_reference_foreach_cb)(const char *refname, void *payload); + /** * Perform a callback on each reference in the repository. * @@ -308,7 +310,11 @@ GIT_EXTERN(int) git_reference_list(git_strarray *array, git_repository *repo, un * @param payload Additional data to pass to the callback * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ -GIT_EXTERN(int) git_reference_foreach(git_repository *repo, unsigned int list_flags, int (*callback)(const char *, void *), void *payload); +GIT_EXTERN(int) git_reference_foreach( + git_repository *repo, + unsigned int list_flags, + git_reference_foreach_cb callback, + void *payload); /** * Check if a reference has been loaded from a packfile. diff --git a/src/refs.c b/src/refs.c index 1aaf4f60f..1882093cf 100644 --- a/src/refs.c +++ b/src/refs.c @@ -1478,7 +1478,7 @@ int git_reference_packall(git_repository *repo) int git_reference_foreach( git_repository *repo, unsigned int list_flags, - int (*callback)(const char *, void *), + git_reference_foreach_cb callback, void *payload) { int result; From 54b2a37ac7715c74e5b06b76eb2b631987d7b6f8 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 20 Nov 2012 16:02:25 -0800 Subject: [PATCH 08/38] Clean up config.h --- include/git2/config.h | 110 +++++++++++++++++------------- include/git2/types.h | 2 +- src/config.c | 74 ++++++++++---------- src/config.h | 2 +- src/config_file.c | 24 +++---- src/config_file.h | 14 ++-- src/remote.c | 4 +- src/repository.c | 4 +- src/submodule.c | 16 ++--- src/vector.h | 2 +- src/win32/posix_w32.c | 2 +- tests-clar/config/add.c | 4 +- tests-clar/config/write.c | 6 +- tests-clar/network/remoterename.c | 2 +- tests-clar/notes/notesref.c | 2 +- tests-clar/submodule/modify.c | 2 +- 16 files changed, 143 insertions(+), 127 deletions(-) diff --git a/include/git2/config.h b/include/git2/config.h index 8ec78e35c..af4d54044 100644 --- a/include/git2/config.h +++ b/include/git2/config.h @@ -41,23 +41,26 @@ typedef struct { unsigned int level; } git_config_entry; +typedef int (*git_config_foreach_cb)(const git_config_entry *, void *); + + /** * Generic backend that implements the interface to * access a configuration file */ -struct git_config_file { +struct git_config_backend { struct git_config *cfg; /* Open means open the file/database and parse if necessary */ - int (*open)(struct git_config_file *, unsigned int level); - int (*get)(struct git_config_file *, const char *key, const git_config_entry **entry); - int (*get_multivar)(struct git_config_file *, const char *key, const char *regexp, int (*fn)(const git_config_entry *, void *), void *data); - int (*set)(struct git_config_file *, const char *key, const char *value); - int (*set_multivar)(git_config_file *cfg, const char *name, const char *regexp, const char *value); - int (*del)(struct git_config_file *, const char *key); - int (*foreach)(struct git_config_file *, const char *, int (*fn)(const git_config_entry *, void *), void *data); - int (*refresh)(struct git_config_file *); - void (*free)(struct git_config_file *); + int (*open)(struct git_config_backend *, unsigned int level); + int (*get)(const struct git_config_backend *, const char *key, const git_config_entry **entry); + int (*get_multivar)(struct git_config_backend *, const char *key, const char *regexp, git_config_foreach_cb callback, void *payload); + int (*set)(struct git_config_backend *, const char *key, const char *value); + int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value); + int (*del)(struct git_config_backend *, const char *key); + int (*foreach)(struct git_config_backend *, const char *, git_config_foreach_cb callback, void *payload); + int (*refresh)(struct git_config_backend *); + void (*free)(struct git_config_backend *); }; typedef enum { @@ -87,11 +90,11 @@ typedef struct { * This method will not guess the path to the xdg compatible * config file (.config/git/config). * - * @param global_config_path Buffer of GIT_PATH_MAX length to store the path - * @return 0 if a global configuration file has been - * found. Its path will be stored in `buffer`. + * @param out Buffer to store the path in + * @param length size of the buffer in bytes + * @return 0 if a global configuration file has been found. Its path will be stored in `buffer`. */ -GIT_EXTERN(int) git_config_find_global(char *global_config_path, size_t length); +GIT_EXTERN(int) git_config_find_global(char *out, size_t length); /** * Locate the path to the global xdg compatible configuration file @@ -104,11 +107,12 @@ GIT_EXTERN(int) git_config_find_global(char *global_config_path, size_t length); * may be used on any `git_config` call to load the * xdg compatible configuration file. * - * @param xdg_config_path Buffer of GIT_PATH_MAX length to store the path + * @param out Buffer to store the path in + * @param length size of the buffer in bytes * @return 0 if a xdg compatible configuration file has been * found. Its path will be stored in `buffer`. */ -GIT_EXTERN(int) git_config_find_xdg(char *xdg_config_path, size_t length); +GIT_EXTERN(int) git_config_find_xdg(char *out, size_t length); /** * Locate the path to the system configuration file @@ -116,11 +120,12 @@ GIT_EXTERN(int) git_config_find_xdg(char *xdg_config_path, size_t length); * If /etc/gitconfig doesn't exist, it will look for * %PROGRAMFILES%\Git\etc\gitconfig. - * @param system_config_path Buffer of GIT_PATH_MAX length to store the path + * @param global_config_path Buffer to store the path in + * @param length size of the buffer in bytes * @return 0 if a system configuration file has been * found. Its path will be stored in `buffer`. */ -GIT_EXTERN(int) git_config_find_system(char *system_config_path, size_t length); +GIT_EXTERN(int) git_config_find_system(char *out, size_t length); /** * Open the global, XDG and system configuration files @@ -163,9 +168,9 @@ GIT_EXTERN(int) git_config_new(git_config **out); * @return 0 on success, GIT_EEXISTS when adding more than one file * for a given priority level (and force_replace set to 0), or error code */ -GIT_EXTERN(int) git_config_add_file( +GIT_EXTERN(int) git_config_add_backend( git_config *cfg, - git_config_file *file, + git_config_backend *file, unsigned int level, int force); @@ -223,12 +228,15 @@ GIT_EXTERN(int) git_config_open_ondisk(git_config **out, const char *path); * will return different config instances, but containing the same config_file * instance. * + * @param out The configuration instance to create + * @param parent Multi-level config to search for the given level + * @param level Configuration level to search for * @return 0, GIT_ENOTFOUND if the passed level cannot be found in the * multi-level parent config, or an error code */ GIT_EXTERN(int) git_config_open_level( - git_config **cfg_out, - git_config *cfg_parent, + git_config **out, + const git_config *parent, unsigned int level); /** @@ -262,7 +270,10 @@ GIT_EXTERN(void) git_config_free(git_config *cfg); * @param name the variable's name * @return 0 or an error code */ -GIT_EXTERN(int) git_config_get_entry(const git_config_entry **out, git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_get_entry( + const git_config_entry **out, + const git_config *cfg, + const char *name); /** * Get the value of an integer config variable. @@ -276,7 +287,7 @@ GIT_EXTERN(int) git_config_get_entry(const git_config_entry **out, git_config *c * @param name the variable's name * @return 0 or an error code */ -GIT_EXTERN(int) git_config_get_int32(int32_t *out, git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_get_int32(int32_t *out, const git_config *cfg, const char *name); /** * Get the value of a long integer config variable. @@ -290,7 +301,7 @@ GIT_EXTERN(int) git_config_get_int32(int32_t *out, git_config *cfg, const char * * @param name the variable's name * @return 0 or an error code */ -GIT_EXTERN(int) git_config_get_int64(int64_t *out, git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_get_int64(int64_t *out, const git_config *cfg, const char *name); /** * Get the value of a boolean config variable. @@ -307,7 +318,7 @@ GIT_EXTERN(int) git_config_get_int64(int64_t *out, git_config *cfg, const char * * @param name the variable's name * @return 0 or an error code */ -GIT_EXTERN(int) git_config_get_bool(int *out, git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_get_bool(int *out, const git_config *cfg, const char *name); /** * Get the value of a string config variable. @@ -324,7 +335,7 @@ GIT_EXTERN(int) git_config_get_bool(int *out, git_config *cfg, const char *name) * @param name the variable's name * @return 0 or an error code */ -GIT_EXTERN(int) git_config_get_string(const char **out, git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_get_string(const char **out, const git_config *cfg, const char *name); /** * Get each value of a multivar. @@ -338,7 +349,7 @@ GIT_EXTERN(int) git_config_get_string(const char **out, git_config *cfg, const c * @param fn the function to be called on each value of the variable * @param data opaque pointer to pass to the callback */ -GIT_EXTERN(int) git_config_get_multivar(git_config *cfg, const char *name, const char *regexp, int (*fn)(const git_config_entry *, void *), void *data); +GIT_EXTERN(int) git_config_get_multivar(const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb callback, void *payload); /** * Set the value of an integer config variable in the config file @@ -404,7 +415,7 @@ GIT_EXTERN(int) git_config_set_multivar(git_config *cfg, const char *name, const * @param cfg the configuration * @param name the variable to delete */ -GIT_EXTERN(int) git_config_delete(git_config *cfg, const char *name); +GIT_EXTERN(int) git_config_delete_entry(git_config *cfg, const char *name); /** * Perform an operation on each config variable. @@ -420,8 +431,8 @@ GIT_EXTERN(int) git_config_delete(git_config *cfg, const char *name); * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ GIT_EXTERN(int) git_config_foreach( - git_config *cfg, - int (*callback)(const git_config_entry *, void *payload), + const git_config *cfg, + git_config_foreach_cb callback, void *payload); /** @@ -438,9 +449,9 @@ GIT_EXTERN(int) git_config_foreach( * @return 0 or the return value of the callback which didn't return 0 */ GIT_EXTERN(int) git_config_foreach_match( - git_config *cfg, + const git_config *cfg, const char *regexp, - int (*callback)(const git_config_entry *entry, void *payload), + git_config_foreach_cb callback, void *payload); /** @@ -477,7 +488,12 @@ GIT_EXTERN(int) git_config_foreach_match( * @param map_n number of mapping objects in `maps` * @return 0 on success, error code otherwise */ -GIT_EXTERN(int) git_config_get_mapped(int *out, git_config *cfg, const char *name, git_cvar_map *maps, size_t map_n); +GIT_EXTERN(int) git_config_get_mapped( + int *out, + const git_config *cfg, + const char *name, + const git_cvar_map *maps, + size_t map_n); /** * Maps a string value to an integer constant @@ -489,7 +505,7 @@ GIT_EXTERN(int) git_config_get_mapped(int *out, git_config *cfg, const char *nam */ GIT_EXTERN(int) git_config_lookup_map_value( int *out, - git_cvar_map *maps, + const git_cvar_map *maps, size_t map_n, const char *value); @@ -505,18 +521,6 @@ GIT_EXTERN(int) git_config_lookup_map_value( */ GIT_EXTERN(int) git_config_parse_bool(int *out, const char *value); -/** - * Parse a string value as an int64. - * - * An optional value suffix of 'k', 'm', or 'g' will - * cause the value to be multiplied by 1024, 1048576, - * or 1073741824 prior to output. - * - * @param out place to store the result of the parsing - * @param value value to parse - */ -GIT_EXTERN(int) git_config_parse_int64(int64_t *out, const char *value); - /** * Parse a string value as an int32. * @@ -529,6 +533,18 @@ GIT_EXTERN(int) git_config_parse_int64(int64_t *out, const char *value); */ GIT_EXTERN(int) git_config_parse_int32(int32_t *out, const char *value); +/** + * Parse a string value as an int64. + * + * An optional value suffix of 'k', 'm', or 'g' will + * cause the value to be multiplied by 1024, 1048576, + * or 1073741824 prior to output. + * + * @param out place to store the result of the parsing + * @param value value to parse + */ +GIT_EXTERN(int) git_config_parse_int64(int64_t *out, const char *value); + /** @} */ GIT_END_DECL diff --git a/include/git2/types.h b/include/git2/types.h index 256296444..11bcf270f 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -129,7 +129,7 @@ typedef struct git_index git_index; typedef struct git_config git_config; /** Interface to access a configuration file */ -typedef struct git_config_file git_config_file; +typedef struct git_config_backend git_config_backend; /** Representation of a reference log entry */ typedef struct git_reflog_entry git_reflog_entry; diff --git a/src/config.c b/src/config.c index fc9ea65fe..5ee0d39ff 100644 --- a/src/config.c +++ b/src/config.c @@ -19,13 +19,13 @@ typedef struct { git_refcount rc; - git_config_file *file; + git_config_backend *file; unsigned int level; } file_internal; static void file_internal_free(file_internal *internal) { - git_config_file *file; + git_config_backend *file; file = internal->file; file->free(file); @@ -87,7 +87,7 @@ int git_config_add_file_ondisk( unsigned int level, int force) { - git_config_file *file = NULL; + git_config_backend *file = NULL; int res; assert(cfg && path); @@ -100,7 +100,7 @@ int git_config_add_file_ondisk( if (git_config_file__ondisk(&file, path) < 0) return -1; - if ((res = git_config_add_file(cfg, file, level, force)) < 0) { + if ((res = git_config_add_backend(cfg, file, level, force)) < 0) { /* * free manually; the file is not owned by the config * instance yet and will not be freed on cleanup @@ -132,7 +132,7 @@ int git_config_open_ondisk(git_config **out, const char *path) static int find_internal_file_by_level( file_internal **internal_out, - git_config *cfg, + const git_config *cfg, int level) { int pos = -1; @@ -224,7 +224,7 @@ static int git_config__add_internal( int git_config_open_level( git_config **cfg_out, - git_config *cfg_parent, + const git_config *cfg_parent, unsigned int level) { git_config *cfg; @@ -247,9 +247,9 @@ int git_config_open_level( return 0; } -int git_config_add_file( +int git_config_add_backend( git_config *cfg, - git_config_file *file, + git_config_backend *file, unsigned int level, int force) { @@ -284,7 +284,7 @@ int git_config_refresh(git_config *cfg) for (i = 0; i < cfg->files.length && !error; ++i) { file_internal *internal = git_vector_get(&cfg->files, i); - git_config_file *file = internal->file; + git_config_backend *file = internal->file; error = file->refresh(file); } @@ -296,34 +296,34 @@ int git_config_refresh(git_config *cfg) */ int git_config_foreach( - git_config *cfg, int (*fn)(const git_config_entry *, void *), void *data) + const git_config *cfg, git_config_foreach_cb cb, void *payload) { - return git_config_foreach_match(cfg, NULL, fn, data); + return git_config_foreach_match(cfg, NULL, cb, payload); } int git_config_foreach_match( - git_config *cfg, + const git_config *cfg, const char *regexp, - int (*fn)(const git_config_entry *, void *), - void *data) + git_config_foreach_cb cb, + void *payload) { int ret = 0; unsigned int i; file_internal *internal; - git_config_file *file; + git_config_backend *file; for (i = 0; i < cfg->files.length && ret == 0; ++i) { internal = git_vector_get(&cfg->files, i); file = internal->file; - ret = file->foreach(file, regexp, fn, data); + ret = file->foreach(file, regexp, cb, payload); } return ret; } -int git_config_delete(git_config *cfg, const char *name) +int git_config_delete_entry(git_config *cfg, const char *name) { - git_config_file *file; + git_config_backend *file; file_internal *internal; internal = git_vector_get(&cfg->files, 0); @@ -355,7 +355,7 @@ int git_config_set_bool(git_config *cfg, const char *name, int value) int git_config_set_string(git_config *cfg, const char *name, const char *value) { - git_config_file *file; + git_config_backend *file; file_internal *internal; internal = git_vector_get(&cfg->files, 0); @@ -369,9 +369,9 @@ int git_config_set_string(git_config *cfg, const char *name, const char *value) ***********/ int git_config_get_mapped( int *out, - git_config *cfg, + const git_config *cfg, const char *name, - git_cvar_map *maps, + const git_cvar_map *maps, size_t map_n) { const char *value; @@ -383,7 +383,7 @@ int git_config_get_mapped( return git_config_lookup_map_value(out, maps, map_n, value); } -int git_config_get_int64(int64_t *out, git_config *cfg, const char *name) +int git_config_get_int64(int64_t *out, const git_config *cfg, const char *name) { const char *value; int ret; @@ -394,7 +394,7 @@ int git_config_get_int64(int64_t *out, git_config *cfg, const char *name) return git_config_parse_int64(out, value); } -int git_config_get_int32(int32_t *out, git_config *cfg, const char *name) +int git_config_get_int32(int32_t *out, const git_config *cfg, const char *name) { const char *value; int ret; @@ -405,7 +405,7 @@ int git_config_get_int32(int32_t *out, git_config *cfg, const char *name) return git_config_parse_int32(out, value); } -static int get_string_at_file(const char **out, git_config_file *file, const char *name) +static int get_string_at_file(const char **out, const git_config_backend *file, const char *name) { const git_config_entry *entry; int res; @@ -417,7 +417,7 @@ static int get_string_at_file(const char **out, git_config_file *file, const cha return res; } -static int get_string(const char **out, git_config *cfg, const char *name) +static int get_string(const char **out, const git_config *cfg, const char *name) { file_internal *internal; unsigned int i; @@ -434,7 +434,7 @@ static int get_string(const char **out, git_config *cfg, const char *name) return GIT_ENOTFOUND; } -int git_config_get_bool(int *out, git_config *cfg, const char *name) +int git_config_get_bool(int *out, const git_config *cfg, const char *name) { const char *value = NULL; int ret; @@ -445,7 +445,7 @@ int git_config_get_bool(int *out, git_config *cfg, const char *name) return git_config_parse_bool(out, value); } -int git_config_get_string(const char **out, git_config *cfg, const char *name) +int git_config_get_string(const char **out, const git_config *cfg, const char *name) { int ret; const char *str = NULL; @@ -457,7 +457,7 @@ int git_config_get_string(const char **out, git_config *cfg, const char *name) return 0; } -int git_config_get_entry(const git_config_entry **out, git_config *cfg, const char *name) +int git_config_get_entry(const git_config_entry **out, const git_config *cfg, const char *name) { file_internal *internal; unsigned int i; @@ -467,7 +467,7 @@ int git_config_get_entry(const git_config_entry **out, git_config *cfg, const ch *out = NULL; git_vector_foreach(&cfg->files, i, internal) { - git_config_file *file = internal->file; + git_config_backend *file = internal->file; int ret = file->get(file, name, out); if (ret != GIT_ENOTFOUND) return ret; @@ -476,11 +476,11 @@ int git_config_get_entry(const git_config_entry **out, git_config *cfg, const ch return GIT_ENOTFOUND; } -int git_config_get_multivar(git_config *cfg, const char *name, const char *regexp, - int (*fn)(const git_config_entry *entry, void *data), void *data) +int git_config_get_multivar(const git_config *cfg, const char *name, const char *regexp, + git_config_foreach_cb cb, void *payload) { file_internal *internal; - git_config_file *file; + git_config_backend *file; int ret = GIT_ENOTFOUND; size_t i; @@ -493,7 +493,7 @@ int git_config_get_multivar(git_config *cfg, const char *name, const char *regex for (i = cfg->files.length; i > 0; --i) { internal = git_vector_get(&cfg->files, i - 1); file = internal->file; - ret = file->get_multivar(file, name, regexp, fn, data); + ret = file->get_multivar(file, name, regexp, cb, payload); if (ret < 0 && ret != GIT_ENOTFOUND) return ret; } @@ -503,7 +503,7 @@ int git_config_get_multivar(git_config *cfg, const char *name, const char *regex int git_config_set_multivar(git_config *cfg, const char *name, const char *regexp, const char *value) { - git_config_file *file; + git_config_backend *file; file_internal *internal; internal = git_vector_get(&cfg->files, 0); @@ -634,7 +634,7 @@ int git_config_open_default(git_config **out) ***********/ int git_config_lookup_map_value( int *out, - git_cvar_map *maps, + const git_cvar_map *maps, size_t map_n, const char *value) { @@ -644,7 +644,7 @@ int git_config_lookup_map_value( goto fail_parse; for (i = 0; i < map_n; ++i) { - git_cvar_map *m = maps + i; + const git_cvar_map *m = maps + i; switch (m->cvar_type) { case GIT_CVAR_FALSE: @@ -790,7 +790,7 @@ static int rename_config_entries_cb( return error; } - return git_config_delete(data->config, entry->name); + return git_config_delete_entry(data->config, entry->name); } int git_config_rename_section( diff --git a/src/config.h b/src/config.h index c7595ee79..ac8da6ff2 100644 --- a/src/config.h +++ b/src/config.h @@ -43,6 +43,6 @@ extern int git_config_rename_section( * @param out the new backend * @param path where the config file is located */ -extern int git_config_file__ondisk(struct git_config_file **out, const char *path); +extern int git_config_file__ondisk(struct git_config_backend **out, const char *path); #endif diff --git a/src/config_file.c b/src/config_file.c index 1209c53df..7cc812aa4 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -64,7 +64,7 @@ typedef struct cvar_t { (iter) = (tmp)) typedef struct { - git_config_file parent; + git_config_backend parent; git_strmap *values; @@ -149,7 +149,7 @@ static void free_vars(git_strmap *values) git_strmap_free(values); } -static int config_open(git_config_file *cfg, unsigned int level) +static int config_open(git_config_backend *cfg, unsigned int level) { int res; diskfile_backend *b = (diskfile_backend *)cfg; @@ -176,7 +176,7 @@ static int config_open(git_config_file *cfg, unsigned int level) return res; } -static int config_refresh(git_config_file *cfg) +static int config_refresh(git_config_backend *cfg) { int res, updated = 0; diskfile_backend *b = (diskfile_backend *)cfg; @@ -203,7 +203,7 @@ static int config_refresh(git_config_file *cfg) return res; } -static void backend_free(git_config_file *_backend) +static void backend_free(git_config_backend *_backend) { diskfile_backend *backend = (diskfile_backend *)_backend; @@ -216,7 +216,7 @@ static void backend_free(git_config_file *_backend) } static int file_foreach( - git_config_file *backend, + git_config_backend *backend, const char *regexp, int (*fn)(const git_config_entry *, void *), void *data) @@ -262,7 +262,7 @@ cleanup: return result; } -static int config_set(git_config_file *cfg, const char *name, const char *value) +static int config_set(git_config_backend *cfg, const char *name, const char *value) { cvar_t *var = NULL, *old_var; diskfile_backend *b = (diskfile_backend *)cfg; @@ -346,7 +346,7 @@ static int config_set(git_config_file *cfg, const char *name, const char *value) /* * Internal function that actually gets the value in string form */ -static int config_get(git_config_file *cfg, const char *name, const git_config_entry **out) +static int config_get(const git_config_backend *cfg, const char *name, const git_config_entry **out) { diskfile_backend *b = (diskfile_backend *)cfg; char *key; @@ -368,7 +368,7 @@ static int config_get(git_config_file *cfg, const char *name, const git_config_e } static int config_get_multivar( - git_config_file *cfg, + git_config_backend *cfg, const char *name, const char *regex_str, int (*fn)(const git_config_entry *, void *), @@ -431,7 +431,7 @@ static int config_get_multivar( } static int config_set_multivar( - git_config_file *cfg, const char *name, const char *regexp, const char *value) + git_config_backend *cfg, const char *name, const char *regexp, const char *value) { int replaced = 0; cvar_t *var, *newvar; @@ -506,7 +506,7 @@ static int config_set_multivar( return result; } -static int config_delete(git_config_file *cfg, const char *name) +static int config_delete(git_config_backend *cfg, const char *name) { cvar_t *var; diskfile_backend *b = (diskfile_backend *)cfg; @@ -540,7 +540,7 @@ static int config_delete(git_config_file *cfg, const char *name) return result; } -int git_config_file__ondisk(git_config_file **out, const char *path) +int git_config_file__ondisk(git_config_backend **out, const char *path) { diskfile_backend *backend; @@ -562,7 +562,7 @@ int git_config_file__ondisk(git_config_file **out, const char *path) backend->parent.refresh = config_refresh; backend->parent.free = backend_free; - *out = (git_config_file *)backend; + *out = (git_config_backend *)backend; return 0; } diff --git a/src/config_file.h b/src/config_file.h index b500dd64f..a9671b68d 100644 --- a/src/config_file.h +++ b/src/config_file.h @@ -9,36 +9,36 @@ #include "git2/config.h" -GIT_INLINE(int) git_config_file_open(git_config_file *cfg, unsigned int level) +GIT_INLINE(int) git_config_file_open(git_config_backend *cfg, unsigned int level) { return cfg->open(cfg, level); } -GIT_INLINE(void) git_config_file_free(git_config_file *cfg) +GIT_INLINE(void) git_config_file_free(git_config_backend *cfg) { cfg->free(cfg); } GIT_INLINE(int) git_config_file_get_string( - const git_config_entry **out, git_config_file *cfg, const char *name) + const git_config_entry **out, git_config_backend *cfg, const char *name) { return cfg->get(cfg, name, out); } GIT_INLINE(int) git_config_file_set_string( - git_config_file *cfg, const char *name, const char *value) + git_config_backend *cfg, const char *name, const char *value) { return cfg->set(cfg, name, value); } GIT_INLINE(int) git_config_file_delete( - git_config_file *cfg, const char *name) + git_config_backend *cfg, const char *name) { return cfg->del(cfg, name); } GIT_INLINE(int) git_config_file_foreach( - git_config_file *cfg, + git_config_backend *cfg, int (*fn)(const git_config_entry *entry, void *data), void *data) { @@ -46,7 +46,7 @@ GIT_INLINE(int) git_config_file_foreach( } GIT_INLINE(int) git_config_file_foreach_match( - git_config_file *cfg, + git_config_backend *cfg, const char *regexp, int (*fn)(const git_config_entry *entry, void *data), void *data) diff --git a/src/remote.c b/src/remote.c index 063e5186a..5035588a3 100644 --- a/src/remote.c +++ b/src/remote.c @@ -303,7 +303,7 @@ int git_remote_save(const git_remote *remote) return -1; } } else { - int error = git_config_delete(config, git_buf_cstr(&buf)); + int error = git_config_delete_entry(config, git_buf_cstr(&buf)); if (error == GIT_ENOTFOUND) { error = 0; giterr_clear(); @@ -356,7 +356,7 @@ int git_remote_save(const git_remote *remote) if (git_config_set_string(config, git_buf_cstr(&buf), "--no-tags") < 0) goto on_error; } else if (tagopt) { - if (git_config_delete(config, git_buf_cstr(&buf)) < 0) + if (git_config_delete_entry(config, git_buf_cstr(&buf)) < 0) goto on_error; } diff --git a/src/repository.c b/src/repository.c index 1642f4570..efbb3a348 100644 --- a/src/repository.c +++ b/src/repository.c @@ -824,7 +824,7 @@ static int repo_init_config( SET_REPO_CONFIG(string, "core.worktree", work_dir); } else if ((opts->flags & GIT_REPOSITORY_INIT__IS_REINIT) != 0) { - if (git_config_delete(config, "core.worktree") < 0) + if (git_config_delete_entry(config, "core.worktree") < 0) giterr_clear(); } } else { @@ -1356,7 +1356,7 @@ int git_repository_set_workdir( /* passthrough error means gitlink is unnecessary */ if (error == GIT_PASSTHROUGH) - error = git_config_delete(config, "core.worktree"); + error = git_config_delete_entry(config, "core.worktree"); else if (!error) error = git_config_set_string(config, "core.worktree", path.ptr); diff --git a/src/submodule.c b/src/submodule.c index 6093ff960..994ce316a 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -66,7 +66,7 @@ __KHASH_IMPL( str_hash_no_trailing_slash, str_equal_no_trailing_slash); static int load_submodule_config(git_repository *repo, bool force); -static git_config_file *open_gitmodules(git_repository *, bool, const git_oid *); +static git_config_backend *open_gitmodules(git_repository *, bool, const git_oid *); static int lookup_head_remote(git_buf *url, git_repository *repo); static int submodule_get(git_submodule **, git_repository *, const char *, const char *); static void submodule_release(git_submodule *sm, int decr); @@ -201,7 +201,7 @@ int git_submodule_add_setup( int use_gitlink) { int error = 0; - git_config_file *mods = NULL; + git_config_backend *mods = NULL; git_submodule *sm; git_buf name = GIT_BUF_INIT, real_url = GIT_BUF_INIT; git_repository_init_options initopt; @@ -412,7 +412,7 @@ cleanup: int git_submodule_save(git_submodule *submodule) { int error = 0; - git_config_file *mods; + git_config_backend *mods; git_buf key = GIT_BUF_INIT; assert(submodule); @@ -717,7 +717,7 @@ int git_submodule_reload(git_submodule *submodule) git_index *index; int pos, error; git_tree *head; - git_config_file *mods; + git_config_backend *mods; assert(submodule); @@ -1187,14 +1187,14 @@ static int load_submodule_config_from_head( return error; } -static git_config_file *open_gitmodules( +static git_config_backend *open_gitmodules( git_repository *repo, bool okay_to_create, const git_oid *gitmodules_oid) { const char *workdir = git_repository_workdir(repo); git_buf path = GIT_BUF_INIT; - git_config_file *mods = NULL; + git_config_backend *mods = NULL; if (workdir != NULL) { if (git_buf_joinpath(&path, workdir, GIT_MODULES_FILE) != 0) @@ -1230,7 +1230,7 @@ static int load_submodule_config(git_repository *repo, bool force) int error; git_oid gitmodules_oid; git_buf path = GIT_BUF_INIT; - git_config_file *mods = NULL; + git_config_backend *mods = NULL; if (repo->submodules && !force) return 0; @@ -1378,7 +1378,7 @@ static int submodule_update_config( goto cleanup; if (!value) - error = git_config_delete(config, key.ptr); + error = git_config_delete_entry(config, key.ptr); else error = git_config_set_string(config, key.ptr, value); diff --git a/src/vector.h b/src/vector.h index 6d820b8fc..46129f17b 100644 --- a/src/vector.h +++ b/src/vector.h @@ -55,7 +55,7 @@ GIT_INLINE(int) git_vector_bsearch2( return git_vector_bsearch3(NULL, v, cmp, key); } -GIT_INLINE(void *) git_vector_get(git_vector *v, size_t position) +GIT_INLINE(void *) git_vector_get(const git_vector *v, size_t position) { return (position < v->length) ? v->contents[position] : NULL; } diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c index 0efcaf597..e301290dc 100644 --- a/src/win32/posix_w32.c +++ b/src/win32/posix_w32.c @@ -537,7 +537,7 @@ int p_inet_pton(int af, const char* src, void* dst) return -1; } - if (WSAStringToAddress(src, af, NULL, (struct sockaddr *) &sa, &srcsize) != 0) + if (WSAStringToAddress((LPSTR)src, af, NULL, (struct sockaddr *) &sa, &srcsize) != 0) { errno = WSAGetLastError(); return -1; diff --git a/tests-clar/config/add.c b/tests-clar/config/add.c index 9854fbb39..405f1e2c9 100644 --- a/tests-clar/config/add.c +++ b/tests-clar/config/add.c @@ -19,7 +19,7 @@ void test_config_add__to_existing_section(void) cl_git_pass(git_config_set_int32(cfg, "empty.tmp", 5)); cl_git_pass(git_config_get_int32(&i, cfg, "empty.tmp")); cl_assert(i == 5); - cl_git_pass(git_config_delete(cfg, "empty.tmp")); + cl_git_pass(git_config_delete_entry(cfg, "empty.tmp")); git_config_free(cfg); } @@ -32,6 +32,6 @@ void test_config_add__to_new_section(void) cl_git_pass(git_config_set_int32(cfg, "section.tmp", 5)); cl_git_pass(git_config_get_int32(&i, cfg, "section.tmp")); cl_assert(i == 5); - cl_git_pass(git_config_delete(cfg, "section.tmp")); + cl_git_pass(git_config_delete_entry(cfg, "section.tmp")); git_config_free(cfg); } diff --git a/tests-clar/config/write.c b/tests-clar/config/write.c index d98d1dd53..411d40a02 100644 --- a/tests-clar/config/write.c +++ b/tests-clar/config/write.c @@ -62,7 +62,7 @@ void test_config_write__delete_value(void) git_config_free(cfg); cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_git_pass(git_config_delete(cfg, "core.dummy")); + cl_git_pass(git_config_delete_entry(cfg, "core.dummy")); git_config_free(cfg); cl_git_pass(git_config_open_ondisk(&cfg, "config9")); @@ -94,7 +94,7 @@ void test_config_write__delete_value_at_specific_level(void) cl_git_pass(git_config_open_level(&cfg_specific, cfg, GIT_CONFIG_LEVEL_GLOBAL)); - cl_git_pass(git_config_delete(cfg_specific, "core.dummy2")); + cl_git_pass(git_config_delete_entry(cfg_specific, "core.dummy2")); git_config_free(cfg); cl_git_pass(git_config_open_ondisk(&cfg, "config15")); @@ -125,7 +125,7 @@ void test_config_write__delete_inexistent(void) git_config *cfg; cl_git_pass(git_config_open_ondisk(&cfg, "config9")); - cl_assert(git_config_delete(cfg, "core.imaginary") == GIT_ENOTFOUND); + cl_assert(git_config_delete_entry(cfg, "core.imaginary") == GIT_ENOTFOUND); git_config_free(cfg); } diff --git a/tests-clar/network/remoterename.c b/tests-clar/network/remoterename.c index e9a7fc0cc..b14554572 100644 --- a/tests-clar/network/remoterename.c +++ b/tests-clar/network/remoterename.c @@ -64,7 +64,7 @@ void test_network_remoterename__renaming_a_remote_without_a_fetchrefspec_doesnt_ git_remote_free(_remote); cl_git_pass(git_repository_config__weakptr(&config, _repo)); - cl_git_pass(git_config_delete(config, "remote.test.fetch")); + cl_git_pass(git_config_delete_entry(config, "remote.test.fetch")); cl_git_pass(git_remote_load(&_remote, _repo, "test")); diff --git a/tests-clar/notes/notesref.c b/tests-clar/notes/notesref.c index 67c4003c6..d26056f4b 100644 --- a/tests-clar/notes/notesref.c +++ b/tests-clar/notes/notesref.c @@ -57,7 +57,7 @@ void test_notes_notesref__config_corenotesref(void) cl_git_pass(git_note_default_ref(&default_ref, _repo)); cl_assert(!strcmp(default_ref, "refs/notes/mydefaultnotesref")); - cl_git_pass(git_config_delete(_cfg, "core.notesRef")); + cl_git_pass(git_config_delete_entry(_cfg, "core.notesRef")); cl_git_pass(git_note_default_ref(&default_ref, _repo)); cl_assert(!strcmp(default_ref, GIT_NOTES_DEFAULT_REF)); diff --git a/tests-clar/submodule/modify.c b/tests-clar/submodule/modify.c index bfb8c8aaf..f6d41fdf2 100644 --- a/tests-clar/submodule/modify.c +++ b/tests-clar/submodule/modify.c @@ -76,7 +76,7 @@ void test_submodule_modify__add(void) static int delete_one_config(const git_config_entry *entry, void *payload) { git_config *cfg = payload; - return git_config_delete(cfg, entry->name); + return git_config_delete_entry(cfg, entry->name); } static int init_one_submodule( From 793c4385597d0786242e17c8ef37cdfa83f1865c Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 16:36:06 -0800 Subject: [PATCH 09/38] Update diff callback param order This makes the diff functions that take callbacks both take the payload parameter after the callback function pointers and pass the payload as the last argument to the callback function instead of the first. This should make them consistent with other callbacks across the API. --- examples/diff.c | 8 +- examples/general.c | 2 +- include/git2/diff.h | 50 ++++++----- src/diff_output.c | 157 +++++++++++++++++---------------- src/diff_output.h | 10 +-- src/stash.c | 10 +-- src/status.c | 12 +-- tests-clar/diff/blob.c | 36 ++++---- tests-clar/diff/diff_helpers.c | 39 ++++---- tests-clar/diff/diff_helpers.h | 16 ++-- tests-clar/diff/index.c | 12 +-- tests-clar/diff/patch.c | 8 +- tests-clar/diff/rename.c | 6 +- tests-clar/diff/tree.c | 10 +-- tests-clar/diff/workdir.c | 70 +++++++-------- 15 files changed, 225 insertions(+), 221 deletions(-) diff --git a/examples/diff.c b/examples/diff.c index c569b8664..a465182ba 100644 --- a/examples/diff.c +++ b/examples/diff.c @@ -63,12 +63,12 @@ char *colors[] = { }; static int printer( - void *data, const git_diff_delta *delta, const git_diff_range *range, char usage, const char *line, - size_t line_len) + size_t line_len, + void *data) { int *last_color = data, color = 0; @@ -225,9 +225,9 @@ int main(int argc, char *argv[]) fputs(colors[0], stdout); if (compact) - check(git_diff_print_compact(diff, &color, printer), "Displaying diff"); + check(git_diff_print_compact(diff, printer, &color), "Displaying diff"); else - check(git_diff_print_patch(diff, &color, printer), "Displaying diff"); + check(git_diff_print_patch(diff, printer, &color), "Displaying diff"); if (color >= 0) fputs(colors[0], stdout); diff --git a/examples/general.c b/examples/general.c index c4ff21d8b..d9bb6c04d 100644 --- a/examples/general.c +++ b/examples/general.c @@ -298,7 +298,7 @@ int main (int argc, char** argv) // 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 + printf("Blob Size: %ld\n", (long)git_blob_rawsize(blob)); // 8 git_blob_rawcontent(blob); // "content" // ### Revwalking diff --git a/include/git2/diff.h b/include/git2/diff.h index f925cbe39..fd00378af 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -188,9 +188,9 @@ typedef struct { * When iterating over a diff, callback that will be made per file. */ typedef int (*git_diff_file_cb)( - void *cb_data, const git_diff_delta *delta, - float progress); + float progress, + void *payload); /** * Structure describing a hunk of a diff. @@ -206,11 +206,11 @@ typedef struct { * When iterating over a diff, callback that will be made per hunk. */ typedef int (*git_diff_hunk_cb)( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, const char *header, - size_t header_len); + size_t header_len, + void *payload); /** * Line origin constants. @@ -247,12 +247,12 @@ typedef enum { * of lines of file and hunk headers. */ typedef int (*git_diff_data_cb)( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, /**< GIT_DIFF_LINE_... value from above */ const char *content, - size_t content_len); + size_t content_len, + void *payload); /** * The diff patch is used to store all the text diffs for a delta. @@ -284,6 +284,8 @@ typedef enum { * Control behavior of rename and copy detection */ typedef struct { + unsigned int version; + /** Combination of git_diff_find_t values (default FIND_RENAMES) */ unsigned int flags; @@ -462,7 +464,6 @@ GIT_EXTERN(int) git_diff_find_similar( * the iteration and cause this return `GIT_EUSER`. * * @param diff A git_diff_list generated by one of the above functions. - * @param cb_data Reference pointer that will be passed to your callbacks. * @param file_cb Callback function to make per file in the diff. * @param hunk_cb Optional callback to make per hunk of text diff. This * callback is called to describe a range of lines in the @@ -470,14 +471,15 @@ GIT_EXTERN(int) git_diff_find_similar( * @param line_cb Optional callback to make per line of diff text. This * same callback will be made for context lines, added, and * removed lines, and even for a deleted trailing newline. + * @param payload Reference pointer that will be passed to your callbacks. * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ GIT_EXTERN(int) git_diff_foreach( git_diff_list *diff, - void *cb_data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb line_cb); + git_diff_data_cb line_cb, + void *payload); /** * Iterate over a diff generating text output like "git diff --name-status". @@ -486,14 +488,14 @@ GIT_EXTERN(int) git_diff_foreach( * iteration and cause this return `GIT_EUSER`. * * @param diff A git_diff_list generated by one of the above functions. - * @param cb_data Reference pointer that will be passed to your callback. * @param print_cb Callback to make per line of diff text. + * @param payload Reference pointer that will be passed to your callback. * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ GIT_EXTERN(int) git_diff_print_compact( git_diff_list *diff, - void *cb_data, - git_diff_data_cb print_cb); + git_diff_data_cb print_cb, + void *payload); /** * Look up the single character abbreviation for a delta status code. @@ -518,7 +520,7 @@ GIT_EXTERN(char) git_diff_status_char(git_delta_t status); * iteration and cause this return `GIT_EUSER`. * * @param diff A git_diff_list generated by one of the above functions. - * @param cb_data Reference pointer that will be passed to your callbacks. + * @param payload Reference pointer that will be passed to your callbacks. * @param print_cb Callback function to output lines of the diff. This * same function will be called for file headers, hunk * headers, and diff lines. Fortunately, you can probably @@ -528,8 +530,8 @@ GIT_EXTERN(char) git_diff_status_char(git_delta_t status); */ GIT_EXTERN(int) git_diff_print_patch( git_diff_list *diff, - void *cb_data, - git_diff_data_cb print_cb); + git_diff_data_cb print_cb, + void *payload); /** * Query how many diff records are there in a diff list. @@ -573,15 +575,15 @@ GIT_EXTERN(size_t) git_diff_num_deltas_of_type( * It is okay to pass NULL for either of the output parameters; if you pass * NULL for the `git_diff_patch`, then the text diff will not be calculated. * - * @param patch Output parameter for the delta patch object - * @param delta Output parameter for the delta object + * @param patch_out Output parameter for the delta patch object + * @param delta_out Output parameter for the delta object * @param diff Diff list object * @param idx Index into diff list * @return 0 on success, other value < 0 on error */ GIT_EXTERN(int) git_diff_get_patch( - git_diff_patch **patch, - const git_diff_delta **delta, + git_diff_patch **patch_out, + const git_diff_delta **delta_out, git_diff_list *diff, size_t idx); @@ -673,15 +675,15 @@ GIT_EXTERN(int) git_diff_patch_get_line_in_hunk( * and cause this return `GIT_EUSER`. * * @param patch A git_diff_patch representing changes to one file - * @param cb_data Reference pointer that will be passed to your callbacks. * @param print_cb Callback function to output lines of the patch. Will be * called for file headers, hunk headers, and diff lines. + * @param payload Reference pointer that will be passed to your callbacks. * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ GIT_EXTERN(int) git_diff_patch_print( git_diff_patch *patch, - void *cb_data, - git_diff_data_cb print_cb); + git_diff_data_cb print_cb, + void *payload); /** * Get the content of a patch as a single diff text. @@ -719,10 +721,10 @@ GIT_EXTERN(int) git_diff_blobs( git_blob *old_blob, git_blob *new_blob, const git_diff_options *options, - void *cb_data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb line_cb); + git_diff_data_cb line_cb, + void *payload); GIT_END_DECL diff --git a/src/diff_output.c b/src/diff_output.c index 5c887cd7e..7873f066d 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -440,10 +440,10 @@ static void diff_context_init( git_diff_list *diff, git_repository *repo, const git_diff_options *opts, - void *data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb data_cb) + git_diff_data_cb data_cb, + void *payload) { memset(ctxt, 0, sizeof(diff_context)); @@ -453,8 +453,8 @@ static void diff_context_init( ctxt->file_cb = file_cb; ctxt->hunk_cb = hunk_cb; ctxt->data_cb = data_cb; - ctxt->cb_data = data; - ctxt->cb_error = 0; + ctxt->payload = payload; + ctxt->error = 0; setup_xdiff_options(ctxt->opts, &ctxt->xdiff_config, &ctxt->xdiff_params); } @@ -469,10 +469,10 @@ static int diff_delta_file_callback( progress = ctxt->diff ? ((float)idx / ctxt->diff->deltas.length) : 1.0f; - if (ctxt->file_cb(ctxt->cb_data, delta, progress) != 0) - ctxt->cb_error = GIT_EUSER; + if (ctxt->file_cb(delta, progress, ctxt->payload) != 0) + ctxt->error = GIT_EUSER; - return ctxt->cb_error; + return ctxt->error; } static void diff_patch_init( @@ -643,14 +643,14 @@ static int diff_patch_cb(void *priv, mmbuffer_t *bufs, int len) diff_context *ctxt = patch->ctxt; if (len == 1) { - ctxt->cb_error = parse_hunk_header(&ctxt->cb_range, bufs[0].ptr); - if (ctxt->cb_error < 0) - return ctxt->cb_error; + ctxt->error = parse_hunk_header(&ctxt->range, bufs[0].ptr); + if (ctxt->error < 0) + return ctxt->error; if (ctxt->hunk_cb != NULL && - ctxt->hunk_cb(ctxt->cb_data, patch->delta, &ctxt->cb_range, - bufs[0].ptr, bufs[0].size)) - ctxt->cb_error = GIT_EUSER; + ctxt->hunk_cb(patch->delta, &ctxt->range, + bufs[0].ptr, bufs[0].size, ctxt->payload)) + ctxt->error = GIT_EUSER; } if (len == 2 || len == 3) { @@ -661,12 +661,12 @@ static int diff_patch_cb(void *priv, mmbuffer_t *bufs, int len) GIT_DIFF_LINE_CONTEXT; if (ctxt->data_cb != NULL && - ctxt->data_cb(ctxt->cb_data, patch->delta, &ctxt->cb_range, - origin, bufs[1].ptr, bufs[1].size)) - ctxt->cb_error = GIT_EUSER; + ctxt->data_cb(patch->delta, &ctxt->range, + origin, bufs[1].ptr, bufs[1].size, ctxt->payload)) + ctxt->error = GIT_EUSER; } - if (len == 3 && !ctxt->cb_error) { + if (len == 3 && !ctxt->error) { /* If we have a '+' and a third buf, then we have added a line * without a newline and the old code had one, so DEL_EOFNL. * If we have a '-' and a third buf, then we have removed a line @@ -678,12 +678,12 @@ static int diff_patch_cb(void *priv, mmbuffer_t *bufs, int len) GIT_DIFF_LINE_CONTEXT; if (ctxt->data_cb != NULL && - ctxt->data_cb(ctxt->cb_data, patch->delta, &ctxt->cb_range, - origin, bufs[2].ptr, bufs[2].size)) - ctxt->cb_error = GIT_EUSER; + ctxt->data_cb(patch->delta, &ctxt->range, + origin, bufs[2].ptr, bufs[2].size, ctxt->payload)) + ctxt->error = GIT_EUSER; } - return ctxt->cb_error; + return ctxt->error; } static int diff_patch_generate( @@ -720,7 +720,7 @@ static int diff_patch_generate( xdl_diff(&old_xdiff_data, &new_xdiff_data, &ctxt->xdiff_params, &ctxt->xdiff_config, &xdiff_callback); - error = ctxt->cb_error; + error = ctxt->error; if (!error) patch->flags |= GIT_DIFF_PATCH_DIFFED; @@ -775,13 +775,13 @@ static void diff_patch_free(git_diff_patch *patch) #define MIN_LINE_STEP 8 static int diff_patch_hunk_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, const char *header, - size_t header_len) + size_t header_len, + void *payload) { - git_diff_patch *patch = cb_data; + git_diff_patch *patch = payload; diff_patch_hunk *hunk; GIT_UNUSED(delta); @@ -822,14 +822,14 @@ static int diff_patch_hunk_cb( } static int diff_patch_line_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, const char *content, - size_t content_len) + size_t content_len, + void *payload) { - git_diff_patch *patch = cb_data; + git_diff_patch *patch = payload; diff_patch_hunk *hunk; diff_patch_line *last, *line; @@ -904,10 +904,10 @@ static int diff_patch_line_cb( int git_diff_foreach( git_diff_list *diff, - void *cb_data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb data_cb) + git_diff_data_cb data_cb, + void *payload) { int error = 0; diff_context ctxt; @@ -916,7 +916,7 @@ int git_diff_foreach( diff_context_init( &ctxt, diff, diff->repo, &diff->opts, - cb_data, file_cb, hunk_cb, data_cb); + file_cb, hunk_cb, data_cb, payload); diff_patch_init(&ctxt, &patch); @@ -952,7 +952,7 @@ int git_diff_foreach( typedef struct { git_diff_list *diff; git_diff_data_cb print_cb; - void *cb_data; + void *payload; git_buf *buf; } diff_print_info; @@ -986,7 +986,7 @@ char git_diff_status_char(git_delta_t status) } static int print_compact( - void *data, const git_diff_delta *delta, float progress) + const git_diff_delta *delta, float progress, void *data) { diff_print_info *pi = data; char old_suffix, new_suffix, code = git_diff_status_char(delta->status); @@ -1017,8 +1017,8 @@ static int print_compact( if (git_buf_oom(pi->buf)) return -1; - if (pi->print_cb(pi->cb_data, delta, NULL, GIT_DIFF_LINE_FILE_HDR, - git_buf_cstr(pi->buf), git_buf_len(pi->buf))) + if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR, + git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload)) { giterr_clear(); return GIT_EUSER; @@ -1029,8 +1029,8 @@ static int print_compact( int git_diff_print_compact( git_diff_list *diff, - void *cb_data, - git_diff_data_cb print_cb) + git_diff_data_cb print_cb, + void *payload) { int error; git_buf buf = GIT_BUF_INIT; @@ -1038,10 +1038,10 @@ int git_diff_print_compact( pi.diff = diff; pi.print_cb = print_cb; - pi.cb_data = cb_data; + pi.payload = payload; pi.buf = &buf; - error = git_diff_foreach(diff, &pi, print_compact, NULL, NULL); + error = git_diff_foreach(diff, print_compact, NULL, NULL, &pi); git_buf_free(&buf); @@ -1079,7 +1079,7 @@ static int print_oid_range(diff_print_info *pi, const git_diff_delta *delta) } static int print_patch_file( - void *data, const git_diff_delta *delta, float progress) + const git_diff_delta *delta, float progress, void *data) { diff_print_info *pi = data; const char *oldpfx = pi->diff->opts.old_prefix; @@ -1121,7 +1121,8 @@ static int print_patch_file( if (git_buf_oom(pi->buf)) return -1; - if (pi->print_cb(pi->cb_data, delta, NULL, GIT_DIFF_LINE_FILE_HDR, git_buf_cstr(pi->buf), git_buf_len(pi->buf))) + if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_FILE_HDR, + git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload)) { giterr_clear(); return GIT_EUSER; @@ -1137,8 +1138,8 @@ static int print_patch_file( if (git_buf_oom(pi->buf)) return -1; - if (pi->print_cb(pi->cb_data, delta, NULL, GIT_DIFF_LINE_BINARY, - git_buf_cstr(pi->buf), git_buf_len(pi->buf))) + if (pi->print_cb(delta, NULL, GIT_DIFF_LINE_BINARY, + git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload)) { giterr_clear(); return GIT_EUSER; @@ -1148,11 +1149,11 @@ static int print_patch_file( } static int print_patch_hunk( - void *data, const git_diff_delta *d, const git_diff_range *r, const char *header, - size_t header_len) + size_t header_len, + void *data) { diff_print_info *pi = data; @@ -1163,8 +1164,8 @@ static int print_patch_hunk( if (git_buf_printf(pi->buf, "%.*s", (int)header_len, header) < 0) return -1; - if (pi->print_cb(pi->cb_data, d, r, GIT_DIFF_LINE_HUNK_HDR, - git_buf_cstr(pi->buf), git_buf_len(pi->buf))) + if (pi->print_cb(d, r, GIT_DIFF_LINE_HUNK_HDR, + git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload)) { giterr_clear(); return GIT_EUSER; @@ -1174,12 +1175,12 @@ static int print_patch_hunk( } static int print_patch_line( - void *data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, /* GIT_DIFF_LINE value from above */ const char *content, - size_t content_len) + size_t content_len, + void *data) { diff_print_info *pi = data; @@ -1198,8 +1199,8 @@ static int print_patch_line( if (git_buf_oom(pi->buf)) return -1; - if (pi->print_cb(pi->cb_data, delta, range, line_origin, - git_buf_cstr(pi->buf), git_buf_len(pi->buf))) + if (pi->print_cb(delta, range, line_origin, + git_buf_cstr(pi->buf), git_buf_len(pi->buf), pi->payload)) { giterr_clear(); return GIT_EUSER; @@ -1210,8 +1211,8 @@ static int print_patch_line( int git_diff_print_patch( git_diff_list *diff, - void *cb_data, - git_diff_data_cb print_cb) + git_diff_data_cb print_cb, + void *payload) { int error; git_buf buf = GIT_BUF_INIT; @@ -1219,11 +1220,11 @@ int git_diff_print_patch( pi.diff = diff; pi.print_cb = print_cb; - pi.cb_data = cb_data; + pi.payload = payload; pi.buf = &buf; error = git_diff_foreach( - diff, &pi, print_patch_file, print_patch_hunk, print_patch_line); + diff, print_patch_file, print_patch_hunk, print_patch_line, &pi); git_buf_free(&buf); @@ -1250,10 +1251,10 @@ int git_diff_blobs( git_blob *old_blob, git_blob *new_blob, const git_diff_options *options, - void *cb_data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb data_cb) + git_diff_data_cb data_cb, + void *payload) { int error; git_repository *repo; @@ -1276,7 +1277,7 @@ int git_diff_blobs( diff_context_init( &ctxt, NULL, repo, options, - cb_data, file_cb, hunk_cb, data_cb); + file_cb, hunk_cb, data_cb, payload); diff_patch_init(&ctxt, &patch); @@ -1374,7 +1375,7 @@ int git_diff_get_patch( diff_context_init( &ctxt, diff, diff->repo, &diff->opts, - NULL, NULL, diff_patch_hunk_cb, diff_patch_line_cb); + NULL, diff_patch_hunk_cb, diff_patch_line_cb, NULL); if (git_diff_delta__should_skip(ctxt.opts, delta)) return 0; @@ -1384,12 +1385,12 @@ int git_diff_get_patch( return -1; if (!(error = diff_patch_load(&ctxt, patch))) { - ctxt.cb_data = patch; + ctxt.payload = patch; error = diff_patch_generate(&ctxt, patch); if (error == GIT_EUSER) - error = ctxt.cb_error; + error = ctxt.error; } if (error) @@ -1503,22 +1504,22 @@ notfound: } static int print_to_buffer_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, const char *content, - size_t content_len) + size_t content_len, + void *payload) { - git_buf *output = cb_data; + git_buf *output = payload; GIT_UNUSED(delta); GIT_UNUSED(range); GIT_UNUSED(line_origin); return git_buf_put(output, content, content_len); } int git_diff_patch_print( git_diff_patch *patch, - void *cb_data, - git_diff_data_cb print_cb) + git_diff_data_cb print_cb, + void *payload) { int error; git_buf temp = GIT_BUF_INIT; @@ -1529,23 +1530,23 @@ int git_diff_patch_print( pi.diff = patch->diff; pi.print_cb = print_cb; - pi.cb_data = cb_data; + pi.payload = payload; pi.buf = &temp; - error = print_patch_file(&pi, patch->delta, 0); + error = print_patch_file(patch->delta, 0, &pi); for (h = 0; h < patch->hunks_size && !error; ++h) { diff_patch_hunk *hunk = &patch->hunks[h]; - error = print_patch_hunk(&pi, patch->delta, - &hunk->range, hunk->header, hunk->header_len); + error = print_patch_hunk( + patch->delta, &hunk->range, hunk->header, hunk->header_len, &pi); for (l = 0; l < hunk->line_count && !error; ++l) { diff_patch_line *line = &patch->lines[hunk->line_start + l]; error = print_patch_line( - &pi, patch->delta, &hunk->range, - line->origin, line->ptr, line->len); + patch->delta, &hunk->range, + line->origin, line->ptr, line->len, &pi); } } @@ -1561,7 +1562,7 @@ int git_diff_patch_to_str( int error; git_buf output = GIT_BUF_INIT; - error = git_diff_patch_print(patch, &output, print_to_buffer_cb); + error = git_diff_patch_print(patch, print_to_buffer_cb, &output); /* GIT_EUSER means git_buf_put in print_to_buffer_cb returned -1, * meaning a memory allocation failure, so just map to -1... @@ -1577,8 +1578,8 @@ int git_diff_patch_to_str( int git_diff__paired_foreach( git_diff_list *idx2head, git_diff_list *wd2idx, - int (*cb)(void *cbref, git_diff_delta *i2h, git_diff_delta *w2i), - void *cbref) + int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload), + void *payload) { int cmp; git_diff_delta *i2h, *w2i; @@ -1611,15 +1612,15 @@ int git_diff__paired_foreach( STRCMP_CASESELECT(icase, i2h->old_file.path, w2i->old_file.path); if (cmp < 0) { - if (cb(cbref, i2h, NULL)) + if (cb(i2h, NULL, payload)) return GIT_EUSER; i++; } else if (cmp > 0) { - if (cb(cbref, NULL, w2i)) + if (cb(NULL, w2i, payload)) return GIT_EUSER; j++; } else { - if (cb(cbref, i2h, w2i)) + if (cb(i2h, w2i, payload)) return GIT_EUSER; i++; j++; } diff --git a/src/diff_output.h b/src/diff_output.h index 8d7b5e472..13f2a120d 100644 --- a/src/diff_output.h +++ b/src/diff_output.h @@ -30,9 +30,9 @@ typedef struct { git_diff_file_cb file_cb; git_diff_hunk_cb hunk_cb; git_diff_data_cb data_cb; - void *cb_data; - int cb_error; - git_diff_range cb_range; + void *payload; + int error; + git_diff_range range; xdemitconf_t xdiff_config; xpparam_t xdiff_params; } diff_context; @@ -86,7 +86,7 @@ typedef struct { extern int git_diff__paired_foreach( git_diff_list *idx2head, git_diff_list *wd2idx, - int (*cb)(void *cbref, git_diff_delta *i2h, git_diff_delta *w2i), - void *cbref); + int (*cb)(git_diff_delta *i2h, git_diff_delta *w2i, void *payload), + void *payload); #endif diff --git a/src/stash.c b/src/stash.c index 89e5ff330..2efdd91c5 100644 --- a/src/stash.c +++ b/src/stash.c @@ -169,12 +169,12 @@ struct cb_data { }; static int update_index_cb( - void *cb_data, const git_diff_delta *delta, - float progress) + float progress, + void *payload) { int pos; - struct cb_data *data = (struct cb_data *)cb_data; + struct cb_data *data = (struct cb_data *)payload; GIT_UNUSED(progress); @@ -253,7 +253,7 @@ static int build_untracked_tree( if (git_diff_workdir_to_tree(&diff, git_index_owner(index), i_tree, &opts) < 0) goto cleanup; - if (git_diff_foreach(diff, &data, update_index_cb, NULL, NULL) < 0) + if (git_diff_foreach(diff, update_index_cb, NULL, NULL, &data) < 0) goto cleanup; if (build_tree_from_index(tree_out, index) < 0) @@ -334,7 +334,7 @@ static int build_workdir_tree( data.index = index; data.include_changed = true; - if (git_diff_foreach(diff, &data, update_index_cb, NULL, NULL) < 0) + if (git_diff_foreach(diff, update_index_cb, NULL, NULL, &data) < 0) goto cleanup; if (build_tree_from_index(tree_out, index) < 0) diff --git a/src/status.c b/src/status.c index b832cfe64..468417249 100644 --- a/src/status.c +++ b/src/status.c @@ -79,13 +79,13 @@ static unsigned int workdir_delta2status(git_delta_t workdir_status) typedef struct { int (*cb)(const char *, unsigned int, void *); - void *cbdata; + void *payload; } status_user_callback; static int status_invoke_cb( - void *cbref, git_diff_delta *i2h, git_diff_delta *w2i) + git_diff_delta *i2h, git_diff_delta *w2i, void *payload) { - status_user_callback *usercb = cbref; + status_user_callback *usercb = payload; const char *path = NULL; unsigned int status = 0; @@ -98,14 +98,14 @@ static int status_invoke_cb( status |= index_delta2status(i2h->status); } - return usercb->cb(path, status, usercb->cbdata); + return usercb->cb(path, status, usercb->payload); } int git_status_foreach_ext( git_repository *repo, const git_status_options *opts, int (*cb)(const char *, unsigned int, void *), - void *cbdata) + void *payload) { int err = 0; git_diff_options diffopt; @@ -152,7 +152,7 @@ int git_status_foreach_ext( goto cleanup; usercb.cb = cb; - usercb.cbdata = cbdata; + usercb.payload = payload; if (show == GIT_STATUS_SHOW_INDEX_THEN_WORKDIR) { if ((err = git_diff__paired_foreach( diff --git a/tests-clar/diff/blob.c b/tests-clar/diff/blob.c index cbef0f313..6a5645d4b 100644 --- a/tests-clar/diff/blob.c +++ b/tests-clar/diff/blob.c @@ -59,7 +59,7 @@ void test_diff_blob__can_compare_text_blobs(void) /* diff on tests/resources/attr/root_test1 */ cl_git_pass(git_diff_blobs( - a, b, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + a, b, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -74,7 +74,7 @@ void test_diff_blob__can_compare_text_blobs(void) /* diff on tests/resources/attr/root_test2 */ memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - b, c, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + b, c, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -89,7 +89,7 @@ void test_diff_blob__can_compare_text_blobs(void) /* diff on tests/resources/attr/root_test3 */ memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - a, c, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + a, c, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -103,7 +103,7 @@ void test_diff_blob__can_compare_text_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - c, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + c, d, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_MODIFIED]); @@ -125,7 +125,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) git_blob *e = NULL; cl_git_pass(git_diff_blobs( - d, e, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + d, e, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_DELETED]); @@ -140,7 +140,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - d, e, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + d, e, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.file_status[GIT_DELTA_ADDED]); @@ -155,7 +155,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - alien, NULL, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + alien, NULL, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.files_binary); @@ -166,7 +166,7 @@ void test_diff_blob__can_compare_against_null_blobs(void) memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - NULL, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + NULL, alien, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.files); cl_assert_equal_i(1, expected.files_binary); @@ -186,21 +186,21 @@ static void assert_identical_blobs_comparison(diff_expects *expected) void test_diff_blob__can_compare_identical_blobs(void) { cl_git_pass(git_diff_blobs( - d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + d, d, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(0, expected.files_binary); assert_identical_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - NULL, NULL, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + NULL, NULL, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(0, expected.files_binary); assert_identical_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - alien, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + alien, alien, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert(expected.files_binary > 0); assert_identical_blobs_comparison(&expected); @@ -226,14 +226,14 @@ void test_diff_blob__can_compare_two_binary_blobs(void) cl_git_pass(git_blob_lookup_prefix(&heart, g_repo, &h_oid, 4)); cl_git_pass(git_diff_blobs( - alien, heart, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + alien, heart, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); assert_binary_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - heart, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + heart, alien, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); assert_binary_blobs_comparison(&expected); @@ -243,14 +243,14 @@ void test_diff_blob__can_compare_two_binary_blobs(void) void test_diff_blob__can_compare_a_binary_blob_and_a_text_blob(void) { cl_git_pass(git_diff_blobs( - alien, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + alien, d, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); assert_binary_blobs_comparison(&expected); memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - d, alien, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + d, alien, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); assert_binary_blobs_comparison(&expected); } @@ -291,7 +291,7 @@ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) /* Test with default inter-hunk-context (not set) => default is 0 */ cl_git_pass(git_diff_blobs( - old_d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + old_d, d, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(2, expected.hunks); @@ -299,7 +299,7 @@ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) opts.interhunk_lines = 0; memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - old_d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + old_d, d, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(2, expected.hunks); @@ -307,7 +307,7 @@ void test_diff_blob__comparing_two_text_blobs_honors_interhunkcontext(void) opts.interhunk_lines = 1; memset(&expected, 0, sizeof(expected)); cl_git_pass(git_diff_blobs( - old_d, d, &opts, &expected, diff_file_cb, diff_hunk_cb, diff_line_cb)); + old_d, d, &opts, diff_file_cb, diff_hunk_cb, diff_line_cb, &expected)); cl_assert_equal_i(1, expected.hunks); diff --git a/tests-clar/diff/diff_helpers.c b/tests-clar/diff/diff_helpers.c index 96a921350..1436ada03 100644 --- a/tests-clar/diff/diff_helpers.c +++ b/tests-clar/diff/diff_helpers.c @@ -22,11 +22,11 @@ git_tree *resolve_commit_oid_to_tree( } int diff_file_cb( - void *cb_data, const git_diff_delta *delta, - float progress) + float progress, + void *payload) { - diff_expects *e = cb_data; + diff_expects *e = payload; GIT_UNUSED(progress); @@ -43,13 +43,13 @@ int diff_file_cb( } int diff_hunk_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, const char *header, - size_t header_len) + size_t header_len, + void *payload) { - diff_expects *e = cb_data; + diff_expects *e = payload; GIT_UNUSED(delta); GIT_UNUSED(header); @@ -62,14 +62,14 @@ int diff_hunk_cb( } int diff_line_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, const char *content, - size_t content_len) + size_t content_len, + void *payload) { - diff_expects *e = cb_data; + diff_expects *e = payload; GIT_UNUSED(delta); GIT_UNUSED(range); @@ -103,10 +103,10 @@ int diff_line_cb( int diff_foreach_via_iterator( git_diff_list *diff, - void *data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb line_cb) + git_diff_data_cb line_cb, + void *data) { size_t d, num_d = git_diff_num_deltas(diff); @@ -119,7 +119,7 @@ int diff_foreach_via_iterator( cl_assert(delta); /* call file_cb for this file */ - if (file_cb != NULL && file_cb(data, delta, (float)d / num_d) != 0) { + if (file_cb != NULL && file_cb(delta, (float)d / num_d, data) != 0) { git_diff_patch_free(patch); goto abort; } @@ -145,7 +145,7 @@ int diff_foreach_via_iterator( cl_git_pass(git_diff_patch_get_hunk( &range, &hdr, &hdr_len, &num_l, patch, h)); - if (hunk_cb && hunk_cb(data, delta, range, hdr, hdr_len) != 0) { + if (hunk_cb && hunk_cb(delta, range, hdr, hdr_len, data) != 0) { git_diff_patch_free(patch); goto abort; } @@ -160,7 +160,8 @@ int diff_foreach_via_iterator( &origin, &line, &line_len, &old_lineno, &new_lineno, patch, h, l)); - if (line_cb(data, delta, range, origin, line, line_len) != 0) { + if (line_cb && + line_cb(delta, range, origin, line, line_len, data) != 0) { git_diff_patch_free(patch); goto abort; } @@ -178,23 +179,23 @@ abort: } static int diff_print_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, /**< GIT_DIFF_LINE_... value from above */ const char *content, - size_t content_len) + size_t content_len, + void *payload) { - GIT_UNUSED(cb_data); + GIT_UNUSED(payload); GIT_UNUSED(delta); GIT_UNUSED(range); GIT_UNUSED(line_origin); GIT_UNUSED(content_len); - fputs(content, (FILE *)cb_data); + fputs(content, (FILE *)payload); return 0; } void diff_print(FILE *fp, git_diff_list *diff) { - cl_git_pass(git_diff_print_patch(diff, fp ? fp : stderr, diff_print_cb)); + cl_git_pass(git_diff_print_patch(diff, diff_print_cb, fp ? fp : stderr)); } diff --git a/tests-clar/diff/diff_helpers.h b/tests-clar/diff/diff_helpers.h index b5c36d64e..12591f63e 100644 --- a/tests-clar/diff/diff_helpers.h +++ b/tests-clar/diff/diff_helpers.h @@ -21,30 +21,30 @@ typedef struct { } diff_expects; extern int diff_file_cb( - void *cb_data, const git_diff_delta *delta, - float progress); + float progress, + void *cb_data); extern int diff_hunk_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, const char *header, - size_t header_len); + size_t header_len, + void *cb_data); extern int diff_line_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, const char *content, - size_t content_len); + size_t content_len, + void *cb_data); extern int diff_foreach_via_iterator( git_diff_list *diff, - void *data, git_diff_file_cb file_cb, git_diff_hunk_cb hunk_cb, - git_diff_data_cb line_cb); + git_diff_data_cb line_cb, + void *data); extern void diff_print(FILE *fp, git_diff_list *diff); diff --git a/tests-clar/diff/index.c b/tests-clar/diff/index.c index e89260217..9591e3457 100644 --- a/tests-clar/diff/index.c +++ b/tests-clar/diff/index.c @@ -35,7 +35,7 @@ void test_diff_index__0(void) cl_git_pass(git_diff_index_to_tree(&diff, g_repo, a, NULL, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); /* to generate these values: * - cd to tests/resources/status, @@ -63,7 +63,7 @@ void test_diff_index__0(void) cl_git_pass(git_diff_index_to_tree(&diff, g_repo, b, NULL, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); /* to generate these values: * - cd to tests/resources/status, @@ -92,11 +92,11 @@ void test_diff_index__0(void) } static int diff_stop_after_2_files( - void *cb_data, const git_diff_delta *delta, - float progress) + float progress, + void *payload) { - diff_expects *e = cb_data; + diff_expects *e = payload; GIT_UNUSED(progress); GIT_UNUSED(delta); @@ -129,7 +129,7 @@ void test_diff_index__1(void) cl_assert_equal_i( GIT_EUSER, - git_diff_foreach(diff, &exp, diff_stop_after_2_files, NULL, NULL) + git_diff_foreach(diff, diff_stop_after_2_files, NULL, NULL, &exp) ); cl_assert_equal_i(2, exp.files); diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index 6aaf7651f..16ed2551b 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -22,14 +22,14 @@ void test_diff_patch__cleanup(void) #define EXPECTED_HUNK "@@ -1,2 +0,0 @@\n" static int check_removal_cb( - void *cb_data, const git_diff_delta *delta, const git_diff_range *range, char line_origin, const char *formatted_output, - size_t output_len) + size_t output_len, + void *payload) { - GIT_UNUSED(cb_data); + GIT_UNUSED(payload); GIT_UNUSED(output_len); switch (line_origin) { @@ -90,7 +90,7 @@ void test_diff_patch__can_properly_display_the_removal_of_a_file(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - cl_git_pass(git_diff_print_patch(diff, NULL, check_removal_cb)); + cl_git_pass(git_diff_print_patch(diff, check_removal_cb, NULL)); git_diff_list_free(diff); diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c index ee6a1816b..0d57f8ff0 100644 --- a/tests-clar/diff/rename.c +++ b/tests-clar/diff/rename.c @@ -55,7 +55,7 @@ void test_diff_rename__match_oid(void) */ memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(4, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); @@ -69,7 +69,7 @@ void test_diff_rename__match_oid(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); @@ -91,7 +91,7 @@ void test_diff_rename__match_oid(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNMODIFIED]); diff --git a/tests-clar/diff/tree.c b/tests-clar/diff/tree.c index 6eb5826e4..58dc4e6fa 100644 --- a/tests-clar/diff/tree.c +++ b/tests-clar/diff/tree.c @@ -37,7 +37,7 @@ void test_diff_tree__0(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(5, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); @@ -59,7 +59,7 @@ void test_diff_tree__0(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, c, b, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(2, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -148,7 +148,7 @@ void test_diff_tree__options(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, c, d, &opts)); cl_git_pass(git_diff_foreach( - diff, &actual, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &actual)); expected = &test_expects[i]; cl_assert_equal_i(actual.files, expected->files); @@ -192,7 +192,7 @@ void test_diff_tree__bare(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, a, b, &opts)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); @@ -242,7 +242,7 @@ void test_diff_tree__merge(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff1, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff1, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(6, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index 87013135d..7636c6e64 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -33,10 +33,10 @@ void test_diff_workdir__to_index(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); /* to generate these values: * - cd to tests/resources/status, @@ -101,10 +101,10 @@ void test_diff_workdir__to_tree(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(14, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -137,10 +137,10 @@ void test_diff_workdir__to_tree(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(15, exp.files); cl_assert_equal_i(2, exp.file_status[GIT_DELTA_ADDED]); @@ -174,10 +174,10 @@ void test_diff_workdir__to_tree(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(16, exp.files); cl_assert_equal_i(5, exp.file_status[GIT_DELTA_ADDED]); @@ -223,9 +223,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, NULL, NULL)); + diff, diff_file_cb, NULL, NULL, &exp)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp)); cl_assert_equal_i(13, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -246,9 +246,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, NULL, NULL)); + diff, diff_file_cb, NULL, NULL, &exp)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -269,9 +269,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, NULL, NULL)); + diff, diff_file_cb, NULL, NULL, &exp)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp)); cl_assert_equal_i(3, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -292,9 +292,9 @@ void test_diff_workdir__to_index_with_pathspec(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, NULL, NULL)); + diff, diff_file_cb, NULL, NULL, &exp)); else - cl_git_pass(git_diff_foreach(diff, &exp, diff_file_cb, NULL, NULL)); + cl_git_pass(git_diff_foreach(diff, diff_file_cb, NULL, NULL, &exp)); cl_assert_equal_i(2, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -331,10 +331,10 @@ void test_diff_workdir__filemode_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); @@ -354,10 +354,10 @@ void test_diff_workdir__filemode_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(1, exp.file_status[GIT_DELTA_MODIFIED]); @@ -390,7 +390,7 @@ void test_diff_workdir__filemode_changes_with_filemode_false(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); @@ -406,7 +406,7 @@ void test_diff_workdir__filemode_changes_with_filemode_false(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_MODIFIED]); @@ -450,10 +450,10 @@ void test_diff_workdir__head_index_and_workdir_all_differ(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -471,10 +471,10 @@ void test_diff_workdir__head_index_and_workdir_all_differ(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff_w2i, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff_w2i, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff_w2i, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff_w2i, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -494,10 +494,10 @@ void test_diff_workdir__head_index_and_workdir_all_differ(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff_i2t, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff_i2t, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -536,10 +536,10 @@ void test_diff_workdir__eof_newline_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(0, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -563,10 +563,10 @@ void test_diff_workdir__eof_newline_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -590,10 +590,10 @@ void test_diff_workdir__eof_newline_changes(void) if (use_iterator) cl_git_pass(diff_foreach_via_iterator( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); else cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); cl_assert_equal_i(1, exp.files); cl_assert_equal_i(0, exp.file_status[GIT_DELTA_ADDED]); @@ -792,7 +792,7 @@ void test_diff_workdir__submodules(void) memset(&exp, 0, sizeof(exp)); cl_git_pass(git_diff_foreach( - diff, &exp, diff_file_cb, diff_hunk_cb, diff_line_cb)); + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); /* the following differs from "git diff 873585" by one "untracked" file * because the diff list includes the "not_submodule/" directory which From 9cd423583fc8ccb7402b2fb65478cc532d011abc Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 16:57:16 -0800 Subject: [PATCH 10/38] API updates for submodule.h --- include/git2/submodule.h | 6 +++--- src/diff.c | 4 ++-- src/diff_output.c | 4 ++-- src/submodule.c | 16 ++++++++-------- tests-clar/submodule/lookup.c | 24 ++++++++++++------------ 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/git2/submodule.h b/include/git2/submodule.h index b00fad2d4..90e45cebd 100644 --- a/include/git2/submodule.h +++ b/include/git2/submodule.h @@ -318,7 +318,7 @@ GIT_EXTERN(int) git_submodule_set_url(git_submodule *submodule, const char *url) * @param submodule Pointer to submodule object * @return Pointer to git_oid or NULL if submodule is not in index. */ -GIT_EXTERN(const git_oid *) git_submodule_index_oid(git_submodule *submodule); +GIT_EXTERN(const git_oid *) git_submodule_index_id(git_submodule *submodule); /** * Get the OID for the submodule in the current HEAD tree. @@ -326,7 +326,7 @@ GIT_EXTERN(const git_oid *) git_submodule_index_oid(git_submodule *submodule); * @param submodule Pointer to submodule object * @return Pointer to git_oid or NULL if submodule is not in the HEAD. */ -GIT_EXTERN(const git_oid *) git_submodule_head_oid(git_submodule *submodule); +GIT_EXTERN(const git_oid *) git_submodule_head_id(git_submodule *submodule); /** * Get the OID for the submodule in the current working directory. @@ -339,7 +339,7 @@ GIT_EXTERN(const git_oid *) git_submodule_head_oid(git_submodule *submodule); * @param submodule Pointer to submodule object * @return Pointer to git_oid or NULL if submodule is not checked out. */ -GIT_EXTERN(const git_oid *) git_submodule_wd_oid(git_submodule *submodule); +GIT_EXTERN(const git_oid *) git_submodule_wd_id(git_submodule *submodule); /** * Get the ignore rule for the submodule. diff --git a/src/diff.c b/src/diff.c index d6f5bd454..86f76f9c0 100644 --- a/src/diff.c +++ b/src/diff.c @@ -363,7 +363,7 @@ int git_diff__oid_for_file( const git_oid *sm_oid; if (!git_submodule_lookup(&sm, repo, path) && - (sm_oid = git_submodule_wd_oid(sm)) != NULL) + (sm_oid = git_submodule_wd_id(sm)) != NULL) git_oid_cpy(oid, sm_oid); else { /* if submodule lookup failed probably just in an intermediate @@ -496,7 +496,7 @@ static int maybe_modified( /* grab OID while we are here */ if (git_oid_iszero(&nitem->oid)) { - const git_oid *sm_oid = git_submodule_wd_oid(sub); + const git_oid *sm_oid = git_submodule_wd_id(sub); if (sm_oid != NULL) { git_oid_cpy(&noid, sm_oid); use_noid = &noid; diff --git a/src/diff_output.c b/src/diff_output.c index 7873f066d..804325e47 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -287,8 +287,8 @@ static int get_workdir_sm_content( if ((file->flags & GIT_DIFF_FILE_VALID_OID) == 0) { const git_oid* sm_head; - if ((sm_head = git_submodule_wd_oid(sm)) != NULL || - (sm_head = git_submodule_head_oid(sm)) != NULL) + if ((sm_head = git_submodule_wd_id(sm)) != NULL || + (sm_head = git_submodule_head_id(sm)) != NULL) { git_oid_cpy(&file->oid, sm_head); file->flags |= GIT_DIFF_FILE_VALID_OID; diff --git a/src/submodule.c b/src/submodule.c index 994ce316a..bc38f1f24 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -513,7 +513,7 @@ int git_submodule_set_url(git_submodule *submodule, const char *url) return 0; } -const git_oid *git_submodule_index_oid(git_submodule *submodule) +const git_oid *git_submodule_index_id(git_submodule *submodule) { assert(submodule); @@ -523,7 +523,7 @@ const git_oid *git_submodule_index_oid(git_submodule *submodule) return NULL; } -const git_oid *git_submodule_head_oid(git_submodule *submodule) +const git_oid *git_submodule_head_id(git_submodule *submodule) { assert(submodule); @@ -533,7 +533,7 @@ const git_oid *git_submodule_head_oid(git_submodule *submodule) return NULL; } -const git_oid *git_submodule_wd_oid(git_submodule *submodule) +const git_oid *git_submodule_wd_id(git_submodule *submodule) { assert(submodule); @@ -1389,8 +1389,8 @@ cleanup: static int submodule_index_status(unsigned int *status, git_submodule *sm) { - const git_oid *head_oid = git_submodule_head_oid(sm); - const git_oid *index_oid = git_submodule_index_oid(sm); + const git_oid *head_oid = git_submodule_head_id(sm); + const git_oid *index_oid = git_submodule_index_id(sm); if (!head_oid) { if (index_oid) @@ -1410,7 +1410,7 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) const git_oid *wd_oid, *index_oid; git_repository *sm_repo = NULL; - /* open repo now if we need it (so wd_oid() call won't reopen) */ + /* open repo now if we need it (so wd_id() call won't reopen) */ if ((sm->ignore == GIT_SUBMODULE_IGNORE_NONE || sm->ignore == GIT_SUBMODULE_IGNORE_UNTRACKED) && (sm->flags & GIT_SUBMODULE_STATUS_IN_WD) != 0) @@ -1419,8 +1419,8 @@ static int submodule_wd_status(unsigned int *status, git_submodule *sm) return error; } - index_oid = git_submodule_index_oid(sm); - wd_oid = git_submodule_wd_oid(sm); + index_oid = git_submodule_index_id(sm); + wd_oid = git_submodule_wd_id(sm); if (!index_oid) { if (wd_oid) diff --git a/tests-clar/submodule/lookup.c b/tests-clar/submodule/lookup.c index 94eb19b5e..868b51e55 100644 --- a/tests-clar/submodule/lookup.c +++ b/tests-clar/submodule/lookup.c @@ -62,9 +62,9 @@ void test_submodule_lookup__accessors(void) cl_assert(git__suffixcmp(git_submodule_path(sm), "sm_unchanged") == 0); cl_assert(git__suffixcmp(git_submodule_url(sm), "/submod2_target") == 0); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0); cl_assert(git_submodule_ignore(sm) == GIT_SUBMODULE_IGNORE_NONE); cl_assert(git_submodule_update(sm) == GIT_SUBMODULE_UPDATE_CHECKOUT); @@ -72,24 +72,24 @@ void test_submodule_lookup__accessors(void) cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); cl_assert_equal_s("sm_changed_head", git_submodule_name(sm)); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), "3d9386c507f6b093471a3e324085657a3c2b4247") == 0); cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_added_and_uncommited")); cl_assert_equal_s("sm_added_and_uncommited", git_submodule_name(sm)); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_submodule_head_oid(sm) == NULL); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_submodule_head_id(sm) == NULL); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), oid) == 0); cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_missing_commits")); cl_assert_equal_s("sm_missing_commits", git_submodule_name(sm)); - cl_assert(git_oid_streq(git_submodule_index_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_head_oid(sm), oid) == 0); - cl_assert(git_oid_streq(git_submodule_wd_oid(sm), + cl_assert(git_oid_streq(git_submodule_index_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_head_id(sm), oid) == 0); + cl_assert(git_oid_streq(git_submodule_wd_id(sm), "5e4963595a9774b90524d35a807169049de8ccad") == 0); } From d9023dbe0cb5d47e30d86149701b7be9006f7683 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 20 Nov 2012 17:06:54 -0800 Subject: [PATCH 11/38] API updates for tag.h --- include/git2/object.h | 6 +- include/git2/tag.h | 109 +++++++++++++++++----------------- src/refs.c | 2 +- src/tag.c | 24 ++++---- tests-clar/object/tag/write.c | 2 +- 5 files changed, 73 insertions(+), 70 deletions(-) diff --git a/include/git2/object.h b/include/git2/object.h index 69af392a0..fcc56cb27 100644 --- a/include/git2/object.h +++ b/include/git2/object.h @@ -183,9 +183,9 @@ GIT_EXTERN(size_t) git_object__size(git_otype type); * @return 0 or an error code */ GIT_EXTERN(int) git_object_peel( - git_object **peeled, - const git_object *object, - git_otype target_type); + git_object **peeled, + const git_object *object, + git_otype target_type); /** @} */ GIT_END_DECL diff --git a/include/git2/tag.h b/include/git2/tag.h index a1b685f12..f82a6c9f9 100644 --- a/include/git2/tag.h +++ b/include/git2/tag.h @@ -25,14 +25,16 @@ GIT_BEGIN_DECL /** * Lookup a tag object from the repository. * - * @param tag pointer to the looked up tag + * @param out pointer to the looked up tag * @param repo the repo to use when locating the tag. * @param id identity of the tag to locate. * @return 0 or an error code */ -GIT_INLINE(int) git_tag_lookup(git_tag **tag, git_repository *repo, const git_oid *id) +GIT_INLINE(int) git_tag_lookup( + git_tag **out, git_repository *repo, const git_oid *id) { - return git_object_lookup((git_object **)tag, repo, id, (git_otype)GIT_OBJ_TAG); + return git_object_lookup( + (git_object **)out, repo, id, (git_otype)GIT_OBJ_TAG); } /** @@ -41,32 +43,33 @@ GIT_INLINE(int) git_tag_lookup(git_tag **tag, git_repository *repo, const git_oi * * @see git_object_lookup_prefix * - * @param tag pointer to the looked up tag + * @param out pointer to the looked up tag * @param repo the repo to use when locating the tag. * @param id identity of the tag to locate. * @param len the length of the short identifier * @return 0 or an error code */ -GIT_INLINE(int) git_tag_lookup_prefix(git_tag **tag, git_repository *repo, const git_oid *id, size_t len) +GIT_INLINE(int) git_tag_lookup_prefix( + git_tag **out, git_repository *repo, const git_oid *id, size_t len) { - return git_object_lookup_prefix((git_object **)tag, repo, id, len, (git_otype)GIT_OBJ_TAG); + return git_object_lookup_prefix( + (git_object **)out, repo, id, len, (git_otype)GIT_OBJ_TAG); } /** * Close an open tag * - * This is a wrapper around git_object_free() + * You can no longer use the git_tag pointer after this call. * - * IMPORTANT: - * It *is* necessary to call this method when you stop - * using a tag. Failure to do so will cause a memory leak. + * IMPORTANT: You MUST call this method when you are through with a tag to + * release memory. Failure to do so will cause a memory leak. * * @param tag the tag to close */ GIT_INLINE(void) git_tag_free(git_tag *tag) { - git_object_free((git_object *) tag); + git_object_free((git_object *)tag); } @@ -76,7 +79,7 @@ GIT_INLINE(void) git_tag_free(git_tag *tag) * @param tag a previously loaded tag. * @return object identity for the tag. */ -GIT_EXTERN(const git_oid *) git_tag_id(git_tag *tag); +GIT_EXTERN(const git_oid *) git_tag_id(const git_tag *tag); /** * Get the tagged object of a tag @@ -84,11 +87,11 @@ GIT_EXTERN(const git_oid *) git_tag_id(git_tag *tag); * This method performs a repository lookup for the * given object and returns it * - * @param target pointer where to store the target + * @param target_out pointer where to store the target * @param tag a previously loaded tag. * @return 0 or an error code */ -GIT_EXTERN(int) git_tag_target(git_object **target, git_tag *tag); +GIT_EXTERN(int) git_tag_target(git_object **target_out, const git_tag *tag); /** * Get the OID of the tagged object of a tag @@ -96,7 +99,7 @@ GIT_EXTERN(int) git_tag_target(git_object **target, git_tag *tag); * @param tag a previously loaded tag. * @return pointer to the OID */ -GIT_EXTERN(const git_oid *) git_tag_target_oid(git_tag *tag); +GIT_EXTERN(const git_oid *) git_tag_target_id(const git_tag *tag); /** * Get the type of a tag's tagged object @@ -104,7 +107,7 @@ GIT_EXTERN(const git_oid *) git_tag_target_oid(git_tag *tag); * @param tag a previously loaded tag. * @return type of the tagged object */ -GIT_EXTERN(git_otype) git_tag_target_type(git_tag *tag); +GIT_EXTERN(git_otype) git_tag_target_type(const git_tag *tag); /** * Get the name of a tag @@ -112,7 +115,7 @@ GIT_EXTERN(git_otype) git_tag_target_type(git_tag *tag); * @param tag a previously loaded tag. * @return name of the tag */ -GIT_EXTERN(const char *) git_tag_name(git_tag *tag); +GIT_EXTERN(const char *) git_tag_name(const git_tag *tag); /** * Get the tagger (author) of a tag @@ -120,7 +123,7 @@ GIT_EXTERN(const char *) git_tag_name(git_tag *tag); * @param tag a previously loaded tag. * @return reference to the tag's author */ -GIT_EXTERN(const git_signature *) git_tag_tagger(git_tag *tag); +GIT_EXTERN(const git_signature *) git_tag_tagger(const git_tag *tag); /** * Get the message of a tag @@ -128,7 +131,7 @@ GIT_EXTERN(const git_signature *) git_tag_tagger(git_tag *tag); * @param tag a previously loaded tag. * @return message of the tag */ -GIT_EXTERN(const char *) git_tag_message(git_tag *tag); +GIT_EXTERN(const char *) git_tag_message(const git_tag *tag); /** @@ -167,13 +170,13 @@ GIT_EXTERN(const char *) git_tag_message(git_tag *tag); * is written in the /refs/tags folder, pointing to it */ GIT_EXTERN(int) git_tag_create( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - const git_signature *tagger, - const char *message, - int force); + git_oid *oid, + git_repository *repo, + const char *tag_name, + const git_object *target, + const git_signature *tagger, + const char *message, + int force); /** * Create a new tag in the repository from a buffer @@ -185,10 +188,10 @@ GIT_EXTERN(int) git_tag_create( * @return 0 on success; error code otherwise */ GIT_EXTERN(int) git_tag_create_frombuffer( - git_oid *oid, - git_repository *repo, - const char *buffer, - int force); + git_oid *oid, + git_repository *repo, + const char *buffer, + int force); /** * Create a new lightweight tag pointing at a target object @@ -218,11 +221,11 @@ GIT_EXTERN(int) git_tag_create_frombuffer( * pointing to the provided target object */ GIT_EXTERN(int) git_tag_create_lightweight( - git_oid *oid, - git_repository *repo, - const char *tag_name, - const git_object *target, - int force); + git_oid *oid, + git_repository *repo, + const char *tag_name, + const git_object *target, + int force); /** * Delete an existing tag reference. @@ -235,8 +238,8 @@ GIT_EXTERN(int) git_tag_create_lightweight( * @return 0 or an error code */ GIT_EXTERN(int) git_tag_delete( - git_repository *repo, - const char *tag_name); + git_repository *repo, + const char *tag_name); /** * Fill a list with all the tags in the Repository @@ -252,8 +255,8 @@ GIT_EXTERN(int) git_tag_delete( * @return 0 or an error code */ GIT_EXTERN(int) git_tag_list( - git_strarray *tag_names, - git_repository *repo); + git_strarray *tag_names, + git_repository *repo); /** * Fill a list with all the tags in the Repository @@ -274,39 +277,39 @@ GIT_EXTERN(int) git_tag_list( * @return 0 or an error code */ GIT_EXTERN(int) git_tag_list_match( - git_strarray *tag_names, - const char *pattern, - git_repository *repo); + git_strarray *tag_names, + const char *pattern, + git_repository *repo); -typedef int (*git_tag_foreach_cb)(const char *name, git_oid *oid, void *data); +typedef int (*git_tag_foreach_cb)(const char *name, git_oid *oid, void *payload); + /** * Call callback `cb' for each tag in the repository * * @param repo Repository - * @param cb Callback function - * @param cb_data Pointer to callback data (optional) + * @param callback Callback function + * @param payload Pointer to callback data (optional) */ GIT_EXTERN(int) git_tag_foreach( - git_repository *repo, - git_tag_foreach_cb cb, - void *cb_data); + git_repository *repo, + git_tag_foreach_cb callback, + void *payload); /** - * Recursively peel a tag until a non tag git_object - * is met + * Recursively peel a tag until a non tag git_object is found * * The retrieved `tag_target` object is owned by the repository * and should be closed with the `git_object_free` method. * - * @param tag_target Pointer to the peeled git_object + * @param tag_target_out Pointer to the peeled git_object * @param tag The tag to be processed * @return 0 or an error code */ GIT_EXTERN(int) git_tag_peel( - git_object **tag_target, - git_tag *tag); + git_object **tag_target_out, + const git_tag *tag); /** @} */ GIT_END_DECL diff --git a/src/refs.c b/src/refs.c index 1882093cf..76c9f42ba 100644 --- a/src/refs.c +++ b/src/refs.c @@ -647,7 +647,7 @@ static int packed_find_peel(git_repository *repo, struct packref *ref) /* * Find the object pointed at by this tag */ - git_oid_cpy(&ref->peel, git_tag_target_oid(tag)); + git_oid_cpy(&ref->peel, git_tag_target_id(tag)); ref->flags |= GIT_PACKREF_HAS_PEEL; /* diff --git a/src/tag.c b/src/tag.c index c39119c22..606afd657 100644 --- a/src/tag.c +++ b/src/tag.c @@ -22,41 +22,41 @@ void git_tag__free(git_tag *tag) git__free(tag); } -const git_oid *git_tag_id(git_tag *c) +const git_oid *git_tag_id(const git_tag *c) { - return git_object_id((git_object *)c); + return git_object_id((const git_object *)c); } -int git_tag_target(git_object **target, git_tag *t) +int git_tag_target(git_object **target, const git_tag *t) { assert(t); return git_object_lookup(target, t->object.repo, &t->target, t->type); } -const git_oid *git_tag_target_oid(git_tag *t) +const git_oid *git_tag_target_id(const git_tag *t) { assert(t); return &t->target; } -git_otype git_tag_target_type(git_tag *t) +git_otype git_tag_target_type(const git_tag *t) { assert(t); return t->type; } -const char *git_tag_name(git_tag *t) +const char *git_tag_name(const git_tag *t) { assert(t); return t->tag_name; } -const git_signature *git_tag_tagger(git_tag *t) +const git_signature *git_tag_tagger(const git_tag *t) { return t->tagger; } -const char *git_tag_message(git_tag *t) +const char *git_tag_message(const git_tag *t) { assert(t); return t->message; @@ -425,8 +425,8 @@ int git_tag_foreach(git_repository *repo, git_tag_foreach_cb cb, void *cb_data) data.cb_data = cb_data; data.repo = repo; - return git_reference_foreach(repo, GIT_REF_OID | GIT_REF_PACKED, - &tags_cb, &data); + return git_reference_foreach( + repo, GIT_REF_OID | GIT_REF_PACKED, &tags_cb, &data); } typedef struct { @@ -477,7 +477,7 @@ int git_tag_list(git_strarray *tag_names, git_repository *repo) return git_tag_list_match(tag_names, "", repo); } -int git_tag_peel(git_object **tag_target, git_tag *tag) +int git_tag_peel(git_object **tag_target, const git_tag *tag) { - return git_object_peel(tag_target, (git_object *)tag, GIT_OBJ_ANY); + return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJ_ANY); } diff --git a/tests-clar/object/tag/write.c b/tests-clar/object/tag/write.c index 3e1100399..ad6ca76b2 100644 --- a/tests-clar/object/tag/write.c +++ b/tests-clar/object/tag/write.c @@ -45,7 +45,7 @@ void test_object_tag_write__basic(void) git_signature_free(tagger); cl_git_pass(git_tag_lookup(&tag, g_repo, &tag_id)); - cl_assert(git_oid_cmp(git_tag_target_oid(tag), &target_id) == 0); + cl_assert(git_oid_cmp(git_tag_target_id(tag), &target_id) == 0); /* Check attributes were set correctly */ tagger1 = git_tag_tagger(tag); From f45d51ff8e04c6849413c13aedcf5abacc3c69bd Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 20 Nov 2012 19:57:46 -0700 Subject: [PATCH 12/38] API updates for index.h --- examples/general.c | 2 +- include/git2/index.h | 77 +++++++++++---------- include/git2/tree.h | 2 +- src/attr.c | 2 +- src/index.c | 8 +-- src/iterator.c | 2 +- src/submodule.c | 2 +- src/tree.c | 8 +-- tests-clar/attr/repo.c | 2 +- tests-clar/index/conflicts.c | 6 +- tests-clar/index/filemodes.c | 4 +- tests-clar/index/rename.c | 2 +- tests-clar/index/stage.c | 4 +- tests-clar/index/tests.c | 2 +- tests-clar/object/commit/commitstagedfile.c | 2 +- 15 files changed, 63 insertions(+), 62 deletions(-) diff --git a/examples/general.c b/examples/general.c index d9bb6c04d..9ea264ec6 100644 --- a/examples/general.c +++ b/examples/general.c @@ -371,7 +371,7 @@ int main (int argc, char** argv) // 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_byindex(index, i); + const git_index_entry *e = git_index_get_byindex(index, i); printf("path: %s\n", e->path); printf("mtime: %d\n", (int)e->mtime.seconds); diff --git a/include/git2/index.h b/include/git2/index.h index 8e1a7e521..195e5b13f 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -21,10 +21,10 @@ */ GIT_BEGIN_DECL -#define GIT_IDXENTRY_NAMEMASK (0x0fff) +#define GIT_IDXENTRY_NAMEMASK (0x0fff) #define GIT_IDXENTRY_STAGEMASK (0x3000) -#define GIT_IDXENTRY_EXTENDED (0x4000) -#define GIT_IDXENTRY_VALID (0x8000) +#define GIT_IDXENTRY_EXTENDED (0x4000) +#define GIT_IDXENTRY_VALID (0x8000) #define GIT_IDXENTRY_STAGESHIFT 12 /* @@ -34,26 +34,26 @@ GIT_BEGIN_DECL * * In-memory only flags: */ -#define GIT_IDXENTRY_UPDATE (1 << 0) -#define GIT_IDXENTRY_REMOVE (1 << 1) -#define GIT_IDXENTRY_UPTODATE (1 << 2) -#define GIT_IDXENTRY_ADDED (1 << 3) +#define GIT_IDXENTRY_UPDATE (1 << 0) +#define GIT_IDXENTRY_REMOVE (1 << 1) +#define GIT_IDXENTRY_UPTODATE (1 << 2) +#define GIT_IDXENTRY_ADDED (1 << 3) -#define GIT_IDXENTRY_HASHED (1 << 4) -#define GIT_IDXENTRY_UNHASHED (1 << 5) -#define GIT_IDXENTRY_WT_REMOVE (1 << 6) /* remove in work directory */ -#define GIT_IDXENTRY_CONFLICTED (1 << 7) +#define GIT_IDXENTRY_HASHED (1 << 4) +#define GIT_IDXENTRY_UNHASHED (1 << 5) +#define GIT_IDXENTRY_WT_REMOVE (1 << 6) /* remove in work directory */ +#define GIT_IDXENTRY_CONFLICTED (1 << 7) -#define GIT_IDXENTRY_UNPACKED (1 << 8) +#define GIT_IDXENTRY_UNPACKED (1 << 8) #define GIT_IDXENTRY_NEW_SKIP_WORKTREE (1 << 9) /* * Extended on-disk flags: */ -#define GIT_IDXENTRY_INTENT_TO_ADD (1 << 13) -#define GIT_IDXENTRY_SKIP_WORKTREE (1 << 14) +#define GIT_IDXENTRY_INTENT_TO_ADD (1 << 13) +#define GIT_IDXENTRY_SKIP_WORKTREE (1 << 14) /* GIT_IDXENTRY_EXTENDED2 is for future extension */ -#define GIT_IDXENTRY_EXTENDED2 (1 << 15) +#define GIT_IDXENTRY_EXTENDED2 (1 << 15) #define GIT_IDXENTRY_EXTENDED_FLAGS (GIT_IDXENTRY_INTENT_TO_ADD | GIT_IDXENTRY_SKIP_WORKTREE) @@ -119,11 +119,11 @@ enum { * * The index must be freed once it's no longer in use. * - * @param index the pointer for the new index + * @param out the pointer for the new index * @param index_path the path to the index file in disk * @return 0 or an error code */ -GIT_EXTERN(int) git_index_open(git_index **index, const char *index_path); +GIT_EXTERN(int) git_index_open(git_index **out, const char *index_path); /** * Create an in-memory index object. @@ -133,10 +133,10 @@ GIT_EXTERN(int) git_index_open(git_index **index, const char *index_path); * * The index must be freed once it's no longer in use. * - * @param index the pointer for the new index + * @param out the pointer for the new index * @return 0 or an error code */ -GIT_EXTERN(int) git_index_new(git_index **index); +GIT_EXTERN(int) git_index_new(git_index **out); /** * Free an existing index object. @@ -201,7 +201,7 @@ GIT_EXTERN(int) git_index_write(git_index *index); * @param tree tree to read * @return 0 or an error code */ -GIT_EXTERN(int) git_index_read_tree(git_index *index, git_tree *tree); +GIT_EXTERN(int) git_index_read_tree(git_index *index, const git_tree *tree); /** * Write the index as a tree @@ -217,12 +217,12 @@ GIT_EXTERN(int) git_index_read_tree(git_index *index, git_tree *tree); * * The index must not contain any file in conflict. * - * @param oid Pointer where to store the OID of the written tree + * @param out Pointer where to store the OID of the written tree * @param index Index to write * @return 0 on success, GIT_EUNMERGED when the index is not clean * or an error code */ -GIT_EXTERN(int) git_index_write_tree(git_oid *oid, git_index *index); +GIT_EXTERN(int) git_index_write_tree(git_oid *out, git_index *index); /** * Write the index as a tree to the given repository @@ -233,13 +233,13 @@ GIT_EXTERN(int) git_index_write_tree(git_oid *oid, git_index *index); * * The index must not contain any file in conflict. * - * @param oid Pointer where to store OID of the the written tree + * @param out Pointer where to store OID of the the written tree * @param index Index to write * @param repo Repository where to write the tree * @return 0 on success, GIT_EUNMERGED when the index is not clean * or an error code */ -GIT_EXTERN(int) git_index_write_tree_to(git_oid *oid, git_index *index, git_repository *repo); +GIT_EXTERN(int) git_index_write_tree_to(git_oid *out, git_index *index, git_repository *repo); /**@}*/ @@ -282,7 +282,7 @@ GIT_EXTERN(void) git_index_clear(git_index *index); * @param n the position of the entry * @return a pointer to the entry; NULL if out of bounds */ -GIT_EXTERN(git_index_entry *) git_index_get_byindex(git_index *index, size_t n); +GIT_EXTERN(const git_index_entry *) git_index_get_byindex(git_index *index, size_t n); /** * Get a pointer to one of the entries in the index @@ -298,7 +298,7 @@ GIT_EXTERN(git_index_entry *) git_index_get_byindex(git_index *index, size_t n); * @param stage stage to search * @return a pointer to the entry; NULL if it was not found */ -GIT_EXTERN(git_index_entry *) git_index_get_bypath(git_index *index, const char *path, int stage); +GIT_EXTERN(const git_index_entry *) git_index_get_bypath(git_index *index, const char *path, int stage); /** * Remove an entry from the index @@ -402,7 +402,8 @@ GIT_EXTERN(int) git_index_find(git_index *index, const char *path); * @param their_entry the entry data for their side of the merge conflict * @return 0 or an error code */ -GIT_EXTERN(int) git_index_conflict_add(git_index *index, +GIT_EXTERN(int) git_index_conflict_add( + git_index *index, const git_index_entry *ancestor_entry, const git_index_entry *our_entry, const git_index_entry *their_entry); @@ -475,7 +476,7 @@ GIT_EXTERN(int) git_index_reuc_find(git_index *index, const char *path); * Get a resolve undo entry from the index. * * The returned entry is read-only and should not be modified - * of freed by the caller. + * or freed by the caller. * * @param index an existing index object * @param path path to search @@ -487,7 +488,7 @@ GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_bypath(git_index *in * Get a resolve undo entry from the index. * * The returned entry is read-only and should not be modified - * of freed by the caller. + * or freed by the caller. * * @param index an existing index object * @param n the position of the entry @@ -496,7 +497,7 @@ GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_bypath(git_index *in GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_byindex(git_index *index, size_t n); /** - * Adds an resolve undo entry for a file based on the given parameters. + * Adds a resolve undo entry for a file based on the given parameters. * * The resolve undo entry contains the OIDs of files that were involved * in a merge conflict after the conflict has been resolved. This allows @@ -510,26 +511,26 @@ GIT_EXTERN(const git_index_reuc_entry *) git_index_reuc_get_byindex(git_index *i * @param index an existing index object * @param path filename to add * @param ancestor_mode mode of the ancestor file - * @param ancestor_oid oid of the ancestor file + * @param ancestor_id oid of the ancestor file * @param our_mode mode of our file - * @param our_oid oid of our file + * @param our_id oid of our file * @param their_mode mode of their file - * @param their_oid oid of their file + * @param their_id oid of their file * @return 0 or an error code */ GIT_EXTERN(int) git_index_reuc_add(git_index *index, const char *path, - int ancestor_mode, git_oid *ancestor_oid, - int our_mode, git_oid *our_oid, - int their_mode, git_oid *their_oid); + int ancestor_mode, git_oid *ancestor_id, + int our_mode, git_oid *our_id, + int their_mode, git_oid *their_id); /** * Remove an resolve undo entry from the index * * @param index an existing index object - * @param position position of the resolve undo entry to remove + * @param n position of the resolve undo entry to remove * @return 0 or an error code */ -GIT_EXTERN(int) git_index_reuc_remove(git_index *index, int position); +GIT_EXTERN(int) git_index_reuc_remove(git_index *index, size_t n); /**@}*/ diff --git a/include/git2/tree.h b/include/git2/tree.h index d20141052..0104ba144 100644 --- a/include/git2/tree.h +++ b/include/git2/tree.h @@ -371,7 +371,7 @@ typedef enum { * @return 0 or an error code */ GIT_EXTERN(int) git_tree_walk( - git_tree *tree, + const git_tree *tree, git_treewalk_mode mode, git_treewalk_cb callback, void *payload); diff --git a/src/attr.c b/src/attr.c index b5757446f..95d63bea8 100644 --- a/src/attr.c +++ b/src/attr.c @@ -295,7 +295,7 @@ static int load_attr_blob_from_index( { int error; git_index *index; - git_index_entry *entry; + const git_index_entry *entry; if ((error = git_repository_index__weakptr(&index, repo)) < 0 || (error = git_index_find(index, relfile)) < 0) diff --git a/src/index.c b/src/index.c index 971fec9fa..fb0061cea 100644 --- a/src/index.c +++ b/src/index.c @@ -494,14 +494,14 @@ unsigned int git_index_entrycount(git_index *index) return (unsigned int)index->entries.length; } -git_index_entry *git_index_get_byindex(git_index *index, size_t n) +const git_index_entry *git_index_get_byindex(git_index *index, size_t n) { assert(index); git_vector_sort(&index->entries); return git_vector_get(&index->entries, n); } -git_index_entry *git_index_get_bypath(git_index *index, const char *path, int stage) +const git_index_entry *git_index_get_bypath(git_index *index, const char *path, int stage) { int pos; @@ -1072,7 +1072,7 @@ const git_index_reuc_entry *git_index_reuc_get_byindex( return git_vector_get(&index->reuc, n); } -int git_index_reuc_remove(git_index *index, int position) +int git_index_reuc_remove(git_index *index, size_t position) { int error; git_index_reuc_entry *reuc; @@ -1599,7 +1599,7 @@ static int read_tree_cb(const char *root, const git_tree_entry *tentry, void *da return 0; } -int git_index_read_tree(git_index *index, git_tree *tree) +int git_index_read_tree(git_index *index, const git_tree *tree) { git_index_clear(index); diff --git a/src/iterator.c b/src/iterator.c index ec3c08ee7..469913d3b 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -337,7 +337,7 @@ static int index_iterator__current( git_iterator *self, const git_index_entry **entry) { index_iterator *ii = (index_iterator *)self; - git_index_entry *ie = git_index_get_byindex(ii->index, ii->current); + const git_index_entry *ie = git_index_get_byindex(ii->index, ii->current); if (ie != NULL && ii->base.end != NULL && diff --git a/src/submodule.c b/src/submodule.c index bc38f1f24..b6e5c96f6 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -733,7 +733,7 @@ int git_submodule_reload(git_submodule *submodule) pos = git_index_find(index, submodule->path); if (pos >= 0) { - git_index_entry *entry = git_index_get_byindex(index, pos); + const git_index_entry *entry = git_index_get_byindex(index, pos); if (S_ISGITLINK(entry->mode)) { if ((error = submodule_load_from_index(repo, entry)) < 0) diff --git a/src/tree.c b/src/tree.c index 252980182..6692263c5 100644 --- a/src/tree.c +++ b/src/tree.c @@ -356,7 +356,7 @@ static unsigned int find_next_dir(const char *dirname, git_index *index, unsigne dirlen = strlen(dirname); for (i = start; i < entries; ++i) { - git_index_entry *entry = git_index_get_byindex(index, i); + const git_index_entry *entry = git_index_get_byindex(index, i); if (strlen(entry->path) < dirlen || memcmp(entry->path, dirname, dirlen) || (dirlen > 0 && entry->path[dirlen] != '/')) { @@ -421,7 +421,7 @@ static int write_tree( * need to keep track of the current position. */ for (i = start; i < entries; ++i) { - git_index_entry *entry = git_index_get_byindex(index, i); + const git_index_entry *entry = git_index_get_byindex(index, i); char *filename, *next_slash; /* @@ -807,7 +807,7 @@ int git_tree_entry_bypath( } static int tree_walk( - git_tree *tree, + const git_tree *tree, git_treewalk_cb callback, git_buf *path, void *payload, @@ -860,7 +860,7 @@ static int tree_walk( } int git_tree_walk( - git_tree *tree, + const git_tree *tree, git_treewalk_mode mode, git_treewalk_cb callback, void *payload) diff --git a/tests-clar/attr/repo.c b/tests-clar/attr/repo.c index b51d5e335..1d2b1e8df 100644 --- a/tests-clar/attr/repo.c +++ b/tests-clar/attr/repo.c @@ -267,7 +267,7 @@ static void add_to_workdir(const char *filename, const char *content) static void assert_proper_normalization(git_index *index, const char *filename, const char *expected_sha) { int index_pos; - git_index_entry *entry; + const git_index_entry *entry; add_to_workdir(filename, CONTENT); cl_git_pass(git_index_add_from_workdir(index, filename)); diff --git a/tests-clar/index/conflicts.c b/tests-clar/index/conflicts.c index 91ff926e5..790e06717 100644 --- a/tests-clar/index/conflicts.c +++ b/tests-clar/index/conflicts.c @@ -132,7 +132,7 @@ void test_index_conflicts__get(void) void test_index_conflicts__remove(void) { - git_index_entry *entry; + const git_index_entry *entry; size_t i; cl_assert(git_index_entrycount(repo_index) == 8); @@ -156,7 +156,7 @@ void test_index_conflicts__remove(void) void test_index_conflicts__moved_to_reuc(void) { - git_index_entry *entry; + const git_index_entry *entry; size_t i; cl_assert(git_index_entrycount(repo_index) == 8); @@ -178,7 +178,7 @@ void test_index_conflicts__moved_to_reuc(void) void test_index_conflicts__remove_all_conflicts(void) { size_t i; - git_index_entry *entry; + const git_index_entry *entry; cl_assert(git_index_entrycount(repo_index) == 8); diff --git a/tests-clar/index/filemodes.c b/tests-clar/index/filemodes.c index 882d41748..a2d5df605 100644 --- a/tests-clar/index/filemodes.c +++ b/tests-clar/index/filemodes.c @@ -25,7 +25,7 @@ void test_index_filemodes__read(void) cl_assert_equal_i(6, git_index_entrycount(index)); for (i = 0; i < 6; ++i) { - git_index_entry *entry = git_index_get_byindex(index, i); + const git_index_entry *entry = git_index_get_byindex(index, i); cl_assert(entry != NULL); cl_assert(((entry->mode & 0100) ? 1 : 0) == expected[i]); } @@ -54,7 +54,7 @@ static void add_and_check_mode( git_index *index, const char *filename, unsigned int expect_mode) { int pos; - git_index_entry *entry; + const git_index_entry *entry; cl_git_pass(git_index_add_from_workdir(index, filename)); diff --git a/tests-clar/index/rename.c b/tests-clar/index/rename.c index e16ec00c1..adbbcfaac 100644 --- a/tests-clar/index/rename.c +++ b/tests-clar/index/rename.c @@ -7,7 +7,7 @@ void test_index_rename__single_file(void) git_index *index; int position; git_oid expected; - git_index_entry *entry; + const git_index_entry *entry; p_mkdir("rename", 0700); diff --git a/tests-clar/index/stage.c b/tests-clar/index/stage.c index 9c9d29660..0f3b29832 100644 --- a/tests-clar/index/stage.c +++ b/tests-clar/index/stage.c @@ -27,7 +27,7 @@ void test_index_stage__cleanup(void) void test_index_stage__add_always_adds_stage_0(void) { int entry_idx; - git_index_entry *entry; + const git_index_entry *entry; cl_git_mkfile("./mergedrepo/new-file.txt", "new-file\n"); @@ -41,7 +41,7 @@ void test_index_stage__add_always_adds_stage_0(void) void test_index_stage__find_gets_first_stage(void) { int entry_idx; - git_index_entry *entry; + const git_index_entry *entry; cl_assert((entry_idx = git_index_find(repo_index, "one.txt")) >= 0); cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL); diff --git a/tests-clar/index/tests.c b/tests-clar/index/tests.c index 3b71b704d..4d613d693 100644 --- a/tests-clar/index/tests.c +++ b/tests-clar/index/tests.c @@ -208,7 +208,7 @@ void test_index_tests__add(void) git_index *index; git_filebuf file = GIT_FILEBUF_INIT; git_repository *repo; - git_index_entry *entry; + const git_index_entry *entry; git_oid id1; /* Intialize a new repository */ diff --git a/tests-clar/object/commit/commitstagedfile.c b/tests-clar/object/commit/commitstagedfile.c index 6dc536e3a..55c70d98e 100644 --- a/tests-clar/object/commit/commitstagedfile.c +++ b/tests-clar/object/commit/commitstagedfile.c @@ -21,7 +21,7 @@ void test_object_commit_commitstagedfile__cleanup(void) void test_object_commit_commitstagedfile__generate_predictable_object_ids(void) { git_index *index; - git_index_entry *entry; + const git_index_entry *entry; git_oid expected_blob_oid, tree_oid, expected_tree_oid, commit_oid, expected_commit_oid; git_signature *signature; git_tree *tree; From 16248ee2d1d67bd386277bca67f04049afef875e Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 21 Nov 2012 11:03:07 -0800 Subject: [PATCH 13/38] Fix up some missing consts in tree & index This fixes some missed places where we can apply const-ness to various public APIs. There are still some index and tree APIs that cannot take const pointers because we sort our `git_vectors` lazily and so we can't reliably bsearch the index and tree content without applying a `git_vector_sort()` first. This also fixes some missed places where size_t can be used and where const can be applied to a couple internal functions. --- include/git2/index.h | 10 ++++++---- include/git2/tree.h | 17 +++++++---------- src/index.c | 38 ++++++++++++++++++++------------------ src/index.h | 2 +- src/iterator.c | 8 +++++--- src/tree.c | 33 +++++++++++++++++++-------------- src/tree.h | 3 ++- src/util.c | 2 +- src/vector.c | 35 ++++++++++++++++++----------------- src/vector.h | 20 ++++++++------------ tests-clar/core/vector.c | 2 +- 11 files changed, 88 insertions(+), 82 deletions(-) diff --git a/include/git2/index.h b/include/git2/index.h index 195e5b13f..9d1fd17d0 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -258,7 +258,7 @@ GIT_EXTERN(int) git_index_write_tree_to(git_oid *out, git_index *index, git_repo * @param index an existing index object * @return integer of count of current entries */ -GIT_EXTERN(unsigned int) git_index_entrycount(git_index *index); +GIT_EXTERN(unsigned int) git_index_entrycount(const git_index *index); /** * Clear the contents (all the entries) of an index object. @@ -282,7 +282,8 @@ GIT_EXTERN(void) git_index_clear(git_index *index); * @param n the position of the entry * @return a pointer to the entry; NULL if out of bounds */ -GIT_EXTERN(const git_index_entry *) git_index_get_byindex(git_index *index, size_t n); +GIT_EXTERN(const git_index_entry *) git_index_get_byindex( + git_index *index, size_t n); /** * Get a pointer to one of the entries in the index @@ -298,7 +299,8 @@ GIT_EXTERN(const git_index_entry *) git_index_get_byindex(git_index *index, size * @param stage stage to search * @return a pointer to the entry; NULL if it was not found */ -GIT_EXTERN(const git_index_entry *) git_index_get_bypath(git_index *index, const char *path, int stage); +GIT_EXTERN(const git_index_entry *) git_index_get_bypath( + git_index *index, const char *path, int stage); /** * Remove an entry from the index @@ -443,7 +445,7 @@ GIT_EXTERN(void) git_index_conflict_cleanup(git_index *index); * * @return 1 if at least one conflict is found, 0 otherwise. */ -GIT_EXTERN(int) git_index_has_conflicts(git_index *index); +GIT_EXTERN(int) git_index_has_conflicts(const git_index *index); /**@}*/ diff --git a/include/git2/tree.h b/include/git2/tree.h index 0104ba144..2d3534fab 100644 --- a/include/git2/tree.h +++ b/include/git2/tree.h @@ -127,7 +127,7 @@ GIT_EXTERN(const git_tree_entry *) git_tree_entry_byindex( * @return the tree entry; NULL if not found */ GIT_EXTERN(const git_tree_entry *) git_tree_entry_byoid( - git_tree *tree, const git_oid *oid); + const git_tree *tree, const git_oid *oid); /** * Retrieve a tree entry contained in a tree or in any of its subtrees, @@ -351,18 +351,15 @@ typedef enum { } git_treewalk_mode; /** - * Traverse the entries in a tree and its subtrees in - * post or pre order + * Traverse the entries in a tree and its subtrees in post or pre order. * - * The entries will be traversed in the specified order, - * children subtrees will be automatically loaded as required, - * and the `callback` will be called once per entry with - * the current (relative) root for the entry and the entry - * data itself. + * The entries will be traversed in the specified order, children subtrees + * will be automatically loaded as required, and the `callback` will be + * called once per entry with the current (relative) root for the entry and + * the entry data itself. * * If the callback returns a positive value, the passed entry will be - * skipped on the traversal (in pre mode). A negative value stops the - * walk. + * skipped on the traversal (in pre mode). A negative value stops the walk. * * @param tree The tree to walk * @param mode Traversal mode (pre or post-order) diff --git a/src/index.c b/src/index.c index fb0061cea..86f44ca52 100644 --- a/src/index.c +++ b/src/index.c @@ -298,7 +298,7 @@ static void index_free(git_index *index) { git_index_entry *e; git_index_reuc_entry *reuc; - unsigned int i; + size_t i; git_index_clear(index); git_vector_foreach(&index->entries, i, e) { @@ -488,20 +488,22 @@ int git_index_write_tree_to(git_oid *oid, git_index *index, git_repository *repo return git_tree__write_index(oid, index, repo); } -unsigned int git_index_entrycount(git_index *index) +unsigned int git_index_entrycount(const git_index *index) { assert(index); return (unsigned int)index->entries.length; } -const git_index_entry *git_index_get_byindex(git_index *index, size_t n) +const git_index_entry *git_index_get_byindex( + git_index *index, size_t n) { assert(index); git_vector_sort(&index->entries); return git_vector_get(&index->entries, n); } -const git_index_entry *git_index_get_bypath(git_index *index, const char *path, int stage) +const git_index_entry *git_index_get_bypath( + git_index *index, const char *path, int stage) { int pos; @@ -810,13 +812,15 @@ int git_index_find(git_index *index, const char *path) assert(index && path); - if ((pos = git_vector_bsearch2(&index->entries, index->entries_search_path, path)) < 0) + if ((pos = git_vector_bsearch2( + &index->entries, index->entries_search_path, path)) < 0) return pos; /* Since our binary search only looked at path, we may be in the - * middle of a list of stages. */ + * middle of a list of stages. + */ while (pos > 0) { - git_index_entry *prev = git_vector_get(&index->entries, pos-1); + const git_index_entry *prev = git_vector_get(&index->entries, pos-1); if (index->entries_cmp_path(prev->path, path) != 0) break; @@ -827,10 +831,10 @@ int git_index_find(git_index *index, const char *path) return pos; } -unsigned int git_index__prefix_position(git_index *index, const char *path) +size_t git_index__prefix_position(git_index *index, const char *path) { struct entry_srch_key srch_key; - unsigned int pos; + size_t pos; srch_key.path = path; srch_key.stage = 0; @@ -961,7 +965,7 @@ int git_index_conflict_remove(git_index *index, const char *path) return error; } -static int index_conflicts_match(git_vector *v, size_t idx) +static int index_conflicts_match(const git_vector *v, size_t idx) { git_index_entry *entry = git_vector_get(v, idx); @@ -979,9 +983,9 @@ void git_index_conflict_cleanup(git_index *index) git_vector_remove_matching(&index->entries, index_conflicts_match); } -int git_index_has_conflicts(git_index *index) +int git_index_has_conflicts(const git_index *index) { - unsigned int i; + size_t i; git_index_entry *entry; assert(index); @@ -1361,7 +1365,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size) static int is_index_extended(git_index *index) { - unsigned int i, extended; + size_t i, extended; git_index_entry *entry; extended = 0; @@ -1374,7 +1378,7 @@ static int is_index_extended(git_index *index) } } - return extended; + return (int)extended; } static int write_disk_entry(git_filebuf *file, git_index_entry *entry) @@ -1440,7 +1444,7 @@ static int write_disk_entry(git_filebuf *file, git_index_entry *entry) static int write_entries(git_index *index, git_filebuf *file) { int error = 0; - unsigned int i; + size_t i; git_vector case_sorted; git_index_entry *entry; git_vector *out = &index->entries; @@ -1506,7 +1510,7 @@ static int write_reuc_extension(git_index *index, git_filebuf *file) git_vector *out = &index->reuc; git_index_reuc_entry *reuc; struct index_extension extension; - unsigned int i; + size_t i; int error = 0; git_vector_foreach(out, i, reuc) { @@ -1529,9 +1533,7 @@ done: static int write_index(git_index *index, git_filebuf *file) { git_oid hash_final; - struct index_header header; - int is_extended; assert(index && file); diff --git a/src/index.h b/src/index.h index f0dcd64d5..05123b580 100644 --- a/src/index.h +++ b/src/index.h @@ -43,7 +43,7 @@ struct git_index { extern void git_index_entry__init_from_stat(git_index_entry *entry, struct stat *st); -extern unsigned int git_index__prefix_position(git_index *index, const char *path); +extern size_t git_index__prefix_position(git_index *index, const char *path); extern int git_index_entry__cmp(const void *a, const void *b); extern int git_index_entry__cmp_icase(const void *a, const void *b); diff --git a/src/iterator.c b/src/iterator.c index 469913d3b..a68a0050b 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -434,7 +434,7 @@ typedef struct workdir_iterator_frame workdir_iterator_frame; struct workdir_iterator_frame { workdir_iterator_frame *next; git_vector entries; - unsigned int index; + size_t index; char *start; }; @@ -761,7 +761,8 @@ static int spoolandsort_iterator__current( spoolandsort_iterator *si = (spoolandsort_iterator *)self; if (si->position < si->entries.length) - *entry = (const git_index_entry *)git_vector_get_const(&si->entries, si->position); + *entry = (const git_index_entry *)git_vector_get( + &si->entries, si->position); else *entry = NULL; @@ -781,7 +782,8 @@ static int spoolandsort_iterator__advance( spoolandsort_iterator *si = (spoolandsort_iterator *)self; if (si->position < si->entries.length) - *entry = (const git_index_entry *)git_vector_get_const(&si->entries, ++si->position); + *entry = (const git_index_entry *)git_vector_get( + &si->entries, ++si->position); else *entry = NULL; diff --git a/src/tree.c b/src/tree.c index 6692263c5..177ccb98d 100644 --- a/src/tree.c +++ b/src/tree.c @@ -98,11 +98,11 @@ static int homing_search_cmp(const void *key, const void *array_member) * ambiguous because of folder vs file sorting, we look linearly * around the area for our target file. */ -static int tree_key_search(git_vector *entries, const char *filename, size_t filename_len) +static int tree_key_search( + git_vector *entries, const char *filename, size_t filename_len) { struct tree_key_search ksearch; const git_tree_entry *entry; - int homing, i; ksearch.filename = filename; @@ -226,7 +226,8 @@ int git_tree_entry_to_object( return git_object_lookup(object_out, repo, &entry->oid, GIT_OBJ_ANY); } -static git_tree_entry *entry_fromname(git_tree *tree, const char *name, size_t name_len) +static const git_tree_entry *entry_fromname( + git_tree *tree, const char *name, size_t name_len) { int idx = tree_key_search(&tree->entries, name, name_len); if (idx < 0) @@ -235,22 +236,25 @@ static git_tree_entry *entry_fromname(git_tree *tree, const char *name, size_t n return git_vector_get(&tree->entries, idx); } -const git_tree_entry *git_tree_entry_byname(git_tree *tree, const char *filename) +const git_tree_entry *git_tree_entry_byname( + git_tree *tree, const char *filename) { assert(tree && filename); return entry_fromname(tree, filename, strlen(filename)); } -const git_tree_entry *git_tree_entry_byindex(git_tree *tree, size_t idx) +const git_tree_entry *git_tree_entry_byindex( + git_tree *tree, size_t idx) { assert(tree); return git_vector_get(&tree->entries, idx); } -const git_tree_entry *git_tree_entry_byoid(git_tree *tree, const git_oid *oid) +const git_tree_entry *git_tree_entry_byoid( + const git_tree *tree, const git_oid *oid) { - unsigned int i; - git_tree_entry *e; + size_t i; + const git_tree_entry *e; assert(tree); @@ -266,7 +270,7 @@ int git_tree__prefix_position(git_tree *tree, const char *path) { git_vector *entries = &tree->entries; struct tree_key_search ksearch; - unsigned int at_pos; + size_t at_pos; ksearch.filename = path; ksearch.filename_len = strlen(path); @@ -286,7 +290,7 @@ int git_tree__prefix_position(git_tree *tree, const char *path) break; } - return at_pos; + return (int)at_pos; } size_t git_tree_entrycount(const git_tree *tree) @@ -422,7 +426,7 @@ static int write_tree( */ for (i = start; i < entries; ++i) { const git_index_entry *entry = git_index_get_byindex(index, i); - char *filename, *next_slash; + const char *filename, *next_slash; /* * If we've left our (sub)tree, exit the loop and return. The @@ -497,7 +501,8 @@ on_error: return -1; } -int git_tree__write_index(git_oid *oid, git_index *index, git_repository *repo) +int git_tree__write_index( + git_oid *oid, git_index *index, git_repository *repo) { int ret; @@ -814,10 +819,10 @@ static int tree_walk( bool preorder) { int error = 0; - unsigned int i; + size_t i; for (i = 0; i < tree->entries.length; ++i) { - git_tree_entry *entry = tree->entries.contents[i]; + const git_tree_entry *entry = tree->entries.contents[i]; if (preorder) { error = callback(path->ptr, entry, payload); diff --git a/src/tree.h b/src/tree.h index b67c55202..e0bcd6acf 100644 --- a/src/tree.h +++ b/src/tree.h @@ -51,7 +51,8 @@ int git_tree__prefix_position(git_tree *tree, const char *prefix); /** * Write a tree to the given repository */ -int git_tree__write_index(git_oid *oid, git_index *index, git_repository *repo); +int git_tree__write_index( + git_oid *oid, git_index *index, git_repository *repo); /** * Obsolete mode kept for compatibility reasons diff --git a/src/util.c b/src/util.c index 3a08d4554..9813eb694 100644 --- a/src/util.c +++ b/src/util.c @@ -447,7 +447,7 @@ int git__bsearch( /** * A strcmp wrapper - * + * * We don't want direct pointers to the CRT on Windows, we may * get stdcall conflicts. */ diff --git a/src/vector.c b/src/vector.c index 4763792f5..c758583b6 100644 --- a/src/vector.c +++ b/src/vector.c @@ -9,14 +9,14 @@ #include "repository.h" #include "vector.h" -static const double resize_factor = 1.75; -static const unsigned int minimum_size = 8; +static const double git_vector_resize_factor = 1.75; +static const size_t git_vector_minimum_size = 8; static int resize_vector(git_vector *v) { - v->_alloc_size = ((unsigned int)(v->_alloc_size * resize_factor)) + 1; - if (v->_alloc_size < minimum_size) - v->_alloc_size = minimum_size; + v->_alloc_size = (size_t)(v->_alloc_size * git_vector_resize_factor) + 1; + if (v->_alloc_size < git_vector_minimum_size) + v->_alloc_size = git_vector_minimum_size; v->contents = git__realloc(v->contents, v->_alloc_size * sizeof(void *)); GITERR_CHECK_ALLOC(v->contents); @@ -24,7 +24,7 @@ static int resize_vector(git_vector *v) return 0; } -int git_vector_dup(git_vector *v, git_vector *src, git_vector_cmp cmp) +int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp) { assert(v && src); @@ -58,7 +58,7 @@ int git_vector_init(git_vector *v, size_t initial_size, git_vector_cmp cmp) memset(v, 0x0, sizeof(git_vector)); if (initial_size == 0) - initial_size = minimum_size; + initial_size = git_vector_minimum_size; v->_alloc_size = initial_size; v->_cmp = cmp; @@ -133,7 +133,7 @@ void git_vector_sort(git_vector *v) } int git_vector_bsearch3( - unsigned int *at_pos, + size_t *at_pos, git_vector *v, git_vector_cmp key_lookup, const void *key) @@ -151,15 +151,15 @@ int git_vector_bsearch3( rval = git__bsearch(v->contents, v->length, key, key_lookup, &pos); if (at_pos != NULL) - *at_pos = (unsigned int)pos; + *at_pos = pos; return (rval >= 0) ? (int)pos : GIT_ENOTFOUND; } int git_vector_search2( - git_vector *v, git_vector_cmp key_lookup, const void *key) + const git_vector *v, git_vector_cmp key_lookup, const void *key) { - unsigned int i; + size_t i; assert(v && key && key_lookup); @@ -176,14 +176,14 @@ static int strict_comparison(const void *a, const void *b) return (a == b) ? 0 : -1; } -int git_vector_search(git_vector *v, const void *entry) +int git_vector_search(const git_vector *v, const void *entry) { return git_vector_search2(v, v->_cmp ? v->_cmp : strict_comparison, entry); } -int git_vector_remove(git_vector *v, unsigned int idx) +int git_vector_remove(git_vector *v, size_t idx) { - unsigned int i; + size_t i; assert(v); @@ -206,7 +206,7 @@ void git_vector_pop(git_vector *v) void git_vector_uniq(git_vector *v) { git_vector_cmp cmp; - unsigned int i, j; + size_t i, j; if (v->length <= 1) return; @@ -223,9 +223,10 @@ void git_vector_uniq(git_vector *v) v->length -= j - i - 1; } -void git_vector_remove_matching(git_vector *v, int (*match)(git_vector *v, size_t idx)) +void git_vector_remove_matching( + git_vector *v, int (*match)(const git_vector *v, size_t idx)) { - unsigned int i, j; + size_t i, j; for (i = 0, j = 0; j < v->length; ++j) { v->contents[i] = v->contents[j]; diff --git a/src/vector.h b/src/vector.h index 46129f17b..15356ef16 100644 --- a/src/vector.h +++ b/src/vector.h @@ -24,23 +24,23 @@ typedef struct git_vector { int git_vector_init(git_vector *v, size_t initial_size, git_vector_cmp cmp); void git_vector_free(git_vector *v); void git_vector_clear(git_vector *v); -int git_vector_dup(git_vector *v, git_vector *src, git_vector_cmp cmp); +int git_vector_dup(git_vector *v, const git_vector *src, git_vector_cmp cmp); void git_vector_swap(git_vector *a, git_vector *b); void git_vector_sort(git_vector *v); /** Linear search for matching entry using internal comparison function */ -int git_vector_search(git_vector *v, const void *entry); +int git_vector_search(const git_vector *v, const void *entry); /** Linear search for matching entry using explicit comparison function */ -int git_vector_search2(git_vector *v, git_vector_cmp cmp, const void *key); +int git_vector_search2(const git_vector *v, git_vector_cmp cmp, const void *key); /** * Binary search for matching entry using explicit comparison function that * returns position where item would go if not found. */ int git_vector_bsearch3( - unsigned int *at_pos, git_vector *v, git_vector_cmp cmp, const void *key); + size_t *at_pos, git_vector *v, git_vector_cmp cmp, const void *key); /** Binary search for matching entry using internal comparison function */ GIT_INLINE(int) git_vector_bsearch(git_vector *v, const void *key) @@ -60,14 +60,9 @@ GIT_INLINE(void *) git_vector_get(const git_vector *v, size_t position) return (position < v->length) ? v->contents[position] : NULL; } -GIT_INLINE(const void *) git_vector_get_const(const git_vector *v, size_t position) -{ - return (position < v->length) ? v->contents[position] : NULL; -} - #define GIT_VECTOR_GET(V,I) ((I) < (V)->length ? (V)->contents[(I)] : NULL) -GIT_INLINE(void *) git_vector_last(git_vector *v) +GIT_INLINE(void *) git_vector_last(const git_vector *v) { return (v->length > 0) ? git_vector_get(v, v->length - 1) : NULL; } @@ -81,10 +76,11 @@ GIT_INLINE(void *) git_vector_last(git_vector *v) int git_vector_insert(git_vector *v, void *element); int git_vector_insert_sorted(git_vector *v, void *element, int (*on_dup)(void **old, void *new)); -int git_vector_remove(git_vector *v, unsigned int idx); +int git_vector_remove(git_vector *v, size_t idx); void git_vector_pop(git_vector *v); void git_vector_uniq(git_vector *v); -void git_vector_remove_matching(git_vector *v, int (*match)(git_vector *v, size_t idx)); +void git_vector_remove_matching( + git_vector *v, int (*match)(const git_vector *v, size_t idx)); int git_vector_resize_to(git_vector *v, size_t new_length); int git_vector_set(void **old, git_vector *v, size_t position, void *value); diff --git a/tests-clar/core/vector.c b/tests-clar/core/vector.c index b165905ae..c9e43a149 100644 --- a/tests-clar/core/vector.c +++ b/tests-clar/core/vector.c @@ -190,7 +190,7 @@ void test_core_vector__5(void) git_vector_free(&x); } -static int remove_ones(git_vector *v, size_t idx) +static int remove_ones(const git_vector *v, size_t idx) { return (git_vector_get(v, idx) == (void *)0x001); } From 9daf240053dbe843ed925ccb713edad4a4ddff9e Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 21 Nov 2012 11:12:33 -0800 Subject: [PATCH 14/38] Fixing up some comments in strarray.h --- include/git2/strarray.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/include/git2/strarray.h b/include/git2/strarray.h index f6092fa9c..030567978 100644 --- a/include/git2/strarray.h +++ b/include/git2/strarray.h @@ -28,21 +28,28 @@ struct _git_strarray { /** * Close a string array object * - * This method must always be called once a git_strarray is no - * longer needed, otherwise memory will leak. + * This method should be called on `git_strarray` objects where the strings + * array is allocated and contains allocated strings, such as what you + * would get from `git_strarray_copy()`. Not doing so, will result in a + * memory leak. * - * @param array array to close + * This does not free the `git_strarray` itself, since the library will + * never allocate that object directly itself (it is more commonly embedded + * inside another struct or created on the stack). + * + * @param array git_strarray from which to free string data */ GIT_EXTERN(void) git_strarray_free(git_strarray *array); /** * Copy a string array object from source to target. - * - * Note: target is overwritten and hence should be empty, + * + * Note: target is overwritten and hence should be empty, * otherwise its contents are leaked. * * @param tgt target * @param src source + * @return 0 on success, < 0 on allocation failure */ GIT_EXTERN(int) git_strarray_copy(git_strarray *tgt, const git_strarray *src); @@ -51,4 +58,4 @@ GIT_EXTERN(int) git_strarray_copy(git_strarray *tgt, const git_strarray *src); GIT_END_DECL #endif - + From d574de0e6ef05c5de89810b5460bc201ddc513de Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 21 Nov 2012 11:53:54 -0800 Subject: [PATCH 15/38] API updates for status.h --- include/git2/status.h | 21 +++++++++++++++++---- src/status.c | 6 +++--- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/include/git2/status.h b/include/git2/status.h index 8c59d768d..c6926f343 100644 --- a/include/git2/status.h +++ b/include/git2/status.h @@ -46,6 +46,18 @@ typedef enum { GIT_STATUS_IGNORED = (1u << 14), } git_status_t; +/** + * Function pointer to receive status on individual files + * + * `path` is the relative path to the file from the root of the repository. + * + * `status_flags` is a combination of `git_status_t` values that apply. + * + * `payload` is the value you passed to the foreach function as payload. + */ +typedef int (*git_status_cb)( + const char *path, unsigned int status_flags, void *payload); + /** * Gather file statuses and run a callback for each one. * @@ -63,7 +75,7 @@ typedef enum { */ GIT_EXTERN(int) git_status_foreach( git_repository *repo, - int (*callback)(const char *, unsigned int, void *), + git_status_cb callback, void *payload); /** @@ -146,9 +158,10 @@ typedef enum { * `GIT_STATUS_OPT_DISABLE_PATHSPEC_MATCH` is specified in the flags. */ typedef struct { + unsigned int version; git_status_show_t show; - unsigned int flags; - git_strarray pathspec; + unsigned int flags; + git_strarray pathspec; } git_status_options; /** @@ -168,7 +181,7 @@ typedef struct { GIT_EXTERN(int) git_status_foreach_ext( git_repository *repo, const git_status_options *opts, - int (*callback)(const char *, unsigned int, void *), + git_status_cb callback, void *payload); /** diff --git a/src/status.c b/src/status.c index 468417249..c7dea2c71 100644 --- a/src/status.c +++ b/src/status.c @@ -78,7 +78,7 @@ static unsigned int workdir_delta2status(git_delta_t workdir_status) } typedef struct { - int (*cb)(const char *, unsigned int, void *); + git_status_cb cb; void *payload; } status_user_callback; @@ -104,7 +104,7 @@ static int status_invoke_cb( int git_status_foreach_ext( git_repository *repo, const git_status_options *opts, - int (*cb)(const char *, unsigned int, void *), + git_status_cb cb, void *payload) { int err = 0; @@ -178,7 +178,7 @@ cleanup: int git_status_foreach( git_repository *repo, - int (*callback)(const char *, unsigned int, void *), + git_status_cb callback, void *payload) { git_status_options opts; From 4604a65460b42ee4b3fead03dbb92197d583cc65 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 21 Nov 2012 11:57:06 -0800 Subject: [PATCH 16/38] update internal index API to avoid cast --- src/index.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.c b/src/index.c index 86f44ca52..ef644a618 100644 --- a/src/index.c +++ b/src/index.c @@ -94,7 +94,7 @@ static size_t read_entry(git_index_entry *dest, const void *buffer, size_t buffe static int read_header(struct index_header *dest, const void *buffer); static int parse_index(git_index *index, const char *buffer, size_t buffer_size); -static int is_index_extended(git_index *index); +static bool is_index_extended(git_index *index); static int write_index(git_index *index, git_filebuf *file); static int index_find(git_index *index, const char *path, int stage); @@ -1363,7 +1363,7 @@ static int parse_index(git_index *index, const char *buffer, size_t buffer_size) return 0; } -static int is_index_extended(git_index *index) +static bool is_index_extended(git_index *index) { size_t i, extended; git_index_entry *entry; @@ -1378,7 +1378,7 @@ static int is_index_extended(git_index *index) } } - return (int)extended; + return (extended > 0); } static int write_disk_entry(git_filebuf *file, git_index_entry *entry) @@ -1534,7 +1534,7 @@ static int write_index(git_index *index, git_filebuf *file) { git_oid hash_final; struct index_header header; - int is_extended; + bool is_extended; assert(index && file); From a8122b5d4a179456b1a1d9af8d09313e22bfab8d Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Wed, 21 Nov 2012 15:39:03 -0800 Subject: [PATCH 17/38] Fix warnings on Win64 build --- include/git2/index.h | 2 +- src/delta.c | 21 ++++++------ src/delta.h | 36 +++++++++++---------- src/diff_output.c | 14 +++++--- src/hash/hash_win32.c | 4 +-- src/index.c | 21 ++++++------ src/iterator.c | 2 +- src/pack-objects.c | 25 ++++++++------- src/reflog.c | 23 +++++++------ src/revparse.c | 39 +++++++++++------------ src/stash.c | 2 +- src/transports/cred.c | 6 ++-- src/transports/smart.c | 2 +- src/transports/smart.h | 2 +- src/transports/smart_protocol.c | 10 +++--- src/transports/winhttp.c | 2 +- src/tree.c | 18 ++++------- src/vector.c | 2 +- src/win32/posix_w32.c | 6 ++-- tests-clar/diff/patch.c | 2 +- tests-clar/index/conflicts.c | 2 +- tests-clar/index/filemodes.c | 2 +- tests-clar/index/inmemory.c | 2 +- tests-clar/index/tests.c | 8 ++--- tests-clar/network/fetch.c | 4 +-- tests-clar/network/fetchlocal.c | 6 ++-- tests-clar/object/blob/filter.c | 4 +-- tests-clar/object/tree/duplicateentries.c | 2 +- tests-clar/refs/reflog/drop.c | 22 ++++++------- tests-clar/refs/reflog/reflog.c | 6 ++-- tests-clar/stash/drop.c | 6 ++-- tests-clar/status/worktree.c | 2 +- 32 files changed, 158 insertions(+), 147 deletions(-) diff --git a/include/git2/index.h b/include/git2/index.h index 9d1fd17d0..fa9a19785 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -258,7 +258,7 @@ GIT_EXTERN(int) git_index_write_tree_to(git_oid *out, git_index *index, git_repo * @param index an existing index object * @return integer of count of current entries */ -GIT_EXTERN(unsigned int) git_index_entrycount(const git_index *index); +GIT_EXTERN(size_t) git_index_entrycount(const git_index *index); /** * Clear the contents (all the entries) of an index object. diff --git a/src/delta.c b/src/delta.c index 49f7df017..2514dccaf 100644 --- a/src/delta.c +++ b/src/delta.c @@ -148,7 +148,7 @@ git_delta_create_index(const void *buf, unsigned long bufsize) /* Determine index hash size. Note that indexing skips the first byte to allow for optimizing the Rabin's polynomial initialization in create_delta(). */ - entries = (bufsize - 1) / RABIN_WINDOW; + entries = (unsigned int)(bufsize - 1) / RABIN_WINDOW; if (bufsize >= 0xffffffffUL) { /* * Current delta format can't encode offsets into @@ -317,9 +317,12 @@ unsigned long git_delta_sizeof_index(struct git_delta_index *index) #define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7) void * -git_delta_create(const struct git_delta_index *index, - const void *trg_buf, unsigned long trg_size, - unsigned long *delta_size, unsigned long max_size) +git_delta_create( + const struct git_delta_index *index, + const void *trg_buf, + unsigned long trg_size, + unsigned long *delta_size, + unsigned long max_size) { unsigned int i, outpos, outsize, moff, msize, val; int inscnt; @@ -332,7 +335,7 @@ git_delta_create(const struct git_delta_index *index, outpos = 0; outsize = 8192; if (max_size && outsize >= max_size) - outsize = max_size + MAX_OP_SIZE + 1; + outsize = (unsigned int)(max_size + MAX_OP_SIZE + 1); out = git__malloc(outsize); if (!out) return NULL; @@ -377,19 +380,19 @@ git_delta_create(const struct git_delta_index *index, for (entry = index->hash[i]; entry < index->hash[i+1]; entry++) { const unsigned char *ref = entry->ptr; const unsigned char *src = data; - unsigned int ref_size = ref_top - ref; + unsigned int ref_size = (unsigned int)(ref_top - ref); if (entry->val != val) continue; if (ref_size > (unsigned int)(top - src)) - ref_size = top - src; + ref_size = (unsigned int)(top - src); if (ref_size <= msize) break; while (ref_size-- && *src++ == *ref) ref++; if (msize < (unsigned int)(ref - entry->ptr)) { /* this is our best match so far */ - msize = ref - entry->ptr; - moff = entry->ptr - ref_data; + msize = (unsigned int)(ref - entry->ptr); + moff = (unsigned int)(entry->ptr - ref_data); if (msize >= 4096) /* good enough */ break; } diff --git a/src/delta.h b/src/delta.h index b0b8e4183..4ca327992 100644 --- a/src/delta.h +++ b/src/delta.h @@ -46,11 +46,12 @@ extern unsigned long git_delta_sizeof_index(struct git_delta_index *index); * returned and *delta_size is updated with its size. The returned buffer * must be freed by the caller. */ -extern void * -git_delta_create(const struct git_delta_index *index, - const void *buf, unsigned long bufsize, - unsigned long *delta_size, - unsigned long max_delta_size); +extern void *git_delta_create( + const struct git_delta_index *index, + const void *buf, + unsigned long bufsize, + unsigned long *delta_size, + unsigned long max_delta_size); /* * diff_delta: create a delta from source buffer to target buffer @@ -60,15 +61,16 @@ git_delta_create(const struct git_delta_index *index, * pointer to the buffer with the delta data is returned and *delta_size is * updated with its size. The returned buffer must be freed by the caller. */ -GIT_INLINE(void *) -git_delta(const void *src_buf, unsigned long src_bufsize, - const void *trg_buf, unsigned long trg_bufsize, - unsigned long *delta_size, unsigned long max_delta_size) +GIT_INLINE(void *) git_delta( + const void *src_buf, unsigned long src_bufsize, + const void *trg_buf, unsigned long trg_bufsize, + unsigned long *delta_size, + unsigned long max_delta_size) { struct git_delta_index *index = git_delta_create_index(src_buf, src_bufsize); if (index) { - void *delta = git_delta_create(index, trg_buf, trg_bufsize, - delta_size, max_delta_size); + void *delta = git_delta_create( + index, trg_buf, trg_bufsize, delta_size, max_delta_size); git_delta_free_index(index); return delta; } @@ -82,9 +84,10 @@ git_delta(const void *src_buf, unsigned long src_bufsize, * *trg_bufsize is updated with its size. On failure a NULL pointer is * returned. The returned buffer must be freed by the caller. */ -extern void *git_delta_patch(const void *src_buf, unsigned long src_size, - const void *delta_buf, unsigned long delta_size, - unsigned long *dst_size); +extern void *git_delta_patch( + const void *src_buf, unsigned long src_size, + const void *delta_buf, unsigned long delta_size, + unsigned long *dst_size); /* the smallest possible delta size is 4 bytes */ #define GIT_DELTA_SIZE_MIN 4 @@ -93,9 +96,8 @@ extern void *git_delta_patch(const void *src_buf, unsigned long src_size, * This must be called twice on the delta data buffer, first to get the * expected source buffer size, and again to get the target buffer size. */ -GIT_INLINE(unsigned long) -git_delta_get_hdr_size(const unsigned char **datap, - const unsigned char *top) +GIT_INLINE(unsigned long) git_delta_get_hdr_size( + const unsigned char **datap, const unsigned char *top) { const unsigned char *data = *datap; unsigned long cmd, size = 0; diff --git a/src/diff_output.c b/src/diff_output.c index 804325e47..3d5e03a29 100644 --- a/src/diff_output.c +++ b/src/diff_output.c @@ -262,7 +262,7 @@ static int get_blob_content( return error; map->data = (void *)git_blob_rawcontent(*blob); - map->len = git_blob_rawsize(*blob); + map->len = (size_t)git_blob_rawsize(*blob); return diff_delta_is_binary_by_content(ctxt, delta, file, map); } @@ -1236,14 +1236,18 @@ static void set_data_from_blob( git_blob *blob, git_map *map, git_diff_file *file) { if (blob) { - map->data = (char *)git_blob_rawcontent(blob); - file->size = map->len = git_blob_rawsize(blob); + file->size = git_blob_rawsize(blob); git_oid_cpy(&file->oid, git_object_id((const git_object *)blob)); file->mode = 0644; + + map->len = (size_t)file->size; + map->data = (char *)git_blob_rawcontent(blob); } else { - map->data = ""; - file->size = map->len = 0; + file->size = 0; file->flags |= GIT_DIFF_FILE_NO_DATA; + + map->len = 0; + map->data = ""; } } diff --git a/src/hash/hash_win32.c b/src/hash/hash_win32.c index a89dffa7c..469ce7807 100644 --- a/src/hash/hash_win32.c +++ b/src/hash/hash_win32.c @@ -155,7 +155,7 @@ GIT_INLINE(int) hash_cryptoapi_update(git_hash_ctx *ctx, const void *data, size_ { assert(ctx->ctx.cryptoapi.valid); - if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, (const BYTE *)data, len, 0)) + if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, (const BYTE *)data, (DWORD)len, 0)) return -1; return 0; @@ -219,7 +219,7 @@ GIT_INLINE(int) hash_cng_init(git_hash_ctx *ctx) GIT_INLINE(int) hash_cng_update(git_hash_ctx *ctx, const void *data, size_t len) { - if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, (PBYTE)data, len, 0) < 0) + if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, (PBYTE)data, (ULONG)len, 0) < 0) return -1; return 0; diff --git a/src/index.c b/src/index.c index ef644a618..f3ced9e39 100644 --- a/src/index.c +++ b/src/index.c @@ -488,10 +488,10 @@ int git_index_write_tree_to(git_oid *oid, git_index *index, git_repository *repo return git_tree__write_index(oid, index, repo); } -unsigned int git_index_entrycount(const git_index *index) +size_t git_index_entrycount(const git_index *index) { assert(index); - return (unsigned int)index->entries.length; + return index->entries.length; } const git_index_entry *git_index_get_byindex( @@ -852,7 +852,7 @@ int git_index_conflict_add(git_index *index, const git_index_entry *their_entry) { git_index_entry *entries[3] = { 0 }; - size_t i; + unsigned short i; int ret = 0; assert (index); @@ -890,7 +890,7 @@ int git_index_conflict_get(git_index_entry **ancestor_out, git_index_entry **their_out, git_index *index, const char *path) { - int pos, stage; + int pos, posmax, stage; git_index_entry *conflict_entry; int error = GIT_ENOTFOUND; @@ -903,7 +903,8 @@ int git_index_conflict_get(git_index_entry **ancestor_out, if ((pos = git_index_find(index, path)) < 0) return pos; - while ((unsigned int)pos < git_index_entrycount(index)) { + for (posmax = (int)git_index_entrycount(index); pos < posmax; ++pos) { + conflict_entry = git_vector_get(&index->entries, pos); if (index->entries_cmp_path(conflict_entry->path, path) != 0) @@ -927,8 +928,6 @@ int git_index_conflict_get(git_index_entry **ancestor_out, default: break; }; - - ++pos; } return error; @@ -936,7 +935,7 @@ int git_index_conflict_get(git_index_entry **ancestor_out, int git_index_conflict_remove(git_index *index, const char *path) { - int pos; + int pos, posmax; git_index_entry *conflict_entry; int error = 0; @@ -945,7 +944,9 @@ int git_index_conflict_remove(git_index *index, const char *path) if ((pos = git_index_find(index, path)) < 0) return pos; - while ((unsigned int)pos < git_index_entrycount(index)) { + posmax = (int)git_index_entrycount(index); + + while (pos < posmax) { conflict_entry = git_vector_get(&index->entries, pos); if (index->entries_cmp_path(conflict_entry->path, path) != 0) @@ -1520,7 +1521,7 @@ static int write_reuc_extension(git_index *index, git_filebuf *file) memset(&extension, 0x0, sizeof(struct index_extension)); memcpy(&extension.signature, INDEX_EXT_UNMERGED_SIG, 4); - extension.extension_size = reuc_buf.size; + extension.extension_size = (uint32_t)reuc_buf.size; error = write_extension(file, &extension, &reuc_buf); diff --git a/src/iterator.c b/src/iterator.c index a68a0050b..6be45a4bb 100644 --- a/src/iterator.c +++ b/src/iterator.c @@ -329,7 +329,7 @@ int git_iterator_for_tree_range( typedef struct { git_iterator base; git_index *index; - unsigned int current; + size_t current; bool free_index; } index_iterator; diff --git a/src/pack-objects.c b/src/pack-objects.c index e2840a745..008d8f288 100644 --- a/src/pack-objects.c +++ b/src/pack-objects.c @@ -229,7 +229,7 @@ static int gen_pack_object_header( } *hdr++ = c; - return hdr - hdr_base; + return (int)(hdr - hdr_base); } static int get_delta(void **out, git_odb *odb, git_pobject *po) @@ -244,9 +244,10 @@ static int get_delta(void **out, git_odb *odb, git_pobject *po) git_odb_read(&trg, odb, &po->id) < 0) goto on_error; - delta_buf = git_delta(git_odb_object_data(src), git_odb_object_size(src), - git_odb_object_data(trg), git_odb_object_size(trg), - &delta_size, 0); + delta_buf = git_delta( + git_odb_object_data(src), (unsigned long)git_odb_object_size(src), + git_odb_object_data(trg), (unsigned long)git_odb_object_size(trg), + &delta_size, 0); if (!delta_buf || delta_size != po->delta_size) { giterr_set(GITERR_INVALID, "Delta size changed"); @@ -287,7 +288,7 @@ static int write_object(git_buf *buf, git_packbuilder *pb, git_pobject *po) goto on_error; data = (void *)git_odb_object_data(obj); - size = git_odb_object_size(obj); + size = (unsigned long)git_odb_object_size(obj); type = git_odb_object_type(obj); } @@ -315,7 +316,7 @@ static int write_object(git_buf *buf, git_packbuilder *pb, git_pobject *po) if (po->delta) git__free(data); data = zbuf.ptr; - size = zbuf.size; + size = (unsigned long)zbuf.size; } if (git_buf_put(buf, data, size) < 0 || @@ -707,7 +708,7 @@ static int try_delta(git_packbuilder *pb, struct unpacked *trg, return 0; /* Now some size filtering heuristics. */ - trg_size = trg_object->size; + trg_size = (unsigned long)trg_object->size; if (!trg_object->delta) { max_size = trg_size/2 - 20; ref_depth = 1; @@ -721,7 +722,7 @@ static int try_delta(git_packbuilder *pb, struct unpacked *trg, if (max_size == 0) return 0; - src_size = src_object->size; + src_size = (unsigned long)src_object->size; sizediff = src_size < trg_size ? trg_size - src_size : 0; if (sizediff >= max_size) return 0; @@ -733,7 +734,7 @@ static int try_delta(git_packbuilder *pb, struct unpacked *trg, if (git_odb_read(&obj, pb->odb, &trg_object->id) < 0) return -1; - sz = git_odb_object_size(obj); + sz = (unsigned long)git_odb_object_size(obj); trg->data = git__malloc(sz); GITERR_CHECK_ALLOC(trg->data); memcpy(trg->data, git_odb_object_data(obj), sz); @@ -752,7 +753,7 @@ static int try_delta(git_packbuilder *pb, struct unpacked *trg, if (git_odb_read(&obj, pb->odb, &src_object->id) < 0) return -1; - sz = git_odb_object_size(obj); + sz = (unsigned long)git_odb_object_size(obj); src->data = git__malloc(sz); GITERR_CHECK_ALLOC(src->data); memcpy(src->data, git_odb_object_data(obj), sz); @@ -835,7 +836,7 @@ static unsigned long free_unpacked(struct unpacked *n) git_delta_free_index(n->index); n->index = NULL; if (n->data) { - freed_mem += n->object->size; + freed_mem += (unsigned long)n->object->size; git__free(n->data); n->data = NULL; } @@ -941,7 +942,7 @@ static int find_deltas(git_packbuilder *pb, git_pobject **list, GITERR_CHECK_ALLOC(po->delta_data); memcpy(po->delta_data, zbuf.ptr, zbuf.size); - po->z_delta_size = zbuf.size; + po->z_delta_size = (unsigned long)zbuf.size; git_buf_clear(&zbuf); git_packbuilder__cache_lock(pb); diff --git a/src/reflog.c b/src/reflog.c index 72a34f695..ac481fb81 100644 --- a/src/reflog.c +++ b/src/reflog.c @@ -275,7 +275,7 @@ int git_reflog_write(git_reflog *reflog) if ((error = git_filebuf_write(&fbuf, log.ptr, log.size)) < 0) goto cleanup; } - + error = git_filebuf_commit(&fbuf, GIT_REFLOG_FILE_MODE); goto success; @@ -411,18 +411,20 @@ size_t git_reflog_entrycount(git_reflog *reflog) return reflog->entries.length; } +GIT_INLINE(size_t) reflog_inverse_index(size_t idx, size_t total) +{ + return (total - 1) - idx; +} + const git_reflog_entry * git_reflog_entry_byindex(git_reflog *reflog, size_t idx) { - int pos; - assert(reflog); - pos = git_reflog_entrycount(reflog) - (idx + 1); - - if (pos < 0) + if (idx >= reflog->entries.length) return NULL; - return git_vector_get(&reflog->entries, pos); + return git_vector_get( + &reflog->entries, reflog_inverse_index(idx, reflog->entries.length)); } const git_oid * git_reflog_entry_id_old(const git_reflog_entry *entry) @@ -454,7 +456,7 @@ int git_reflog_drop( size_t idx, int rewrite_previous_entry) { - unsigned int entrycount; + size_t entrycount; git_reflog_entry *entry, *previous; assert(reflog); @@ -468,7 +470,8 @@ int git_reflog_drop( reflog_entry_free(entry); - if (git_vector_remove(&reflog->entries, entrycount - (idx + 1)) < 0) + if (git_vector_remove( + &reflog->entries, reflog_inverse_index(idx, entrycount)) < 0) return -1; if (!rewrite_previous_entry) @@ -489,7 +492,7 @@ int git_reflog_drop( /* ...clear the oid_old member of the "new" oldest entry */ if (git_oid_fromstr(&entry->oid_old, GIT_OID_HEX_ZERO) < 0) return -1; - + return 0; } diff --git a/src/revparse.c b/src/revparse.c index 79900c4cc..308b92923 100644 --- a/src/revparse.c +++ b/src/revparse.c @@ -161,7 +161,7 @@ static int revparse_lookup_object(git_object **out, git_repository *repo, const static int try_parse_numeric(int *n, const char *curly_braces_content) { - int content; + int32_t content; const char *end_ptr; if (git__strtol32(&content, curly_braces_content, &end_ptr, 10) < 0) @@ -170,16 +170,17 @@ static int try_parse_numeric(int *n, const char *curly_braces_content) if (*end_ptr != '\0') return -1; - *n = content; + *n = (int)content; return 0; } -static int retrieve_previously_checked_out_branch_or_revision(git_object **out, git_reference **base_ref, git_repository *repo, const char *spec, const char *identifier, unsigned int position) +static int retrieve_previously_checked_out_branch_or_revision(git_object **out, git_reference **base_ref, git_repository *repo, const char *spec, const char *identifier, size_t position) { git_reference *ref = NULL; git_reflog *reflog = NULL; regex_t preg; - int numentries, i, cur, error = -1; + int error = -1; + size_t i, numentries, cur; const git_reflog_entry *entry; const char *msg; regmatch_t regexmatches[2]; @@ -204,7 +205,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out, for (i = 0; i < numentries; i++) { entry = git_reflog_entry_byindex(reflog, i); msg = git_reflog_entry_message(entry); - + if (regexec(&preg, msg, 2, regexmatches, 0)) continue; @@ -212,7 +213,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out, if (cur > 0) continue; - + git_buf_put(&buf, msg+regexmatches[1].rm_so, regexmatches[1].rm_eo - regexmatches[1].rm_so); if ((error = disambiguate_refname(base_ref, repo, git_buf_cstr(&buf))) == 0) @@ -225,7 +226,7 @@ static int retrieve_previously_checked_out_branch_or_revision(git_object **out, goto cleanup; } - + error = GIT_ENOTFOUND; cleanup: @@ -236,27 +237,25 @@ cleanup: return error; } -static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, unsigned int identifier) +static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, size_t identifier) { git_reflog *reflog; int error = -1; - unsigned int numentries; + size_t numentries; const git_reflog_entry *entry; bool search_by_pos = (identifier <= 100000000); if (git_reflog_read(&reflog, ref) < 0) return -1; - numentries = git_reflog_entrycount(reflog); + numentries = git_reflog_entrycount(reflog); if (search_by_pos) { if (numentries < identifier + 1) { giterr_set( GITERR_REFERENCE, - "Reflog for '%s' has only %d entries, asked for %d", - git_reference_name(ref), - numentries, - identifier); + "Reflog for '%s' has only "PRIuZ" entries, asked for "PRIuZ, + git_reference_name(ref), numentries, identifier); error = GIT_ENOTFOUND; goto cleanup; @@ -268,14 +267,14 @@ static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, unsigned i goto cleanup; } else { - unsigned int i; + size_t i; git_time commit_time; for (i = 0; i < numentries; i++) { entry = git_reflog_entry_byindex(reflog, i); commit_time = git_reflog_entry_committer(entry)->when; - - if (commit_time.time - identifier > 0) + + if (commit_time.time > (git_time_t)identifier) continue; git_oid_cpy(oid, git_reflog_entry_id_new(entry)); @@ -291,7 +290,7 @@ cleanup: return error; } -static int retrieve_revobject_from_reflog(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, unsigned int position) +static int retrieve_revobject_from_reflog(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, size_t position) { git_reference *ref; git_oid oid; @@ -380,7 +379,7 @@ static int handle_at_syntax(git_object **out, git_reference **ref, const char *s if (git__date_parse(×tamp, curly_braces_content) < 0) goto cleanup; - error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), (unsigned int)timestamp); + error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), (size_t)timestamp); cleanup: git_buf_free(&identifier); @@ -394,7 +393,7 @@ static git_otype parse_obj_type(const char *str) if (!strcmp(str, "tree")) return GIT_OBJ_TREE; - + if (!strcmp(str, "blob")) return GIT_OBJ_BLOB; diff --git a/src/stash.c b/src/stash.c index 2efdd91c5..b16637e59 100644 --- a/src/stash.c +++ b/src/stash.c @@ -56,7 +56,7 @@ static int append_abbreviated_oid(git_buf *out, const git_oid *b_commit) static int append_commit_description(git_buf *out, git_commit* commit) { const char *message; - int pos = 0, len; + size_t pos = 0, len; if (append_abbreviated_oid(out, git_commit_id(commit)) < 0) return -1; diff --git a/src/transports/cred.c b/src/transports/cred.c index 55295372f..e137ca9ac 100644 --- a/src/transports/cred.c +++ b/src/transports/cred.c @@ -11,7 +11,7 @@ static void plaintext_free(struct git_cred *cred) { git_cred_userpass_plaintext *c = (git_cred_userpass_plaintext *)cred; - int pass_len = strlen(c->password); + size_t pass_len = strlen(c->password); git__free(c->username); @@ -19,6 +19,8 @@ static void plaintext_free(struct git_cred *cred) memset(c->password, 0x0, pass_len); git__free(c->password); + memset(c, 0, sizeof(*c)); + git__free(c); } @@ -54,4 +56,4 @@ int git_cred_userpass_plaintext_new( *cred = &c->parent; return 0; -} \ No newline at end of file +} diff --git a/src/transports/smart.c b/src/transports/smart.c index 8f9715a3f..195ea285c 100644 --- a/src/transports/smart.c +++ b/src/transports/smart.c @@ -24,7 +24,7 @@ static int git_smart__recv_cb(gitno_buffer *buf) buf->offset += bytes_read; if (t->packetsize_cb) - t->packetsize_cb(bytes_read, t->packetsize_payload); + t->packetsize_cb((int)bytes_read, t->packetsize_payload); return (int)(buf->offset - old_len); } diff --git a/src/transports/smart.h b/src/transports/smart.h index 046bc89a4..b37c4ba96 100644 --- a/src/transports/smart.h +++ b/src/transports/smart.h @@ -94,7 +94,7 @@ typedef struct transport_smart_caps { include_tag:1; } transport_smart_caps; -typedef void (*packetsize_cb)(int received, void *payload); +typedef void (*packetsize_cb)(size_t received, void *payload); typedef struct { git_transport parent; diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c index 06424cb17..99d34e23b 100644 --- a/src/transports/smart_protocol.c +++ b/src/transports/smart_protocol.c @@ -367,7 +367,7 @@ static int no_sideband(transport_smart *t, struct git_odb_writepack *writepack, return 0; } -struct network_packetsize_payload +struct network_packetsize_payload { git_transfer_progress_callback callback; void *payload; @@ -375,7 +375,7 @@ struct network_packetsize_payload size_t last_fired_bytes; }; -static void network_packetsize(int received, void *payload) +static void network_packetsize(size_t received, void *payload) { struct network_packetsize_payload *npp = (struct network_packetsize_payload*)payload; @@ -384,8 +384,8 @@ static void network_packetsize(int received, void *payload) /* Fire notification if the threshold is reached */ if ((npp->stats->received_bytes - npp->last_fired_bytes) > NETWORK_XFER_THRESHOLD) { - npp->last_fired_bytes = npp->stats->received_bytes; - npp->callback(npp->stats, npp->payload); + npp->last_fired_bytes = npp->stats->received_bytes; + npp->callback(npp->stats, npp->payload); } } @@ -414,7 +414,7 @@ int git_smart__download_pack( /* We might have something in the buffer already from negotiate_fetch */ if (t->buffer.offset > 0) - t->packetsize_cb(t->buffer.offset, t->packetsize_payload); + t->packetsize_cb((int)t->buffer.offset, t->packetsize_payload); } if ((error = git_repository_odb__weakptr(&odb, repo)) < 0 || diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c index df6cd87ec..f3abe8598 100644 --- a/src/transports/winhttp.c +++ b/src/transports/winhttp.c @@ -376,7 +376,7 @@ replay: if (!WinHttpReadData(s->request, (LPVOID)buffer, - buf_size, + (DWORD)buf_size, &dw_bytes_read)) { giterr_set(GITERR_OS, "Failed to read data"); diff --git a/src/tree.c b/src/tree.c index 177ccb98d..b3f5c302d 100644 --- a/src/tree.c +++ b/src/tree.c @@ -353,10 +353,9 @@ int git_tree__parse(git_tree *tree, git_odb_object *obj) return tree_parse_buffer(tree, (char *)obj->raw.data, (char *)obj->raw.data + obj->raw.len); } -static unsigned int find_next_dir(const char *dirname, git_index *index, unsigned int start) +static size_t find_next_dir(const char *dirname, git_index *index, size_t start) { - unsigned int i, entries = git_index_entrycount(index); - size_t dirlen; + size_t dirlen, i, entries = git_index_entrycount(index); dirlen = strlen(dirname); for (i = start; i < entries; ++i) { @@ -399,11 +398,10 @@ static int write_tree( git_repository *repo, git_index *index, const char *dirname, - unsigned int start) + size_t start) { git_treebuilder *bld = NULL; - - unsigned int i, entries = git_index_entrycount(index); + size_t i, entries = git_index_entrycount(index); int error; size_t dirname_len = strlen(dirname); const git_tree_cache *cache; @@ -411,13 +409,11 @@ static int write_tree( 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); + return (int)find_next_dir(dirname, index, start); } - error = git_treebuilder_create(&bld, NULL); - if (bld == NULL) { + if ((error = git_treebuilder_create(&bld, NULL)) < 0 || bld == NULL) return -1; - } /* * This loop is unfortunate, but necessary. The index doesn't have @@ -494,7 +490,7 @@ static int write_tree( goto on_error; git_treebuilder_free(bld); - return i; + return (int)i; on_error: git_treebuilder_free(bld); diff --git a/src/vector.c b/src/vector.c index c758583b6..5d3bc0887 100644 --- a/src/vector.c +++ b/src/vector.c @@ -165,7 +165,7 @@ int git_vector_search2( for (i = 0; i < v->length; ++i) { if (key_lookup(key, v->contents[i]) == 0) - return i; + return (int)i; } return GIT_ENOTFOUND; diff --git a/src/win32/posix_w32.c b/src/win32/posix_w32.c index e301290dc..3a4398bbd 100644 --- a/src/win32/posix_w32.c +++ b/src/win32/posix_w32.c @@ -520,17 +520,17 @@ int p_inet_pton(int af, const char* src, void* dst) struct sockaddr_in6 sin6; struct sockaddr_in sin; } sa; - size_t srcsize; + int srcsize; switch(af) { case AF_INET: sa.sin.sin_family = AF_INET; - srcsize = sizeof (sa.sin); + srcsize = (int)sizeof(sa.sin); break; case AF_INET6: sa.sin6.sin6_family = AF_INET6; - srcsize = sizeof (sa.sin6); + srcsize = (int)sizeof(sa.sin6); break; default: errno = WSAEPFNOSUPPORT; diff --git a/tests-clar/diff/patch.c b/tests-clar/diff/patch.c index 16ed2551b..6a3c5bc39 100644 --- a/tests-clar/diff/patch.c +++ b/tests-clar/diff/patch.c @@ -113,7 +113,7 @@ void test_diff_patch__to_string(void) cl_git_pass(git_diff_tree_to_tree(&diff, g_repo, one, another, NULL)); - cl_assert_equal_i(1, git_diff_num_deltas(diff)); + cl_assert_equal_i(1, (int)git_diff_num_deltas(diff)); cl_git_pass(git_diff_get_patch(&patch, NULL, diff, 0)); diff --git a/tests-clar/index/conflicts.c b/tests-clar/index/conflicts.c index 790e06717..2fbad3e67 100644 --- a/tests-clar/index/conflicts.c +++ b/tests-clar/index/conflicts.c @@ -134,7 +134,7 @@ void test_index_conflicts__remove(void) { const git_index_entry *entry; size_t i; - + cl_assert(git_index_entrycount(repo_index) == 8); cl_git_pass(git_index_conflict_remove(repo_index, "conflicts-one.txt")); diff --git a/tests-clar/index/filemodes.c b/tests-clar/index/filemodes.c index a2d5df605..6140b11ed 100644 --- a/tests-clar/index/filemodes.c +++ b/tests-clar/index/filemodes.c @@ -22,7 +22,7 @@ void test_index_filemodes__read(void) static bool expected[6] = { 0, 1, 0, 1, 0, 1 }; cl_git_pass(git_repository_index(&index, g_repo)); - cl_assert_equal_i(6, git_index_entrycount(index)); + cl_assert_equal_i(6, (int)git_index_entrycount(index)); for (i = 0; i < 6; ++i) { const git_index_entry *entry = git_index_get_byindex(index, i); diff --git a/tests-clar/index/inmemory.c b/tests-clar/index/inmemory.c index c997b965f..a5f72c422 100644 --- a/tests-clar/index/inmemory.c +++ b/tests-clar/index/inmemory.c @@ -5,7 +5,7 @@ void test_index_inmemory__can_create_an_inmemory_index(void) git_index *index; cl_git_pass(git_index_new(&index)); - cl_assert_equal_i(0, git_index_entrycount(index)); + cl_assert_equal_i(0, (int)git_index_entrycount(index)); git_index_free(index); } diff --git a/tests-clar/index/tests.c b/tests-clar/index/tests.c index 4d613d693..30a5a31fa 100644 --- a/tests-clar/index/tests.c +++ b/tests-clar/index/tests.c @@ -1,8 +1,8 @@ #include "clar_libgit2.h" #include "index.h" -static const int index_entry_count = 109; -static const int index_entry_count_2 = 1437; +static const size_t index_entry_count = 109; +static const size_t index_entry_count_2 = 1437; #define TEST_INDEX_PATH cl_fixture("testrepo.git/index") #define TEST_INDEX2_PATH cl_fixture("gitgit.index") #define TEST_INDEXBIG_PATH cl_fixture("big.index") @@ -99,7 +99,7 @@ void test_index_tests__default_test_index(void) cl_git_pass(git_index_open(&index, TEST_INDEX_PATH)); cl_assert(index->on_disk); - cl_assert(git_index_entrycount(index) == (unsigned int)index_entry_count); + cl_assert(git_index_entrycount(index) == index_entry_count); cl_assert(index->entries.sorted); entries = (git_index_entry **)index->entries.contents; @@ -122,7 +122,7 @@ void test_index_tests__gitgit_index(void) cl_git_pass(git_index_open(&index, TEST_INDEX2_PATH)); cl_assert(index->on_disk); - cl_assert(git_index_entrycount(index) == (unsigned int)index_entry_count_2); + cl_assert(git_index_entrycount(index) == index_entry_count_2); cl_assert(index->entries.sorted); cl_assert(index->tree != NULL); diff --git a/tests-clar/network/fetch.c b/tests-clar/network/fetch.c index 9c37d721f..a575b18ca 100644 --- a/tests-clar/network/fetch.c +++ b/tests-clar/network/fetch.c @@ -29,7 +29,7 @@ static int update_tips(const char *refname, const git_oid *a, const git_oid *b, static void progress(const git_transfer_progress *stats, void *payload) { - int *bytes_received = (int*)payload; + size_t *bytes_received = (size_t *)payload; *bytes_received = stats->received_bytes; } @@ -37,7 +37,7 @@ static void do_fetch(const char *url, int flag, int n) { git_remote *remote; git_remote_callbacks callbacks; - int bytes_received = 0; + size_t bytes_received = 0; memset(&callbacks, 0, sizeof(git_remote_callbacks)); callbacks.update_tips = update_tips; diff --git a/tests-clar/network/fetchlocal.c b/tests-clar/network/fetchlocal.c index bff0bb06b..a0369d040 100644 --- a/tests-clar/network/fetchlocal.c +++ b/tests-clar/network/fetchlocal.c @@ -27,7 +27,7 @@ void test_network_fetchlocal__complete(void) cl_git_pass(git_remote_update_tips(origin)); cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL)); - cl_assert_equal_i(18, refnames.count); + cl_assert_equal_i(18, (int)refnames.count); cl_assert(callcount > 0); git_strarray_free(&refnames); @@ -44,7 +44,7 @@ void test_network_fetchlocal__partial(void) const char *url; cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL)); - cl_assert_equal_i(1, refnames.count); + cl_assert_equal_i(1, (int)refnames.count); url = cl_git_fixture_url("testrepo.git"); cl_git_pass(git_remote_add(&origin, repo, GIT_REMOTE_ORIGIN, url)); @@ -55,7 +55,7 @@ void test_network_fetchlocal__partial(void) git_strarray_free(&refnames); cl_git_pass(git_reference_list(&refnames, repo, GIT_REF_LISTALL)); - cl_assert_equal_i(19, refnames.count); /* 18 remote + 1 local */ + cl_assert_equal_i(19, (int)refnames.count); /* 18 remote + 1 local */ cl_assert(callcount > 0); git_strarray_free(&refnames); diff --git a/tests-clar/object/blob/filter.c b/tests-clar/object/blob/filter.c index 4b058049a..785489849 100644 --- a/tests-clar/object/blob/filter.c +++ b/tests-clar/object/blob/filter.c @@ -43,7 +43,7 @@ void test_object_blob_filter__initialize(void) for (i = 0; i < NUM_TEST_OBJECTS; i++) { size_t len = (g_len[i] < 0) ? strlen(g_raw[i]) : (size_t)g_len[i]; - g_len[i] = (int)len; + g_len[i] = (git_off_t)len; cl_git_pass( git_blob_create_frombuffer(&g_oids[i], g_repo, g_raw[i], len) @@ -66,7 +66,7 @@ void test_object_blob_filter__unfiltered(void) for (i = 0; i < NUM_TEST_OBJECTS; i++) { cl_git_pass(git_blob_lookup(&blob, g_repo, &g_oids[i])); cl_assert(g_len[i] == git_blob_rawsize(blob)); - cl_assert(memcmp(git_blob_rawcontent(blob), g_raw[i], g_len[i]) == 0); + cl_assert(memcmp(git_blob_rawcontent(blob), g_raw[i], (size_t)g_len[i]) == 0); git_blob_free(blob); } } diff --git a/tests-clar/object/tree/duplicateentries.c b/tests-clar/object/tree/duplicateentries.c index 3052e2926..9262f9a1a 100644 --- a/tests-clar/object/tree/duplicateentries.c +++ b/tests-clar/object/tree/duplicateentries.c @@ -42,7 +42,7 @@ static void tree_checker( git_oid oid; cl_git_pass(git_tree_lookup(&tree, _repo, tid)); - cl_assert_equal_i(1, git_tree_entrycount(tree)); + cl_assert_equal_i(1, (int)git_tree_entrycount(tree)); entry = git_tree_entry_byindex(tree, 0); cl_git_pass(git_oid_fromstr(&oid, expected_sha)); diff --git a/tests-clar/refs/reflog/drop.c b/tests-clar/refs/reflog/drop.c index d805d1ee0..21cc847bf 100644 --- a/tests-clar/refs/reflog/drop.c +++ b/tests-clar/refs/reflog/drop.c @@ -4,15 +4,15 @@ static git_repository *g_repo; static git_reflog *g_reflog; -static unsigned int entrycount; +static size_t entrycount; void test_refs_reflog_drop__initialize(void) { git_reference *ref; - + g_repo = cl_git_sandbox_init("testrepo.git"); cl_git_pass(git_reference_lookup(&ref, g_repo, "HEAD")); - + git_reflog_read(&g_reflog, ref); entrycount = git_reflog_entrycount(g_reflog); @@ -31,7 +31,7 @@ void test_refs_reflog_drop__dropping_a_non_exisiting_entry_from_the_log_returns_ { cl_assert_equal_i(GIT_ENOTFOUND, git_reflog_drop(g_reflog, entrycount, 0)); - cl_assert_equal_i(entrycount, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount, git_reflog_entrycount(g_reflog)); } void test_refs_reflog_drop__can_drop_an_entry(void) @@ -39,7 +39,7 @@ void test_refs_reflog_drop__can_drop_an_entry(void) cl_assert(entrycount > 4); cl_git_pass(git_reflog_drop(g_reflog, 2, 0)); - cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); } void test_refs_reflog_drop__can_drop_an_entry_and_rewrite_the_log_history(void) @@ -57,7 +57,7 @@ void test_refs_reflog_drop__can_drop_an_entry_and_rewrite_the_log_history(void) cl_git_pass(git_reflog_drop(g_reflog, 1, 1)); - cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); after_current = git_reflog_entry_byindex(g_reflog, 0); @@ -72,7 +72,7 @@ void test_refs_reflog_drop__can_drop_the_oldest_entry(void) cl_assert(entrycount > 2); cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 0)); - cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); entry = git_reflog_entry_byindex(g_reflog, entrycount - 2); cl_assert(git_oid_streq(&entry->oid_old, GIT_OID_HEX_ZERO) != 0); @@ -85,7 +85,7 @@ void test_refs_reflog_drop__can_drop_the_oldest_entry_and_rewrite_the_log_histor cl_assert(entrycount > 2); cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 1)); - cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); entry = git_reflog_entry_byindex(g_reflog, entrycount - 2); cl_assert(git_oid_streq(&entry->oid_old, GIT_OID_HEX_ZERO) == 0); @@ -101,7 +101,7 @@ void test_refs_reflog_drop__can_drop_all_the_entries(void) cl_git_pass(git_reflog_drop(g_reflog, 0, 1)); - cl_assert_equal_i(0, git_reflog_entrycount(g_reflog)); + cl_assert_equal_i(0, (int)git_reflog_entrycount(g_reflog)); } void test_refs_reflog_drop__can_persist_deletion_on_disk(void) @@ -112,7 +112,7 @@ void test_refs_reflog_drop__can_persist_deletion_on_disk(void) cl_git_pass(git_reference_lookup(&ref, g_repo, g_reflog->ref_name)); cl_git_pass(git_reflog_drop(g_reflog, 0, 1)); - cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); cl_git_pass(git_reflog_write(g_reflog)); git_reflog_free(g_reflog); @@ -120,5 +120,5 @@ void test_refs_reflog_drop__can_persist_deletion_on_disk(void) git_reflog_read(&g_reflog, ref); git_reference_free(ref); - cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); + cl_assert_equal_sz(entrycount - 1, git_reflog_entrycount(g_reflog)); } diff --git a/tests-clar/refs/reflog/reflog.c b/tests-clar/refs/reflog/reflog.c index 4c3d0dab7..8743c8a76 100644 --- a/tests-clar/refs/reflog/reflog.c +++ b/tests-clar/refs/reflog/reflog.c @@ -66,7 +66,7 @@ void test_refs_reflog_reflog__append_then_read(void) /* Read and parse the reflog for this branch */ cl_git_pass(git_reflog_read(&reflog, lookedup_ref)); - cl_assert_equal_i(2, git_reflog_entrycount(reflog)); + cl_assert_equal_i(2, (int)git_reflog_entrycount(reflog)); entry = git_reflog_entry_byindex(reflog, 1); assert_signature(committer, entry->committer); @@ -143,7 +143,7 @@ void test_refs_reflog_reflog__reading_the_reflog_from_a_reference_with_no_log_re cl_git_pass(git_reflog_read(&reflog, subtrees)); - cl_assert_equal_i(0, git_reflog_entrycount(reflog)); + cl_assert_equal_i(0, (int)git_reflog_entrycount(reflog)); git_reflog_free(reflog); git_reference_free(subtrees); @@ -160,7 +160,7 @@ void test_refs_reflog_reflog__cannot_write_a_moved_reflog(void) cl_git_pass(git_reflog_read(&reflog, master)); cl_git_pass(git_reflog_write(reflog)); - + cl_git_pass(git_reference_rename(master, "refs/moved", 0)); cl_git_fail(git_reflog_write(reflog)); diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c index 26b571736..c146e90ec 100644 --- a/tests-clar/stash/drop.c +++ b/tests-clar/stash/drop.c @@ -91,13 +91,13 @@ void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) push_three_states(); cl_git_pass(git_reference_lookup(&stash, repo, "refs/stash")); - + cl_git_pass(git_reflog_read(&reflog, stash)); entry = git_reflog_entry_byindex(reflog, 1); git_oid_cpy(&oid, git_reflog_entry_id_old(entry)); count = git_reflog_entrycount(reflog); - + git_reflog_free(reflog); cl_git_pass(git_stash_drop(repo, 1)); @@ -106,7 +106,7 @@ void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) entry = git_reflog_entry_byindex(reflog, 0); cl_assert_equal_i(0, git_oid_cmp(&oid, git_reflog_entry_id_old(entry))); - cl_assert_equal_i(count - 1, git_reflog_entrycount(reflog)); + cl_assert_equal_sz(count - 1, git_reflog_entrycount(reflog)); git_reflog_free(reflog); diff --git a/tests-clar/status/worktree.c b/tests-clar/status/worktree.c index 04e3ef112..838a04377 100644 --- a/tests-clar/status/worktree.c +++ b/tests-clar/status/worktree.c @@ -464,7 +464,7 @@ void test_status_worktree__status_file_without_index_or_workdir(void) cl_git_pass(git_repository_set_workdir(repo, "wd", false)); cl_git_pass(git_index_open(&index, "empty-index")); - cl_assert_equal_i(0, git_index_entrycount(index)); + cl_assert_equal_i(0, (int)git_index_entrycount(index)); git_repository_set_index(repo, index); cl_git_pass(git_status_file(&status, repo, "branch_file.txt")); From 839c5f574f40726f6fbdb82c947635bd14bdc9aa Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 26 Nov 2012 12:04:07 -0800 Subject: [PATCH 18/38] API updates for indexer.h --- include/git2/indexer.h | 8 ++++---- src/indexer.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/git2/indexer.h b/include/git2/indexer.h index a2a155473..41a1503a4 100644 --- a/include/git2/indexer.h +++ b/include/git2/indexer.h @@ -44,14 +44,14 @@ GIT_EXTERN(int) git_indexer_stream_new( git_indexer_stream **out, const char *path, git_transfer_progress_callback progress_cb, - void *progress_callback_payload); + void *progress_cb_payload); /** * Add data to the indexer * * @param idx the indexer * @param data the data to add - * @param size the size of the data + * @param size the size of the data in bytes * @param stats stat storage */ GIT_EXTERN(int) git_indexer_stream_add(git_indexer_stream *idx, const void *data, size_t size, git_transfer_progress *stats); @@ -73,7 +73,7 @@ GIT_EXTERN(int) git_indexer_stream_finalize(git_indexer_stream *idx, git_transfe * * @param idx the indexer instance */ -GIT_EXTERN(const git_oid *) git_indexer_stream_hash(git_indexer_stream *idx); +GIT_EXTERN(const git_oid *) git_indexer_stream_hash(const git_indexer_stream *idx); /** * Free the indexer and its resources @@ -120,7 +120,7 @@ GIT_EXTERN(int) git_indexer_write(git_indexer *idx); * * @param idx the indexer instance */ -GIT_EXTERN(const git_oid *) git_indexer_hash(git_indexer *idx); +GIT_EXTERN(const git_oid *) git_indexer_hash(const git_indexer *idx); /** * Free the indexer and its resources diff --git a/src/indexer.c b/src/indexer.c index d8939f03d..a51d903ed 100644 --- a/src/indexer.c +++ b/src/indexer.c @@ -56,12 +56,12 @@ struct delta_info { git_off_t delta_off; }; -const git_oid *git_indexer_hash(git_indexer *idx) +const git_oid *git_indexer_hash(const git_indexer *idx) { return &idx->hash; } -const git_oid *git_indexer_stream_hash(git_indexer_stream *idx) +const git_oid *git_indexer_stream_hash(const git_indexer_stream *idx) { return &idx->hash; } From 4ff192d3f224c780c741e62146c3350e54cba759 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 26 Nov 2012 19:47:47 -0800 Subject: [PATCH 19/38] Move merge functions to merge.c In so doing, promote commit_list to git_commit_list, with its own internal API header. --- src/commit_list.c | 190 +++++++++++++++++ src/commit_list.h | 49 +++++ src/merge.c | 196 ++++++++++++++++++ src/merge.h | 3 + src/revwalk.c | 505 ++++------------------------------------------ src/revwalk.h | 44 ++++ 6 files changed, 520 insertions(+), 467 deletions(-) create mode 100644 src/commit_list.c create mode 100644 src/commit_list.h create mode 100644 src/revwalk.h diff --git a/src/commit_list.c b/src/commit_list.c new file mode 100644 index 000000000..c1a7b223f --- /dev/null +++ b/src/commit_list.c @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2009-2012 the libgit2 contributors + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ + +#include "commit_list.h" +#include "common.h" +#include "revwalk.h" +#include "pool.h" +#include "odb.h" + +int git_commit_list_time_cmp(void *a, void *b) +{ + git_commit_list_node *commit_a = (git_commit_list_node *)a; + git_commit_list_node *commit_b = (git_commit_list_node *)b; + + return (commit_a->time < commit_b->time); +} + +git_commit_list *git_commit_list_insert(git_commit_list_node *item, git_commit_list **list_p) +{ + git_commit_list *new_list = git__malloc(sizeof(git_commit_list)); + if (new_list != NULL) { + new_list->item = item; + new_list->next = *list_p; + } + *list_p = new_list; + return new_list; +} + +git_commit_list *git_commit_list_insert_by_date(git_commit_list_node *item, git_commit_list **list_p) +{ + git_commit_list **pp = list_p; + git_commit_list *p; + + while ((p = *pp) != NULL) { + if (git_commit_list_time_cmp(p->item, item) < 0) + break; + + pp = &p->next; + } + + return git_commit_list_insert(item, pp); +} + +git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk) +{ + return (git_commit_list_node *)git_pool_malloc(&walk->commit_pool, COMMIT_ALLOC); +} + +static int commit_error(git_commit_list_node *commit, const char *msg) +{ + char commit_oid[GIT_OID_HEXSZ + 1]; + git_oid_fmt(commit_oid, &commit->oid); + commit_oid[GIT_OID_HEXSZ] = '\0'; + + giterr_set(GITERR_ODB, "Failed to parse commit %s - %s", commit_oid, msg); + + return -1; +} + +static git_commit_list_node **alloc_parents( + git_revwalk *walk, git_commit_list_node *commit, size_t n_parents) +{ + if (n_parents <= PARENTS_PER_COMMIT) + return (git_commit_list_node **)((char *)commit + sizeof(git_commit_list_node)); + + return (git_commit_list_node **)git_pool_malloc( + &walk->commit_pool, (uint32_t)(n_parents * sizeof(git_commit_list_node *))); +} + + +void git_commit_list_free(git_commit_list **list_p) +{ + git_commit_list *list = *list_p; + + if (list == NULL) + return; + + while (list) { + git_commit_list *temp = list; + list = temp->next; + git__free(temp); + } + + *list_p = NULL; +} + +git_commit_list_node *git_commit_list_pop(git_commit_list **stack) +{ + git_commit_list *top = *stack; + git_commit_list_node *item = top ? top->item : NULL; + + if (top) { + *stack = top->next; + git__free(top); + } + return item; +} + +static int commit_quick_parse(git_revwalk *walk, git_commit_list_node *commit, git_rawobj *raw) +{ + const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1; + unsigned char *buffer = raw->data; + unsigned char *buffer_end = buffer + raw->len; + unsigned char *parents_start, *committer_start; + int i, parents = 0; + int commit_time; + + buffer += strlen("tree ") + GIT_OID_HEXSZ + 1; + + parents_start = buffer; + while (buffer + parent_len < buffer_end && memcmp(buffer, "parent ", strlen("parent ")) == 0) { + parents++; + buffer += parent_len; + } + + commit->parents = alloc_parents(walk, commit, parents); + GITERR_CHECK_ALLOC(commit->parents); + + buffer = parents_start; + for (i = 0; i < parents; ++i) { + git_oid oid; + + if (git_oid_fromstr(&oid, (char *)buffer + strlen("parent ")) < 0) + return -1; + + commit->parents[i] = commit_lookup(walk, &oid); + if (commit->parents[i] == NULL) + return -1; + + buffer += parent_len; + } + + commit->out_degree = (unsigned short)parents; + + if ((committer_start = buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) + return commit_error(commit, "object is corrupted"); + + buffer++; + + if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) + return commit_error(commit, "object is corrupted"); + + /* Skip trailing spaces */ + while (buffer > committer_start && git__isspace(*buffer)) + buffer--; + + /* Seek for the begining of the pack of digits */ + while (buffer > committer_start && git__isdigit(*buffer)) + buffer--; + + /* Skip potential timezone offset */ + if ((buffer > committer_start) && (*buffer == '+' || *buffer == '-')) { + buffer--; + + while (buffer > committer_start && git__isspace(*buffer)) + buffer--; + + while (buffer > committer_start && git__isdigit(*buffer)) + buffer--; + } + + if ((buffer == committer_start) || (git__strtol32(&commit_time, (char *)(buffer + 1), NULL, 10) < 0)) + return commit_error(commit, "cannot parse commit time"); + + commit->time = (time_t)commit_time; + commit->parsed = 1; + return 0; +} + +int git_commit_list_parse(git_revwalk *walk, git_commit_list_node *commit) +{ + git_odb_object *obj; + int error; + + if (commit->parsed) + return 0; + + if ((error = git_odb_read(&obj, walk->odb, &commit->oid)) < 0) + return error; + assert(obj->raw.type == GIT_OBJ_COMMIT); + + error = commit_quick_parse(walk, commit, &obj->raw); + git_odb_object_free(obj); + return error; +} + diff --git a/src/commit_list.h b/src/commit_list.h new file mode 100644 index 000000000..ba809c901 --- /dev/null +++ b/src/commit_list.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009-2012 the libgit2 contributors + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_commit_list_h__ +#define INCLUDE_commit_list_h__ + +#include "git2/oid.h" + +#define PARENT1 (1 << 0) +#define PARENT2 (1 << 1) +#define RESULT (1 << 2) +#define STALE (1 << 3) + +#define PARENTS_PER_COMMIT 2 +#define COMMIT_ALLOC \ + (sizeof(git_commit_list_node) + PARENTS_PER_COMMIT * sizeof(git_commit_list_node *)) + +typedef struct git_commit_list_node { + git_oid oid; + uint32_t time; + unsigned int seen:1, + uninteresting:1, + topo_delay:1, + parsed:1, + flags : 4; + + unsigned short in_degree; + unsigned short out_degree; + + struct git_commit_list_node **parents; +} git_commit_list_node; + +typedef struct git_commit_list { + git_commit_list_node *item; + struct git_commit_list *next; +} git_commit_list; + +git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk); +int git_commit_list_time_cmp(void *a, void *b); +void git_commit_list_free(git_commit_list **list_p); +git_commit_list *git_commit_list_insert(git_commit_list_node *item, git_commit_list **list_p); +git_commit_list *git_commit_list_insert_by_date(git_commit_list_node *item, git_commit_list **list_p); +int git_commit_list_parse(git_revwalk *walk, git_commit_list_node *commit); +git_commit_list_node *git_commit_list_pop(git_commit_list **stack); + +#endif diff --git a/src/merge.c b/src/merge.c index 135af6a8c..c795b808b 100644 --- a/src/merge.c +++ b/src/merge.c @@ -6,12 +6,14 @@ */ #include "repository.h" +#include "revwalk.h" #include "buffer.h" #include "merge.h" #include "refs.h" #include "git2/repository.h" #include "git2/merge.h" #include "git2/reset.h" +#include "commit_list.h" int git_merge__cleanup(git_repository *repo) { @@ -46,3 +48,197 @@ cleanup: return error; } +int git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_array[], size_t length) +{ + git_revwalk *walk; + git_vector list; + git_commit_list *result = NULL; + int error = -1; + unsigned int i; + git_commit_list_node *commit; + + assert(out && repo && input_array); + + if (length < 2) { + giterr_set(GITERR_INVALID, "At least two commits are required to find an ancestor. Provided 'length' was %u.", length); + return -1; + } + + if (git_vector_init(&list, length - 1, NULL) < 0) + return -1; + + if (git_revwalk_new(&walk, repo) < 0) + goto cleanup; + + for (i = 1; i < length; i++) { + commit = commit_lookup(walk, &input_array[i]); + if (commit == NULL) + goto cleanup; + + git_vector_insert(&list, commit); + } + + commit = commit_lookup(walk, &input_array[0]); + if (commit == NULL) + goto cleanup; + + if (git_merge__bases_many(&result, walk, commit, &list) < 0) + goto cleanup; + + if (!result) { + error = GIT_ENOTFOUND; + goto cleanup; + } + + git_oid_cpy(out, &result->item->oid); + + error = 0; + +cleanup: + git_commit_list_free(&result); + git_revwalk_free(walk); + git_vector_free(&list); + return error; +} + +int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two) +{ + git_revwalk *walk; + git_vector list; + git_commit_list *result = NULL; + git_commit_list_node *commit; + void *contents[1]; + + if (git_revwalk_new(&walk, repo) < 0) + return -1; + + commit = commit_lookup(walk, two); + if (commit == NULL) + goto on_error; + + /* This is just one value, so we can do it on the stack */ + memset(&list, 0x0, sizeof(git_vector)); + contents[0] = commit; + list.length = 1; + list.contents = contents; + + commit = commit_lookup(walk, one); + if (commit == NULL) + goto on_error; + + if (git_merge__bases_many(&result, walk, commit, &list) < 0) + goto on_error; + + if (!result) { + git_revwalk_free(walk); + giterr_clear(); + return GIT_ENOTFOUND; + } + + git_oid_cpy(out, &result->item->oid); + git_commit_list_free(&result); + git_revwalk_free(walk); + + return 0; + +on_error: + git_revwalk_free(walk); + return -1; +} + +static int interesting(git_pqueue *list) +{ + unsigned int i; + /* element 0 isn't used - we need to start at 1 */ + for (i = 1; i < list->size; i++) { + git_commit_list_node *commit = list->d[i]; + if ((commit->flags & STALE) == 0) + return 1; + } + + return 0; +} + +int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos) +{ + int error; + unsigned int i; + git_commit_list_node *two; + git_commit_list *result = NULL, *tmp = NULL; + git_pqueue list; + + /* if the commit is repeated, we have a our merge base already */ + git_vector_foreach(twos, i, two) { + if (one == two) + return git_commit_list_insert(one, out) ? 0 : -1; + } + + if (git_pqueue_init(&list, twos->length * 2, git_commit_list_time_cmp) < 0) + return -1; + + if (git_commit_list_parse(walk, one) < 0) + return -1; + + one->flags |= PARENT1; + if (git_pqueue_insert(&list, one) < 0) + return -1; + + git_vector_foreach(twos, i, two) { + git_commit_list_parse(walk, two); + two->flags |= PARENT2; + if (git_pqueue_insert(&list, two) < 0) + return -1; + } + + /* as long as there are non-STALE commits */ + while (interesting(&list)) { + git_commit_list_node *commit; + int flags; + + commit = git_pqueue_pop(&list); + + flags = commit->flags & (PARENT1 | PARENT2 | STALE); + if (flags == (PARENT1 | PARENT2)) { + if (!(commit->flags & RESULT)) { + commit->flags |= RESULT; + if (git_commit_list_insert(commit, &result) == NULL) + return -1; + } + /* we mark the parents of a merge stale */ + flags |= STALE; + } + + for (i = 0; i < commit->out_degree; i++) { + git_commit_list_node *p = commit->parents[i]; + if ((p->flags & flags) == flags) + continue; + + if ((error = git_commit_list_parse(walk, p)) < 0) + return error; + + p->flags |= flags; + if (git_pqueue_insert(&list, p) < 0) + return -1; + } + } + + git_pqueue_free(&list); + + /* filter out any stale commits in the results */ + tmp = result; + result = NULL; + + while (tmp) { + struct git_commit_list *next = tmp->next; + if (!(tmp->item->flags & STALE)) + if (git_commit_list_insert_by_date(tmp->item, &result) == NULL) + return -1; + + git__free(tmp); + tmp = next; + } + + *out = result; + return 0; +} + diff --git a/src/merge.h b/src/merge.h index 2117d9214..3681e24b7 100644 --- a/src/merge.h +++ b/src/merge.h @@ -8,6 +8,8 @@ #define INCLUDE_merge_h__ #include "git2/types.h" +#include "git2/merge.h" +#include "commit_list.h" #define GIT_MERGE_MSG_FILE "MERGE_MSG" #define GIT_MERGE_MODE_FILE "MERGE_MODE" @@ -15,5 +17,6 @@ #define MERGE_CONFIG_FILE_MODE 0666 int git_merge__cleanup(git_repository *repo); +int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos); #endif diff --git a/src/revwalk.c b/src/revwalk.c index 236c94502..bdbbdbd17 100644 --- a/src/revwalk.c +++ b/src/revwalk.c @@ -8,149 +8,16 @@ #include "common.h" #include "commit.h" #include "odb.h" -#include "pqueue.h" #include "pool.h" -#include "oidmap.h" -#include "git2/revwalk.h" -#include "git2/merge.h" +#include "revwalk.h" +#include "merge.h" #include -GIT__USE_OIDMAP; - -#define PARENT1 (1 << 0) -#define PARENT2 (1 << 1) -#define RESULT (1 << 2) -#define STALE (1 << 3) - -typedef struct commit_object { - git_oid oid; - uint32_t time; - unsigned int seen:1, - uninteresting:1, - topo_delay:1, - parsed:1, - flags : 4; - - unsigned short in_degree; - unsigned short out_degree; - - struct commit_object **parents; -} commit_object; - -typedef struct commit_list { - commit_object *item; - struct commit_list *next; -} commit_list; - -struct git_revwalk { - git_repository *repo; - git_odb *odb; - - git_oidmap *commits; - git_pool commit_pool; - - commit_list *iterator_topo; - commit_list *iterator_rand; - commit_list *iterator_reverse; - git_pqueue iterator_time; - - int (*get_next)(commit_object **, git_revwalk *); - int (*enqueue)(git_revwalk *, commit_object *); - - unsigned walking:1; - unsigned int sorting; - - /* merge base calculation */ - commit_object *one; - git_vector twos; -}; - -static int commit_time_cmp(void *a, void *b) +git_commit_list_node *commit_lookup(git_revwalk *walk, const git_oid *oid) { - commit_object *commit_a = (commit_object *)a; - commit_object *commit_b = (commit_object *)b; - - return (commit_a->time < commit_b->time); -} - -static commit_list *commit_list_insert(commit_object *item, commit_list **list_p) -{ - commit_list *new_list = git__malloc(sizeof(commit_list)); - if (new_list != NULL) { - new_list->item = item; - new_list->next = *list_p; - } - *list_p = new_list; - return new_list; -} - -static commit_list *commit_list_insert_by_date(commit_object *item, commit_list **list_p) -{ - commit_list **pp = list_p; - commit_list *p; - - while ((p = *pp) != NULL) { - if (commit_time_cmp(p->item, item) < 0) - break; - - pp = &p->next; - } - - return commit_list_insert(item, pp); -} -static void commit_list_free(commit_list **list_p) -{ - commit_list *list = *list_p; - - if (list == NULL) - return; - - while (list) { - commit_list *temp = list; - list = temp->next; - git__free(temp); - } - - *list_p = NULL; -} - -static commit_object *commit_list_pop(commit_list **stack) -{ - commit_list *top = *stack; - commit_object *item = top ? top->item : NULL; - - if (top) { - *stack = top->next; - git__free(top); - } - return item; -} - -#define PARENTS_PER_COMMIT 2 -#define COMMIT_ALLOC \ - (sizeof(commit_object) + PARENTS_PER_COMMIT * sizeof(commit_object *)) - -static commit_object *alloc_commit(git_revwalk *walk) -{ - return (commit_object *)git_pool_malloc(&walk->commit_pool, COMMIT_ALLOC); -} - -static commit_object **alloc_parents( - git_revwalk *walk, commit_object *commit, size_t n_parents) -{ - if (n_parents <= PARENTS_PER_COMMIT) - return (commit_object **)((char *)commit + sizeof(commit_object)); - - return (commit_object **)git_pool_malloc( - &walk->commit_pool, (uint32_t)(n_parents * sizeof(commit_object *))); -} - - -static commit_object *commit_lookup(git_revwalk *walk, const git_oid *oid) -{ - commit_object *commit; + git_commit_list_node *commit; khiter_t pos; int ret; @@ -159,7 +26,7 @@ static commit_object *commit_lookup(git_revwalk *walk, const git_oid *oid) if (pos != kh_end(walk->commits)) return kh_value(walk->commits, pos); - commit = alloc_commit(walk); + commit = git_commit_list_alloc_node(walk); if (commit == NULL) return NULL; @@ -172,300 +39,7 @@ static commit_object *commit_lookup(git_revwalk *walk, const git_oid *oid) return commit; } -static int commit_error(commit_object *commit, const char *msg) -{ - char commit_oid[GIT_OID_HEXSZ + 1]; - git_oid_fmt(commit_oid, &commit->oid); - commit_oid[GIT_OID_HEXSZ] = '\0'; - - giterr_set(GITERR_ODB, "Failed to parse commit %s - %s", commit_oid, msg); - - return -1; -} - -static int commit_quick_parse(git_revwalk *walk, commit_object *commit, git_rawobj *raw) -{ - const size_t parent_len = strlen("parent ") + GIT_OID_HEXSZ + 1; - unsigned char *buffer = raw->data; - unsigned char *buffer_end = buffer + raw->len; - unsigned char *parents_start, *committer_start; - int i, parents = 0; - int commit_time; - - buffer += strlen("tree ") + GIT_OID_HEXSZ + 1; - - parents_start = buffer; - while (buffer + parent_len < buffer_end && memcmp(buffer, "parent ", strlen("parent ")) == 0) { - parents++; - buffer += parent_len; - } - - commit->parents = alloc_parents(walk, commit, parents); - GITERR_CHECK_ALLOC(commit->parents); - - buffer = parents_start; - for (i = 0; i < parents; ++i) { - git_oid oid; - - if (git_oid_fromstr(&oid, (char *)buffer + strlen("parent ")) < 0) - return -1; - - commit->parents[i] = commit_lookup(walk, &oid); - if (commit->parents[i] == NULL) - return -1; - - buffer += parent_len; - } - - commit->out_degree = (unsigned short)parents; - - if ((committer_start = buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) - return commit_error(commit, "object is corrupted"); - - buffer++; - - if ((buffer = memchr(buffer, '\n', buffer_end - buffer)) == NULL) - return commit_error(commit, "object is corrupted"); - - /* Skip trailing spaces */ - while (buffer > committer_start && git__isspace(*buffer)) - buffer--; - - /* Seek for the begining of the pack of digits */ - while (buffer > committer_start && git__isdigit(*buffer)) - buffer--; - - /* Skip potential timezone offset */ - if ((buffer > committer_start) && (*buffer == '+' || *buffer == '-')) { - buffer--; - - while (buffer > committer_start && git__isspace(*buffer)) - buffer--; - - while (buffer > committer_start && git__isdigit(*buffer)) - buffer--; - } - - if ((buffer == committer_start) || (git__strtol32(&commit_time, (char *)(buffer + 1), NULL, 10) < 0)) - return commit_error(commit, "cannot parse commit time"); - - commit->time = (time_t)commit_time; - commit->parsed = 1; - return 0; -} - -static int commit_parse(git_revwalk *walk, commit_object *commit) -{ - git_odb_object *obj; - int error; - - if (commit->parsed) - return 0; - - if ((error = git_odb_read(&obj, walk->odb, &commit->oid)) < 0) - return error; - assert(obj->raw.type == GIT_OBJ_COMMIT); - - error = commit_quick_parse(walk, commit, &obj->raw); - git_odb_object_free(obj); - return error; -} - -static int interesting(git_pqueue *list) -{ - unsigned int i; - /* element 0 isn't used - we need to start at 1 */ - for (i = 1; i < list->size; i++) { - commit_object *commit = list->d[i]; - if ((commit->flags & STALE) == 0) - return 1; - } - - return 0; -} - -static int merge_bases_many(commit_list **out, git_revwalk *walk, commit_object *one, git_vector *twos) -{ - int error; - unsigned int i; - commit_object *two; - commit_list *result = NULL, *tmp = NULL; - git_pqueue list; - - /* if the commit is repeated, we have a our merge base already */ - git_vector_foreach(twos, i, two) { - if (one == two) - return commit_list_insert(one, out) ? 0 : -1; - } - - if (git_pqueue_init(&list, twos->length * 2, commit_time_cmp) < 0) - return -1; - - if (commit_parse(walk, one) < 0) - return -1; - - one->flags |= PARENT1; - if (git_pqueue_insert(&list, one) < 0) - return -1; - - git_vector_foreach(twos, i, two) { - commit_parse(walk, two); - two->flags |= PARENT2; - if (git_pqueue_insert(&list, two) < 0) - return -1; - } - - /* as long as there are non-STALE commits */ - while (interesting(&list)) { - commit_object *commit; - int flags; - - commit = git_pqueue_pop(&list); - - flags = commit->flags & (PARENT1 | PARENT2 | STALE); - if (flags == (PARENT1 | PARENT2)) { - if (!(commit->flags & RESULT)) { - commit->flags |= RESULT; - if (commit_list_insert(commit, &result) == NULL) - return -1; - } - /* we mark the parents of a merge stale */ - flags |= STALE; - } - - for (i = 0; i < commit->out_degree; i++) { - commit_object *p = commit->parents[i]; - if ((p->flags & flags) == flags) - continue; - - if ((error = commit_parse(walk, p)) < 0) - return error; - - p->flags |= flags; - if (git_pqueue_insert(&list, p) < 0) - return -1; - } - } - - git_pqueue_free(&list); - - /* filter out any stale commits in the results */ - tmp = result; - result = NULL; - - while (tmp) { - struct commit_list *next = tmp->next; - if (!(tmp->item->flags & STALE)) - if (commit_list_insert_by_date(tmp->item, &result) == NULL) - return -1; - - git__free(tmp); - tmp = next; - } - - *out = result; - return 0; -} - -int git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_array[], size_t length) -{ - git_revwalk *walk; - git_vector list; - commit_list *result = NULL; - int error = -1; - unsigned int i; - commit_object *commit; - - assert(out && repo && input_array); - - if (length < 2) { - giterr_set(GITERR_INVALID, "At least two commits are required to find an ancestor. Provided 'length' was %u.", length); - return -1; - } - - if (git_vector_init(&list, length - 1, NULL) < 0) - return -1; - - if (git_revwalk_new(&walk, repo) < 0) - goto cleanup; - - for (i = 1; i < length; i++) { - commit = commit_lookup(walk, &input_array[i]); - if (commit == NULL) - goto cleanup; - - git_vector_insert(&list, commit); - } - - commit = commit_lookup(walk, &input_array[0]); - if (commit == NULL) - goto cleanup; - - if (merge_bases_many(&result, walk, commit, &list) < 0) - goto cleanup; - - if (!result) { - error = GIT_ENOTFOUND; - goto cleanup; - } - - git_oid_cpy(out, &result->item->oid); - - error = 0; - -cleanup: - commit_list_free(&result); - git_revwalk_free(walk); - git_vector_free(&list); - return error; -} - -int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two) -{ - git_revwalk *walk; - git_vector list; - commit_list *result = NULL; - commit_object *commit; - void *contents[1]; - - if (git_revwalk_new(&walk, repo) < 0) - return -1; - - commit = commit_lookup(walk, two); - if (commit == NULL) - goto on_error; - - /* This is just one value, so we can do it on the stack */ - memset(&list, 0x0, sizeof(git_vector)); - contents[0] = commit; - list.length = 1; - list.contents = contents; - - commit = commit_lookup(walk, one); - if (commit == NULL) - goto on_error; - - if (merge_bases_many(&result, walk, commit, &list) < 0) - goto on_error; - - if (!result) { - git_revwalk_free(walk); - giterr_clear(); - return GIT_ENOTFOUND; - } - - git_oid_cpy(out, &result->item->oid); - commit_list_free(&result); - git_revwalk_free(walk); - - return 0; - -on_error: - git_revwalk_free(walk); - return -1; -} - -static void mark_uninteresting(commit_object *commit) +static void mark_uninteresting(git_commit_list_node *commit) { unsigned short i; assert(commit); @@ -481,7 +55,7 @@ static void mark_uninteresting(commit_object *commit) mark_uninteresting(commit->parents[i]); } -static int process_commit(git_revwalk *walk, commit_object *commit, int hide) +static int process_commit(git_revwalk *walk, git_commit_list_node *commit, int hide) { int error; @@ -493,13 +67,13 @@ static int process_commit(git_revwalk *walk, commit_object *commit, int hide) commit->seen = 1; - if ((error = commit_parse(walk, commit)) < 0) + if ((error = git_commit_list_parse(walk, commit)) < 0) return error; return walk->enqueue(walk, commit); } -static int process_commit_parents(git_revwalk *walk, commit_object *commit) +static int process_commit_parents(git_revwalk *walk, git_commit_list_node *commit) { unsigned short i; int error = 0; @@ -514,7 +88,7 @@ static int push_commit(git_revwalk *walk, const git_oid *oid, int uninteresting) { git_object *obj; git_otype type; - commit_object *commit; + git_commit_list_node *commit; if (git_object_lookup(&obj, walk->repo, oid, GIT_OBJ_ANY) < 0) return -1; @@ -659,20 +233,20 @@ int git_revwalk_hide_ref(git_revwalk *walk, const char *refname) return push_ref(walk, refname, 1); } -static int revwalk_enqueue_timesort(git_revwalk *walk, commit_object *commit) +static int revwalk_enqueue_timesort(git_revwalk *walk, git_commit_list_node *commit) { return git_pqueue_insert(&walk->iterator_time, commit); } -static int revwalk_enqueue_unsorted(git_revwalk *walk, commit_object *commit) +static int revwalk_enqueue_unsorted(git_revwalk *walk, git_commit_list_node *commit) { - return commit_list_insert(commit, &walk->iterator_rand) ? 0 : -1; + return git_commit_list_insert(commit, &walk->iterator_rand) ? 0 : -1; } -static int revwalk_next_timesort(commit_object **object_out, git_revwalk *walk) +static int revwalk_next_timesort(git_commit_list_node **object_out, git_revwalk *walk) { int error; - commit_object *next; + git_commit_list_node *next; while ((next = git_pqueue_pop(&walk->iterator_time)) != NULL) { if ((error = process_commit_parents(walk, next)) < 0) @@ -688,12 +262,12 @@ static int revwalk_next_timesort(commit_object **object_out, git_revwalk *walk) return GIT_ITEROVER; } -static int revwalk_next_unsorted(commit_object **object_out, git_revwalk *walk) +static int revwalk_next_unsorted(git_commit_list_node **object_out, git_revwalk *walk) { int error; - commit_object *next; + git_commit_list_node *next; - while ((next = commit_list_pop(&walk->iterator_rand)) != NULL) { + while ((next = git_commit_list_pop(&walk->iterator_rand)) != NULL) { if ((error = process_commit_parents(walk, next)) < 0) return error; @@ -707,13 +281,13 @@ static int revwalk_next_unsorted(commit_object **object_out, git_revwalk *walk) return GIT_ITEROVER; } -static int revwalk_next_toposort(commit_object **object_out, git_revwalk *walk) +static int revwalk_next_toposort(git_commit_list_node **object_out, git_revwalk *walk) { - commit_object *next; + git_commit_list_node *next; unsigned short i; for (;;) { - next = commit_list_pop(&walk->iterator_topo); + next = git_commit_list_pop(&walk->iterator_topo); if (next == NULL) { giterr_clear(); return GIT_ITEROVER; @@ -725,11 +299,11 @@ static int revwalk_next_toposort(commit_object **object_out, git_revwalk *walk) } for (i = 0; i < next->out_degree; ++i) { - commit_object *parent = next->parents[i]; + git_commit_list_node *parent = next->parents[i]; if (--parent->in_degree == 0 && parent->topo_delay) { parent->topo_delay = 0; - if (commit_list_insert(parent, &walk->iterator_topo) == NULL) + if (git_commit_list_insert(parent, &walk->iterator_topo) == NULL) return -1; } } @@ -739,9 +313,9 @@ static int revwalk_next_toposort(commit_object **object_out, git_revwalk *walk) } } -static int revwalk_next_reverse(commit_object **object_out, git_revwalk *walk) +static int revwalk_next_reverse(git_commit_list_node **object_out, git_revwalk *walk) { - *object_out = commit_list_pop(&walk->iterator_reverse); + *object_out = git_commit_list_pop(&walk->iterator_reverse); return *object_out ? 0 : GIT_ITEROVER; } @@ -750,8 +324,8 @@ static int prepare_walk(git_revwalk *walk) { int error; unsigned int i; - commit_object *next, *two; - commit_list *bases = NULL; + git_commit_list_node *next, *two; + git_commit_list *bases = NULL; /* * If walk->one is NULL, there were no positive references, @@ -763,10 +337,10 @@ static int prepare_walk(git_revwalk *walk) } /* first figure out what the merge bases are */ - if (merge_bases_many(&bases, walk, walk->one, &walk->twos) < 0) + if (git_merge__bases_many(&bases, walk, walk->one, &walk->twos) < 0) return -1; - commit_list_free(&bases); + git_commit_list_free(&bases); if (process_commit(walk, walk->one, walk->one->uninteresting) < 0) return -1; @@ -780,11 +354,11 @@ static int prepare_walk(git_revwalk *walk) while ((error = walk->get_next(&next, walk)) == 0) { for (i = 0; i < next->out_degree; ++i) { - commit_object *parent = next->parents[i]; + git_commit_list_node *parent = next->parents[i]; parent->in_degree++; } - if (commit_list_insert(next, &walk->iterator_topo) == NULL) + if (git_commit_list_insert(next, &walk->iterator_topo) == NULL) return -1; } @@ -797,7 +371,7 @@ static int prepare_walk(git_revwalk *walk) if (walk->sorting & GIT_SORT_REVERSE) { while ((error = walk->get_next(&next, walk)) == 0) - if (commit_list_insert(next, &walk->iterator_reverse) == NULL) + if (git_commit_list_insert(next, &walk->iterator_reverse) == NULL) return -1; if (error != GIT_ITEROVER) @@ -811,9 +385,6 @@ static int prepare_walk(git_revwalk *walk) } - - - int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo) { git_revwalk *walk; @@ -826,7 +397,7 @@ int git_revwalk_new(git_revwalk **revwalk_out, git_repository *repo) walk->commits = git_oidmap_alloc(); GITERR_CHECK_ALLOC(walk->commits); - if (git_pqueue_init(&walk->iterator_time, 8, commit_time_cmp) < 0 || + if (git_pqueue_init(&walk->iterator_time, 8, git_commit_list_time_cmp) < 0 || git_vector_init(&walk->twos, 4, NULL) < 0 || git_pool_init(&walk->commit_pool, 1, git_pool__suggest_items_per_page(COMMIT_ALLOC) * COMMIT_ALLOC) < 0) @@ -888,7 +459,7 @@ void git_revwalk_sorting(git_revwalk *walk, unsigned int sort_mode) int git_revwalk_next(git_oid *oid, git_revwalk *walk) { int error; - commit_object *next; + git_commit_list_node *next; assert(walk && oid); @@ -913,7 +484,7 @@ int git_revwalk_next(git_oid *oid, git_revwalk *walk) void git_revwalk_reset(git_revwalk *walk) { - commit_object *commit; + git_commit_list_node *commit; assert(walk); @@ -925,9 +496,9 @@ void git_revwalk_reset(git_revwalk *walk) }); git_pqueue_clear(&walk->iterator_time); - commit_list_free(&walk->iterator_topo); - commit_list_free(&walk->iterator_rand); - commit_list_free(&walk->iterator_reverse); + git_commit_list_free(&walk->iterator_topo); + git_commit_list_free(&walk->iterator_rand); + git_commit_list_free(&walk->iterator_reverse); walk->walking = 0; walk->one = NULL; diff --git a/src/revwalk.h b/src/revwalk.h new file mode 100644 index 000000000..2d482cfcc --- /dev/null +++ b/src/revwalk.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2009-2012 the libgit2 contributors + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_revwalk_h__ +#define INCLUDE_revwalk_h__ + +#include "git2/revwalk.h" +#include "oidmap.h" +#include "commit_list.h" +#include "pqueue.h" +#include "pool.h" +#include "vector.h" + +GIT__USE_OIDMAP; + +struct git_revwalk { + git_repository *repo; + git_odb *odb; + + git_oidmap *commits; + git_pool commit_pool; + + git_commit_list *iterator_topo; + git_commit_list *iterator_rand; + git_commit_list *iterator_reverse; + git_pqueue iterator_time; + + int (*get_next)(git_commit_list_node **, git_revwalk *); + int (*enqueue)(git_revwalk *, git_commit_list_node *); + + unsigned walking:1; + unsigned int sorting; + + /* merge base calculation */ + git_commit_list_node *one; + git_vector twos; +}; + +git_commit_list_node *commit_lookup(git_revwalk *walk, const git_oid *oid); + +#endif From eac7695683d03f9716a7ca04006b9b6c43976a15 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 26 Nov 2012 19:53:04 -0800 Subject: [PATCH 20/38] Format/documentation tweaks for merge.h --- include/git2/merge.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/git2/merge.h b/include/git2/merge.h index 37b1c787d..59493969c 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -27,8 +27,13 @@ GIT_BEGIN_DECL * @param repo the repository where the commits exist * @param one one of the commits * @param two the other commit + * @return Zero on success; GIT_ENOTFOUND or -1 on failure. */ -GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two); +GIT_EXTERN(int) git_merge_base( + git_oid *out, + git_repository *repo, + const git_oid *one, + const git_oid *two); /** * Find a merge base given a list of commits @@ -37,8 +42,13 @@ GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid * @param repo the repository where the commits exist * @param input_array oids of the commits * @param length The number of commits in the provided `input_array` + * @return Zero on success; GIT_ENOTFOUND or -1 on failure. */ -GIT_EXTERN(int) git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_array[], size_t length); +GIT_EXTERN(int) git_merge_base_many( + git_oid *out, + git_repository *repo, + const git_oid input_array[], + size_t length); /** @} */ GIT_END_DECL From fe55f1631c85b322fac5a322863b40beefe68252 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 26 Nov 2012 19:56:01 -0800 Subject: [PATCH 21/38] API updates for message.h --- include/git2/message.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/git2/message.h b/include/git2/message.h index b42cb7677..e20173f3f 100644 --- a/include/git2/message.h +++ b/include/git2/message.h @@ -23,7 +23,7 @@ GIT_BEGIN_DECL * * Optionally, can remove lines starting with a "#". * - * @param message_out The user allocated buffer which will be filled with + * @param out The user-allocated buffer which will be filled with * the cleaned up message. Pass NULL if you just want to get the size of the * prettified message as the output value. * @@ -36,7 +36,11 @@ GIT_BEGIN_DECL * @return -1 on error, else number of characters in prettified message * including the trailing NUL byte */ -GIT_EXTERN(int) git_message_prettify(char *message_out, size_t buffer_size, const char *message, int strip_comments); +GIT_EXTERN(int) git_message_prettify( + char *out, + size_t buffer_size, + const char *message, + int strip_comments); /** @} */ GIT_END_DECL From 05a3ab61c276472296cd9d52bfa7219e65356a9b Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 26 Nov 2012 20:00:34 -0800 Subject: [PATCH 22/38] API updates for net.h --- include/git2/net.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/git2/net.h b/include/git2/net.h index c2301b6f1..734ee708f 100644 --- a/include/git2/net.h +++ b/include/git2/net.h @@ -4,8 +4,8 @@ * This file is part of libgit2, distributed under the GNU GPL v2 with * a Linking Exception. For full terms see the included COPYING file. */ -#ifndef INCLUDE_net_h__ -#define INCLUDE_net_h__ +#ifndef INCLUDE_git_net_h__ +#define INCLUDE_git_net_h__ #include "common.h" #include "oid.h" @@ -44,7 +44,7 @@ struct git_remote_head { /** * Callback for listing the remote heads */ -typedef int (*git_headlist_cb)(git_remote_head *, void *); +typedef int (*git_headlist_cb)(git_remote_head *rhead, void *payload); /** @} */ GIT_END_DECL From de5596bfd683273d60e8865626a064c6c1ece321 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Mon, 26 Nov 2012 20:09:38 -0800 Subject: [PATCH 23/38] API updates for notes.h/c. --- include/git2/notes.h | 67 +++++++++++++++++++++++++++----------------- src/notes.c | 33 ++++++++++++---------- 2 files changed, 59 insertions(+), 41 deletions(-) diff --git a/include/git2/notes.h b/include/git2/notes.h index af480a408..765ee5ddd 100644 --- a/include/git2/notes.h +++ b/include/git2/notes.h @@ -18,21 +18,40 @@ */ GIT_BEGIN_DECL +/** + * Basic components of a note + * + * - Oid of the blob containing the message + * - Oid of the git object being annotated + */ +typedef struct { + git_oid blob_oid; + git_oid annotated_object_oid; +} git_note_data; + +/** + * Callback for git_note_foreach. + */ +typedef int (*git_note_foreach_cb)(git_note_data *note_data, void *payload); + /** * Read the note for an object * * The note must be freed manually by the user. * - * @param note pointer to the read note; NULL in case of error + * @param out pointer to the read note; NULL in case of error * @param repo repository where to look up the note - * @param notes_ref canonical name of the reference to use (optional); - * defaults to "refs/notes/commits" + * @param notes_ref canonical name of the reference to use (optional); defaults to + * "refs/notes/commits" * @param oid OID of the git object to read the note from * * @return 0 or an error code */ -GIT_EXTERN(int) git_note_read(git_note **note, git_repository *repo, - const char *notes_ref, const git_oid *oid); +GIT_EXTERN(int) git_note_read( + git_note **out, + git_repository *repo, + const char *notes_ref, + const git_oid *oid); /** * Get the note message @@ -40,7 +59,7 @@ GIT_EXTERN(int) git_note_read(git_note **note, git_repository *repo, * @param note * @return the note message */ -GIT_EXTERN(const char *) git_note_message(git_note *note); +GIT_EXTERN(const char *) git_note_message(const git_note *note); /** @@ -49,7 +68,7 @@ GIT_EXTERN(const char *) git_note_message(git_note *note); * @param note * @return the note object OID */ -GIT_EXTERN(const git_oid *) git_note_oid(git_note *note); +GIT_EXTERN(const git_oid *) git_note_oid(const git_note *note); /** * Add a note for an object @@ -65,10 +84,14 @@ GIT_EXTERN(const git_oid *) git_note_oid(git_note *note); * * @return 0 or an error code */ -GIT_EXTERN(int) git_note_create(git_oid *out, git_repository *repo, - git_signature *author, git_signature *committer, - const char *notes_ref, const git_oid *oid, - const char *note); +GIT_EXTERN(int) git_note_create( + git_oid *out, + git_repository *repo, + const git_signature *author, + const git_signature *committer, + const char *notes_ref, + const git_oid *oid, + const char *note); /** @@ -83,9 +106,12 @@ GIT_EXTERN(int) git_note_create(git_oid *out, git_repository *repo, * * @return 0 or an error code */ -GIT_EXTERN(int) git_note_remove(git_repository *repo, const char *notes_ref, - git_signature *author, git_signature *committer, - const git_oid *oid); +GIT_EXTERN(int) git_note_remove( + git_repository *repo, + const char *notes_ref, + const git_signature *author, + const git_signature *committer, + const git_oid *oid); /** * Free a git_note object @@ -104,17 +130,6 @@ GIT_EXTERN(void) git_note_free(git_note *note); */ GIT_EXTERN(int) git_note_default_ref(const char **out, git_repository *repo); -/** - * Basic components of a note - * - * - Oid of the blob containing the message - * - Oid of the git object being annotated - */ -typedef struct { - git_oid blob_oid; - git_oid annotated_object_oid; -} git_note_data; - /** * Loop over all the notes within a specified namespace * and issue a callback for each one. @@ -134,7 +149,7 @@ typedef struct { GIT_EXTERN(int) git_note_foreach( git_repository *repo, const char *notes_ref, - int (*note_cb)(git_note_data *note_data, void *payload), + git_note_foreach_cb note_cb, void *payload ); diff --git a/src/notes.c b/src/notes.c index 95ff0170a..debf64133 100644 --- a/src/notes.c +++ b/src/notes.c @@ -263,8 +263,8 @@ static int insert_note_in_tree_enotfound_cb(git_tree **out, static int note_write(git_oid *out, git_repository *repo, - git_signature *author, - git_signature *committer, + const git_signature *author, + const git_signature *committer, const char *notes_ref, const char *note, git_tree *commit_tree, @@ -343,9 +343,9 @@ cleanup: } static int note_remove(git_repository *repo, - git_signature *author, git_signature *committer, - const char *notes_ref, git_tree *tree, - const char *target, git_commit **parents) + const git_signature *author, const git_signature *committer, + const char *notes_ref, git_tree *tree, + const char *target, git_commit **parents) { int error; git_tree *tree_after_removal = NULL; @@ -442,9 +442,12 @@ cleanup: } int git_note_create( - git_oid *out, git_repository *repo, - git_signature *author, git_signature *committer, - const char *notes_ref, const git_oid *oid, + git_oid *out, + git_repository *repo, + const git_signature *author, + const git_signature *committer, + const char *notes_ref, + const git_oid *oid, const char *note) { int error; @@ -461,7 +464,7 @@ int git_note_create( goto cleanup; error = note_write(out, repo, author, committer, notes_ref, - note, tree, target, &commit); + note, tree, target, &commit); cleanup: git__free(target); @@ -471,8 +474,8 @@ cleanup: } int git_note_remove(git_repository *repo, const char *notes_ref, - git_signature *author, git_signature *committer, - const git_oid *oid) + const git_signature *author, const git_signature *committer, + const git_oid *oid) { int error; char *target = NULL; @@ -501,13 +504,13 @@ int git_note_default_ref(const char **out, git_repository *repo) return note_get_default_ref(out, repo); } -const char * git_note_message(git_note *note) +const char * git_note_message(const git_note *note) { assert(note); return note->message; } -const git_oid * git_note_oid(git_note *note) +const git_oid * git_note_oid(const git_note *note) { assert(note); return ¬e->oid; @@ -525,7 +528,7 @@ void git_note_free(git_note *note) static int process_entry_path( const char* entry_path, const git_oid *note_oid, - int (*note_cb)(git_note_data *note_data, void *payload), + git_note_foreach_cb note_cb, void *payload) { int error = -1; @@ -581,7 +584,7 @@ cleanup: int git_note_foreach( git_repository *repo, const char *notes_ref, - int (*note_cb)(git_note_data *note_data, void *payload), + git_note_foreach_cb note_cb, void *payload) { int error; From 2e76b5fc84b7aa3877ef6b8251b7ba15eac1b2de Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 09:49:16 -0800 Subject: [PATCH 24/38] API updates for odb.h --- include/git2/odb.h | 46 ++++++++++++++++++++++++++++------------------ src/odb.c | 4 ++-- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/include/git2/odb.h b/include/git2/odb.h index 4afa3b788..d41c2fb52 100644 --- a/include/git2/odb.h +++ b/include/git2/odb.h @@ -22,6 +22,11 @@ */ GIT_BEGIN_DECL +/** + * Function type for callbacks from git_odb_foreach. + */ +typedef int (*git_odb_foreach_cb)(git_oid *id, void *payload); + /** * Create a new object database with no backends. * @@ -136,9 +141,10 @@ GIT_EXTERN(int) git_odb_read(git_odb_object **out, git_odb *db, const git_oid *i * @param db database to search for the object in. * @param short_id a prefix of the id of the object to read. * @param len the length of the prefix - * @return 0 if the object was read; - * GIT_ENOTFOUND if the object is not in the database. - * GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix) + * @return + * - 0 if the object was read; + * - GIT_ENOTFOUND if the object is not in the database. + * - GIT_EAMBIGUOUS if the prefix is ambiguous (several objects match the prefix) */ GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git_oid *short_id, size_t len); @@ -152,15 +158,15 @@ GIT_EXTERN(int) git_odb_read_prefix(git_odb_object **out, git_odb *db, const git * of an object, so the whole object will be read and then the * header will be returned. * - * @param len_p pointer where to store the length - * @param type_p pointer where to store the type + * @param len_out pointer where to store the length + * @param type_out pointer where to store the type * @param db database to search for the object in. * @param id identity of the object to read. * @return * - 0 if the object was read; * - GIT_ENOTFOUND if the object is not in the database. */ -GIT_EXTERN(int) git_odb_read_header(size_t *len_p, git_otype *type_p, git_odb *db, const git_oid *id); +GIT_EXTERN(int) git_odb_read_header(size_t *len_out, git_otype *type_out, git_odb *db, const git_oid *id); /** * Determine if the given object can be found in the object database. @@ -183,10 +189,10 @@ GIT_EXTERN(int) git_odb_exists(git_odb *db, const git_oid *id); * * @param db database to use * @param cb the callback to call for each object - * @param data data to pass to the callback + * @param payload data to pass to the callback * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ -GIT_EXTERN(int) git_odb_foreach(git_odb *db, int (*cb)(git_oid *oid, void *data), void *data); +GIT_EXTERN(int) git_odb_foreach(git_odb *db, git_odb_foreach_cb cb, void *payload); /** * Write an object directly into the ODB @@ -199,14 +205,14 @@ GIT_EXTERN(int) git_odb_foreach(git_odb *db, int (*cb)(git_oid *oid, void *data) * This method is provided for compatibility with custom backends * which are not able to support streaming writes * - * @param oid pointer to store the OID result of the write + * @param out pointer to store the OID result of the write * @param odb object database where to store the object * @param data buffer with the data to store * @param len size of the buffer * @param type type of the data to store * @return 0 or an error code */ -GIT_EXTERN(int) git_odb_write(git_oid *oid, git_odb *odb, const void *data, size_t len, git_otype type); +GIT_EXTERN(int) git_odb_write(git_oid *out, git_odb *odb, const void *data, size_t len, git_otype type); /** * Open a stream to write an object into the ODB @@ -229,13 +235,13 @@ GIT_EXTERN(int) git_odb_write(git_oid *oid, git_odb *odb, const void *data, size * * @see git_odb_stream * - * @param stream pointer where to store the stream + * @param out pointer where to store the stream * @param db object database where the stream will write * @param size final size of the object that will be written * @param type type of the object that will be written * @return 0 if the stream was created; error code otherwise */ -GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **stream, git_odb *db, size_t size, git_otype type); +GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **out, git_odb *db, size_t size, git_otype type); /** * Open a stream to read an object from the ODB @@ -256,12 +262,12 @@ GIT_EXTERN(int) git_odb_open_wstream(git_odb_stream **stream, git_odb *db, size_ * * @see git_odb_stream * - * @param stream pointer where to store the stream + * @param out pointer where to store the stream * @param db object database where the stream will read from * @param oid oid of the object the stream will read from * @return 0 if the stream was created; error code otherwise */ -GIT_EXTERN(int) git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const git_oid *oid); +GIT_EXTERN(int) git_odb_open_rstream(git_odb_stream **out, git_odb *db, const git_oid *oid); /** * Open a stream for writing a pack file to the ODB. @@ -274,14 +280,18 @@ GIT_EXTERN(int) git_odb_open_rstream(git_odb_stream **stream, git_odb *db, const * * @see git_odb_writepack * - * @param writepack pointer to the writepack functions + * @param out pointer to the writepack functions * @param db object database where the stream will read from * @param progress_cb function to call with progress information. * Be aware that this is called inline with network and indexing operations, * so performance may be affected. * @param progress_payload payload for the progress callback */ -GIT_EXTERN(int) git_odb_write_pack(git_odb_writepack **writepack, git_odb *db, git_transfer_progress_callback progress_cb, void *progress_payload); +GIT_EXTERN(int) git_odb_write_pack( + git_odb_writepack **out, + git_odb *db, + git_transfer_progress_callback progress_cb, + void *progress_payload); /** * Determine the object-ID (sha1 hash) of a data buffer @@ -289,13 +299,13 @@ GIT_EXTERN(int) git_odb_write_pack(git_odb_writepack **writepack, git_odb *db, g * The resulting SHA-1 OID will be the identifier for the data * buffer as if the data buffer it were to written to the ODB. * - * @param id the resulting object-ID. + * @param out the resulting object-ID. * @param data data to hash * @param len size of the data * @param type of the data to hash * @return 0 or an error code */ -GIT_EXTERN(int) git_odb_hash(git_oid *id, const void *data, size_t len, git_otype type); +GIT_EXTERN(int) git_odb_hash(git_oid *out, const void *data, size_t len, git_otype type); /** * Read a file from disk and fill a git_oid with the object id diff --git a/src/odb.c b/src/odb.c index 9c602d1d2..e622eb076 100644 --- a/src/odb.c +++ b/src/odb.c @@ -683,14 +683,14 @@ int git_odb_read_prefix( return 0; } -int git_odb_foreach(git_odb *db, int (*cb)(git_oid *oid, void *data), void *data) +int git_odb_foreach(git_odb *db, git_odb_foreach_cb cb, void *payload) { unsigned int i; backend_internal *internal; git_vector_foreach(&db->backends, i, internal) { git_odb_backend *b = internal->backend; - int error = b->foreach(b, cb, data); + int error = b->foreach(b, cb, payload); if (error < 0) return error; } From 0ed67c1cb47f59f0b794379614ac9918138405a0 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 12:33:58 -0800 Subject: [PATCH 25/38] API updates for odb_backend.h --- include/git2/odb_backend.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h index 4df48d77e..694803efd 100644 --- a/include/git2/odb_backend.h +++ b/include/git2/odb_backend.h @@ -79,8 +79,8 @@ struct git_odb_backend { int (* foreach)( struct git_odb_backend *, - int (*cb)(git_oid *oid, void *data), - void *data); + int (*cb)(git_oid *oid, void *payload), + void *payload); int (* writepack)( struct git_odb_writepack **, @@ -101,7 +101,7 @@ enum { /** A stream to read/write from a backend */ struct git_odb_stream { struct git_odb_backend *backend; - int mode; + unsigned int mode; int (*read)(struct git_odb_stream *stream, char *buffer, size_t len); int (*write)(struct git_odb_stream *stream, const char *buffer, size_t len); @@ -118,12 +118,15 @@ struct git_odb_writepack { void (*free)(struct git_odb_writepack *writepack); }; -GIT_EXTERN(int) git_odb_backend_pack(git_odb_backend **backend_out, const char *objects_dir); -GIT_EXTERN(int) git_odb_backend_loose(git_odb_backend **backend_out, const char *objects_dir, int compression_level, int do_fsync); -GIT_EXTERN(int) git_odb_backend_one_pack(git_odb_backend **backend_out, const char *index_file); - GIT_EXTERN(void *) git_odb_backend_malloc(git_odb_backend *backend, size_t len); +/** + * Constructors for in-box ODB backends. + */ +GIT_EXTERN(int) git_odb_backend_pack(git_odb_backend **out, const char *objects_dir); +GIT_EXTERN(int) git_odb_backend_loose(git_odb_backend **out, const char *objects_dir, int compression_level, int do_fsync); +GIT_EXTERN(int) git_odb_backend_one_pack(git_odb_backend **out, const char *index_file); + GIT_END_DECL #endif From 74f9132212a1c634c45241852dbd8564427e964b Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 12:45:44 -0800 Subject: [PATCH 26/38] API updates for oid.h --- include/git2/oid.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/include/git2/oid.h b/include/git2/oid.h index 9e54a9f96..43717ad70 100644 --- a/include/git2/oid.h +++ b/include/git2/oid.h @@ -30,11 +30,10 @@ GIT_BEGIN_DECL #define GIT_OID_MINPREFIXLEN 4 /** Unique identity of any object (commit, tree, blob, tag). */ -typedef struct _git_oid git_oid; -struct _git_oid { +typedef struct git_oid { /** raw binary formatted id */ unsigned char id[GIT_OID_RAWSZ]; -}; +} git_oid; /** * Parse a hex formatted object id into a git_oid. @@ -71,14 +70,14 @@ GIT_EXTERN(void) git_oid_fromraw(git_oid *out, const unsigned char *raw); /** * Format a git_oid into a hex string. * - * @param str output hex string; must be pointing at the start of + * @param out output hex string; must be pointing at the start of * the hex sequence and have at least the number of bytes * needed for an oid encoded in hex (40 bytes). Only the * oid digits are written; a '\\0' terminator must be added * by the caller if it is required. * @param oid oid structure to format. */ -GIT_EXTERN(void) git_oid_fmt(char *str, const git_oid *oid); +GIT_EXTERN(void) git_oid_fmt(char *out, const git_oid *id); /** * Format a git_oid into a loose-object path string. @@ -86,14 +85,14 @@ GIT_EXTERN(void) git_oid_fmt(char *str, const git_oid *oid); * The resulting string is "aa/...", where "aa" is the first two * hex digits of the oid and "..." is the remaining 38 digits. * - * @param str output hex string; must be pointing at the start of + * @param out output hex string; must be pointing at the start of * the hex sequence and have at least the number of bytes * needed for an oid encoded in hex (41 bytes). Only the * oid digits are written; a '\\0' terminator must be added * by the caller if it is required. - * @param oid oid structure to format. + * @param id oid structure to format. */ -GIT_EXTERN(void) git_oid_pathfmt(char *str, const git_oid *oid); +GIT_EXTERN(void) git_oid_pathfmt(char *out, const git_oid *id); /** * Format a git_oid into a newly allocated c-string. @@ -102,7 +101,7 @@ GIT_EXTERN(void) git_oid_pathfmt(char *str, const git_oid *oid); * @return the c-string; NULL if memory is exhausted. Caller must * deallocate the string with git__free(). */ -GIT_EXTERN(char *) git_oid_allocfmt(const git_oid *oid); +GIT_EXTERN(char *) git_oid_allocfmt(const git_oid *id); /** * Format a git_oid into a buffer as a hex format c-string. @@ -115,11 +114,11 @@ GIT_EXTERN(char *) git_oid_allocfmt(const git_oid *oid); * * @param out the buffer into which the oid string is output. * @param n the size of the out buffer. - * @param oid the oid structure to format. + * @param id the oid structure to format. * @return the out buffer pointer, assuming no input parameter * errors, otherwise a pointer to an empty string. */ -GIT_EXTERN(char *) git_oid_tostr(char *out, size_t n, const git_oid *oid); +GIT_EXTERN(char *) git_oid_tostr(char *out, size_t n, const git_oid *id); /** * Copy an oid from one structure to another. @@ -176,19 +175,19 @@ GIT_EXTERN(int) git_oid_ncmp(const git_oid *a, const git_oid *b, size_t len); /** * Check if an oid equals an hex formatted object id. * - * @param a oid structure. + * @param id oid structure. * @param str input hex string of an object id. * @return GIT_ENOTOID if str is not a valid hex string, * 0 in case of a match, GIT_ERROR otherwise. */ -GIT_EXTERN(int) git_oid_streq(const git_oid *a, const char *str); +GIT_EXTERN(int) git_oid_streq(const git_oid *id, const char *str); /** * Check is an oid is all zeros. * * @return 1 if all zeros, 0 otherwise. */ -GIT_EXTERN(int) git_oid_iszero(const git_oid *a); +GIT_EXTERN(int) git_oid_iszero(const git_oid *id); /** * OID Shortener object @@ -230,12 +229,12 @@ GIT_EXTERN(git_oid_shorten *) git_oid_shorten_new(size_t min_length); * GIT_ENOMEM error * * @param os a `git_oid_shorten` instance - * @param text_oid an OID in text form + * @param text_id an OID in text form * @return the minimal length to uniquely identify all OIDs * added so far to the set; or an error code (<0) if an * error occurs. */ -GIT_EXTERN(int) git_oid_shorten_add(git_oid_shorten *os, const char *text_oid); +GIT_EXTERN(int) git_oid_shorten_add(git_oid_shorten *os, const char *text_id); /** * Free an OID shortener instance From df705148ecc0d0a4c78f7a3b0903527918e38149 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 13:15:43 -0800 Subject: [PATCH 27/38] API updates for remote.h Includes typedef for git_direction, and renames for GIT_DIR_[FETCH|PUSH] to GIT_DIRECTION_(\1). --- examples/network/fetch.c | 2 +- examples/network/ls-remote.c | 4 +- include/git2/net.h | 6 ++- include/git2/remote.h | 23 +++++---- src/clone.c | 2 +- src/remote.c | 32 ++++++------ src/transports/smart.c | 4 +- tests-clar/fetchhead/network.c | 2 +- tests-clar/network/fetch.c | 2 +- tests-clar/network/fetchlocal.c | 4 +- tests-clar/network/refspecs.c | 88 ++++++++++++++++---------------- tests-clar/network/remotelocal.c | 2 +- tests-clar/network/remotes.c | 8 +-- 13 files changed, 91 insertions(+), 88 deletions(-) diff --git a/examples/network/fetch.c b/examples/network/fetch.c index 9d1404ab4..e341d2d6c 100644 --- a/examples/network/fetch.c +++ b/examples/network/fetch.c @@ -25,7 +25,7 @@ static void *download(void *ptr) // Connect to the remote end specifying that we want to fetch // information from it. - if (git_remote_connect(data->remote, GIT_DIR_FETCH) < 0) { + if (git_remote_connect(data->remote, GIT_DIRECTION_FETCH) < 0) { data->ret = -1; goto exit; } diff --git a/examples/network/ls-remote.c b/examples/network/ls-remote.c index 822d6f668..62131d4ba 100644 --- a/examples/network/ls-remote.c +++ b/examples/network/ls-remote.c @@ -27,7 +27,7 @@ static int use_unnamed(git_repository *repo, const char *url) // When connecting, the underlying code needs to know wether we // want to push or fetch - error = git_remote_connect(remote, GIT_DIR_FETCH); + error = git_remote_connect(remote, GIT_DIRECTION_FETCH); if (error < 0) goto cleanup; @@ -49,7 +49,7 @@ static int use_remote(git_repository *repo, char *name) if (error < 0) goto cleanup; - error = git_remote_connect(remote, GIT_DIR_FETCH); + error = git_remote_connect(remote, GIT_DIRECTION_FETCH); if (error < 0) goto cleanup; diff --git a/include/git2/net.h b/include/git2/net.h index 734ee708f..2543ff8e0 100644 --- a/include/git2/net.h +++ b/include/git2/net.h @@ -27,8 +27,10 @@ GIT_BEGIN_DECL * gets called. */ -#define GIT_DIR_FETCH 0 -#define GIT_DIR_PUSH 1 +typedef enum { + GIT_DIRECTION_FETCH = 0, + GIT_DIRECTION_PUSH = 1 +} git_direction; /** diff --git a/include/git2/remote.h b/include/git2/remote.h index 44390e7a4..e7d06b6e1 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -24,6 +24,7 @@ */ GIT_BEGIN_DECL +typedef int (*git_remote_rename_problem_cb)(const char *problematic_refspec, void *payload); /* * TODO: This functions still need to be implemented: * - _listcb/_foreach @@ -71,7 +72,7 @@ GIT_EXTERN(int) git_remote_save(const git_remote *remote); * @param remote the remote * @return a pointer to the name */ -GIT_EXTERN(const char *) git_remote_name(git_remote *remote); +GIT_EXTERN(const char *) git_remote_name(const git_remote *remote); /** * Get the remote's url @@ -79,7 +80,7 @@ GIT_EXTERN(const char *) git_remote_name(git_remote *remote); * @param remote the remote * @return a pointer to the url */ -GIT_EXTERN(const char *) git_remote_url(git_remote *remote); +GIT_EXTERN(const char *) git_remote_url(const git_remote *remote); /** * Get the remote's url for pushing @@ -87,7 +88,7 @@ GIT_EXTERN(const char *) git_remote_url(git_remote *remote); * @param remote the remote * @return a pointer to the url or NULL if no special url for pushing is set */ -GIT_EXTERN(const char *) git_remote_pushurl(git_remote *remote); +GIT_EXTERN(const char *) git_remote_pushurl(const git_remote *remote); /** * Set the remote's url @@ -126,7 +127,7 @@ GIT_EXTERN(int) git_remote_set_fetchspec(git_remote *remote, const char *spec); * @param remote the remote * @return a pointer to the fetch refspec or NULL if it doesn't exist */ -GIT_EXTERN(const git_refspec *) git_remote_fetchspec(git_remote *remote); +GIT_EXTERN(const git_refspec *) git_remote_fetchspec(const git_remote *remote); /** * Set the remote's push refspec @@ -144,7 +145,7 @@ GIT_EXTERN(int) git_remote_set_pushspec(git_remote *remote, const char *spec); * @return a pointer to the push refspec or NULL if it doesn't exist */ -GIT_EXTERN(const git_refspec *) git_remote_pushspec(git_remote *remote); +GIT_EXTERN(const git_refspec *) git_remote_pushspec(const git_remote *remote); /** * Open a connection to a remote @@ -157,7 +158,7 @@ GIT_EXTERN(const git_refspec *) git_remote_pushspec(git_remote *remote); * @param direction whether you want to receive or send data * @return 0 or an error code */ -GIT_EXTERN(int) git_remote_connect(git_remote *remote, int direction); +GIT_EXTERN(int) git_remote_connect(git_remote *remote, git_direction direction); /** * Get a list of refs at the remote @@ -194,7 +195,7 @@ GIT_EXTERN(int) git_remote_ls(git_remote *remote, git_headlist_cb list_cb, void GIT_EXTERN(int) git_remote_download( git_remote *remote, git_transfer_progress_callback progress_cb, - void *progress_payload); + void *payload); /** * Check whether the remote is connected @@ -266,11 +267,11 @@ GIT_EXTERN(int) git_remote_supported_url(const char* url); * * The string array must be freed by the user. * - * @param remotes_list a string array with the names of the remotes + * @param out a string array which receives the names of the remotes * @param repo the repository to query * @return 0 or an error code */ -GIT_EXTERN(int) git_remote_list(git_strarray *remotes_list, git_repository *repo); +GIT_EXTERN(int) git_remote_list(git_strarray *out, git_repository *repo); /** * Add a remote with the default fetch refspec to the repository's configuration @@ -340,7 +341,7 @@ struct git_remote_callbacks { void (*progress)(const char *str, int len, void *data); int (*completion)(git_remote_completion_type type, void *data); int (*update_tips)(const char *refname, const git_oid *a, const git_oid *b, void *data); - void *data; + void *payload; }; /** @@ -398,7 +399,7 @@ GIT_EXTERN(void) git_remote_set_autotag(git_remote *remote, int value); GIT_EXTERN(int) git_remote_rename( git_remote *remote, const char *new_name, - int (*callback)(const char *problematic_refspec, void *payload), + git_remote_rename_problem_cb callback, void *payload); /** diff --git a/src/clone.c b/src/clone.c index c90d85466..7d49b398b 100644 --- a/src/clone.c +++ b/src/clone.c @@ -278,7 +278,7 @@ static int setup_remotes_and_fetch( git_remote_set_update_fetchhead(origin, 0); /* Connect and download everything */ - if (!git_remote_connect(origin, GIT_DIR_FETCH)) { + if (!git_remote_connect(origin, GIT_DIRECTION_FETCH)) { if (!git_remote_download(origin, progress_cb, progress_payload)) { /* Create "origin/foo" branches for all remote branches */ if (!git_remote_update_tips(origin)) { diff --git a/src/remote.c b/src/remote.c index 5035588a3..2f7c89471 100644 --- a/src/remote.c +++ b/src/remote.c @@ -252,7 +252,7 @@ static int update_config_refspec( &name, "remote.%s.%s", remote_name, - git_direction == GIT_DIR_FETCH ? "fetch" : "push") < 0) + git_direction == GIT_DIRECTION_FETCH ? "fetch" : "push") < 0) goto cleanup; if (git_refspec__serialize(&value, refspec) < 0) @@ -318,14 +318,14 @@ int git_remote_save(const git_remote *remote) config, remote->name, &remote->fetch, - GIT_DIR_FETCH) < 0) + GIT_DIRECTION_FETCH) < 0) goto on_error; if (update_config_refspec( config, remote->name, &remote->push, - GIT_DIR_PUSH) < 0) + GIT_DIRECTION_PUSH) < 0) goto on_error; /* @@ -369,13 +369,13 @@ on_error: return -1; } -const char *git_remote_name(git_remote *remote) +const char *git_remote_name(const git_remote *remote) { assert(remote); return remote->name; } -const char *git_remote_url(git_remote *remote) +const char *git_remote_url(const git_remote *remote) { assert(remote); return remote->url; @@ -393,7 +393,7 @@ int git_remote_set_url(git_remote *remote, const char* url) return 0; } -const char *git_remote_pushurl(git_remote *remote) +const char *git_remote_pushurl(const git_remote *remote) { assert(remote); return remote->pushurl; @@ -429,7 +429,7 @@ int git_remote_set_fetchspec(git_remote *remote, const char *spec) return 0; } -const git_refspec *git_remote_fetchspec(git_remote *remote) +const git_refspec *git_remote_fetchspec(const git_remote *remote) { assert(remote); return &remote->fetch; @@ -451,7 +451,7 @@ int git_remote_set_pushspec(git_remote *remote, const char *spec) return 0; } -const git_refspec *git_remote_pushspec(git_remote *remote) +const git_refspec *git_remote_pushspec(const git_remote *remote) { assert(remote); return &remote->push; @@ -461,18 +461,18 @@ const char* git_remote__urlfordirection(git_remote *remote, int direction) { assert(remote); - if (direction == GIT_DIR_FETCH) { + if (direction == GIT_DIRECTION_FETCH) { return remote->url; } - if (direction == GIT_DIR_PUSH) { + if (direction == GIT_DIRECTION_PUSH) { return remote->pushurl ? remote->pushurl : remote->url; } return NULL; } -int git_remote_connect(git_remote *remote, int direction) +int git_remote_connect(git_remote *remote, git_direction direction) { git_transport *t; const char *url; @@ -492,7 +492,7 @@ int git_remote_connect(git_remote *remote, int direction) return -1; if (t->set_callbacks && - t->set_callbacks(t, remote->callbacks.progress, NULL, remote->callbacks.data) < 0) + t->set_callbacks(t, remote->callbacks.progress, NULL, remote->callbacks.payload) < 0) goto on_error; if (!remote->check_cert) @@ -753,7 +753,7 @@ int git_remote_update_tips(git_remote *remote) git_reference_free(ref); if (remote->callbacks.update_tips != NULL) { - if (remote->callbacks.update_tips(refname.ptr, &old, &head->oid, remote->callbacks.data) < 0) + if (remote->callbacks.update_tips(refname.ptr, &old, &head->oid, remote->callbacks.payload) < 0) goto on_error; } } @@ -936,7 +936,7 @@ void git_remote_set_callbacks(git_remote *remote, git_remote_callbacks *callback remote->transport->set_callbacks(remote->transport, remote->callbacks.progress, NULL, - remote->callbacks.data); + remote->callbacks.payload); } void git_remote_set_cred_acquire_cb( @@ -1194,7 +1194,7 @@ static int rename_fetch_refspecs( if (git_repository_config__weakptr(&config, remote->repo) < 0) goto cleanup; - error = update_config_refspec(config, new_name, &remote->fetch, GIT_DIR_FETCH); + error = update_config_refspec(config, new_name, &remote->fetch, GIT_DIRECTION_FETCH); cleanup: git_buf_free(&serialized); @@ -1205,7 +1205,7 @@ cleanup: int git_remote_rename( git_remote *remote, const char *new_name, - int (*callback)(const char *problematic_refspec, void *payload), + git_remote_rename_problem_cb callback, void *payload) { int error; diff --git a/src/transports/smart.c b/src/transports/smart.c index 195ea285c..e8dbbef5c 100644 --- a/src/transports/smart.c +++ b/src/transports/smart.c @@ -73,7 +73,7 @@ static int git_smart__connect( t->flags = flags; t->cred_acquire_cb = cred_acquire_cb; - if (GIT_DIR_FETCH == direction) + if (GIT_DIRECTION_FETCH == direction) { if ((error = t->wrapped->action(&stream, t->wrapped, t->url, GIT_SERVICE_UPLOADPACK_LS)) < 0) return error; @@ -159,7 +159,7 @@ int git_smart__negotiation_step(git_transport *transport, void *data, size_t len if (t->rpc) git_smart__reset_stream(t); - if (GIT_DIR_FETCH == t->direction) { + if (GIT_DIRECTION_FETCH == t->direction) { if ((error = t->wrapped->action(&stream, t->wrapped, t->url, GIT_SERVICE_UPLOADPACK)) < 0) return error; diff --git a/tests-clar/fetchhead/network.c b/tests-clar/fetchhead/network.c index 0710480cd..46cb977e0 100644 --- a/tests-clar/fetchhead/network.c +++ b/tests-clar/fetchhead/network.c @@ -46,7 +46,7 @@ static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fet if(fetchspec != NULL) git_remote_set_fetchspec(remote, fetchspec); - cl_git_pass(git_remote_connect(remote, GIT_DIR_FETCH)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH)); cl_git_pass(git_remote_download(remote, NULL, NULL)); cl_git_pass(git_remote_update_tips(remote)); git_remote_disconnect(remote); diff --git a/tests-clar/network/fetch.c b/tests-clar/network/fetch.c index a575b18ca..81a0eed25 100644 --- a/tests-clar/network/fetch.c +++ b/tests-clar/network/fetch.c @@ -46,7 +46,7 @@ static void do_fetch(const char *url, int flag, int n) cl_git_pass(git_remote_add(&remote, _repo, "test", url)); git_remote_set_callbacks(remote, &callbacks); git_remote_set_autotag(remote, flag); - cl_git_pass(git_remote_connect(remote, GIT_DIR_FETCH)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH)); cl_git_pass(git_remote_download(remote, progress, &bytes_received)); git_remote_disconnect(remote); cl_git_pass(git_remote_update_tips(remote)); diff --git a/tests-clar/network/fetchlocal.c b/tests-clar/network/fetchlocal.c index a0369d040..018531c5c 100644 --- a/tests-clar/network/fetchlocal.c +++ b/tests-clar/network/fetchlocal.c @@ -22,7 +22,7 @@ void test_network_fetchlocal__complete(void) cl_git_pass(git_repository_init(&repo, "foo", true)); cl_git_pass(git_remote_add(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_connect(origin, GIT_DIR_FETCH)); + cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH)); cl_git_pass(git_remote_download(origin, transfer_cb, &callcount)); cl_git_pass(git_remote_update_tips(origin)); @@ -48,7 +48,7 @@ void test_network_fetchlocal__partial(void) url = cl_git_fixture_url("testrepo.git"); cl_git_pass(git_remote_add(&origin, repo, GIT_REMOTE_ORIGIN, url)); - cl_git_pass(git_remote_connect(origin, GIT_DIR_FETCH)); + cl_git_pass(git_remote_connect(origin, GIT_DIRECTION_FETCH)); cl_git_pass(git_remote_download(origin, transfer_cb, &callcount)); cl_git_pass(git_remote_update_tips(origin)); diff --git a/tests-clar/network/refspecs.c b/tests-clar/network/refspecs.c index 3b1281722..b3d80fb85 100644 --- a/tests-clar/network/refspecs.c +++ b/tests-clar/network/refspecs.c @@ -7,7 +7,7 @@ static void assert_refspec(unsigned int direction, const char *input, bool is_ex git_refspec refspec; int error; - error = git_refspec__parse(&refspec, input, direction == GIT_DIR_FETCH); + error = git_refspec__parse(&refspec, input, direction == GIT_DIRECTION_FETCH); git_refspec__free(&refspec); if (is_expected_to_be_valid) @@ -20,19 +20,19 @@ void test_network_refspecs__parsing(void) { // Ported from https://github.com/git/git/blob/abd2bde78bd994166900290434a2048e660dabed/t/t5511-refspec.sh - assert_refspec(GIT_DIR_PUSH, "", false); - assert_refspec(GIT_DIR_PUSH, ":", true); - assert_refspec(GIT_DIR_PUSH, "::", false); - assert_refspec(GIT_DIR_PUSH, "+:", true); + assert_refspec(GIT_DIRECTION_PUSH, "", false); + assert_refspec(GIT_DIRECTION_PUSH, ":", true); + assert_refspec(GIT_DIRECTION_PUSH, "::", false); + assert_refspec(GIT_DIRECTION_PUSH, "+:", true); - assert_refspec(GIT_DIR_FETCH, "", true); - assert_refspec(GIT_DIR_PUSH, ":", true); - assert_refspec(GIT_DIR_FETCH, "::", false); + assert_refspec(GIT_DIRECTION_FETCH, "", true); + assert_refspec(GIT_DIRECTION_PUSH, ":", true); + assert_refspec(GIT_DIRECTION_FETCH, "::", false); - assert_refspec(GIT_DIR_PUSH, "refs/heads/*:refs/remotes/frotz/*", true); - assert_refspec(GIT_DIR_PUSH, "refs/heads/*:refs/remotes/frotz", false); - assert_refspec(GIT_DIR_PUSH, "refs/heads:refs/remotes/frotz/*", false); - assert_refspec(GIT_DIR_PUSH, "refs/heads/master:refs/remotes/frotz/xyzzy", true); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*:refs/remotes/frotz/*", true); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*:refs/remotes/frotz", false); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads:refs/remotes/frotz/*", false); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/master:refs/remotes/frotz/xyzzy", true); /* * These have invalid LHS, but we do not have a formal "valid sha-1 @@ -40,45 +40,45 @@ void test_network_refspecs__parsing(void) * code. They will be caught downstream anyway, but we may want to * have tighter check later... */ - //assert_refspec(GIT_DIR_PUSH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); - //assert_refspec(GIT_DIR_PUSH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); + //assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); + //assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/*:refs/remotes/frotz/*", true); - assert_refspec(GIT_DIR_FETCH, "refs/heads/*:refs/remotes/frotz", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads:refs/remotes/frotz/*", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/master:refs/remotes/frotz/xyzzy", true); - assert_refspec(GIT_DIR_FETCH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*:refs/remotes/frotz/*", true); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*:refs/remotes/frotz", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads:refs/remotes/frotz/*", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/master:refs/remotes/frotz/xyzzy", true); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/master::refs/remotes/frotz/xyzzy", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/maste :refs/remotes/frotz/xyzzy", false); - assert_refspec(GIT_DIR_PUSH, "master~1:refs/remotes/frotz/backup", true); - assert_refspec(GIT_DIR_FETCH, "master~1:refs/remotes/frotz/backup", false); - assert_refspec(GIT_DIR_PUSH, "HEAD~4:refs/remotes/frotz/new", true); - assert_refspec(GIT_DIR_FETCH, "HEAD~4:refs/remotes/frotz/new", false); + assert_refspec(GIT_DIRECTION_PUSH, "master~1:refs/remotes/frotz/backup", true); + assert_refspec(GIT_DIRECTION_FETCH, "master~1:refs/remotes/frotz/backup", false); + assert_refspec(GIT_DIRECTION_PUSH, "HEAD~4:refs/remotes/frotz/new", true); + assert_refspec(GIT_DIRECTION_FETCH, "HEAD~4:refs/remotes/frotz/new", false); - assert_refspec(GIT_DIR_PUSH, "HEAD", true); - assert_refspec(GIT_DIR_FETCH, "HEAD", true); - assert_refspec(GIT_DIR_PUSH, "refs/heads/ nitfol", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/ nitfol", false); + assert_refspec(GIT_DIRECTION_PUSH, "HEAD", true); + assert_refspec(GIT_DIRECTION_FETCH, "HEAD", true); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/ nitfol", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/ nitfol", false); - assert_refspec(GIT_DIR_PUSH, "HEAD:", false); - assert_refspec(GIT_DIR_FETCH, "HEAD:", true); - assert_refspec(GIT_DIR_PUSH, "refs/heads/ nitfol:", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/ nitfol:", false); + assert_refspec(GIT_DIRECTION_PUSH, "HEAD:", false); + assert_refspec(GIT_DIRECTION_FETCH, "HEAD:", true); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/ nitfol:", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/ nitfol:", false); - assert_refspec(GIT_DIR_PUSH, ":refs/remotes/frotz/deleteme", true); - assert_refspec(GIT_DIR_FETCH, ":refs/remotes/frotz/HEAD-to-me", true); - assert_refspec(GIT_DIR_PUSH, ":refs/remotes/frotz/delete me", false); - assert_refspec(GIT_DIR_FETCH, ":refs/remotes/frotz/HEAD to me", false); + assert_refspec(GIT_DIRECTION_PUSH, ":refs/remotes/frotz/deleteme", true); + assert_refspec(GIT_DIRECTION_FETCH, ":refs/remotes/frotz/HEAD-to-me", true); + assert_refspec(GIT_DIRECTION_PUSH, ":refs/remotes/frotz/delete me", false); + assert_refspec(GIT_DIRECTION_FETCH, ":refs/remotes/frotz/HEAD to me", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false); - assert_refspec(GIT_DIR_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*-blah", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads*/for-linus:refs/remotes/mine/*", false); - assert_refspec(GIT_DIR_PUSH, "refs/heads*/for-linus:refs/remotes/mine/*", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads*/for-linus:refs/remotes/mine/*", false); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads*/for-linus:refs/remotes/mine/*", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false); - assert_refspec(GIT_DIR_PUSH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/*/for-linus:refs/remotes/mine/*", false); - assert_refspec(GIT_DIR_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*", true); - assert_refspec(GIT_DIR_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*", true); + assert_refspec(GIT_DIRECTION_FETCH, "refs/heads/*/for-linus:refs/remotes/mine/*", true); + assert_refspec(GIT_DIRECTION_PUSH, "refs/heads/*/for-linus:refs/remotes/mine/*", true); } diff --git a/tests-clar/network/remotelocal.c b/tests-clar/network/remotelocal.c index f7dcfc0e6..8376b8bf1 100644 --- a/tests-clar/network/remotelocal.c +++ b/tests-clar/network/remotelocal.c @@ -51,7 +51,7 @@ static void connect_to_local_repository(const char *local_repository) git_buf_sets(&file_path_buf, cl_git_path_url(local_repository)); cl_git_pass(git_remote_new(&remote, repo, NULL, git_buf_cstr(&file_path_buf), NULL)); - cl_git_pass(git_remote_connect(remote, GIT_DIR_FETCH)); + cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH)); } diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c index 4fe3ebed9..14fda1670 100644 --- a/tests-clar/network/remotes.c +++ b/tests-clar/network/remotes.c @@ -33,9 +33,9 @@ void test_network_remotes__parsing(void) cl_assert_equal_s(git_remote_url(_remote), "git://github.com/libgit2/libgit2"); cl_assert(git_remote_pushurl(_remote) == NULL); - cl_assert_equal_s(git_remote__urlfordirection(_remote, GIT_DIR_FETCH), + cl_assert_equal_s(git_remote__urlfordirection(_remote, GIT_DIRECTION_FETCH), "git://github.com/libgit2/libgit2"); - cl_assert_equal_s(git_remote__urlfordirection(_remote, GIT_DIR_PUSH), + cl_assert_equal_s(git_remote__urlfordirection(_remote, GIT_DIRECTION_PUSH), "git://github.com/libgit2/libgit2"); cl_git_pass(git_remote_load(&_remote2, _repo, "test_with_pushurl")); @@ -43,9 +43,9 @@ void test_network_remotes__parsing(void) cl_assert_equal_s(git_remote_url(_remote2), "git://github.com/libgit2/fetchlibgit2"); cl_assert_equal_s(git_remote_pushurl(_remote2), "git://github.com/libgit2/pushlibgit2"); - cl_assert_equal_s(git_remote__urlfordirection(_remote2, GIT_DIR_FETCH), + cl_assert_equal_s(git_remote__urlfordirection(_remote2, GIT_DIRECTION_FETCH), "git://github.com/libgit2/fetchlibgit2"); - cl_assert_equal_s(git_remote__urlfordirection(_remote2, GIT_DIR_PUSH), + cl_assert_equal_s(git_remote__urlfordirection(_remote2, GIT_DIRECTION_PUSH), "git://github.com/libgit2/pushlibgit2"); git_remote_free(_remote2); From cb7ac81c4daa0bd9b1a988d614225218cf6bbc16 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 13:30:04 -0800 Subject: [PATCH 28/38] Fix warning --- tests-clar/refs/branches/create.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests-clar/refs/branches/create.c b/tests-clar/refs/branches/create.c index 5a43ef204..a8c4d4f51 100644 --- a/tests-clar/refs/branches/create.c +++ b/tests-clar/refs/branches/create.c @@ -18,7 +18,7 @@ void test_refs_branches_create__cleanup(void) git_reference_free(branch); branch = NULL; - git_object_free(target); + git_commit_free(target); target = NULL; git_repository_free(repo); From c9fc4a6ff9b6afba42b173abe0666cb7298e8695 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 13:44:49 -0800 Subject: [PATCH 29/38] API updates for repository.h --- include/git2/repository.h | 48 +++++++++++++++++++-------------------- src/repository.c | 10 ++++---- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/include/git2/repository.h b/include/git2/repository.h index f891e91e9..29bb9863f 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -29,11 +29,11 @@ GIT_BEGIN_DECL * The method will automatically detect if 'path' is a normal * or bare repository or fail is 'path' is neither. * - * @param repository pointer to the repo which will be opened + * @param out pointer to the repo which will be opened * @param path the path to the repository * @return 0 or an error code */ -GIT_EXTERN(int) git_repository_open(git_repository **repository, const char *path); +GIT_EXTERN(int) git_repository_open(git_repository **out, const char *path); /** * Create a "fake" repository to wrap an object database @@ -42,11 +42,11 @@ GIT_EXTERN(int) git_repository_open(git_repository **repository, const char *pat * with the API when all you have is an object database. This doesn't * have any paths associated with it, so use with care. * - * @param repository pointer to the repo + * @param out pointer to the repo * @param odb the object database to wrap * @return 0 or an error code */ -GIT_EXTERN(int) git_repository_wrap_odb(git_repository **repository, git_odb *odb); +GIT_EXTERN(int) git_repository_wrap_odb(git_repository **out, git_odb *odb); /** * Look for a git repository and copy its path in the given buffer. @@ -58,10 +58,10 @@ GIT_EXTERN(int) git_repository_wrap_odb(git_repository **repository, git_odb *od * The method will automatically detect if the repository is bare * (if there is a repository). * - * @param repository_path The user allocated buffer which will + * @param path_out The user allocated buffer which will * contain the found path. * - * @param size repository_path size + * @param path_size repository_path size * * @param start_path The base path where the lookup starts. * @@ -77,8 +77,8 @@ GIT_EXTERN(int) git_repository_wrap_odb(git_repository **repository, git_odb *od * @return 0 or an error code */ GIT_EXTERN(int) git_repository_discover( - char *repository_path, - size_t size, + char *path_out, + size_t path_size, const char *start_path, int across_fs, const char *ceiling_dirs); @@ -95,18 +95,18 @@ GIT_EXTERN(int) git_repository_discover( * directory "/home/user/source/" will not return "/.git/" as the found * repo if "/" is a different filesystem than "/home".) */ -enum { +typedef enum { GIT_REPOSITORY_OPEN_NO_SEARCH = (1 << 0), GIT_REPOSITORY_OPEN_CROSS_FS = (1 << 1), -}; +} git_repository_open_flags; /** * Find and open a repository with extended controls. * - * @param repo_out Pointer to the repo which will be opened. This can + * @param out Pointer to the repo which will be opened. This can * actually be NULL if you only want to use the error code to * see if a repo at this path could be opened. - * @param start_path Path to open as git repository. If the flags + * @param path Path to open as git repository. If the flags * permit "searching", then this can be a path to a subdirectory * inside the working directory of the repository. * @param flags A combination of the GIT_REPOSITORY_OPEN flags above. @@ -118,9 +118,9 @@ enum { * (such as repo corruption or system errors). */ GIT_EXTERN(int) git_repository_open_ext( - git_repository **repo, - const char *start_path, - uint32_t flags, + git_repository **out, + const char *path, + unsigned int flags, const char *ceiling_dirs); /** @@ -142,7 +142,7 @@ GIT_EXTERN(void) git_repository_free(git_repository *repo); * TODO: * - Reinit the repository * - * @param repo_out pointer to the repo which will be created or reinitialized + * @param out pointer to the repo which will be created or reinitialized * @param path the path to the repository * @param is_bare if true, a Git repository without a working directory is * created at the pointed path. If false, provided path will be @@ -152,7 +152,7 @@ GIT_EXTERN(void) git_repository_free(git_repository *repo); * @return 0 or an error code */ GIT_EXTERN(int) git_repository_init( - git_repository **repo_out, + git_repository **out, const char *path, unsigned is_bare); @@ -238,7 +238,7 @@ enum { * repository initialization is completed, an "origin" remote * will be added pointing to this URL. */ -typedef struct { +typedef struct git_repository_init_options { uint32_t flags; uint32_t mode; const char *workdir_path; @@ -256,26 +256,26 @@ typedef struct { * auto-detect the case sensitivity of the file system and if the * file system supports file mode bits correctly. * - * @param repo_out Pointer to the repo which will be created or reinitialized. + * @param out Pointer to the repo which will be created or reinitialized. * @param repo_path The path to the repository. * @param opts Pointer to git_repository_init_options struct. * @return 0 or an error code on failure. */ GIT_EXTERN(int) git_repository_init_ext( - git_repository **repo_out, + git_repository **out, const char *repo_path, git_repository_init_options *opts); /** * Retrieve and resolve the reference pointed at by HEAD. * - * @param head_out pointer to the reference which will be retrieved + * @param out pointer to the reference which will be retrieved * @param repo a repository object * * @return 0 on success, GIT_EORPHANEDHEAD when HEAD points to a non existing * branch, GIT_ENOTFOUND when HEAD is missing; an error code otherwise */ -GIT_EXTERN(int) git_repository_head(git_reference **head_out, git_repository *repo); +GIT_EXTERN(int) git_repository_head(git_reference **out, git_repository *repo); /** * Check if a repository's HEAD is detached @@ -468,12 +468,12 @@ GIT_EXTERN(void) git_repository_set_index(git_repository *repo, git_index *index * Use this function to get the contents of this file. Don't forget to * remove the file after you create the commit. * - * @param buffer Buffer to write data into or NULL to just read required size + * @param out Buffer to write data into or NULL to just read required size * @param len Length of buffer in bytes * @param repo Repository to read prepared message from * @return Bytes written to buffer, GIT_ENOTFOUND if no message, or -1 on error */ -GIT_EXTERN(int) git_repository_message(char *buffer, size_t len, git_repository *repo); +GIT_EXTERN(int) git_repository_message(char *out, size_t len, git_repository *repo); /** * Remove git's prepared message. diff --git a/src/repository.c b/src/repository.c index efbb3a348..b49b49b7a 100644 --- a/src/repository.c +++ b/src/repository.c @@ -361,7 +361,7 @@ static int find_repo( int git_repository_open_ext( git_repository **repo_ptr, const char *start_path, - uint32_t flags, + unsigned int flags, const char *ceiling_dirs) { int error; @@ -1162,14 +1162,14 @@ int git_repository_init( } int git_repository_init_ext( - git_repository **repo_out, + git_repository **out, const char *given_repo, git_repository_init_options *opts) { int error; git_buf repo_path = GIT_BUF_INIT, wd_path = GIT_BUF_INIT; - assert(repo_out && given_repo && opts); + assert(out && given_repo && opts); error = repo_init_directories(&repo_path, &wd_path, given_repo, opts); if (error < 0) @@ -1202,10 +1202,10 @@ int git_repository_init_ext( if (error < 0) goto cleanup; - error = git_repository_open(repo_out, git_buf_cstr(&repo_path)); + error = git_repository_open(out, git_buf_cstr(&repo_path)); if (!error && opts->origin_url) - error = repo_init_create_origin(*repo_out, opts->origin_url); + error = repo_init_create_origin(*out, opts->origin_url); cleanup: git_buf_free(&repo_path); From 44d9f2cb60f05c05ab55e6aaae0fda8b31bbbbc6 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 14:01:24 -0800 Subject: [PATCH 30/38] API updates for revwalk.h --- include/git2/revwalk.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/git2/revwalk.h b/include/git2/revwalk.h index 0a85a4c60..893ad2c9d 100644 --- a/include/git2/revwalk.h +++ b/include/git2/revwalk.h @@ -63,11 +63,11 @@ GIT_BEGIN_DECL * it is possible to have several revision walkers in * several different threads walking the same repository. * - * @param walker pointer to the new revision walker + * @param out pointer to the new revision walker * @param repo the repo to walk through * @return 0 or an error code */ -GIT_EXTERN(int) git_revwalk_new(git_revwalk **walker, git_repository *repo); +GIT_EXTERN(int) git_revwalk_new(git_revwalk **out, git_repository *repo); /** * Reset the revision walker for reuse. @@ -96,10 +96,10 @@ GIT_EXTERN(void) git_revwalk_reset(git_revwalk *walker); * be started. * * @param walk the walker being used for the traversal. - * @param oid the oid of the commit to start from. + * @param id the oid of the commit to start from. * @return 0 or an error code */ -GIT_EXTERN(int) git_revwalk_push(git_revwalk *walk, const git_oid *oid); +GIT_EXTERN(int) git_revwalk_push(git_revwalk *walk, const git_oid *id); /** * Push matching references @@ -134,10 +134,10 @@ GIT_EXTERN(int) git_revwalk_push_head(git_revwalk *walk); * output on the revision walk. * * @param walk the walker being used for the traversal. - * @param oid the oid of commit that will be ignored during the traversal + * @param commit_id the oid of commit that will be ignored during the traversal * @return 0 or an error code */ -GIT_EXTERN(int) git_revwalk_hide(git_revwalk *walk, const git_oid *oid); +GIT_EXTERN(int) git_revwalk_hide(git_revwalk *walk, const git_oid *commit_id); /** * Hide matching references. @@ -198,12 +198,12 @@ GIT_EXTERN(int) git_revwalk_hide_ref(git_revwalk *walk, const char *refname); * * The revision walker is reset when the walk is over. * - * @param oid Pointer where to store the oid of the next commit + * @param out Pointer where to store the oid of the next commit * @param walk the walker to pop the commit from. * @return 0 if the next commit was found; * GIT_ITEROVER if there are no commits left to iterate */ -GIT_EXTERN(int) git_revwalk_next(git_oid *oid, git_revwalk *walk); +GIT_EXTERN(int) git_revwalk_next(git_oid *out, git_revwalk *walk); /** * Change the sorting mode when iterating through the From ff6b5ac97d0cae2088c45b691002934e2920e872 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 14:03:53 -0800 Subject: [PATCH 31/38] API updates for signature.h --- include/git2/signature.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/git2/signature.h b/include/git2/signature.h index cdbe67879..01a6dfb44 100644 --- a/include/git2/signature.h +++ b/include/git2/signature.h @@ -26,31 +26,32 @@ GIT_BEGIN_DECL * Note: angle brackets ('<' and '>') characters are not allowed * to be used in either the `name` or the `email` parameter. * - * @param sig_out new signature, in case of error NULL + * @param out new signature, in case of error NULL * @param name name of the person * @param email email of the person * @param time time when the action happened * @param offset timezone offset in minutes for the time * @return 0 or an error code */ -GIT_EXTERN(int) git_signature_new(git_signature **sig_out, const char *name, const char *email, git_time_t time, int offset); +GIT_EXTERN(int) git_signature_new(git_signature **out, const char *name, const char *email, git_time_t time, int offset); /** * Create a new action signature with a timestamp of 'now'. The * signature must be freed manually or using git_signature_free * - * @param sig_out new signature, in case of error NULL + * @param out new signature, in case of error NULL * @param name name of the person * @param email email of the person * @return 0 or an error code */ -GIT_EXTERN(int) git_signature_now(git_signature **sig_out, const char *name, const char *email); +GIT_EXTERN(int) git_signature_now(git_signature **out, const char *name, const char *email); /** - * Create a copy of an existing signature. + * Create a copy of an existing signature. All internal strings are also duplicated. + * The caller is responsible for freeing this structure with + * git_signature_free. * - * All internal strings are also duplicated. * @param sig signature to duplicated * @return a copy of sig, NULL on out of memory */ From 1d8ec670be6252ae5af6ded5edd6017434de3ab2 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 14:06:56 -0800 Subject: [PATCH 32/38] API updates for stash.h --- include/git2/stash.h | 17 ++++++++--------- src/stash.c | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/include/git2/stash.h b/include/git2/stash.h index 3ecd9e88d..b57d47b3a 100644 --- a/include/git2/stash.h +++ b/include/git2/stash.h @@ -18,7 +18,7 @@ */ GIT_BEGIN_DECL -enum { +typedef enum { GIT_STASH_DEFAULT = 0, /* All changes already added to the index @@ -35,7 +35,7 @@ enum { * cleaned up from the working directory */ GIT_STASH_INCLUDE_IGNORED = (1 << 2), -}; +} git_stash_flags; /** * Save the local modifications to a new stash. @@ -49,18 +49,17 @@ enum { * * @param message Optional description along with the stashed state. * - * @param flags Flags to control the stashing process. + * @param flags Flags to control the stashing process. (see GIT_STASH_* above) * * @return 0 on success, GIT_ENOTFOUND where there's nothing to stash, * or error code. */ - GIT_EXTERN(int) git_stash_save( git_oid *out, git_repository *repo, git_signature *stasher, const char *message, - uint32_t flags); + unsigned int flags); /** * When iterating over all the stashed states, callback that will be @@ -71,16 +70,16 @@ GIT_EXTERN(int) git_stash_save( * * @param message The stash message. * - * @param stash_oid The commit oid of the stashed state. + * @param stash_id The commit oid of the stashed state. * * @param payload Extra parameter to callback function. * * @return 0 on success, GIT_EUSER on non-zero callback, or error code */ -typedef int (*stash_cb)( +typedef int (*git_stash_cb)( size_t index, const char* message, - const git_oid *stash_oid, + const git_oid *stash_id, void *payload); /** @@ -99,7 +98,7 @@ typedef int (*stash_cb)( */ GIT_EXTERN(int) git_stash_foreach( git_repository *repo, - stash_cb callback, + git_stash_cb callback, void *payload); /** diff --git a/src/stash.c b/src/stash.c index b16637e59..107cbe3ca 100644 --- a/src/stash.c +++ b/src/stash.c @@ -579,7 +579,7 @@ cleanup: int git_stash_foreach( git_repository *repo, - stash_cb callback, + git_stash_cb callback, void *payload) { git_reference *stash; From f4a62c306d5e313fe80815369be47318ea29575b Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 14:13:03 -0800 Subject: [PATCH 33/38] Typedef enums. --- include/git2/remote.h | 10 ++++++---- include/git2/repository.h | 10 +++++----- src/remote.c | 4 ++-- src/remote.h | 8 ++++---- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/git2/remote.h b/include/git2/remote.h index e7d06b6e1..6c70d7fbc 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -360,12 +360,12 @@ GIT_EXTERN(void) git_remote_set_callbacks(git_remote *remote, git_remote_callbac */ GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote); -enum { +typedef enum { GIT_REMOTE_DOWNLOAD_TAGS_UNSET, GIT_REMOTE_DOWNLOAD_TAGS_NONE, GIT_REMOTE_DOWNLOAD_TAGS_AUTO, GIT_REMOTE_DOWNLOAD_TAGS_ALL -}; +} git_remote_autotag_option_t; /** * Retrieve the tag auto-follow setting @@ -373,7 +373,7 @@ enum { * @param remote the remote to query * @return the auto-follow setting */ -GIT_EXTERN(int) git_remote_autotag(git_remote *remote); +GIT_EXTERN(git_remote_autotag_option_t) git_remote_autotag(git_remote *remote); /** * Set the tag auto-follow setting @@ -381,7 +381,9 @@ GIT_EXTERN(int) git_remote_autotag(git_remote *remote); * @param remote the remote to configure * @param value a GIT_REMOTE_DOWNLOAD_TAGS value */ -GIT_EXTERN(void) git_remote_set_autotag(git_remote *remote, int value); +GIT_EXTERN(void) git_remote_set_autotag( + git_remote *remote, + git_remote_autotag_option_t value); /** * Give the remote a new name diff --git a/include/git2/repository.h b/include/git2/repository.h index 29bb9863f..f1b55f433 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -98,7 +98,7 @@ GIT_EXTERN(int) git_repository_discover( typedef enum { GIT_REPOSITORY_OPEN_NO_SEARCH = (1 << 0), GIT_REPOSITORY_OPEN_CROSS_FS = (1 << 1), -} git_repository_open_flags; +} git_repository_open_flag_t; /** * Find and open a repository with extended controls. @@ -182,14 +182,14 @@ GIT_EXTERN(int) git_repository_init( * `init.templatedir` global config if not, or falling back on * "/usr/share/git-core/templates" if it exists. */ -enum { +typedef enum { GIT_REPOSITORY_INIT_BARE = (1u << 0), GIT_REPOSITORY_INIT_NO_REINIT = (1u << 1), GIT_REPOSITORY_INIT_NO_DOTGIT_DIR = (1u << 2), GIT_REPOSITORY_INIT_MKDIR = (1u << 3), GIT_REPOSITORY_INIT_MKPATH = (1u << 4), GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE = (1u << 5), -}; +} git_repository_init_flag_t; /** * Mode options for `git_repository_init_ext`. @@ -204,11 +204,11 @@ enum { * * SHARED_ALL - Use "--shared=all" behavior, adding world readability. * * Anything else - Set to custom value. */ -enum { +typedef enum { GIT_REPOSITORY_INIT_SHARED_UMASK = 0, GIT_REPOSITORY_INIT_SHARED_GROUP = 0002775, GIT_REPOSITORY_INIT_SHARED_ALL = 0002777, -}; +} git_repository_init_mode_t; /** * Extended options structure for `git_repository_init_ext`. diff --git a/src/remote.c b/src/remote.c index 2f7c89471..bdec3c1f4 100644 --- a/src/remote.c +++ b/src/remote.c @@ -967,12 +967,12 @@ const git_transfer_progress* git_remote_stats(git_remote *remote) return &remote->stats; } -int git_remote_autotag(git_remote *remote) +git_remote_autotag_option_t git_remote_autotag(git_remote *remote) { return remote->download_tags; } -void git_remote_set_autotag(git_remote *remote, int value) +void git_remote_set_autotag(git_remote *remote, git_remote_autotag_option_t value) { remote->download_tags = value; } diff --git a/src/remote.h b/src/remote.h index 840c9a905..448a9e9a9 100644 --- a/src/remote.h +++ b/src/remote.h @@ -27,10 +27,10 @@ struct git_remote { git_repository *repo; git_remote_callbacks callbacks; git_transfer_progress stats; - unsigned int need_pack:1, - download_tags:2, /* There are four possible values */ - check_cert:1, - update_fetchhead:1; + unsigned int need_pack; + git_remote_autotag_option_t download_tags; + unsigned int check_cert; + unsigned int update_fetchhead; }; const char* git_remote__urlfordirection(struct git_remote *remote, int direction); From 336d1275ca53e7acc0b1b28986513a3061260a22 Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 27 Nov 2012 14:18:51 -0800 Subject: [PATCH 34/38] API updates for transport.h --- include/git2/transport.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/git2/transport.h b/include/git2/transport.h index b2bdaae71..5a27d7f97 100644 --- a/include/git2/transport.h +++ b/include/git2/transport.h @@ -45,12 +45,12 @@ typedef struct git_cred_userpass_plaintext { /** * Creates a new plain-text username and password credential object. * - * @param cred The newly created credential object. + * @param out The newly created credential object. * @param username The username of the credential. * @param password The password of the credential. */ GIT_EXTERN(int) git_cred_userpass_plaintext_new( - git_cred **cred, + git_cred **out, const char *username, const char *password); @@ -64,7 +64,7 @@ GIT_EXTERN(int) git_cred_userpass_plaintext_new( typedef int (*git_cred_acquire_cb)( git_cred **cred, const char *url, - int allowed_types); + unsigned int allowed_types); /* *** End interface for credentials acquisition *** @@ -144,11 +144,11 @@ typedef struct git_transport { * is scanned to find a transport that implements the scheme of the URI (i.e. * git:// or http://) and a transport object is returned to the caller. * - * @param transport The newly created transport (out) + * @param out The newly created transport (out) * @param url The URL to connect to * @return 0 or an error code */ -GIT_EXTERN(int) git_transport_new(git_transport **transport, const char *url); +GIT_EXTERN(int) git_transport_new(git_transport **out, const char *url); /** * Function which checks to see if a transport could be created for the @@ -161,7 +161,7 @@ GIT_EXTERN(int) git_transport_new(git_transport **transport, const char *url); GIT_EXTERN(int) git_transport_valid_url(const char *url); /* Signature of a function which creates a transport */ -typedef int (*git_transport_cb)(git_transport **transport, void *param); +typedef int (*git_transport_cb)(git_transport **out, void *payload); /* Transports which come with libgit2 (match git_transport_cb). The expected * value for "param" is listed in-line below. */ @@ -170,34 +170,34 @@ typedef int (*git_transport_cb)(git_transport **transport, void *param); * Create an instance of the dummy transport. * * @param transport The newly created transport (out) - * @param param You must pass NULL for this parameter. + * @param payload You must pass NULL for this parameter. * @return 0 or an error code */ GIT_EXTERN(int) git_transport_dummy( git_transport **transport, - /* NULL */ void *param); + /* NULL */ void *payload); /** * Create an instance of the local transport. * * @param transport The newly created transport (out) - * @param param You must pass NULL for this parameter. + * @param payload You must pass NULL for this parameter. * @return 0 or an error code */ GIT_EXTERN(int) git_transport_local( git_transport **transport, - /* NULL */ void *param); + /* NULL */ void *payload); /** * Create an instance of the smart transport. * * @param transport The newly created transport (out) - * @param param A pointer to a git_smart_subtransport_definition + * @param payload A pointer to a git_smart_subtransport_definition * @return 0 or an error code */ GIT_EXTERN(int) git_transport_smart( git_transport **transport, - /* (git_smart_subtransport_definition *) */ void *param); + /* (git_smart_subtransport_definition *) */ void *payload); /* *** End of base transport interface *** From 2bd5998c9cab0afdea2aba00ce35a70656ba9fda Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 27 Nov 2012 14:47:39 -0800 Subject: [PATCH 35/38] Remove git_note_data structure --- include/git2/notes.h | 22 ++++++++-------------- src/notes.c | 9 +++------ tests-clar/notes/notes.c | 13 ++++++++----- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/include/git2/notes.h b/include/git2/notes.h index 765ee5ddd..ae66975cd 100644 --- a/include/git2/notes.h +++ b/include/git2/notes.h @@ -18,21 +18,16 @@ */ GIT_BEGIN_DECL -/** - * Basic components of a note - * - * - Oid of the blob containing the message - * - Oid of the git object being annotated - */ -typedef struct { - git_oid blob_oid; - git_oid annotated_object_oid; -} git_note_data; - /** * Callback for git_note_foreach. + * + * Receives: + * - blob_id: Oid of the blob containing the message + * - annotated_object_id: Oid of the git object being annotated + * - payload: Payload data passed to `git_note_foreach` */ -typedef int (*git_note_foreach_cb)(git_note_data *note_data, void *payload); +typedef int (*git_note_foreach_cb)( + const git_oid *blob_id, const git_oid *annotated_object_id, void *payload); /** * Read the note for an object @@ -150,8 +145,7 @@ GIT_EXTERN(int) git_note_foreach( git_repository *repo, const char *notes_ref, git_note_foreach_cb note_cb, - void *payload -); + void *payload); /** @} */ GIT_END_DECL diff --git a/src/notes.c b/src/notes.c index debf64133..dd36cc2fe 100644 --- a/src/notes.c +++ b/src/notes.c @@ -534,7 +534,7 @@ static int process_entry_path( int error = -1; size_t i = 0, j = 0, len; git_buf buf = GIT_BUF_INIT; - git_note_data note_data; + git_oid annotated_object_id; if ((error = git_buf_puts(&buf, entry_path)) < 0) goto cleanup; @@ -567,13 +567,10 @@ static int process_entry_path( goto cleanup; } - if ((error = git_oid_fromstr( - ¬e_data.annotated_object_oid, buf.ptr)) < 0) + if ((error = git_oid_fromstr(&annotated_object_id, buf.ptr)) < 0) goto cleanup; - git_oid_cpy(¬e_data.blob_oid, note_oid); - - if (note_cb(¬e_data, payload)) + if (note_cb(note_oid, &annotated_object_id, payload)) error = GIT_EUSER; cleanup: diff --git a/tests-clar/notes/notes.c b/tests-clar/notes/notes.c index 706bc03ce..3f5194c51 100644 --- a/tests-clar/notes/notes.c +++ b/tests-clar/notes/notes.c @@ -50,7 +50,8 @@ static struct { #define EXPECTATIONS_COUNT (sizeof(list_expectations)/sizeof(list_expectations[0])) - 1 -static int note_list_cb(git_note_data *note_data, void *payload) +static int note_list_cb( + const git_oid *blob_id, const git_oid *annotated_obj_id, void *payload) { git_oid expected_note_oid, expected_target_oid; @@ -59,10 +60,10 @@ static int note_list_cb(git_note_data *note_data, void *payload) cl_assert(*count < EXPECTATIONS_COUNT); cl_git_pass(git_oid_fromstr(&expected_note_oid, list_expectations[*count].note_sha)); - cl_assert(git_oid_cmp(&expected_note_oid, ¬e_data->blob_oid) == 0); + cl_assert(git_oid_cmp(&expected_note_oid, blob_id) == 0); cl_git_pass(git_oid_fromstr(&expected_target_oid, list_expectations[*count].annotated_object_sha)); - cl_assert(git_oid_cmp(&expected_target_oid, ¬e_data->annotated_object_oid) == 0); + cl_assert(git_oid_cmp(&expected_target_oid, annotated_obj_id) == 0); (*count)++; @@ -103,11 +104,13 @@ void test_notes_notes__can_retrieve_a_list_of_notes_for_a_given_namespace(void) cl_assert_equal_i(4, retrieved_notes); } -static int note_cancel_cb(git_note_data *note_data, void *payload) +static int note_cancel_cb( + const git_oid *blob_id, const git_oid *annotated_obj_id, void *payload) { unsigned int *count = (unsigned int *)payload; - GIT_UNUSED(note_data); + GIT_UNUSED(blob_id); + GIT_UNUSED(annotated_obj_id); (*count)++; From f984d97b2208b48a6aec8877d0af357cca0c637d Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 27 Nov 2012 15:00:28 -0800 Subject: [PATCH 36/38] Clarify git_message_prettify comments --- include/git2/message.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/git2/message.h b/include/git2/message.h index e20173f3f..e89d022a1 100644 --- a/include/git2/message.h +++ b/include/git2/message.h @@ -23,25 +23,27 @@ GIT_BEGIN_DECL * * Optionally, can remove lines starting with a "#". * - * @param out The user-allocated buffer which will be filled with - * the cleaned up message. Pass NULL if you just want to get the size of the - * prettified message as the output value. + * @param out The user-allocated buffer which will be filled with the + * cleaned up message. Pass NULL if you just want to get the needed + * size of the prettified message as the output value. * - * @param size The size of the allocated buffer message_out. + * @param out_size Size of the `out` buffer in bytes. * * @param message The message to be prettified. * - * @param strip_comments 1 to remove lines starting with a "#", 0 otherwise. + * @param strip_comments Non-zero to remove lines starting with "#", 0 to + * leave them in. * * @return -1 on error, else number of characters in prettified message - * including the trailing NUL byte + * including the trailing NUL byte */ GIT_EXTERN(int) git_message_prettify( char *out, - size_t buffer_size, + size_t out_size, const char *message, int strip_comments); /** @} */ GIT_END_DECL + #endif /* INCLUDE_git_message_h__ */ From c3fb7d04edecb68f0307dfaa48a311f0f72db90e Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 27 Nov 2012 15:00:49 -0800 Subject: [PATCH 37/38] Make git_odb_foreach_cb take const param This makes the first OID param of the ODB callback a const pointer and also propogates that change all the way to the backends. --- include/git2/odb.h | 5 ----- include/git2/odb_backend.h | 11 +++++++++-- src/odb_loose.c | 4 ++-- src/odb_pack.c | 2 +- src/pack.c | 2 +- src/pack.h | 2 +- tests-clar/odb/foreach.c | 4 ++-- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/include/git2/odb.h b/include/git2/odb.h index d41c2fb52..f2633d11c 100644 --- a/include/git2/odb.h +++ b/include/git2/odb.h @@ -22,11 +22,6 @@ */ GIT_BEGIN_DECL -/** - * Function type for callbacks from git_odb_foreach. - */ -typedef int (*git_odb_foreach_cb)(git_oid *id, void *payload); - /** * Create a new object database with no backends. * diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h index 694803efd..04658f9b3 100644 --- a/include/git2/odb_backend.h +++ b/include/git2/odb_backend.h @@ -24,7 +24,14 @@ GIT_BEGIN_DECL struct git_odb_stream; struct git_odb_writepack; -/** An instance for a custom backend */ +/** + * Function type for callbacks from git_odb_foreach. + */ +typedef int (*git_odb_foreach_cb)(const git_oid *id, void *payload); + +/** + * An instance for a custom backend + */ struct git_odb_backend { git_odb *odb; @@ -79,7 +86,7 @@ struct git_odb_backend { int (* foreach)( struct git_odb_backend *, - int (*cb)(git_oid *oid, void *payload), + git_odb_foreach_cb cb, void *payload); int (* writepack)( diff --git a/src/odb_loose.c b/src/odb_loose.c index 41121ae10..e2f1aec32 100644 --- a/src/odb_loose.c +++ b/src/odb_loose.c @@ -678,7 +678,7 @@ static int loose_backend__exists(git_odb_backend *backend, const git_oid *oid) struct foreach_state { size_t dir_len; - int (*cb)(git_oid *oid, void *data); + git_odb_foreach_cb cb; void *data; int cb_error; }; @@ -734,7 +734,7 @@ static int foreach_cb(void *_state, git_buf *path) return git_path_direach(path, foreach_object_dir_cb, state); } -static int loose_backend__foreach(git_odb_backend *_backend, int (*cb)(git_oid *oid, void *data), void *data) +static int loose_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb cb, void *data) { char *objects_dir; int error; diff --git a/src/odb_pack.c b/src/odb_pack.c index 9f7a6ee1f..35bf1580d 100644 --- a/src/odb_pack.c +++ b/src/odb_pack.c @@ -458,7 +458,7 @@ static int pack_backend__exists(git_odb_backend *backend, const git_oid *oid) return pack_entry_find(&e, (struct pack_backend *)backend, oid) == 0; } -static int pack_backend__foreach(git_odb_backend *_backend, int (*cb)(git_oid *oid, void *data), void *data) +static int pack_backend__foreach(git_odb_backend *_backend, git_odb_foreach_cb cb, void *data) { int error; struct git_pack_file *p; diff --git a/src/pack.c b/src/pack.c index a2a2fbcd1..6cb46d37b 100644 --- a/src/pack.c +++ b/src/pack.c @@ -698,7 +698,7 @@ static int git__memcmp4(const void *a, const void *b) { int git_pack_foreach_entry( struct git_pack_file *p, - int (*cb)(git_oid *oid, void *data), + git_odb_foreach_cb cb, void *data) { const unsigned char *index = p->index_map.data, *current; diff --git a/src/pack.h b/src/pack.h index af87b7cd5..9fb26b6a9 100644 --- a/src/pack.h +++ b/src/pack.h @@ -105,7 +105,7 @@ int git_pack_entry_find( size_t len); int git_pack_foreach_entry( struct git_pack_file *p, - int (*cb)(git_oid *oid, void *data), + git_odb_foreach_cb cb, void *data); #endif diff --git a/tests-clar/odb/foreach.c b/tests-clar/odb/foreach.c index bf52cc1b5..37158d458 100644 --- a/tests-clar/odb/foreach.c +++ b/tests-clar/odb/foreach.c @@ -16,7 +16,7 @@ void test_odb_foreach__cleanup(void) _repo = NULL; } -static int foreach_cb(git_oid *oid, void *data) +static int foreach_cb(const git_oid *oid, void *data) { GIT_UNUSED(data); GIT_UNUSED(oid); @@ -59,7 +59,7 @@ void test_odb_foreach__one_pack(void) cl_assert(nobj == 1628); } -static int foreach_stop_cb(git_oid *oid, void *data) +static int foreach_stop_cb(const git_oid *oid, void *data) { GIT_UNUSED(data); GIT_UNUSED(oid); From ca94e031fa21787ae6336f0aada1b01b2dd22077 Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Tue, 27 Nov 2012 15:28:48 -0800 Subject: [PATCH 38/38] Various minor commenting fixes --- include/git2/repository.h | 6 +++++- include/git2/signature.h | 23 +++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/include/git2/repository.h b/include/git2/repository.h index f1b55f433..e91108a33 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -238,7 +238,7 @@ typedef enum { * repository initialization is completed, an "origin" remote * will be added pointing to this URL. */ -typedef struct git_repository_init_options { +typedef struct { uint32_t flags; uint32_t mode; const char *workdir_path; @@ -269,6 +269,10 @@ GIT_EXTERN(int) git_repository_init_ext( /** * Retrieve and resolve the reference pointed at by HEAD. * + * The returned `git_reference` will be owned by caller and + * `git_reference_free()` must be called when done with it to release the + * allocated memory and prevent a leak. + * * @param out pointer to the reference which will be retrieved * @param repo a repository object * diff --git a/include/git2/signature.h b/include/git2/signature.h index 01a6dfb44..7a265bd8e 100644 --- a/include/git2/signature.h +++ b/include/git2/signature.h @@ -20,8 +20,9 @@ GIT_BEGIN_DECL /** - * Create a new action signature. The signature must be freed - * manually or using git_signature_free + * Create a new action signature. + * + * Call `git_signature_free()` to free the data. * * Note: angle brackets ('<' and '>') characters are not allowed * to be used in either the `name` or the `email` parameter. @@ -36,8 +37,9 @@ GIT_BEGIN_DECL GIT_EXTERN(int) git_signature_new(git_signature **out, const char *name, const char *email, git_time_t time, int offset); /** - * Create a new action signature with a timestamp of 'now'. The - * signature must be freed manually or using git_signature_free + * Create a new action signature with a timestamp of 'now'. + * + * Call `git_signature_free()` to free the data. * * @param out new signature, in case of error NULL * @param name name of the person @@ -48,9 +50,10 @@ GIT_EXTERN(int) git_signature_now(git_signature **out, const char *name, const c /** - * Create a copy of an existing signature. All internal strings are also duplicated. - * The caller is responsible for freeing this structure with - * git_signature_free. + * Create a copy of an existing signature. All internal strings are also + * duplicated. + * + * Call `git_signature_free()` to free the data. * * @param sig signature to duplicated * @return a copy of sig, NULL on out of memory @@ -58,7 +61,11 @@ GIT_EXTERN(int) git_signature_now(git_signature **out, const char *name, const c GIT_EXTERN(git_signature *) git_signature_dup(const git_signature *sig); /** - * Free an existing signature + * Free an existing signature. + * + * Because the signature is not an opaque structure, it is legal to free it + * manually, but be sure to free the "name" and "email" strings in addition + * to the structure itself. * * @param sig signature to free */