blob: 4fcf8523f719f46c77ace75569277f717ef3298d [file] [log] [blame]
Lars Hjemli36aba002006-12-20 22:48:27 +01001/* ui-diff.c: show diff between two blobs
2 *
3 * Copyright (C) 2006 Lars Hjemli
4 *
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
7 */
8
9#include "cgit.h"
Lars Hjemli36aba002006-12-20 22:48:27 +010010
Lars Hjemli36aba002006-12-20 22:48:27 +010011
Lars Hjemlie238ebe2007-10-01 12:30:29 +020012unsigned char old_rev_sha1[20];
13unsigned char new_rev_sha1[20];
14
Lars Hjemli36aba002006-12-20 22:48:27 +010015/*
16 * print a single line returned from xdiff
17 */
18static void print_line(char *line, int len)
19{
20 char *class = "ctx";
21 char c = line[len-1];
22
23 if (line[0] == '+')
24 class = "add";
25 else if (line[0] == '-')
26 class = "del";
27 else if (line[0] == '@')
28 class = "hunk";
29
30 htmlf("<div class='%s'>", class);
31 line[len-1] = '\0';
32 html_txt(line);
33 html("</div>");
34 line[len-1] = c;
35}
36
Lars Hjemlif4f13392007-05-16 04:21:06 +020037static void header(unsigned char *sha1, char *path1, int mode1,
38 unsigned char *sha2, char *path2, int mode2)
Lars Hjemlia342ac62007-05-14 18:31:05 +020039{
40 char *abbrev1, *abbrev2;
Lars Hjemlif4f13392007-05-16 04:21:06 +020041 int subproject;
42
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -050043 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
Lars Hjemlia342ac62007-05-14 18:31:05 +020044 html("<div class='head'>");
45 html("diff --git a/");
46 html_txt(path1);
47 html(" b/");
48 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +020049
50 if (is_null_sha1(sha1))
51 path1 = "dev/null";
52 if (is_null_sha1(sha2))
53 path2 = "dev/null";
54
55 if (mode1 == 0)
56 htmlf("<br/>new file mode %.6o", mode2);
57
58 if (mode2 == 0)
59 htmlf("<br/>deleted file mode %.6o", mode1);
60
61 if (!subproject) {
62 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
63 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
64 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
65 free(abbrev1);
66 free(abbrev2);
67 if (mode1 != 0 && mode2 != 0) {
68 htmlf(" %.6o", mode1);
69 if (mode2 != mode1)
70 htmlf("..%.6o", mode2);
71 }
72 html("<br/>--- a/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +020073 if (mode1 != 0)
74 cgit_tree_link(path1, NULL, NULL, cgit_query_head,
75 sha1_to_hex(old_rev_sha1), path1);
76 else
77 html_txt(path1);
Lars Hjemlif4f13392007-05-16 04:21:06 +020078 html("<br/>+++ b/");
Lars Hjemlie238ebe2007-10-01 12:30:29 +020079 if (mode2 != 0)
80 cgit_tree_link(path2, NULL, NULL, cgit_query_head,
81 sha1_to_hex(new_rev_sha1), path2);
82 else
83 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +020084 }
Lars Hjemlia342ac62007-05-14 18:31:05 +020085 html("</div>");
86}
87
Lars Hjemli6a8749d2007-05-13 23:13:12 +020088static void filepair_cb(struct diff_filepair *pair)
89{
Lars Hjemlif4f13392007-05-16 04:21:06 +020090 header(pair->one->sha1, pair->one->path, pair->one->mode,
91 pair->two->sha1, pair->two->path, pair->two->mode);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -050092 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
93 if (S_ISGITLINK(pair->one->mode))
Lars Hjemlif4f13392007-05-16 04:21:06 +020094 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -050095 if (S_ISGITLINK(pair->two->mode))
Lars Hjemlif4f13392007-05-16 04:21:06 +020096 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
97 return;
98 }
Lars Hjemli6a8749d2007-05-13 23:13:12 +020099 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
100 cgit_print_error("Error running diff");
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200101}
102
Lars Hjemli1a6025b2007-10-01 11:46:38 +0200103void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
Lars Hjemli36aba002006-12-20 22:48:27 +0100104{
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200105 enum object_type type;
106 unsigned long size;
Lars Hjemli4a0be582007-06-17 18:12:03 +0200107 struct commit *commit, *commit2;
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200108
Lars Hjemli4a0be582007-06-17 18:12:03 +0200109 if (!new_rev)
110 new_rev = cgit_query_head;
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200111 get_sha1(new_rev, new_rev_sha1);
112 type = sha1_object_info(new_rev_sha1, &size);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200113 if (type == OBJ_BAD) {
114 cgit_print_error(fmt("Bad object name: %s", new_rev));
115 return;
116 }
117 if (type != OBJ_COMMIT) {
118 cgit_print_error(fmt("Unhandled object type: %s",
119 typename(type)));
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200120 return;
121 }
Lars Hjemli36aba002006-12-20 22:48:27 +0100122
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200123 commit = lookup_commit_reference(new_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200124 if (!commit || parse_commit(commit))
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200125 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
Lars Hjemli36aba002006-12-20 22:48:27 +0100126
Lars Hjemli4a0be582007-06-17 18:12:03 +0200127 if (old_rev)
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200128 get_sha1(old_rev, old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200129 else if (commit->parents && commit->parents->item)
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200130 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200131 else
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200132 hashclr(old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200133
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200134 if (!is_null_sha1(old_rev_sha1)) {
135 type = sha1_object_info(old_rev_sha1, &size);
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200136 if (type == OBJ_BAD) {
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200137 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200138 return;
139 }
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200140 commit2 = lookup_commit_reference(old_rev_sha1);
Lars Hjemli4a0be582007-06-17 18:12:03 +0200141 if (!commit2 || parse_commit(commit2))
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200142 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200143 }
Lars Hjemli29154832007-11-11 13:04:28 +0100144 html("<table summary='diff' class='diff'>");
Lars Hjemli4a0be582007-06-17 18:12:03 +0200145 html("<tr><td>");
Lars Hjemlie238ebe2007-10-01 12:30:29 +0200146 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
Lars Hjemli4a6201e2007-06-05 11:44:47 +0200147 html("</td></tr>");
Ondrej Jirman0928d882007-05-26 01:14:25 +0200148 html("</table>");
Lars Hjemli36aba002006-12-20 22:48:27 +0100149}