object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / object-name.c

diff --git a/object-name.c b/object-name.c
index 2dd1a0f56e1e442dec47dfbbcdd46d58aecc812c..3cd5b327293b2b30cb47ffd0b34418fea6800133 100644 (file)
--- a/object-name.c
+++ b/object-name.c
@@ -1,5 +1,10 @@
 #include "cache.h"
+#include "object-name.h"
+#include "advice.h"
 #include "config.h"
+#include "environment.h"
+#include "gettext.h"
+#include "hex.h"
 #include "tag.h"
 #include "commit.h"
 #include "tree.h"
@@ -12,6 +17,7 @@
 #include "packfile.h"
 #include "object-store.h"
 #include "repository.h"
+#include "setup.h"
 #include "submodule.h"
 #include "midx.h"
 #include "commit-reach.h"
@@ -223,7 +229,7 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
 
 static int disambiguate_commit_only(struct repository *r,
                                    const struct object_id *oid,
-                                   void *cb_data_unused)
+                                   void *cb_data UNUSED)
 {
        int kind = oid_object_info(r, oid, NULL);
        return kind == OBJ_COMMIT;
@@ -231,7 +237,7 @@ static int disambiguate_commit_only(struct repository *r,
 
 static int disambiguate_committish_only(struct repository *r,
                                        const struct object_id *oid,
-                                       void *cb_data_unused)
+                                       void *cb_data UNUSED)
 {
        struct object *obj;
        int kind;
@@ -251,7 +257,7 @@ static int disambiguate_committish_only(struct repository *r,
 
 static int disambiguate_tree_only(struct repository *r,
                                  const struct object_id *oid,
-                                 void *cb_data_unused)
+                                 void *cb_data UNUSED)
 {
        int kind = oid_object_info(r, oid, NULL);
        return kind == OBJ_TREE;
@@ -259,7 +265,7 @@ static int disambiguate_tree_only(struct repository *r,
 
 static int disambiguate_treeish_only(struct repository *r,
                                     const struct object_id *oid,
-                                    void *cb_data_unused)
+                                    void *cb_data UNUSED)
 {
        struct object *obj;
        int kind;
@@ -279,7 +285,7 @@ static int disambiguate_treeish_only(struct repository *r,
 
 static int disambiguate_blob_only(struct repository *r,
                                  const struct object_id *oid,
-                                 void *cb_data_unused)
+                                 void *cb_data UNUSED)
 {
        int kind = oid_object_info(r, oid, NULL);
        return kind == OBJ_BLOB;
@@ -394,8 +400,10 @@ static int show_ambiguous_object(const struct object_id *oid, void *data)
                if (commit) {
                        struct pretty_print_context pp = {0};
                        pp.date_mode.type = DATE_SHORT;
-                       format_commit_message(commit, "%ad", &date, &pp);
-                       format_commit_message(commit, "%s", &msg, &pp);
+                       repo_format_commit_message(the_repository, commit,
+                                                  "%ad", &date, &pp);
+                       repo_format_commit_message(the_repository, commit,
+                                                  "%s", &msg, &pp);
                }
 
                /*
@@ -473,7 +481,7 @@ static int collect_ambiguous(const struct object_id *oid, void *data)
        return 0;
 }
 
-static int repo_collect_ambiguous(struct repository *r,
+static int repo_collect_ambiguous(struct repository *r UNUSED,
                                  const struct object_id *oid,
                                  void *data)
 {
@@ -665,7 +673,7 @@ static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
        return 0;
 }
 
-static int repo_extend_abbrev_len(struct repository *r,
+static int repo_extend_abbrev_len(struct repository *r UNUSED,
                                  const struct object_id *oid,
                                  void *cb_data)
 {
@@ -1036,7 +1044,7 @@ static enum get_oid_result get_parent(struct repository *r,
        if (ret)
                return ret;
        commit = lookup_commit_reference(r, &oid);
-       if (parse_commit(commit))
+       if (repo_parse_commit(r, commit))
                return MISSING_OBJECT;
        if (!idx) {
                oidcpy(result, &commit->object.oid);
@@ -1070,7 +1078,7 @@ static enum get_oid_result get_nth_ancestor(struct repository *r,
                return MISSING_OBJECT;
 
        while (generation--) {
-               if (parse_commit(commit) || !commit->parents)
+               if (repo_parse_commit(r, commit) || !commit->parents)
                        return MISSING_OBJECT;
                commit = commit->parents->item;
        }
@@ -1361,10 +1369,10 @@ static int get_oid_oneline(struct repository *r,
                commit = pop_most_recent_commit(&list, ONELINE_SEEN);
                if (!parse_object(r, &commit->object.oid))
                        continue;
-               buf = get_commit_buffer(commit, NULL);
+               buf = repo_get_commit_buffer(r, commit, NULL);
                p = strstr(buf, "\n\n");
                matches = negative ^ (p && !regexec(&regex, p + 2, 0, NULL, 0));
-               unuse_commit_buffer(commit, buf);
+               repo_unuse_commit_buffer(r, commit, buf);
 
                if (matches) {
                        oidcpy(oid, &commit->object.oid);
@@ -1666,7 +1674,8 @@ void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
        struct interpret_branch_name_options options = {
                .allowed = allowed
        };
-       int used = interpret_branch_name(name, len, sb, &options);
+       int used = repo_interpret_branch_name(the_repository, name, len, sb,
+                                             &options);
 
        if (used < 0)
                used = 0;
@@ -1719,7 +1728,7 @@ int get_oidf(struct object_id *oid, const char *fmt, ...)
        strbuf_vaddf(&sb, fmt, ap);
        va_end(ap);
 
-       ret = get_oid(sb.buf, oid);
+       ret = repo_get_oid(the_repository, sb.buf, oid);
        strbuf_release(&sb);
 
        return ret;