/* ui-diff.c: show diff between two blobs * * Copyright (C) 2006-2014 cgit Development Team * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" #include "ui-diff.h" #include "html.h" #include "ui-shared.h" #include "ui-ssdiff.h" 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; unsigned int binary:1; } *items; static int use_ssdiff = 0; static struct diff_filepair *current_filepair; static const char *current_prefix; struct diff_filespec *cgit_get_current_old_file(void) { return current_filepair->one; } struct diff_filespec *cgit_get_current_new_file(void) { return current_filepair->two; } 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(""); htmlf(""); 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("["); cgit_print_filemode(info->old_mode); html("]"); } htmlf("", class); 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"); html_txt(info->old_path); html(")"); } html(""); if (info->binary) { htmlf("bin%ld -> %ld bytes", info->old_size, info->new_size); return; } htmlf("%d", info->added + info->removed); html(""); htmlf("", (max_changes > 100 ? 100 : max_changes)); htmlf("
", info->added * 100.0 / max_changes); htmlf("", info->removed * 100.0 / max_changes); htmlf("", (max_changes - info->removed - info->added) * 100.0 / max_changes); html("
\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 int show_filepair(struct diff_filepair *pair) { /* Always show if we have no limiting prefix. */ if (!current_prefix) return 1; /* Show if either path in the pair begins with the prefix. */ if (starts_with(pair->one->path, current_prefix) || starts_with(pair->two->path, current_prefix)) return 1; /* Otherwise we don't want to show this filepair. */ return 0; } static void inspect_filepair(struct diff_filepair *pair) { int binary = 0; unsigned long old_size = 0; unsigned long new_size = 0; if (!show_filepair(pair)) return; files++; lines_added = 0; lines_removed = 0; 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) 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; } static void cgit_print_diffstat(const unsigned char *old_sha1, const unsigned char *new_sha1, const char *prefix) { int i; html("
"); cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.sha2, NULL); if (prefix) { html(" (limited to '"); html_txt(prefix); html("')"); } html("
"); html(""); max_changes = 0; cgit_diff_tree(old_sha1, new_sha1, inspect_filepair, prefix, ctx.qry.ignorews); for (i = 0; i"); html("
"); htmlf("%d files changed, %d insertions, %d deletions", files, total_adds, total_rems); html("
"); } /* * print a single line returned from xdiff */ static void print_line(char *line, int len) { char *class = "ctx"; char c = line[len-1]; if (line[0] == '+') class = "add"; else if (line[0] == '-') class = "del"; else if (line[0] == '@') class = "hunk"; htmlf("
", class); line[len-1] = '\0'; html_txt(line); html("
"); line[len-1] = c; } static void header(unsigned char *sha1, char *path1, int mode1, unsigned char *sha2, char *path2, int mode2) { char *abbrev1, *abbrev2; int subproject; subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); html("
"); html("diff --git a/"); html_txt(path1); html(" b/"); html_txt(path2); if (mode1 == 0) htmlf("
new file mode %.6o", mode2); if (mode2 == 0) htmlf("
deleted file mode %.6o", mode1); if (!subproject) { abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); htmlf("
index %s..%s", abbrev1, abbrev2); free(abbrev1); free(abbrev2); if (mode1 != 0 && mode2 != 0) { htmlf(" %.6o", mode1); if (mode2 != mode1) htmlf("..%.6o", mode2); } if (is_null_sha1(sha1)) { path1 = "dev/null"; html("
--- /"); } else html("
--- a/"); if (mode1 != 0) cgit_tree_link(path1, NULL, NULL, ctx.qry.head, sha1_to_hex(old_rev_sha1), path1); else html_txt(path1); if (is_null_sha1(sha2)) { path2 = "dev/null"; html("
+++ /"); } else html("
+++ b/"); if (mode2 != 0) cgit_tree_link(path2, NULL, NULL, ctx.qry.head, sha1_to_hex(new_rev_sha1), path2); else html_txt(path2); } html("
"); } static void filepair_cb(struct diff_filepair *pair) { unsigned long old_size = 0; unsigned long new_size = 0; int binary = 0; linediff_fn print_line_fn = print_line; if (!show_fileJune McEnroe
2019-10-26
|
* OopsJune McEnroe2019-10-26
|
* Disconnect client on unknown commandJune McEnroe2019-10-26
| | | | | During registration, no other commands should be sent. Afterwards, only intercepted commands will get parsed.
* Allow reading sensitive information from filesJune McEnroe2019-10-26
|
* Add rc scriptJune McEnroe2019-10-26
|
* Add install and uninstall targetsJune McEnroe2019-10-25
|
* Expand documentationJune McEnroe2019-10-25
|
* Add AGPLv3 notice on client registrationJune McEnroe2019-10-25
| | | | OwO
* Rename project pounceJune McEnroe2019-10-25
|
* Add copy of AGPLv3June McEnroe2019-10-25
|
* Send PRIVMSG and NOTICE to other clientsJune McEnroe2019-10-25
|
* Clean up event loopJune McEnroe2019-10-25
|
* Clean up clientJune McEnroe