2006-12-20 21:48:27 +00:00
|
|
|
/* ui-diff.c: show diff between two blobs
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Lars Hjemli
|
|
|
|
*
|
|
|
|
* Licensed under GNU General Public License v2
|
|
|
|
* (see COPYING for full license text)
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "cgit.h"
|
2008-02-23 21:45:33 +00:00
|
|
|
#include "html.h"
|
2008-03-24 15:50:57 +00:00
|
|
|
#include "ui-shared.h"
|
2006-12-20 21:48:27 +00:00
|
|
|
|
2007-10-01 10:30:29 +00:00
|
|
|
unsigned char old_rev_sha1[20];
|
|
|
|
unsigned char new_rev_sha1[20];
|
|
|
|
|
2006-12-20 21:48:27 +00:00
|
|
|
/*
|
|
|
|
* 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("<div class='%s'>", class);
|
|
|
|
line[len-1] = '\0';
|
|
|
|
html_txt(line);
|
|
|
|
html("</div>");
|
|
|
|
line[len-1] = c;
|
|
|
|
}
|
|
|
|
|
2007-05-16 02:21:06 +00:00
|
|
|
static void header(unsigned char *sha1, char *path1, int mode1,
|
|
|
|
unsigned char *sha2, char *path2, int mode2)
|
2007-05-13 21:13:12 +00:00
|
|
|
{
|
2007-05-14 16:31:05 +00:00
|
|
|
char *abbrev1, *abbrev2;
|
2007-05-16 02:21:06 +00:00
|
|
|
int subproject;
|
|
|
|
|
2007-06-04 17:28:56 +00:00
|
|
|
subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
|
2007-05-14 16:31:05 +00:00
|
|
|
html("<div class='head'>");
|
|
|
|
html("diff --git a/");
|
|
|
|
html_txt(path1);
|
|
|
|
html(" b/");
|
|
|
|
html_txt(path2);
|
2007-05-16 02:21:06 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
html("<br/>--- a/");
|
2007-10-01 10:30:29 +00:00
|
|
|
if (mode1 != 0)
|
2008-02-16 10:53:40 +00:00
|
|
|
cgit_tree_link(path1, NULL, NULL, ctx.qry.head,
|
2007-10-01 10:30:29 +00:00
|
|
|
sha1_to_hex(old_rev_sha1), path1);
|
|
|
|
else
|
|
|
|
html_txt(path1);
|
2007-05-16 02:21:06 +00:00
|
|
|
html("<br/>+++ b/");
|
2007-10-01 10:30:29 +00:00
|
|
|
if (mode2 != 0)
|
2008-02-16 10:53:40 +00:00
|
|
|
cgit_tree_link(path2, NULL, NULL, ctx.qry.head,
|
2007-10-01 10:30:29 +00:00
|
|
|
sha1_to_hex(new_rev_sha1), path2);
|
|
|
|
else
|
|
|
|
html_txt(path2);
|
2007-05-16 02:21:06 +00:00
|
|
|
}
|
2007-05-14 16:31:05 +00:00
|
|
|
html("</div>");
|
|
|
|
}
|
|
|
|
|
|
|
|
static void filepair_cb(struct diff_filepair *pair)
|
|
|
|
{
|
2007-05-16 02:21:06 +00:00
|
|
|
header(pair->one->sha1, pair->one->path, pair->one->mode,
|
|
|
|
pair->two->sha1, pair->two->path, pair->two->mode);
|
2007-06-04 17:28:56 +00:00
|
|
|
if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
|
|
|
|
if (S_ISGITLINK(pair->one->mode))
|
2007-05-16 02:21:06 +00:00
|
|
|
print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
|
2007-06-04 17:28:56 +00:00
|
|
|
if (S_ISGITLINK(pair->two->mode))
|
2007-05-16 02:21:06 +00:00
|
|
|
print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
|
|
|
|
return;
|
|
|
|
}
|
2007-05-13 21:13:12 +00:00
|
|
|
if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
|
|
|
|
cgit_print_error("Error running diff");
|
|
|
|
}
|
|
|
|
|
2007-10-01 09:46:38 +00:00
|
|
|
void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
|
2006-12-20 21:48:27 +00:00
|
|
|
{
|
2007-05-13 21:13:12 +00:00
|
|
|
enum object_type type;
|
|
|
|
unsigned long size;
|
2007-06-17 16:12:03 +00:00
|
|
|
struct commit *commit, *commit2;
|
2007-05-15 22:58:35 +00:00
|
|
|
|
2007-06-17 16:12:03 +00:00
|
|
|
if (!new_rev)
|
2008-02-16 10:53:40 +00:00
|
|
|
new_rev = ctx.qry.head;
|
2007-10-01 10:30:29 +00:00
|
|
|
get_sha1(new_rev, new_rev_sha1);
|
|
|
|
type = sha1_object_info(new_rev_sha1, &size);
|
2007-06-17 16:12:03 +00:00
|
|
|
if (type == OBJ_BAD) {
|
|
|
|
cgit_print_error(fmt("Bad object name: %s", new_rev));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (type != OBJ_COMMIT) {
|
|
|
|
cgit_print_error(fmt("Unhandled object type: %s",
|
|
|
|
typename(type)));
|
2007-05-15 22:58:35 +00:00
|
|
|
return;
|
|
|
|
}
|
2006-12-20 21:48:27 +00:00
|
|
|
|
2007-10-01 10:30:29 +00:00
|
|
|
commit = lookup_commit_reference(new_rev_sha1);
|
2007-06-17 16:12:03 +00:00
|
|
|
if (!commit || parse_commit(commit))
|
2007-10-01 10:30:29 +00:00
|
|
|
cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
|
2006-12-20 21:48:27 +00:00
|
|
|
|
2007-06-17 16:12:03 +00:00
|
|
|
if (old_rev)
|
2007-10-01 10:30:29 +00:00
|
|
|
get_sha1(old_rev, old_rev_sha1);
|
2007-06-17 16:12:03 +00:00
|
|
|
else if (commit->parents && commit->parents->item)
|
2007-10-01 10:30:29 +00:00
|
|
|
hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
|
2007-06-17 16:12:03 +00:00
|
|
|
else
|
2007-10-01 10:30:29 +00:00
|
|
|
hashclr(old_rev_sha1);
|
2007-06-17 16:12:03 +00:00
|
|
|
|
2007-10-01 10:30:29 +00:00
|
|
|
if (!is_null_sha1(old_rev_sha1)) {
|
|
|
|
type = sha1_object_info(old_rev_sha1, &size);
|
2007-05-13 21:13:12 +00:00
|
|
|
if (type == OBJ_BAD) {
|
2007-10-01 10:30:29 +00:00
|
|
|
cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
|
2007-05-13 21:13:12 +00:00
|
|
|
return;
|
|
|
|
}
|
2007-10-01 10:30:29 +00:00
|
|
|
commit2 = lookup_commit_reference(old_rev_sha1);
|
2007-06-17 16:12:03 +00:00
|
|
|
if (!commit2 || parse_commit(commit2))
|
2007-10-01 10:30:29 +00:00
|
|
|
cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
|
2007-05-13 21:13:12 +00:00
|
|
|
}
|
2007-11-11 12:04:28 +00:00
|
|
|
html("<table summary='diff' class='diff'>");
|
2007-06-17 16:12:03 +00:00
|
|
|
html("<tr><td>");
|
2007-10-01 10:30:29 +00:00
|
|
|
cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
|
2007-06-05 09:44:47 +00:00
|
|
|
html("</td></tr>");
|
2007-05-25 23:14:25 +00:00
|
|
|
html("</table>");
|
2006-12-20 21:48:27 +00:00
|
|
|
}
|