dir.h: move DTYPE defines from cache.h

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index f98691a353138584de27eba84d0883c206fc0a91..43f88eaf56c4dcd23477ef5bdb80ab428c8f70fa 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1,9 +1,11 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "alloc.h"
 #include "config.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
+#include "object-name.h"
+#include "object-file.h"
 #include "object-store.h"
 #include "tag.h"
 #include "blob.h"
@@ -31,6 +33,7 @@
 #include "worktree.h"
 #include "setup.h"
 #include "strvec.h"
+#include "trace2.h"
 #include "commit-reach.h"
 #include "commit-graph.h"
 #include "prio-queue.h"
@@ -329,7 +332,8 @@ static void add_pending_object_with_path(struct rev_info *revs,
        if (revs->reflog_info && obj->type == OBJ_COMMIT) {
                struct strbuf buf = STRBUF_INIT;
                size_t namelen = strlen(name);
-               int len = interpret_branch_name(name, namelen, &buf, &options);
+               int len = repo_interpret_branch_name(the_repository, name,
+                                                    namelen, &buf, &options);
 
                if (0 < len && len < namelen && buf.len)
                        strbuf_addstr(&buf, name + len);
@@ -359,7 +363,7 @@ void add_head_to_pending(struct rev_info *revs)
 {
        struct object_id oid;
        struct object *obj;
-       if (get_oid("HEAD", &oid))
+       if (repo_get_oid(the_repository, "HEAD", &oid))
                return;
        obj = parse_object(revs->repo, &oid);
        if (!obj)
@@ -782,8 +786,8 @@ static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
 static int rev_compare_tree(struct rev_info *revs,
                            struct commit *parent, struct commit *commit, int nth_parent)
 {
-       struct tree *t1 = get_commit_tree(parent);
-       struct tree *t2 = get_commit_tree(commit);
+       struct tree *t1 = repo_get_commit_tree(the_repository, parent);
+       struct tree *t2 = repo_get_commit_tree(the_repository, commit);
        int bloom_ret = 1;
 
        if (!t1)
@@ -829,7 +833,7 @@ static int rev_compare_tree(struct rev_info *revs,
 
 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
 {
-       struct tree *t1 = get_commit_tree(commit);
+       struct tree *t1 = repo_get_commit_tree(the_repository, commit);
 
        if (!t1)
                return 0;
@@ -967,7 +971,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
        if (!revs->prune)
                return;
 
-       if (!get_commit_tree(commit))
+       if (!repo_get_commit_tree(the_repository, commit))
                return;
 
        if (!commit->parents) {
@@ -1873,7 +1877,7 @@ static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
                flags ^= UNINTERESTING | BOTTOM;
                arg++;
        }
-       if (get_oid_committish(arg, &oid))
+       if (repo_get_oid_committish(the_repository, arg, &oid))
                return 0;
        while (1) {
                it = get_reference(revs, arg, &oid, 0);
@@ -1954,15 +1958,15 @@ static void prepare_show_merge(struct rev_info *revs)
        int i, prune_num = 1; /* counting terminating NULL */
        struct index_state *istate = revs->repo->index;
 
-       if (get_oid("HEAD", &oid))
+       if (repo_get_oid(the_repository, "HEAD", &oid))
                die("--merge without HEAD?");
        head = lookup_commit_or_die(&oid, "HEAD");
-       if (get_oid("MERGE_HEAD", &oid))
+       if (repo_get_oid(the_repository, "MERGE_HEAD", &oid))
                die("--merge without MERGE_HEAD?");
        other = lookup_commit_or_die(&oid, "MERGE_HEAD");
        add_pending_object(revs, &head->object, "HEAD");
        add_pending_object(revs, &other->object, "MERGE_HEAD");
-       bases = get_merge_bases(head, other);
+       bases = repo_get_merge_bases(the_repository, head, other);
        add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
        add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
        free_commit_list(bases);
@@ -2057,7 +2061,7 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
                if (!a || !b)
                        return dotdot_missing(arg, dotdot, revs, symmetric);
 
-               exclude = get_merge_bases(a, b);
+               exclude = repo_get_merge_bases(the_repository, a, b);
                add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
                                     flags_exclude);
                add_pending_commit_list(revs, exclude, flags_exclude);
@@ -3883,7 +3887,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
         * in it.
         */
        encoding = get_log_output_encoding();
-       message = logmsg_reencode(commit, NULL, encoding);
+       message = repo_logmsg_reencode(the_repository, commit, NULL, encoding);
 
        /* Copy the commit to temporary if we are using "fake" headers */
        if (buf.len)
@@ -3919,7 +3923,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
                retval = grep_buffer(&opt->grep_filter,
                                     (char *)message, strlen(message));
        strbuf_release(&buf);
-       unuse_commit_buffer(commit, message);
+       repo_unuse_commit_buffer(the_repository, commit, message);
        return retval;
 }