]> git.cameronkatri.com Git - cgit.git/commitdiff
global: replace references to 'sha1' with 'oid'
authorChristian Hesse <mail@eworm.de>
Tue, 20 Oct 2020 21:32:45 +0000 (23:32 +0200)
committerChristian Hesse <mail@eworm.de>
Tue, 20 Oct 2020 21:57:12 +0000 (23:57 +0200)
For some time now sha1 is considered broken and upstream is working to
replace it with sha256. Replace all references to 'sha1' with 'oid',
just as upstream does.

Signed-off-by: Christian Hesse <mail@eworm.de>
13 files changed:
cgit.c
cgit.css
cgit.h
cmd.c
parsing.c
tests/t0001-validate-git-versions.sh
ui-blame.c
ui-commit.c
ui-diff.c
ui-log.c
ui-plain.c
ui-shared.c
ui-tag.c

diff --git a/cgit.c b/cgit.c
index c4320f044d4bae6df164719432c650b028bd4419..08d81a1d4b632af9b725a0a2dbf553cff4d3e6b7 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -324,11 +324,11 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.head = xstrdup(value);
                ctx.qry.has_symref = 1;
        } else if (!strcmp(name, "id")) {
-               ctx.qry.sha1 = xstrdup(value);
-               ctx.qry.has_sha1 = 1;
+               ctx.qry.oid = xstrdup(value);
+               ctx.qry.has_oid = 1;
        } else if (!strcmp(name, "id2")) {
-               ctx.qry.sha2 = xstrdup(value);
-               ctx.qry.has_sha1 = 1;
+               ctx.qry.oid2 = xstrdup(value);
+               ctx.qry.has_oid = 1;
        } else if (!strcmp(name, "ofs")) {
                ctx.qry.ofs = atoi(value);
        } else if (!strcmp(name, "path")) {
@@ -992,9 +992,9 @@ static void cgit_parse_args(int argc, const char **argv)
                } else if (skip_prefix(argv[i], "--head=", &arg)) {
                        ctx.qry.head = xstrdup(arg);
                        ctx.qry.has_symref = 1;
-               } else if (skip_prefix(argv[i], "--sha1=", &arg)) {
-                       ctx.qry.sha1 = xstrdup(arg);
-                       ctx.qry.has_sha1 = 1;
+               } else if (skip_prefix(argv[i], "--oid=", &arg)) {
+                       ctx.qry.oid = xstrdup(arg);
+                       ctx.qry.has_oid = 1;
                } else if (skip_prefix(argv[i], "--ofs=", &arg)) {
                        ctx.qry.ofs = atoi(arg);
                } else if (skip_prefix(argv[i], "--scan-tree=", &arg) ||
@@ -1037,7 +1037,7 @@ static int calc_ttl(void)
        if (!strcmp(ctx.qry.page, "snapshot"))
                return ctx.cfg.cache_snapshot_ttl;
 
-       if (ctx.qry.has_sha1)
+       if (ctx.qry.has_oid)
                return ctx.cfg.cache_static_ttl;
 
        if (ctx.qry.has_symref)
index d4aadbfa108428b789d153c6a47665355b383343..dfa144d05dd5757b0a4b64225a9e4c27d8ac1223 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -561,7 +561,7 @@ div#cgit table.diff td div.del {
        color: red;
 }
 
-div#cgit .sha1 {
+div#cgit .oid {
        font-family: monospace;
        font-size: 90%;
 }
diff --git a/cgit.h b/cgit.h
index f5db364f2a3e322d96d6b24bcff66b949292d8a0..69b5c13232e74845907a2212ade32f36f861bba8 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -164,7 +164,7 @@ struct reflist {
 
 struct cgit_query {
        int has_symref;
-       int has_sha1;
+       int has_oid;
        int has_difftype;
        char *raw;
        char *repo;
@@ -172,8 +172,8 @@ struct cgit_query {
        char *search;
        char *grep;
        char *head;
-       char *sha1;
-       char *sha2;
+       char *oid;
+       char *oid2;
        char *path;
        char *name;
        char *url;
diff --git a/cmd.c b/cmd.c
index bf6d8f516fe0263aa50a5b13348f39befabe01e4..0eb75b1da87761ab935e14a40d301d1a30244eb9 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -74,22 +74,22 @@ static void blame_fn(void)
 
 static void blob_fn(void)
 {
-       cgit_print_blob(ctx.qry.sha1, ctx.qry.path, ctx.qry.head, 0);
+       cgit_print_blob(ctx.qry.oid, ctx.qry.path, ctx.qry.head, 0);
 }
 
 static void commit_fn(void)
 {
-       cgit_print_commit(ctx.qry.sha1, ctx.qry.path);
+       cgit_print_commit(ctx.qry.oid, ctx.qry.path);
 }
 
 static void diff_fn(void)
 {
-       cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 0);
+       cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
 }
 
 static void rawdiff_fn(void)
 {
-       cgit_print_diff(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1, 1);
+       cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 1);
 }
 
 static void info_fn(void)
@@ -99,7 +99,7 @@ static void info_fn(void)
 
 static void log_fn(void)
 {
-       cgit_print_log(ctx.qry.sha1, ctx.qry.ofs, ctx.cfg.max_commit_count,
+       cgit_print_log(ctx.qry.oid, ctx.qry.ofs, ctx.cfg.max_commit_count,
                       ctx.qry.grep, ctx.qry.search, ctx.qry.path, 1,
                       ctx.repo->enable_commit_graph,
                       ctx.repo->commit_sort);
@@ -125,7 +125,7 @@ static void repolist_fn(void)
 
 static void patch_fn(void)
 {
-       cgit_print_patch(ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path);
+       cgit_print_patch(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path);
 }
 
 static void plain_fn(void)
@@ -140,7 +140,7 @@ static void refs_fn(void)
 
 static void snapshot_fn(void)
 {
-       cgit_print_snapshot(ctx.qry.head, ctx.qry.sha1, ctx.qry.path,
+       cgit_print_snapshot(ctx.qry.head, ctx.qry.oid, ctx.qry.path,
                            ctx.qry.nohead);
 }
 
@@ -156,12 +156,12 @@ static void summary_fn(void)
 
 static void tag_fn(void)
 {
-       cgit_print_tag(ctx.qry.sha1);
+       cgit_print_tag(ctx.qry.oid);
 }
 
 static void tree_fn(void)
 {
-       cgit_print_tree(ctx.qry.sha1, ctx.qry.path);
+       cgit_print_tree(ctx.qry.oid, ctx.qry.path);
 }
 
 #define def_cmd(name, want_repo, want_vpath, is_clone) \
index 93b4767ee57f2c7d66a01a0daf718d366d204b1a..e647dba018fd470578f570750ce70196c8d7682d 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -127,7 +127,7 @@ static int end_of_header(const char *p)
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
-       const int sha1hex_len = 40;
+       const int oid_hex_len = 40;
        struct commitinfo *ret;
        const char *p = repo_get_commit_buffer(the_repository, commit, NULL);
        const char *t;
@@ -140,10 +140,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 
        if (!skip_prefix(p, "tree ", &p))
                die("Bad commit: %s", oid_to_hex(&commit->object.oid));
-       p += sha1hex_len + 1;
+       p += oid_hex_len + 1;
 
        while (skip_prefix(p, "parent ", &p))
-               p += sha1hex_len + 1;
+               p += oid_hex_len + 1;
 
        if (p && skip_prefix(p, "author ", &p)) {
                parse_user(p, &ret->author, &ret->author_email,
index 73bd32f5c9ead751037b612a575e0bef45f0a711..dd84fe3fcb946de5b97e669f2ff57cfe261bb5a9 100755 (executable)
@@ -33,10 +33,10 @@ test_expect_success 'test submodule version matches Makefile' '
        else
                (
                        cd ../.. &&
-                       sm_sha1=$(git ls-files --stage -- git |
+                       sm_oid=$(git ls-files --stage -- git |
                                sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") &&
                        cd git &&
-                       git describe --match "v[0-9]*" $sm_sha1
+                       git describe --match "v[0-9]*" $sm_oid
                ) | sed -e "s/^v//" -e "s/-/./" >sm_version &&
                test_cmp sm_version makefile_version
        fi
index c3662bb7c4efb54d97d96d3e396e91be1cf2437c..cfab7fb98f0401557deca9c7a23716ca66336e4b 100644 (file)
@@ -48,7 +48,7 @@ static void emit_blame_entry_hash(struct blame_entry *ent)
        unsigned long line = 0;
 
        char *detail = emit_suspect_detail(suspect);
-       html("<span class='sha1'>");
+       html("<span class='oid'>");
        cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
                         NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
        html("</span>");
@@ -256,7 +256,7 @@ static int basedir_len(const char *path)
 
 void cgit_print_blame(void)
 {
-       const char *rev = ctx.qry.sha1;
+       const char *rev = ctx.qry.oid;
        struct object_id oid;
        struct commit *commit;
        struct pathspec_item path_items = {
index 783211ff75deb49aff982e25711efc062f8885c1..948118c468d14b4f1f1311685d763cc7be5f3469 100644 (file)
@@ -70,13 +70,13 @@ void cgit_print_commit(char *hex, const char *prefix)
        html_txt(show_date(info->committer_date, info->committer_tz,
                                cgit_date_mode(DATE_ISO8601)));
        html("</td></tr>\n");
-       html("<tr><th>commit</th><td colspan='2' class='sha1'>");
+       html("<tr><th>commit</th><td colspan='2' class='oid'>");
        tmp = oid_to_hex(&commit->object.oid);
        cgit_commit_link(tmp, NULL, NULL, ctx.qry.head, tmp, prefix);
        html(" (");
        cgit_patch_link("patch", NULL, NULL, NULL, tmp, prefix);
        html(")</td></tr>\n");
-       html("<tr><th>tree</th><td colspan='2' class='sha1'>");
+       html("<tr><th>tree</th><td colspan='2' class='oid'>");
        tmp = xstrdup(hex);
        cgit_tree_link(oid_to_hex(get_commit_tree_oid(commit)), NULL, NULL,
                       ctx.qry.head, tmp, NULL);
@@ -95,7 +95,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                        continue;
                }
                html("<tr><th>parent</th>"
-                    "<td colspan='2' class='sha1'>");
+                    "<td colspan='2' class='oid'>");
                tmp = tmp2 = oid_to_hex(&p->item->object.oid);
                if (ctx.repo->enable_subject_links) {
                        parent_info = cgit_parse_commit(parent);
@@ -109,7 +109,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                parents++;
        }
        if (ctx.repo->snapshots) {
-               html("<tr><th>download</th><td colspan='2' class='sha1'>");
+               html("<tr><th>download</th><td colspan='2' class='oid'>");
                cgit_print_snapshot_links(ctx.repo, hex, "<br/>");
                html("</td></tr>");
        }
@@ -139,7 +139,7 @@ void cgit_print_commit(char *hex, const char *prefix)
                        tmp = oid_to_hex(&commit->parents->item->object.oid);
                else
                        tmp = NULL;
-               cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0);
+               cgit_print_diff(ctx.qry.oid, tmp, prefix, 0, 0);
        }
        strbuf_release(&notes);
        cgit_free_commitinfo(info);
index 329c3506ac30e2aef6b9f4cdd935e69ef0b49768..5ed5990c291522ac4f9342e1a3c9377c1ed72a82 100644 (file)
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -97,8 +97,8 @@ static void print_fileinfo(struct fileinfo *info)
                html("]</span>");
        }
        htmlf("</td><td class='%s'>", class);
-       cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                      ctx.qry.sha2, info->new_path);
+       cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid,
+                      ctx.qry.oid2, info->new_path);
        if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
                htmlf(" (%s from ",
                      info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
@@ -194,8 +194,8 @@ static void cgit_print_diffstat(const struct object_id *old_oid,
        int i;
 
        html("<div class='diffstat-header'>");
-       cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
-                      ctx.qry.sha2, NULL);
+       cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid,
+                      ctx.qry.oid2, NULL);
        if (prefix) {
                html(" (limited to '");
                html_txt(prefix);
index fd074090e9f0d60605a9feca079bc48a6a235276..6914f75e65e4cc2a313b690cab485b93b0ad3b4d 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -463,7 +463,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager) {
                html(" (");
                cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
-                             NULL, ctx.qry.head, ctx.qry.sha1,
+                             NULL, ctx.qry.head, ctx.qry.oid,
                              ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                              ctx.qry.search, ctx.qry.showmsg ? 0 : 1,
                              ctx.qry.follow);
@@ -519,7 +519,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if (ofs > 0) {
                        html("<li>");
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
-                                     ctx.qry.sha1, ctx.qry.vpath,
+                                     ctx.qry.oid, ctx.qry.vpath,
                                      ofs - cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
@@ -528,7 +528,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                if ((commit = get_revision(&rev)) != NULL) {
                        html("<li>");
                        cgit_log_link("[next]", NULL, NULL, ctx.qry.head,
-                                     ctx.qry.sha1, ctx.qry.vpath,
+                                     ctx.qry.oid, ctx.qry.vpath,
                                      ofs + cnt, ctx.qry.grep,
                                      ctx.qry.search, ctx.qry.showmsg,
                                      ctx.qry.follow);
index 2a7b18ccd8c55485bf23ad75b3d13f6da65b5daa..001001c4ab4c319f4ed100dddaba09bc0eac7c92 100644 (file)
@@ -99,7 +99,7 @@ static void print_dir(const struct object_id *oid, const char *base,
                        fullpath = NULL;
                }
                html("<li>");
-               cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+               cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.oid,
                                fullpath);
                html("</li>\n");
        }
@@ -118,7 +118,7 @@ static void print_dir_entry(const struct object_id *oid, const char *base,
        if (S_ISGITLINK(mode)) {
                cgit_submodule_link(NULL, fullpath, oid_to_hex(oid));
        } else
-               cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+               cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.oid,
                                fullpath);
        html("</li>\n");
        free(fullpath);
@@ -163,7 +163,7 @@ static int basedir_len(const char *path)
 
 void cgit_print_plain(void)
 {
-       const char *rev = ctx.qry.sha1;
+       const char *rev = ctx.qry.oid;
        struct object_id oid;
        struct commit *commit;
        struct pathspec_item path_items = {
index d2358f292823ce11bfe91523ed833cdf4cdca235..151ac1797aa99351e63b9872d6f804eedda65431 100644 (file)
@@ -521,45 +521,45 @@ static void cgit_self_link(char *name, const char *title, const char *class)
        else if (!strcmp(ctx.qry.page, "summary"))
                cgit_summary_link(name, title, class, ctx.qry.head);
        else if (!strcmp(ctx.qry.page, "tag"))
-               cgit_tag_link(name, title, class, ctx.qry.has_sha1 ?
-                              ctx.qry.sha1 : ctx.qry.head);
+               cgit_tag_link(name, title, class, ctx.qry.has_oid ?
+                              ctx.qry.oid : ctx.qry.head);
        else if (!strcmp(ctx.qry.page, "tree"))
                cgit_tree_link(name, title, class, ctx.qry.head,
-                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                              ctx.qry.has_oid ? ctx.qry.oid : NULL,
                               ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "plain"))
                cgit_plain_link(name, title, class, ctx.qry.head,
-                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "blame"))
                cgit_blame_link(name, title, class, ctx.qry.head,
-                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "log"))
                cgit_log_link(name, title, class, ctx.qry.head,
-                             ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                             ctx.qry.has_oid ? ctx.qry.oid : NULL,
                              ctx.qry.path, ctx.qry.ofs,
                              ctx.qry.grep, ctx.qry.search,
                              ctx.qry.showmsg, ctx.qry.follow);
        else if (!strcmp(ctx.qry.page, "commit"))
                cgit_commit_link(name, title, class, ctx.qry.head,
-                                ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                 ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "patch"))
                cgit_patch_link(name, title, class, ctx.qry.head,
-                               ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                               ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "refs"))
                cgit_refs_link(name, title, class, ctx.qry.head,
-                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                              ctx.qry.has_oid ? ctx.qry.oid : NULL,
                               ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "snapshot"))
                cgit_snapshot_link(name, title, class, ctx.qry.head,
-                                  ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
+                                  ctx.qry.has_oid ? ctx.qry.oid : NULL,
                                   ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "diff"))
                cgit_diff_link(name, title, class, ctx.qry.head,
-                              ctx.qry.sha1, ctx.qry.sha2,
+                              ctx.qry.oid, ctx.qry.oid2,
                               ctx.qry.path);
        else if (!strcmp(ctx.qry.page, "stats"))
                cgit_stats_link(name, title, class, ctx.qry.head,
@@ -918,10 +918,10 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
            strcmp(ctx.qry.head, ctx.repo->defbranch))
                html_hidden("h", ctx.qry.head);
 
-       if (ctx.qry.sha1)
-               html_hidden("id", ctx.qry.sha1);
-       if (ctx.qry.sha2)
-               html_hidden("id2", ctx.qry.sha2);
+       if (ctx.qry.oid)
+               html_hidden("id", ctx.qry.oid);
+       if (ctx.qry.oid2)
+               html_hidden("id2", ctx.qry.oid2);
        if (ctx.qry.showmsg)
                html_hidden("showmsg", "1");
 
@@ -1038,20 +1038,20 @@ void cgit_print_pageheader(void)
                cgit_summary_link("summary", NULL, hc("summary"),
                                  ctx.qry.head);
                cgit_refs_link("refs", NULL, hc("refs"), ctx.qry.head,
-                              ctx.qry.sha1, NULL);
+                              ctx.qry.oid, NULL);
                cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
                              NULL, ctx.qry.vpath, 0, NULL, NULL,
                              ctx.qry.showmsg, ctx.qry.follow);
                if (ctx.qry.page && !strcmp(ctx.qry.page, "blame"))
                        cgit_blame_link("blame", NULL, hc("blame"), ctx.qry.head,
-                                       ctx.qry.sha1, ctx.qry.vpath);
+                                       ctx.qry.oid, ctx.qry.vpath);
                else
                        cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
-                                      ctx.qry.sha1, ctx.qry.vpath);
+                                      ctx.qry.oid, ctx.qry.vpath);
                cgit_commit_link("commit", NULL, hc("commit"),
-                                ctx.qry.head, ctx.qry.sha1, ctx.qry.vpath);
+                                ctx.qry.head, ctx.qry.oid, ctx.qry.vpath);
                cgit_diff_link("diff", NULL, hc("diff"), ctx.qry.head,
-                              ctx.qry.sha1, ctx.qry.sha2, ctx.qry.vpath);
+                              ctx.qry.oid, ctx.qry.oid2, ctx.qry.vpath);
                if (ctx.repo->max_stats)
                        cgit_stats_link("stats", NULL, hc("stats"),
                                        ctx.qry.head, ctx.qry.vpath);
index 846d5b141f4380b4d1ff0b612566136cf0633645..424bbccd5f316965c8eaf9aaf80af9eebdbca683 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -33,7 +33,7 @@ static void print_tag_content(char *buf)
 
 static void print_download_links(char *revname)
 {
-       html("<tr><th>download</th><td class='sha1'>");
+       html("<tr><th>download</th><td class='oid'>");
        cgit_print_snapshot_links(ctx.repo, revname, "<br/>");
        html("</td></tr>");
 }
@@ -91,7 +91,7 @@ void cgit_print_tag(char *revname)
                        cgit_close_filter(ctx.repo->email_filter);
                        html("</td></tr>\n");
                }
-               html("<tr><td>tagged object</td><td class='sha1'>");
+               html("<tr><td>tagged object</td><td class='oid'>");
                cgit_object_link(tag->tagged);
                html("</td></tr>\n");
                if (ctx.repo->snapshots)
@@ -106,7 +106,7 @@ void cgit_print_tag(char *revname)
                html("<tr><td>tag name</td><td>");
                html_txt(revname);
                html("</td></tr>\n");
-               html("<tr><td>tagged object</td><td class='sha1'>");
+               html("<tr><td>tagged object</td><td class='oid'>");
                cgit_object_link(obj);
                html("</td></tr>\n");
                if (ctx.repo->snapshots)