sha1_name: convert disambiguate_hint_fn to take object_id

Convert this function pointer type and the functions that implement it
to take a struct object_id.  Introduce a temporary in
show_ambiguous_object to avoid having to convert for_each_abbrev at this
point.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_name.c b/sha1_name.c
index cf6f4be0c6539021974cc679fbed8d176d5e8320..2e38aedfa5005f4ac955fea0f88f5c5777b4858b 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -11,7 +11,7 @@
 
 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
 
 
 static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
 

-typedef int (*disambiguate_hint_fn)(const unsigned char *, void *);
+typedef int (*disambiguate_hint_fn)(const struct object_id *, void *);

 
 struct disambiguate_state {
        int len; /* length of prefix in hex chars */
 
 struct disambiguate_state {
        int len; /* length of prefix in hex chars */


@@ -29,7 +29,7 @@ struct disambiguate_state {
        unsigned always_call_fn:1;
 };
 
        unsigned always_call_fn:1;
 };
 

-static void update_candidates(struct disambiguate_state *ds, const unsigned char *current)
+static void update_candidates(struct disambiguate_state *ds, const struct object_id *current)

 {
        if (ds->always_call_fn) {
                ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;
 {
        if (ds->always_call_fn) {
                ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0;


@@ -37,10 +37,10 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char
        }
        if (!ds->candidate_exists) {
                /* this is the first candidate */
        }
        if (!ds->candidate_exists) {
                /* this is the first candidate */

-               hashcpy(ds->candidate.hash, current);
+               oidcpy(&ds->candidate, current);

                ds->candidate_exists = 1;
                return;
                ds->candidate_exists = 1;
                return;

-       } else if (!hashcmp(ds->candidate.hash, current)) {
+       } else if (!oidcmp(&ds->candidate, current)) {

                /* the same as what we already have seen */
                return;
        }
                /* the same as what we already have seen */
                return;
        }


@@ -52,14 +52,14 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char
        }
 
        if (!ds->candidate_checked) {
        }
 
        if (!ds->candidate_checked) {

-               ds->candidate_ok = ds->fn(ds->candidate.hash, ds->cb_data);
+               ds->candidate_ok = ds->fn(&ds->candidate, ds->cb_data);

                ds->disambiguate_fn_used = 1;
                ds->candidate_checked = 1;
        }
 
        if (!ds->candidate_ok) {
                /* discard the candidate; we know it does not satisfy fn */
                ds->disambiguate_fn_used = 1;
                ds->candidate_checked = 1;
        }
 
        if (!ds->candidate_ok) {
                /* discard the candidate; we know it does not satisfy fn */

-               hashcpy(ds->candidate.hash, current);
+               oidcpy(&ds->candidate, current);

                ds->candidate_checked = 0;
                return;
        }
                ds->candidate_checked = 0;
                return;
        }


@@ -107,15 +107,15 @@ static void find_short_object_filename(struct disambiguate_state *ds)
                        continue;
 
                while (!ds->ambiguous && (de = readdir(dir)) != NULL) {
                        continue;
 
                while (!ds->ambiguous && (de = readdir(dir)) != NULL) {

-                       unsigned char sha1[20];
+                       struct object_id oid;

 
 

-                       if (strlen(de->d_name) != 38)
+                       if (strlen(de->d_name) != GIT_SHA1_HEXSZ - 2)

                                continue;
                        if (memcmp(de->d_name, ds->hex_pfx + 2, ds->len - 2))
                                continue;
                                continue;
                        if (memcmp(de->d_name, ds->hex_pfx + 2, ds->len - 2))
                                continue;

-                       memcpy(hex + 2, de->d_name, 38);
-                       if (!get_sha1_hex(hex, sha1))
-                               update_candidates(ds, sha1);
+                       memcpy(hex + 2, de->d_name, GIT_SHA1_HEXSZ - 2);
+                       if (!get_oid_hex(hex, &oid))
+                               update_candidates(ds, &oid);

                }
                closedir(dir);
        }
                }
                closedir(dir);
        }


@@ -140,7 +140,7 @@ static void unique_in_pack(struct packed_git *p,
                           struct disambiguate_state *ds)
 {
        uint32_t num, last, i, first = 0;
                           struct disambiguate_state *ds)
 {
        uint32_t num, last, i, first = 0;

-       const unsigned char *current = NULL;
+       const struct object_id *current = NULL;

 
        open_pack_index(p);
        num = p->num_objects;
 
        open_pack_index(p);
        num = p->num_objects;


@@ -169,8 +169,9 @@ static void unique_in_pack(struct packed_git *p,
         * 0, 1 or more objects that actually match(es).
         */
        for (i = first; i < num && !ds->ambiguous; i++) {
         * 0, 1 or more objects that actually match(es).
         */
        for (i = first; i < num && !ds->ambiguous; i++) {

-               current = nth_packed_object_sha1(p, i);
-               if (!match_sha(ds->len, ds->bin_pfx.hash, current))
+               struct object_id oid;
+               current = nth_packed_object_oid(&oid, p, i);
+               if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))

                        break;
                update_candidates(ds, current);
        }
                        break;
                update_candidates(ds, current);
        }


@@ -213,7 +214,7 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
                 * same repository!
                 */
                ds->candidate_ok = (!ds->disambiguate_fn_used ||
                 * same repository!
                 */
                ds->candidate_ok = (!ds->disambiguate_fn_used ||

-                                   ds->fn(ds->candidate.hash, ds->cb_data));
+                                   ds->fn(&ds->candidate, ds->cb_data));

 
        if (!ds->candidate_ok)
                return SHORT_NAME_AMBIGUOUS;
 
        if (!ds->candidate_ok)
                return SHORT_NAME_AMBIGUOUS;


@@ -222,57 +223,57 @@ static int finish_object_disambiguation(struct disambiguate_state *ds,
        return 0;
 }
 
        return 0;
 }
 

-static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused)
+static int disambiguate_commit_only(const struct object_id *oid, void *cb_data_unused)

 {
 {

-       int kind = sha1_object_info(sha1, NULL);
+       int kind = sha1_object_info(oid->hash, NULL);

        return kind == OBJ_COMMIT;
 }
 
        return kind == OBJ_COMMIT;
 }
 

-static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused)
+static int disambiguate_committish_only(const struct object_id *oid, void *cb_data_unused)

 {
        struct object *obj;
        int kind;
 
 {
        struct object *obj;
        int kind;
 

-       kind = sha1_object_info(sha1, NULL);
+       kind = sha1_object_info(oid->hash, NULL);

        if (kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)
                return 0;
 
        /* We need to do this the hard way... */
        if (kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)
                return 0;
 
        /* We need to do this the hard way... */

-       obj = deref_tag(parse_object(sha1), NULL, 0);
+       obj = deref_tag(parse_object(oid->hash), NULL, 0);

        if (obj && obj->type == OBJ_COMMIT)
                return 1;
        return 0;
 }
 
        if (obj && obj->type == OBJ_COMMIT)
                return 1;
        return 0;
 }
 

-static int disambiguate_tree_only(const unsigned char *sha1, void *cb_data_unused)
+static int disambiguate_tree_only(const struct object_id *oid, void *cb_data_unused)

 {
 {

-       int kind = sha1_object_info(sha1, NULL);
+       int kind = sha1_object_info(oid->hash, NULL);

        return kind == OBJ_TREE;
 }
 
        return kind == OBJ_TREE;
 }
 

-static int disambiguate_treeish_only(const unsigned char *sha1, void *cb_data_unused)
+static int disambiguate_treeish_only(const struct object_id *oid, void *cb_data_unused)

 {
        struct object *obj;
        int kind;
 
 {
        struct object *obj;
        int kind;
 

-       kind = sha1_object_info(sha1, NULL);
+       kind = sha1_object_info(oid->hash, NULL);

        if (kind == OBJ_TREE || kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)
                return 0;
 
        /* We need to do this the hard way... */
        if (kind == OBJ_TREE || kind == OBJ_COMMIT)
                return 1;
        if (kind != OBJ_TAG)
                return 0;
 
        /* We need to do this the hard way... */

-       obj = deref_tag(parse_object(sha1), NULL, 0);
+       obj = deref_tag(parse_object(oid->hash), NULL, 0);

        if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
                return 1;
        return 0;
 }
 
        if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT))
                return 1;
        return 0;
 }
 

-static int disambiguate_blob_only(const unsigned char *sha1, void *cb_data_unused)
+static int disambiguate_blob_only(const struct object_id *oid, void *cb_data_unused)

 {
 {

-       int kind = sha1_object_info(sha1, NULL);
+       int kind = sha1_object_info(oid->hash, NULL);

        return kind == OBJ_BLOB;
 }
 
        return kind == OBJ_BLOB;
 }
 


@@ -344,10 +345,13 @@ static int init_object_disambiguation(const char *name, int len,
 static int show_ambiguous_object(const unsigned char *sha1, void *data)
 {
        const struct disambiguate_state *ds = data;
 static int show_ambiguous_object(const unsigned char *sha1, void *data)
 {
        const struct disambiguate_state *ds = data;

+       struct object_id oid;

        struct strbuf desc = STRBUF_INIT;
        int type;
 
        struct strbuf desc = STRBUF_INIT;
        int type;
 

-       if (ds->fn && !ds->fn(sha1, ds->cb_data))
+
+       hashcpy(oid.hash, sha1);
+       if (ds->fn && !ds->fn(&oid, ds->cb_data))

                return 0;
 
        type = sha1_object_info(sha1, NULL);
                return 0;
 
        type = sha1_object_info(sha1, NULL);


@@ -422,9 +426,9 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1,
        return status;
 }
 
        return status;
 }
 

-static int collect_ambiguous(const unsigned char *sha1, void *data)
+static int collect_ambiguous(const struct object_id *oid, void *data)

 {
 {

-       sha1_array_append(data, sha1);
+       sha1_array_append(data, oid->hash);

        return 0;
 }
 
        return 0;
 }