*/
#include "cgit.h"
-#include "xdiff.h"
+#include "html.h"
+#include "ui-shared.h"
+#include "ui-ssdiff.h"
-char *diff_buffer;
-int diff_buffer_size;
+unsigned char old_rev_sha1[20];
+unsigned char new_rev_sha1[20];
+
+static int files, slots;
+static int total_adds, total_rems, max_changes;
+static int lines_added, lines_removed;
+
+static struct fileinfo {
+ char status;
+ unsigned char old_sha1[20];
+ unsigned char new_sha1[20];
+ unsigned short old_mode;
+ unsigned short new_mode;
+ char *old_path;
+ char *new_path;
+ unsigned int added;
+ unsigned int removed;
+ unsigned long old_size;
+ unsigned long new_size;
+ int binary:1;
+} *items;
+
+static int use_ssdiff = 0;
+
+static void print_fileinfo(struct fileinfo *info)
+{
+ char *class;
+
+ switch (info->status) {
+ case DIFF_STATUS_ADDED:
+ class = "add";
+ break;
+ case DIFF_STATUS_COPIED:
+ class = "cpy";
+ break;
+ case DIFF_STATUS_DELETED:
+ class = "del";
+ break;
+ case DIFF_STATUS_MODIFIED:
+ class = "upd";
+ break;
+ case DIFF_STATUS_RENAMED:
+ class = "mov";
+ break;
+ case DIFF_STATUS_TYPE_CHANGED:
+ class = "typ";
+ break;
+ case DIFF_STATUS_UNKNOWN:
+ class = "unk";
+ break;
+ case DIFF_STATUS_UNMERGED:
+ class = "stg";
+ break;
+ default:
+ die("bug: unhandled diff status %c", info->status);
+ }
+
+ html("<tr>");
+ 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_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.sha1,
+ ctx.qry.sha2, info->new_path, 0);
+ if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
+ htmlf(" (%s from %s)",
+ info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
+ info->old_path);
+ html("</td><td class='right'>");
+ if (info->binary) {
+ htmlf("bin</td><td class='graph'>%d -> %d bytes",
+ info->old_size, info->new_size);
+ return;
+ }
+ htmlf("%d", info->added + info->removed);
+ html("</td><td class='graph'>");
+ htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
+ htmlf("<td class='add' style='width: %.1f%%;'/>",
+ info->added * 100.0 / max_changes);
+ htmlf("<td class='rem' style='width: %.1f%%;'/>",
+ info->removed * 100.0 / max_changes);
+ htmlf("<td class='none' style='width: %.1f%%;'/>",
+ (max_changes - info->removed - info->added) * 100.0 / max_changes);
+ html("</tr></table></td></tr>\n");
+}
+
+static void count_diff_lines(char *line, int len)
+{
+ if (line && (len > 0)) {
+ if (line[0] == '+')
+ lines_added++;
+ else if (line[0] == '-')
+ lines_removed++;
+ }
+}
+
+static void inspect_filepair(struct diff_filepair *pair)
+{
+ int binary = 0;
+ unsigned long old_size = 0;
+ unsigned long new_size = 0;
+ files++;
+ lines_added = 0;
+ lines_removed = 0;
+ cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, &new_size,
+ &binary, count_diff_lines);
+ if (files >= slots) {
+ if (slots == 0)
+ slots = 4;
+ else
+ slots = slots * 2;
+ 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);
+ 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);
+ items[files-1].new_path = xstrdup(pair->two->path);
+ items[files-1].added = lines_added;
+ items[files-1].removed = lines_removed;
+ items[files-1].old_size = old_size;
+ items[files-1].new_size = new_size;
+ items[files-1].binary = binary;
+ if (lines_added + lines_removed > max_changes)
+ max_changes = lines_added + lines_removed;
+ total_adds += lines_added;
+ total_rems += lines_removed;
+}
+
+void cgit_print_diffstat(const unsigned char *old_sha1,
+ const unsigned char *new_sha1)
+{
+ int i;
+
+ html("<div class='diffstat-header'>");
+ cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ ctx.qry.sha2, NULL, 0);
+ html("</div>");
+ html("<table summary='diffstat' class='diffstat'>");
+ max_changes = 0;
+ cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, NULL);
+ for(i = 0; i<files; i++)
+ print_fileinfo(&items[i]);
+ html("</table>");
+ html("<div class='diffstat-summary'>");
+ htmlf("%d files changed, %d insertions, %d deletions",
+ files, total_adds, total_rems);
+ html("</div>");
+}
/*
line[len-1] = c;
}
-/*
- * Receive diff-buffers from xdiff and concatenate them as
- * needed across multiple callbacks.
- *
- * This is basically a copy of xdiff-interface.c/xdiff_outf(),
- * ripped from git and modified to use globals instead of
- * a special callback-struct.
- */
-int diff_cb(void *priv_, mmbuffer_t *mb, int nbuf)
+static void header(unsigned char *sha1, char *path1, int mode1,
+ unsigned char *sha2, char *path2, int mode2)
{
- int i;
+ char *abbrev1, *abbrev2;
+ int subproject;
- for (i = 0; i < nbuf; i++) {
- if (mb[i].ptr[mb[i].size-1] != '\n') {
- /* Incomplete line */
- diff_buffer = xrealloc(diff_buffer,
- diff_buffer_size + mb[i].size);
- memcpy(diff_buffer + diff_buffer_size,
- mb[i].ptr, mb[i].size);
- diff_buffer_size += mb[i].size;
- continue;
- }
+ subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
+ html("<div class='head'>");
+ html("diff --git a/");
+ html_txt(path1);
+ html(" b/");
+ html_txt(path2);
+
+ if (is_null_sha1(sha1))
+ path1 = "dev/null";
+ if (is_null_sha1(sha2))
+ path2 = "dev/null";
+
+ if (mode1 == 0)
+ htmlf("<br/>new file mode %.6o", mode2);
- /* we have a complete line */
- if (!diff_buffer) {
- print_line(mb[i].ptr, mb[i].size);
- continue;
+ if (mode2 == 0)
+ 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));
+ htmlf("<br/>index %s..%s", abbrev1, abbrev2);
+ free(abbrev1);
+ free(abbrev2);
+ if (mode1 != 0 && mode2 != 0) {
+ htmlf(" %.6o", mode1);
+ if (mode2 != mode1)
+ htmlf("..%.6o", mode2);
}
- diff_buffer = xrealloc(diff_buffer,
- diff_buffer_size + mb[i].size);
- memcpy(diff_buffer + diff_buffer_size, mb[i].ptr, mb[i].size);
- print_line(diff_buffer, diff_buffer_size + mb[i].size);
- free(diff_buffer);
- diff_buffer = NULL;
- diff_buffer_size = 0;
- }
- if (diff_buffer) {
- print_line(diff_buffer, diff_buffer_size);
- free(diff_buffer);
- diff_buffer = NULL;
- diff_buffer_size = 0;
+ html("<br/>--- a/");
+ if (mode1 != 0)
+ cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
+ sha1_to_hex(old_rev_sha1), path1);
+ else
+ html_txt(path1);
+ html("<br/>+++ b/");
+ if (mode2 != 0)
+ cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
+ sha1_to_hex(new_rev_sha1), path2);
+ else
+ html_txt(path2);
}
- return 0;
+ html("</div>");
+ if (use_ssdiff)
+ cgit_ssdiff_header();
}
-static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
+static void print_ssdiff_link()
{
- char type[20];
-
- if (is_null_sha1(sha1)) {
- file->ptr = (char *)"";
- file->size = 0;
- } else {
- file->ptr = read_sha1_file(sha1, type, &file->size);
+ if (!strcmp(ctx.qry.page, "diff")) {
+ if (use_ssdiff)
+ cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
+ ctx.qry.sha1, ctx.qry.sha2, NULL, 1);
+ else
+ cgit_diff_link("Side-by-side diff", NULL, NULL,
+ ctx.qry.head, ctx.qry.sha1,
+ ctx.qry.sha2, NULL, 1);
}
- return 1;
}
-static void run_diff(const unsigned char *sha1, const unsigned char *sha2)
+static void filepair_cb(struct diff_filepair *pair)
{
- mmfile_t file1, file2;
- xpparam_t diff_params;
- xdemitconf_t emit_params;
- xdemitcb_t emit_cb;
+ unsigned long old_size = 0;
+ unsigned long new_size = 0;
+ int binary = 0;
+ linediff_fn print_line_fn = print_line;
- if (!load_mmfile(&file1, sha1) || !load_mmfile(&file2, sha2)) {
- cgit_print_error("Unable to load files for diff");
+ 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();
+ print_line_fn = cgit_ssdiff_line_cb;
+ }
+ if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
+ if (S_ISGITLINK(pair->one->mode))
+ print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
+ if (S_ISGITLINK(pair->two->mode))
+ print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
return;
}
+ if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+ &new_size, &binary, print_line_fn))
+ cgit_print_error("Error running diff");
+ if (binary)
+ html("Binary files differ");
+ if (use_ssdiff)
+ cgit_ssdiff_footer();
+}
- diff_params.flags = XDF_NEED_MINIMAL;
-
- emit_params.ctxlen = 3;
- emit_params.flags = XDL_EMIT_FUNCNAMES;
-
- emit_cb.outf = diff_cb;
+void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
+{
+ enum object_type type;
+ unsigned long size;
+ struct commit *commit, *commit2;
- xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
-}
+ if (!new_rev)
+ new_rev = ctx.qry.head;
+ get_sha1(new_rev, new_rev_sha1);
+ type = sha1_object_info(new_rev_sha1, &size);
+ if (type == OBJ_BAD) {
+ cgit_print_error(fmt("Bad object name: %s", new_rev));
+ return;
+ }
+ commit = lookup_commit_reference(new_rev_sha1);
+ if (!commit || parse_commit(commit))
+ cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
+ if (old_rev)
+ get_sha1(old_rev, old_rev_sha1);
+ else if (commit->parents && commit->parents->item)
+ hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
+ else
+ hashclr(old_rev_sha1);
+ if (!is_null_sha1(old_rev_sha1)) {
+ type = sha1_object_info(old_rev_sha1, &size);
+ if (type == OBJ_BAD) {
+ cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
+ return;
+ }
+ commit2 = lookup_commit_reference(old_rev_sha1);
+ if (!commit2 || parse_commit(commit2))
+ cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
+ }
-void cgit_print_diff(const char *old_hex, const char *new_hex)
-{
- unsigned char sha1[20], sha2[20];
+ if ((ctx.qry.ssdiff && !ctx.cfg.ssdiff) || (!ctx.qry.ssdiff && ctx.cfg.ssdiff))
+ use_ssdiff = 1;
- get_sha1(old_hex, sha1);
- get_sha1(new_hex, sha2);
+ print_ssdiff_link();
+ cgit_print_diffstat(old_rev_sha1, new_rev_sha1);
- html("<h2>diff</h2>\n");
- html("<table class='diff'><tr><td>");
- run_diff(sha1, sha2);
- html("</td></tr></table>");
+ html("<table summary='diff' class='diff'>");
+ html("<tr><td>");
+ cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
+ html("</td></tr>");
+ html("</table>");
}
git.ckatri.com / cgit.git / blobdiff