diff: rename struct diff_filespec's sha1_valid member

Now that this struct's sha1 member is called "oid", update the comment
and the sha1_valid member to be called "oid_valid" instead.  The
following Coccinelle semantic patch was used to implement this, followed
by the transformations in object_id.cocci:

@@
struct diff_filespec o;
@@
- o.sha1_valid
+ o.oid_valid

@@
struct diff_filespec *p;
@@
- p->sha1_valid
+ p->oid_valid

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

diff --git a/combine-diff.c b/combine-diff.c
index 3537209cd40c723e3234b8fa2009aed2d27e227a..5940dc87070c7e5f8aabbe920341fc5de1959c2c 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1269,7 +1269,7 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
                pair->one[i].path = p->path;
                pair->one[i].mode = p->parent[i].mode;
                oidcpy(&pair->one[i].oid, &p->parent[i].oid);
                pair->one[i].path = p->path;
                pair->one[i].mode = p->parent[i].mode;
                oidcpy(&pair->one[i].oid, &p->parent[i].oid);

-               pair->one[i].sha1_valid = !is_null_oid(&p->parent[i].oid);
+               pair->one[i].oid_valid = !is_null_oid(&p->parent[i].oid);

                pair->one[i].has_more_entries = 1;
        }
        pair->one[num_parent - 1].has_more_entries = 0;
                pair->one[i].has_more_entries = 1;
        }
        pair->one[num_parent - 1].has_more_entries = 0;


@@ -1277,7 +1277,7 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
        pair->two->path = p->path;
        pair->two->mode = p->mode;
        oidcpy(&pair->two->oid, &p->oid);
        pair->two->path = p->path;
        pair->two->mode = p->mode;
        oidcpy(&pair->two->oid, &p->oid);

-       pair->two->sha1_valid = !is_null_oid(&p->oid);
+       pair->two->oid_valid = !is_null_oid(&p->oid);

        return pair;
 }
 
        return pair;
 }
 

diff --git a/diff.c b/diff.c
index ae9edc30d561d4c58f53e00d0386f67692f84dc8..9abb54ad20cbce24d7737b2e8bc79c3ddbde3496 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1933,7 +1933,7 @@ static void show_dirstat(struct diff_options *options)
 
                name = p->two->path ? p->two->path : p->one->path;
 
 
                name = p->two->path ? p->two->path : p->one->path;
 

-               if (p->one->sha1_valid && p->two->sha1_valid)
+               if (p->one->oid_valid && p->two->oid_valid)

                        content_changed = oidcmp(&p->one->oid, &p->two->oid);
                else
                        content_changed = 1;
                        content_changed = oidcmp(&p->one->oid, &p->two->oid);
                else
                        content_changed = 1;


@@ -2640,7 +2640,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
        if (mode) {
                spec->mode = canon_mode(mode);
                hashcpy(spec->oid.hash, sha1);
        if (mode) {
                spec->mode = canon_mode(mode);
                hashcpy(spec->oid.hash, sha1);

-               spec->sha1_valid = sha1_valid;
+               spec->oid_valid = sha1_valid;

        }
 }
 
        }
 }
 


@@ -2766,7 +2766,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)
        if (S_ISGITLINK(s->mode))
                return diff_populate_gitlink(s, size_only);
 
        if (S_ISGITLINK(s->mode))
                return diff_populate_gitlink(s, size_only);
 

-       if (!s->sha1_valid ||
+       if (!s->oid_valid ||

            reuse_worktree_file(s->path, s->oid.hash, 0)) {
                struct strbuf buf = STRBUF_INIT;
                struct stat st;
            reuse_worktree_file(s->path, s->oid.hash, 0)) {
                struct strbuf buf = STRBUF_INIT;
                struct stat st;


@@ -2915,7 +2915,7 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
        }
 
        if (!S_ISGITLINK(one->mode) &&
        }
 
        if (!S_ISGITLINK(one->mode) &&

-           (!one->sha1_valid ||
+           (!one->oid_valid ||

             reuse_worktree_file(name, one->oid.hash, 1))) {
                struct stat st;
                if (lstat(name, &st) < 0) {
             reuse_worktree_file(name, one->oid.hash, 1))) {
                struct stat st;
                if (lstat(name, &st) < 0) {


@@ -2928,16 +2928,16 @@ static struct diff_tempfile *prepare_temp_file(const char *name,
                        if (strbuf_readlink(&sb, name, st.st_size) < 0)
                                die_errno("readlink(%s)", name);
                        prep_temp_blob(name, temp, sb.buf, sb.len,
                        if (strbuf_readlink(&sb, name, st.st_size) < 0)
                                die_errno("readlink(%s)", name);
                        prep_temp_blob(name, temp, sb.buf, sb.len,

-                                      (one->sha1_valid ?
+                                      (one->oid_valid ?

                                        one->oid.hash : null_sha1),
                                        one->oid.hash : null_sha1),

-                                      (one->sha1_valid ?
+                                      (one->oid_valid ?

                                        one->mode : S_IFLNK));
                        strbuf_release(&sb);
                }
                else {
                        /* we can borrow from the file in the work tree */
                        temp->name = name;
                                        one->mode : S_IFLNK));
                        strbuf_release(&sb);
                }
                else {
                        /* we can borrow from the file in the work tree */
                        temp->name = name;

-                       if (!one->sha1_valid)
+                       if (!one->oid_valid)

                                sha1_to_hex_r(temp->hex, null_sha1);
                        else
                                sha1_to_hex_r(temp->hex, one->oid.hash);
                                sha1_to_hex_r(temp->hex, null_sha1);
                        else
                                sha1_to_hex_r(temp->hex, one->oid.hash);


@@ -3134,7 +3134,7 @@ static void run_diff_cmd(const char *pgm,
 static void diff_fill_sha1_info(struct diff_filespec *one)
 {
        if (DIFF_FILE_VALID(one)) {
 static void diff_fill_sha1_info(struct diff_filespec *one)
 {
        if (DIFF_FILE_VALID(one)) {

-               if (!one->sha1_valid) {
+               if (!one->oid_valid) {

                        struct stat st;
                        if (one->is_stdin) {
                                oidclr(&one->oid);
                        struct stat st;
                        if (one->is_stdin) {
                                oidclr(&one->oid);


@@ -4172,11 +4172,11 @@ int diff_unmodified_pair(struct diff_filepair *p)
        /* both are valid and point at the same path.  that is, we are
         * dealing with a change.
         */
        /* both are valid and point at the same path.  that is, we are
         * dealing with a change.
         */

-       if (one->sha1_valid && two->sha1_valid &&
+       if (one->oid_valid && two->oid_valid &&

            !oidcmp(&one->oid, &two->oid) &&
            !one->dirty_submodule && !two->dirty_submodule)
                return 1; /* no change */
            !oidcmp(&one->oid, &two->oid) &&
            !one->dirty_submodule && !two->dirty_submodule)
                return 1; /* no change */

-       if (!one->sha1_valid && !two->sha1_valid)
+       if (!one->oid_valid && !two->oid_valid)

                return 1; /* both look at the same file on the filesystem. */
        return 0;
 }
                return 1; /* both look at the same file on the filesystem. */
        return 0;
 }


@@ -4237,7 +4237,7 @@ void diff_debug_filespec(struct diff_filespec *s, int x, const char *one)
                s->path,
                DIFF_FILE_VALID(s) ? "valid" : "invalid",
                s->mode,
                s->path,
                DIFF_FILE_VALID(s) ? "valid" : "invalid",
                s->mode,

-               s->sha1_valid ? oid_to_hex(&s->oid) : "");
+               s->oid_valid ? oid_to_hex(&s->oid) : "");

        fprintf(stderr, "queue[%d] %s size %lu\n",
                x, one ? one : "",
                s->size);
        fprintf(stderr, "queue[%d] %s size %lu\n",
                x, one ? one : "",
                s->size);


@@ -4822,7 +4822,7 @@ static int diff_filespec_check_stat_unmatch(struct diff_filepair *p)
         */
        if (!DIFF_FILE_VALID(p->one) || /* (1) */
            !DIFF_FILE_VALID(p->two) ||
         */
        if (!DIFF_FILE_VALID(p->one) || /* (1) */
            !DIFF_FILE_VALID(p->two) ||

-           (p->one->sha1_valid && p->two->sha1_valid) ||
+           (p->one->oid_valid && p->two->oid_valid) ||

            (p->one->mode != p->two->mode) ||
            diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
            diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||
            (p->one->mode != p->two->mode) ||
            diff_populate_filespec(p->one, CHECK_SIZE_ONLY) ||
            diff_populate_filespec(p->two, CHECK_SIZE_ONLY) ||


@@ -5118,7 +5118,7 @@ size_t fill_textconv(struct userdiff_driver *driver,
        if (!driver->textconv)
                die("BUG: fill_textconv called with non-textconv driver");
 
        if (!driver->textconv)
                die("BUG: fill_textconv called with non-textconv driver");
 

-       if (driver->textconv_cache && df->sha1_valid) {
+       if (driver->textconv_cache && df->oid_valid) {

                *outbuf = notes_cache_get(driver->textconv_cache,
                                          df->oid.hash,
                                          &size);
                *outbuf = notes_cache_get(driver->textconv_cache,
                                          df->oid.hash,
                                          &size);


@@ -5130,7 +5130,7 @@ size_t fill_textconv(struct userdiff_driver *driver,
        if (!*outbuf)
                die("unable to read files to diff");
 
        if (!*outbuf)
                die("unable to read files to diff");
 

-       if (driver->textconv_cache && df->sha1_valid) {
+       if (driver->textconv_cache && df->oid_valid) {

                /* ignore errors, as we might be in a readonly repository */
                notes_cache_put(driver->textconv_cache, df->oid.hash, *outbuf,
                                size);
                /* ignore errors, as we might be in a readonly repository */
                notes_cache_put(driver->textconv_cache, df->oid.hash, *outbuf,
                                size);

diff --git a/diffcore-break.c b/diffcore-break.c
index a3e796089ffad89a6f17074f4fe8848f7a13275e..881a74f29e4f6033a2547f2558a5ad8a3eaad584 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -57,7 +57,7 @@ static int should_break(struct diff_filespec *src,
                return 1; /* even their types are different */
        }
 
                return 1; /* even their types are different */
        }
 

-       if (src->sha1_valid && dst->sha1_valid &&
+       if (src->oid_valid && dst->oid_valid &&

            !oidcmp(&src->oid, &dst->oid))
                return 0; /* they are the same */
 
            !oidcmp(&src->oid, &dst->oid))
                return 0; /* they are the same */
 

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 22b239a43ab2966aa3581b434e4a336f542f12e2..58ac0a531be0722bc422eb008bfcb9695965996c 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -60,7 +60,7 @@ static int add_rename_dst(struct diff_filespec *two)
                memmove(rename_dst + first + 1, rename_dst + first,
                        (rename_dst_nr - first - 1) * sizeof(*rename_dst));
        rename_dst[first].two = alloc_filespec(two->path);
                memmove(rename_dst + first + 1, rename_dst + first,
                        (rename_dst_nr - first - 1) * sizeof(*rename_dst));
        rename_dst[first].two = alloc_filespec(two->path);

-       fill_filespec(rename_dst[first].two, two->oid.hash, two->sha1_valid,
+       fill_filespec(rename_dst[first].two, two->oid.hash, two->oid_valid,

                      two->mode);
        rename_dst[first].pair = NULL;
        return 0;
                      two->mode);
        rename_dst[first].pair = NULL;
        return 0;


@@ -261,7 +261,7 @@ struct file_similarity {
 
 static unsigned int hash_filespec(struct diff_filespec *filespec)
 {
 
 static unsigned int hash_filespec(struct diff_filespec *filespec)
 {

-       if (!filespec->sha1_valid) {
+       if (!filespec->oid_valid) {

                if (diff_populate_filespec(filespec, 0))
                        return 0;
                hash_sha1_file(filespec->data, filespec->size, "blob",
                if (diff_populate_filespec(filespec, 0))
                        return 0;
                hash_sha1_file(filespec->data, filespec->size, "blob",

diff --git a/diffcore.h b/diffcore.h
index c40e5b6c1b8ac9af64bafcfe225651e0318114ce..c11b8465fc8ef9e54f12130e490c00bd2fb63616 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -33,7 +33,7 @@ struct diff_filespec {
        int count;               /* Reference count */
        int rename_used;         /* Count of rename users */
        unsigned short mode;     /* file mode */
        int count;               /* Reference count */
        int rename_used;         /* Count of rename users */
        unsigned short mode;     /* file mode */

-       unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
+       unsigned oid_valid : 1;  /* if true, use oid and trust mode;

                                  * if false, use the name and read from
                                  * the filesystem.
                                  */
                                  * if false, use the name and read from
                                  * the filesystem.
                                  */

diff --git a/line-log.c b/line-log.c
index 0293863926f9c2643df92f80799e45c1b162db22..93407baafd12c68aedb04bc6995417d9554aef78 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -894,14 +894,14 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
        if (!pair || !diff)
                return;
 
        if (!pair || !diff)
                return;
 

-       if (pair->one->sha1_valid)
+       if (pair->one->oid_valid)

                fill_line_ends(pair->one, &p_lines, &p_ends);
        fill_line_ends(pair->two, &t_lines, &t_ends);
 
        printf("%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
        printf("%s%s--- %s%s%s\n", prefix, c_meta,
                fill_line_ends(pair->one, &p_lines, &p_ends);
        fill_line_ends(pair->two, &t_lines, &t_ends);
 
        printf("%s%sdiff --git a/%s b/%s%s\n", prefix, c_meta, pair->one->path, pair->two->path, c_reset);
        printf("%s%s--- %s%s%s\n", prefix, c_meta,

-              pair->one->sha1_valid ? "a/" : "",
-              pair->one->sha1_valid ? pair->one->path : "/dev/null",
+              pair->one->oid_valid ? "a/" : "",
+              pair->one->oid_valid ? pair->one->path : "/dev/null",

               c_reset);
        printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
        for (i = 0; i < range->ranges.nr; i++) {
               c_reset);
        printf("%s%s+++ b/%s%s\n", prefix, c_meta, pair->two->path, c_reset);
        for (i = 0; i < range->ranges.nr; i++) {


@@ -1011,12 +1011,12 @@ static int process_diff_filepair(struct rev_info *rev,
        if (rg->ranges.nr == 0)
                return 0;
 
        if (rg->ranges.nr == 0)
                return 0;
 

-       assert(pair->two->sha1_valid);
+       assert(pair->two->oid_valid);

        diff_populate_filespec(pair->two, 0);
        file_target.ptr = pair->two->data;
        file_target.size = pair->two->size;
 
        diff_populate_filespec(pair->two, 0);
        file_target.ptr = pair->two->data;
        file_target.size = pair->two->size;
 

-       if (pair->one->sha1_valid) {
+       if (pair->one->oid_valid) {

                diff_populate_filespec(pair->one, 0);
                file_parent.ptr = pair->one->data;
                file_parent.size = pair->one->size;
                diff_populate_filespec(pair->one, 0);
                file_parent.ptr = pair->one->data;
                file_parent.size = pair->one->size;