aboutsummaryrefslogtreecommitdiff
path: root/ui-diff.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c112
1 files changed, 55 insertions, 57 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 6cfa697..52ed942 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -6,16 +6,14 @@
* (see COPYING for full license text)
*/
-#define USE_THE_REPOSITORY_VARIABLE
-
#include "cgit.h"
#include "ui-diff.h"
#include "html.h"
#include "ui-shared.h"
#include "ui-ssdiff.h"
-struct object_id old_rev_oid[1];
-struct object_id new_rev_oid[1];
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
static int files, slots;
static int total_adds, total_rems, max_changes;
@@ -23,8 +21,8 @@ static int lines_added, lines_removed;
static struct fileinfo {
char status;
- struct object_id old_oid[1];
- struct object_id new_oid[1];
+ unsigned char old_sha1[20];
+ unsigned char new_sha1[20];
unsigned short old_mode;
unsigned short new_mode;
char *old_path;
@@ -84,23 +82,23 @@ static void print_fileinfo(struct fileinfo *info)
}
html("<tr>");
- html("<td class='mode'>");
- if (is_null_oid(info->new_oid)) {
+ htmlf("<td class='mode'>");
+ if (is_null_sha1(info->new_sha1)) {
cgit_print_filemode(info->old_mode);
} else {
cgit_print_filemode(info->new_mode);
}
if (info->old_mode != info->new_mode &&
- !is_null_oid(info->old_oid) &&
- !is_null_oid(info->new_oid)) {
+ !is_null_sha1(info->old_sha1) &&
+ !is_null_sha1(info->new_sha1)) {
html("<span class='modechange'>[");
cgit_print_filemode(info->old_mode);
html("]</span>");
}
htmlf("</td><td class='%s'>", class);
- cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.oid,
- ctx.qry.oid2, info->new_path);
+ cgit_diff_link(info->new_path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ ctx.qry.sha2, info->new_path);
if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) {
htmlf(" (%s from ",
info->status == DIFF_STATUS_COPIED ? "copied" : "renamed");
@@ -162,7 +160,7 @@ static void inspect_filepair(struct diff_filepair *pair)
files++;
lines_added = 0;
lines_removed = 0;
- cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, &new_size,
+ cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
&binary, 0, ctx.qry.ignorews, count_diff_lines);
if (files >= slots) {
if (slots == 0)
@@ -172,8 +170,8 @@ static void inspect_filepair(struct diff_filepair *pair)
items = xrealloc(items, slots * sizeof(struct fileinfo));
}
items[files-1].status = pair->status;
- oidcpy(items[files-1].old_oid, &pair->one->oid);
- oidcpy(items[files-1].new_oid, &pair->two->oid);
+ hashcpy(items[files-1].old_sha1, pair->one->sha1);
+ hashcpy(items[files-1].new_sha1, pair->two->sha1);
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);
@@ -189,15 +187,15 @@ static void inspect_filepair(struct diff_filepair *pair)
total_rems += lines_removed;
}
-static void cgit_print_diffstat(const struct object_id *old_oid,
- const struct object_id *new_oid,
+static void cgit_print_diffstat(const unsigned char *old_sha1,
+ const unsigned char *new_sha1,
const char *prefix)
{
int i;
html("<div class='diffstat-header'>");
- cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.oid,
- ctx.qry.oid2, NULL);
+ cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ ctx.qry.sha2, NULL);
if (prefix) {
html(" (limited to '");
html_txt(prefix);
@@ -206,7 +204,7 @@ static void cgit_print_diffstat(const struct object_id *old_oid,
html("</div>");
html("<table summary='diffstat' class='diffstat'>");
max_changes = 0;
- cgit_diff_tree(old_oid, new_oid, inspect_filepair, prefix,
+ cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix,
ctx.qry.ignorews);
for (i = 0; i<files; i++)
print_fileinfo(&items[i]);
@@ -240,8 +238,8 @@ static void print_line(char *line, int len)
line[len-1] = c;
}
-static void header(const struct object_id *oid1, char *path1, int mode1,
- const struct object_id *oid2, char *path2, int mode2)
+static void header(unsigned char *sha1, char *path1, int mode1,
+ unsigned char *sha2, char *path2, int mode2)
{
char *abbrev1, *abbrev2;
int subproject;
@@ -260,8 +258,8 @@ static void header(const struct object_id *oid1, char *path1, int mode1,
htmlf("<br/>deleted file mode %.6o", mode1);
if (!subproject) {
- abbrev1 = xstrdup(repo_find_unique_abbrev(the_repository, oid1, DEFAULT_ABBREV));
- abbrev2 = xstrdup(repo_find_unique_abbrev(the_repository, oid2, DEFAULT_ABBREV));
+ abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
+ abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
htmlf("<br/>index %s..%s", abbrev1, abbrev2);
free(abbrev1);
free(abbrev2);
@@ -270,24 +268,24 @@ static void header(const struct object_id *oid1, char *path1, int mode1,
if (mode2 != mode1)
htmlf("..%.6o", mode2);
}
- if (is_null_oid(oid1)) {
+ if (is_null_sha1(sha1)) {
path1 = "dev/null";
html("<br/>--- /");
} else
html("<br/>--- a/");
if (mode1 != 0)
cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
- oid_to_hex(old_rev_oid), path1);
+ sha1_to_hex(old_rev_sha1), path1);
else
html_txt(path1);
- if (is_null_oid(oid2)) {
+ if (is_null_sha1(sha2)) {
path2 = "dev/null";
html("<br/>+++ /");
} else
html("<br/>+++ b/");
if (mode2 != 0)
cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
- oid_to_hex(new_rev_oid), path2);
+ sha1_to_hex(new_rev_sha1), path2);
else
html_txt(path2);
}
@@ -309,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->oid, pair->one->path, pair->one->mode,
- &pair->two->oid, pair->two->path, pair->two->mode);
+ header(pair->one->sha1, pair->one->path, pair->one->mode,
+ pair->two->sha1, 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", oid_to_hex(&pair->one->oid)), 52);
+ print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
if (S_ISGITLINK(pair->two->mode))
- print_line_fn(fmt("+Subproject %s", oid_to_hex(&pair->two->oid)), 52);
+ print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
if (use_ssdiff)
cgit_ssdiff_footer();
return;
}
- if (cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size,
+ if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
&new_size, &binary, ctx.qry.context,
ctx.qry.ignorews, print_line_fn))
cgit_print_error("Error running diff");
@@ -342,7 +340,7 @@ void cgit_print_diff_ctrls(void)
html("<div class='cgit-panel'>");
html("<b>diff options</b>");
- html("<form method='get'>");
+ html("<form method='get' action='.'>");
cgit_add_hidden_formfields(1, 0, ctx.qry.page);
html("<table>");
html("<tr><td colspan='2'/></tr>");
@@ -387,7 +385,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
const char *prefix, int show_ctrls, int raw)
{
struct commit *commit, *commit2;
- const struct object_id *old_tree_oid, *new_tree_oid;
+ const unsigned char *old_tree_sha1, *new_tree_sha1;
diff_type difftype;
/*
@@ -395,7 +393,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
* entire commit to detect renames so we must limit the paths in our
* own callbacks and not pass the prefix to the diff machinery.
*/
- if (ctx.qry.follow && ctx.repo->enable_follow_links) {
+ if (ctx.qry.follow && ctx.cfg.enable_follow_links) {
current_prefix = prefix;
prefix = "";
} else {
@@ -404,58 +402,58 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
if (!new_rev)
new_rev = ctx.qry.head;
- if (repo_get_oid(the_repository, new_rev, new_rev_oid)) {
+ if (get_sha1(new_rev, new_rev_sha1)) {
cgit_print_error_page(404, "Not found",
"Bad object name: %s", new_rev);
return;
}
- commit = lookup_commit_reference(the_repository, new_rev_oid);
- if (!commit || repo_parse_commit(the_repository, commit)) {
+ commit = lookup_commit_reference(new_rev_sha1);
+ if (!commit || parse_commit(commit)) {
cgit_print_error_page(404, "Not found",
- "Bad commit: %s", oid_to_hex(new_rev_oid));
+ "Bad commit: %s", sha1_to_hex(new_rev_sha1));
return;
}
- new_tree_oid = get_commit_tree_oid(commit);
+ new_tree_sha1 = commit->tree->object.oid.hash;
if (old_rev) {
- if (repo_get_oid(the_repository, old_rev, old_rev_oid)) {
+ if (get_sha1(old_rev, old_rev_sha1)) {
cgit_print_error_page(404, "Not found",
"Bad object name: %s", old_rev);
return;
}
} else if (commit->parents && commit->parents->item) {
- oidcpy(old_rev_oid, &commit->parents->item->object.oid);
+ hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash);
} else {
- oidclr(old_rev_oid, the_repository->hash_algo);
+ hashclr(old_rev_sha1);
}
- if (!is_null_oid(old_rev_oid)) {
- commit2 = lookup_commit_reference(the_repository, old_rev_oid);
- if (!commit2 || repo_parse_commit(the_repository, commit2)) {
+ if (!is_null_sha1(old_rev_sha1)) {
+ commit2 = lookup_commit_reference(old_rev_sha1);
+ if (!commit2 || parse_commit(commit2)) {
cgit_print_error_page(404, "Not found",
- "Bad commit: %s", oid_to_hex(old_rev_oid));
+ "Bad commit: %s", sha1_to_hex(old_rev_sha1));
return;
}
- old_tree_oid = get_commit_tree_oid(commit2);
+ old_tree_sha1 = commit2->tree->object.oid.hash;
} else {
- old_tree_oid = NULL;
+ old_tree_sha1 = NULL;
}
if (raw) {
struct diff_options diffopt;
- repo_diff_setup(the_repository, &diffopt);
+ diff_setup(&diffopt);
diffopt.output_format = DIFF_FORMAT_PATCH;
- diffopt.flags.recursive = 1;
+ DIFF_OPT_SET(&diffopt, RECURSIVE);
diff_setup_done(&diffopt);
ctx.page.mimetype = "text/plain";
cgit_print_http_headers();
- if (old_tree_oid) {
- diff_tree_oid(old_tree_oid, new_tree_oid, "",
+ if (old_tree_sha1) {
+ diff_tree_sha1(old_tree_sha1, new_tree_sha1, "",
&diffopt);
} else {
- diff_root_tree_oid(new_tree_oid, "", &diffopt);
+ diff_root_tree_sha1(new_tree_sha1, "", &diffopt);
}
diffcore_std(&diffopt);
diff_flush(&diffopt);
@@ -481,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_oid, new_rev_oid, prefix);
+ cgit_print_diffstat(old_rev_sha1, new_rev_sha1, prefix);
if (difftype == DIFF_STATONLY)
return;
@@ -492,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_oid, new_rev_oid, filepair_cb, prefix,
+ cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix,
ctx.qry.ignorews);
if (!use_ssdiff)
html("</td></tr>");
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 20:56:19 +0000