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

[thirdparty/git.git] / builtin / notes.c

diff --git a/builtin/notes.c b/builtin/notes.c
index 75ce7f3f5742b60ce2f76253aef4f9c357635def..896140b9055ce25a4eba970557d127544c4a260f 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -10,8 +10,10 @@
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"
+#include "gettext.h"
 #include "hex.h"
 #include "notes.h"
+#include "object-name.h"
 #include "object-store.h"
 #include "repository.h"
 #include "blob.h"
@@ -24,6 +26,7 @@
 #include "notes-merge.h"
 #include "notes-utils.h"
 #include "worktree.h"
+#include "write-or-die.h"
 
 static const char * const git_notes_usage[] = {
        N_("git notes [--ref <notes-ref>] [list [<object>]]"),
@@ -126,7 +129,7 @@ static void copy_obj_to_fd(int fd, const struct object_id *oid)
 {
        unsigned long size;
        enum object_type type;
-       char *buf = read_object_file(oid, &type, &size);
+       char *buf = repo_read_object_file(the_repository, oid, &type, &size);
        if (buf) {
                if (size)
                        write_or_die(fd, buf, size);
@@ -259,9 +262,9 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
        if (d->buf.len)
                strbuf_addch(&d->buf, '\n');
 
-       if (get_oid(arg, &object))
+       if (repo_get_oid(the_repository, arg, &object))
                die(_("failed to resolve '%s' as a valid ref."), arg);
-       if (!(buf = read_object_file(&object, &type, &len)))
+       if (!(buf = repo_read_object_file(the_repository, &object, &type, &len)))
                die(_("failed to read object '%s'."), arg);
        if (type != OBJ_BLOB) {
                free(buf);
@@ -309,9 +312,9 @@ static int notes_copy_from_stdin(int force, const char *rewrite_cmd)
                        die(_("malformed input line: '%s'."), buf.buf);
                strbuf_rtrim(split[0]);
                strbuf_rtrim(split[1]);
-               if (get_oid(split[0]->buf, &from_obj))
+               if (repo_get_oid(the_repository, split[0]->buf, &from_obj))
                        die(_("failed to resolve '%s' as a valid ref."), split[0]->buf);
-               if (get_oid(split[1]->buf, &to_obj))
+               if (repo_get_oid(the_repository, split[1]->buf, &to_obj))
                        die(_("failed to resolve '%s' as a valid ref."), split[1]->buf);
 
                if (rewrite_cmd)
@@ -379,7 +382,7 @@ static int list(int argc, const char **argv, const char *prefix)
 
        t = init_notes_check("list", 0);
        if (argc) {
-               if (get_oid(argv[0], &object))
+               if (repo_get_oid(the_repository, argv[0], &object))
                        die(_("failed to resolve '%s' as a valid ref."), argv[0]);
                note = get_note(t, &object);
                if (note) {
@@ -434,7 +437,7 @@ static int add(int argc, const char **argv, const char *prefix)
 
        object_ref = argc > 1 ? argv[1] : "HEAD";
 
-       if (get_oid(object_ref, &object))
+       if (repo_get_oid(the_repository, object_ref, &object))
                die(_("failed to resolve '%s' as a valid ref."), object_ref);
 
        t = init_notes_check("add", NOTES_INIT_WRITABLE);
@@ -522,12 +525,12 @@ static int copy(int argc, const char **argv, const char *prefix)
                usage_with_options(git_notes_copy_usage, options);
        }
 
-       if (get_oid(argv[0], &from_obj))
+       if (repo_get_oid(the_repository, argv[0], &from_obj))
                die(_("failed to resolve '%s' as a valid ref."), argv[0]);
 
        object_ref = 1 < argc ? argv[1] : "HEAD";
 
-       if (get_oid(object_ref, &object))
+       if (repo_get_oid(the_repository, object_ref, &object))
                die(_("failed to resolve '%s' as a valid ref."), object_ref);
 
        t = init_notes_check("copy", NOTES_INIT_WRITABLE);
@@ -606,7 +609,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 
        object_ref = 1 < argc ? argv[1] : "HEAD";
 
-       if (get_oid(object_ref, &object))
+       if (repo_get_oid(the_repository, object_ref, &object))
                die(_("failed to resolve '%s' as a valid ref."), object_ref);
 
        t = init_notes_check(argv[0], NOTES_INIT_WRITABLE);
@@ -618,7 +621,8 @@ static int append_edit(int argc, const char **argv, const char *prefix)
                /* Append buf to previous note contents */
                unsigned long size;
                enum object_type type;
-               char *prev_buf = read_object_file(note, &type, &size);
+               char *prev_buf = repo_read_object_file(the_repository, note,
+                                                      &type, &size);
 
                strbuf_grow(&d.buf, size + 1);
                if (d.buf.len && prev_buf && size)
@@ -668,7 +672,7 @@ static int show(int argc, const char **argv, const char *prefix)
 
        object_ref = argc ? argv[0] : "HEAD";
 
-       if (get_oid(object_ref, &object))
+       if (repo_get_oid(the_repository, object_ref, &object))
                die(_("failed to resolve '%s' as a valid ref."), object_ref);
 
        t = init_notes_check("show", 0);
@@ -718,11 +722,11 @@ static int merge_commit(struct notes_merge_options *o)
         * and target notes ref from .git/NOTES_MERGE_REF.
         */
 
-       if (get_oid("NOTES_MERGE_PARTIAL", &oid))
+       if (repo_get_oid(the_repository, "NOTES_MERGE_PARTIAL", &oid))
                die(_("failed to read ref NOTES_MERGE_PARTIAL"));
        else if (!(partial = lookup_commit_reference(the_repository, &oid)))
                die(_("could not find commit from NOTES_MERGE_PARTIAL."));
-       else if (parse_commit(partial))
+       else if (repo_parse_commit(the_repository, partial))
                die(_("could not parse commit from NOTES_MERGE_PARTIAL."));
 
        if (partial->parents)
@@ -743,7 +747,8 @@ static int merge_commit(struct notes_merge_options *o)
 
        /* Reuse existing commit message in reflog message */
        memset(&pretty_ctx, 0, sizeof(pretty_ctx));
-       format_commit_message(partial, "%s", &msg, &pretty_ctx);
+       repo_format_commit_message(the_repository, partial, "%s", &msg,
+                                  &pretty_ctx);
        strbuf_trim(&msg);
        strbuf_insertstr(&msg, 0, "notes: ");
        update_ref(msg.buf, o->local_ref, &oid,
@@ -897,7 +902,7 @@ static int remove_one_note(struct notes_tree *t, const char *name, unsigned flag
 {
        int status;
        struct object_id oid;
-       if (get_oid(name, &oid))
+       if (repo_get_oid(the_repository, name, &oid))
                return error(_("Failed to resolve '%s' as a valid ref."), name);
        status = remove_note(t, oid.hash);
        if (status)