neocgit

a more 'modern' version of cgit
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/neocgit

commit 11695a58fd732689be486edf88d145578a787c89
parent ff9893ac8192579a00dd4c73ddff18ab232099a6
Author: Christian Hesse <mail@eworm.de>
Date:   Sun,  4 Sep 2016 12:38:18 +0200

git: update to v2.10.0

Upstream continues to replace unsigned char *sha1 with struct
object_id old_oid. This makes the required changes.

The git lib has its own main function now. Rename our main function
to cmd_main, it is called from main then.

Diffstat:
MMakefile | 2+-
Mcgit.c | 2+-
Mcgit.h | 8++++----
Mshared.c | 28++++++++++++++--------------
Mui-diff.c | 74+++++++++++++++++++++++++++++++++++++-------------------------------------
Mui-diff.h | 4++--
Mui-log.c | 2+-
Mui-ssdiff.c | 4++--
8 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/Makefile b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 2.9.1 +GIT_VER = 2.10.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz INSTALL = install COPYTREE = cp -r diff --git a/cgit.c b/cgit.c @@ -1026,7 +1026,7 @@ static int calc_ttl(void) return ctx.cfg.cache_repo_ttl; } -int main(int argc, const char **argv) +int cmd_main(int argc, const char **argv) { const char *path; int err, ttl; diff --git a/cgit.h b/cgit.h @@ -348,14 +348,14 @@ extern void *cgit_free_commitinfo(struct commitinfo *info); void cgit_diff_tree_cb(struct diff_queue_struct *q, struct diff_options *options, void *data); -extern int cgit_diff_files(const unsigned char *old_sha1, - const unsigned char *new_sha1, +extern int cgit_diff_files(const struct object_id *old_oid, + const struct object_id *new_oid, unsigned long *old_size, unsigned long *new_size, int *binary, int context, int ignorews, linediff_fn fn); -extern void cgit_diff_tree(const unsigned char *old_sha1, - const unsigned char *new_sha1, +extern void cgit_diff_tree(const struct object_id *old_oid, + const struct object_id *new_oid, filepair_fn fn, const char *prefix, int ignorews); extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, diff --git a/shared.c b/shared.c @@ -263,15 +263,15 @@ void cgit_diff_tree_cb(struct diff_queue_struct *q, } } -static int load_mmfile(mmfile_t *file, const unsigned char *sha1) +static int load_mmfile(mmfile_t *file, const struct object_id *oid) { enum object_type type; - if (is_null_sha1(sha1)) { + if (is_null_oid(oid)) { file->ptr = (char *)""; file->size = 0; } else { - file->ptr = read_sha1_file(sha1, &type, + file->ptr = read_sha1_file(oid->hash, &type, (unsigned long *)&file->size); } return 1; @@ -322,8 +322,8 @@ static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) return 0; } -int cgit_diff_files(const unsigned char *old_sha1, - const unsigned char *new_sha1, unsigned long *old_size, +int cgit_diff_files(const struct object_id *old_oid, + const struct object_id *new_oid, unsigned long *old_size, unsigned long *new_size, int *binary, int context, int ignorews, linediff_fn fn) { @@ -332,7 +332,7 @@ int cgit_diff_files(const unsigned char *old_sha1, xdemitconf_t emit_params; xdemitcb_t emit_cb; - if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) + if (!load_mmfile(&file1, old_oid) || !load_mmfile(&file2, new_oid)) return 1; *old_size = file1.size; @@ -366,8 +366,8 @@ int cgit_diff_files(const unsigned char *old_sha1, return 0; } -void cgit_diff_tree(const unsigned char *old_sha1, - const unsigned char *new_sha1, +void cgit_diff_tree(const struct object_id *old_oid, + const struct object_id *new_oid, filepair_fn fn, const char *prefix, int ignorews) { struct diff_options opt; @@ -391,21 +391,21 @@ void cgit_diff_tree(const unsigned char *old_sha1, } diff_setup_done(&opt); - if (old_sha1 && !is_null_sha1(old_sha1)) - diff_tree_sha1(old_sha1, new_sha1, "", &opt); + if (old_oid && !is_null_oid(old_oid)) + diff_tree_sha1(old_oid->hash, new_oid->hash, "", &opt); else - diff_root_tree_sha1(new_sha1, "", &opt); + diff_root_tree_sha1(new_oid->hash, "", &opt); diffcore_std(&opt); diff_flush(&opt); } void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) { - unsigned char *old_sha1 = NULL; + const struct object_id *old_oid = NULL; if (commit->parents) - old_sha1 = commit->parents->item->object.oid.hash; - cgit_diff_tree(old_sha1, commit->object.oid.hash, fn, prefix, + old_oid = &commit->parents->item->object.oid; + cgit_diff_tree(old_oid, &commit->object.oid, fn, prefix, ctx.qry.ignorews); } diff --git a/ui-diff.c b/ui-diff.c @@ -12,8 +12,8 @@ #include "ui-shared.h" #include "ui-ssdiff.h" -unsigned char old_rev_sha1[20]; -unsigned char new_rev_sha1[20]; +struct object_id old_rev_oid[1]; +struct object_id new_rev_oid[1]; static int files, slots; static int total_adds, total_rems, max_changes; @@ -21,8 +21,8 @@ static int lines_added, lines_removed; static struct fileinfo { char status; - unsigned char old_sha1[20]; - unsigned char new_sha1[20]; + struct object_id old_oid[1]; + struct object_id new_oid[1]; unsigned short old_mode; unsigned short new_mode; char *old_path; @@ -83,15 +83,15 @@ static void print_fileinfo(struct fileinfo *info) html("<tr>"); htmlf("<td class='mode'>"); - if (is_null_sha1(info->new_sha1)) { + if (is_null_oid(info->new_oid)) { cgit_print_filemode(info->old_mode); } else { cgit_print_filemode(info->new_mode); } if (info->old_mode != info->new_mode && - !is_null_sha1(info->old_sha1) && - !is_null_sha1(info->new_sha1)) { + !is_null_oid(info->old_oid) && + !is_null_oid(info->new_oid)) { html("<span class='modechange'>["); cgit_print_filemode(info->old_mode); html("]</span>"); @@ -160,7 +160,7 @@ static void inspect_filepair(struct diff_filepair *pair) files++; lines_added = 0; lines_removed = 0; - cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size, + cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, &new_size, &binary, 0, ctx.qry.ignorews, count_diff_lines); if (files >= slots) { if (slots == 0) @@ -170,8 +170,8 @@ static void inspect_filepair(struct diff_filepair *pair) items = xrealloc(items, slots * sizeof(struct fileinfo)); } items[files-1].status = pair->status; - hashcpy(items[files-1].old_sha1, pair->one->sha1); - hashcpy(items[files-1].new_sha1, pair->two->sha1); + oidcpy(items[files-1].old_oid, &pair->one->oid); + oidcpy(items[files-1].new_oid, &pair->two->oid); items[files-1].old_mode = pair->one->mode; items[files-1].new_mode = pair->two->mode; items[files-1].old_path = xstrdup(pair->one->path); @@ -187,8 +187,8 @@ static void inspect_filepair(struct diff_filepair *pair) total_rems += lines_removed; } -static void cgit_print_diffstat(const unsigned char *old_sha1, - const unsigned char *new_sha1, +static void cgit_print_diffstat(const struct object_id *old_oid, + const struct object_id *new_oid, const char *prefix) { int i; @@ -204,7 +204,7 @@ static void cgit_print_diffstat(const unsigned char *old_sha1, html("</div>"); html("<table summary='diffstat' class='diffstat'>"); max_changes = 0; - cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, + cgit_diff_tree(old_oid, new_oid, inspect_filepair, prefix, ctx.qry.ignorews); for (i = 0; i<files; i++) print_fileinfo(&items[i]); @@ -238,8 +238,8 @@ static void print_line(char *line, int len) line[len-1] = c; } -static void header(unsigned char *sha1, char *path1, int mode1, - unsigned char *sha2, char *path2, int mode2) +static void header(const struct object_id *oid1, char *path1, int mode1, + const struct object_id *oid2, char *path2, int mode2) { char *abbrev1, *abbrev2; int subproject; @@ -258,8 +258,8 @@ static void header(unsigned char *sha1, char *path1, int mode1, htmlf("<br/>deleted file mode %.6o", mode1); if (!subproject) { - abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); - abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); + abbrev1 = xstrdup(find_unique_abbrev(oid1->hash, DEFAULT_ABBREV)); + abbrev2 = xstrdup(find_unique_abbrev(oid2->hash, DEFAULT_ABBREV)); htmlf("<br/>index %s..%s", abbrev1, abbrev2); free(abbrev1); free(abbrev2); @@ -268,24 +268,24 @@ static void header(unsigned char *sha1, char *path1, int mode1, if (mode2 != mode1) htmlf("..%.6o", mode2); } - if (is_null_sha1(sha1)) { + if (is_null_oid(oid1)) { path1 = "dev/null"; html("<br/>--- /"); } else html("<br/>--- a/"); if (mode1 != 0) cgit_tree_link(path1, NULL, NULL, ctx.qry.head, - sha1_to_hex(old_rev_sha1), path1); + oid_to_hex(old_rev_oid), path1); else html_txt(path1); - if (is_null_sha1(sha2)) { + if (is_null_oid(oid2)) { path2 = "dev/null"; html("<br/>+++ /"); } else html("<br/>+++ b/"); if (mode2 != 0) cgit_tree_link(path2, NULL, NULL, ctx.qry.head, - sha1_to_hex(new_rev_sha1), path2); + oid_to_hex(new_rev_oid), path2); else html_txt(path2); } @@ -307,20 +307,20 @@ static void filepair_cb(struct diff_filepair *pair) cgit_ssdiff_header_begin(); print_line_fn = cgit_ssdiff_line_cb; } - header(pair->one->sha1, pair->one->path, pair->one->mode, - pair->two->sha1, pair->two->path, pair->two->mode); + header(&pair->one->oid, pair->one->path, pair->one->mode, + &pair->two->oid, pair->two->path, pair->two->mode); if (use_ssdiff) cgit_ssdiff_header_end(); if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { if (S_ISGITLINK(pair->one->mode)) - print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); + print_line_fn(fmt("-Subproject %s", oid_to_hex(&pair->one->oid)), 52); if (S_ISGITLINK(pair->two->mode)) - print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); + print_line_fn(fmt("+Subproject %s", oid_to_hex(&pair->two->oid)), 52); if (use_ssdiff) cgit_ssdiff_footer(); return; } - if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, + if (cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, &new_size, &binary, ctx.qry.context, ctx.qry.ignorews, print_line_fn)) cgit_print_error("Error running diff"); @@ -402,36 +402,36 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, if (!new_rev) new_rev = ctx.qry.head; - if (get_sha1(new_rev, new_rev_sha1)) { + if (get_oid(new_rev, new_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad object name: %s", new_rev); return; } - commit = lookup_commit_reference(new_rev_sha1); + commit = lookup_commit_reference(new_rev_oid->hash); if (!commit || parse_commit(commit)) { cgit_print_error_page(404, "Not found", - "Bad commit: %s", sha1_to_hex(new_rev_sha1)); + "Bad commit: %s", oid_to_hex(new_rev_oid)); return; } new_tree_sha1 = commit->tree->object.oid.hash; if (old_rev) { - if (get_sha1(old_rev, old_rev_sha1)) { + if (get_oid(old_rev, old_rev_oid)) { cgit_print_error_page(404, "Not found", "Bad object name: %s", old_rev); return; } } else if (commit->parents && commit->parents->item) { - hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash); + oidcpy(old_rev_oid, &commit->parents->item->object.oid); } else { - hashclr(old_rev_sha1); + oidclr(old_rev_oid); } - if (!is_null_sha1(old_rev_sha1)) { - commit2 = lookup_commit_reference(old_rev_sha1); + if (!is_null_oid(old_rev_oid)) { + commit2 = lookup_commit_reference(old_rev_oid->hash); if (!commit2 || parse_commit(commit2)) { cgit_print_error_page(404, "Not found", - "Bad commit: %s", sha1_to_hex(old_rev_sha1)); + "Bad commit: %s", oid_to_hex(old_rev_oid)); return; } old_tree_sha1 = commit2->tree->object.oid.hash; @@ -479,7 +479,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, if (difftype == DIFF_STATONLY) ctx.qry.difftype = ctx.cfg.difftype; - cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix); + cgit_print_diffstat(old_rev_oid, new_rev_oid, prefix); if (difftype == DIFF_STATONLY) return; @@ -490,7 +490,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, html("<table summary='diff' class='diff'>"); html("<tr><td>"); } - cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix, + cgit_diff_tree(old_rev_oid, new_rev_oid, filepair_cb, prefix, ctx.qry.ignorews); if (!use_ssdiff) html("</td></tr>"); diff --git a/ui-diff.h b/ui-diff.h @@ -9,7 +9,7 @@ extern void cgit_print_diff(const char *new_hex, const char *old_hex, extern struct diff_filespec *cgit_get_current_old_file(void); extern struct diff_filespec *cgit_get_current_new_file(void); -extern unsigned char old_rev_sha1[20]; -extern unsigned char new_rev_sha1[20]; +extern struct object_id old_rev_oid[1]; +extern struct object_id new_rev_oid[1]; #endif /* UI_DIFF_H */ diff --git a/ui-log.c b/ui-log.c @@ -49,7 +49,7 @@ static void inspect_files(struct diff_filepair *pair) files++; if (ctx.repo->enable_log_linecount) - cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, + cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, &new_size, &binary, 0, ctx.qry.ignorews, count_lines); } diff --git a/ui-ssdiff.c b/ui-ssdiff.c @@ -229,7 +229,7 @@ static void print_ssdiff_line(char *class, if (old_line_no > 0) { struct diff_filespec *old_file = cgit_get_current_old_file(); char *lineno_str = fmt("n%d", old_line_no); - char *id_str = fmt("id=%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); + char *id_str = fmt("id=%s#%s", is_null_oid(&old_file->oid)?"HEAD":oid_to_hex(old_rev_oid), lineno_str); char *fileurl = cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str); html("<td class='lineno'><a href='"); html(fileurl); @@ -252,7 +252,7 @@ static void print_ssdiff_line(char *class, if (new_line_no > 0) { struct diff_filespec *new_file = cgit_get_current_new_file(); char *lineno_str = fmt("n%d", new_line_no); - char *id_str = fmt("id=%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); + char *id_str = fmt("id=%s#%s", is_null_oid(&new_file->oid)?"HEAD":oid_to_hex(new_rev_oid), lineno_str); char *fileurl = cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str); html("<td class='lineno'><a href='"); html(fileurl);