blob: 4695e3a6442cb1b7bc1e2bbc75291e066d24a013 [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
12/*
13 * print a single line returned from xdiff
14 */
15static void print_line(char *line, int len)
16{
17 char *class = "ctx";
18 char c = line[len-1];
19
20 if (line[0] == '+')
21 class = "add";
22 else if (line[0] == '-')
23 class = "del";
24 else if (line[0] == '@')
25 class = "hunk";
26
27 htmlf("<div class='%s'>", class);
28 line[len-1] = '\0';
29 html_txt(line);
30 html("</div>");
31 line[len-1] = c;
32}
33
Lars Hjemlif4f13392007-05-16 04:21:06 +020034static void header(unsigned char *sha1, char *path1, int mode1,
35 unsigned char *sha2, char *path2, int mode2)
Lars Hjemlia342ac62007-05-14 18:31:05 +020036{
37 char *abbrev1, *abbrev2;
Lars Hjemlif4f13392007-05-16 04:21:06 +020038 int subproject;
39
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -050040 subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2));
Lars Hjemlia342ac62007-05-14 18:31:05 +020041 html("<div class='head'>");
42 html("diff --git a/");
43 html_txt(path1);
44 html(" b/");
45 html_txt(path2);
Lars Hjemlif4f13392007-05-16 04:21:06 +020046
47 if (is_null_sha1(sha1))
48 path1 = "dev/null";
49 if (is_null_sha1(sha2))
50 path2 = "dev/null";
51
52 if (mode1 == 0)
53 htmlf("<br/>new file mode %.6o", mode2);
54
55 if (mode2 == 0)
56 htmlf("<br/>deleted file mode %.6o", mode1);
57
58 if (!subproject) {
59 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
60 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
61 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
62 free(abbrev1);
63 free(abbrev2);
64 if (mode1 != 0 && mode2 != 0) {
65 htmlf(" %.6o", mode1);
66 if (mode2 != mode1)
67 htmlf("..%.6o", mode2);
68 }
69 html("<br/>--- a/");
70 html_txt(path1);
71 html("<br/>+++ b/");
72 html_txt(path2);
73 }
Lars Hjemlia342ac62007-05-14 18:31:05 +020074 html("</div>");
75}
76
Lars Hjemli6a8749d2007-05-13 23:13:12 +020077static void filepair_cb(struct diff_filepair *pair)
78{
Lars Hjemlif4f13392007-05-16 04:21:06 +020079 header(pair->one->sha1, pair->one->path, pair->one->mode,
80 pair->two->sha1, pair->two->path, pair->two->mode);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -050081 if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
82 if (S_ISGITLINK(pair->one->mode))
Lars Hjemlif4f13392007-05-16 04:21:06 +020083 print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
Jeffrey C. Olliee651cb02007-06-04 12:28:56 -050084 if (S_ISGITLINK(pair->two->mode))
Lars Hjemlif4f13392007-05-16 04:21:06 +020085 print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
86 return;
87 }
Lars Hjemli6a8749d2007-05-13 23:13:12 +020088 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
89 cgit_print_error("Error running diff");
Lars Hjemli6a8749d2007-05-13 23:13:12 +020090}
91
Lars Hjemlif9ff7df2007-05-16 00:58:35 +020092void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
Lars Hjemli36aba002006-12-20 22:48:27 +010093{
94 unsigned char sha1[20], sha2[20];
Lars Hjemli6a8749d2007-05-13 23:13:12 +020095 enum object_type type;
96 unsigned long size;
Lars Hjemlif9ff7df2007-05-16 00:58:35 +020097 struct commit *commit;
98
99 if (head && !old_hex && !new_hex) {
100 get_sha1(head, sha1);
101 commit = lookup_commit_reference(sha1);
102 if (commit && !parse_commit(commit)) {
103 html("<table class='diff'>");
Ondrej Jirman0928d882007-05-26 01:14:25 +0200104 html("<tr><td>");
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200105 cgit_diff_commit(commit, filepair_cb);
Ondrej Jirman0928d882007-05-26 01:14:25 +0200106 html("</td></tr>");
107 html("</table>");
Lars Hjemlif9ff7df2007-05-16 00:58:35 +0200108 }
109 return;
110 }
Lars Hjemli36aba002006-12-20 22:48:27 +0100111
112 get_sha1(old_hex, sha1);
113 get_sha1(new_hex, sha2);
114
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200115 type = sha1_object_info(sha1, &size);
116 if (type == OBJ_BAD) {
117 type = sha1_object_info(sha2, &size);
118 if (type == OBJ_BAD) {
119 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
120 return;
121 }
122 }
123
124 html("<table class='diff'>");
125 switch(type) {
126 case OBJ_BLOB:
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200127 html("<tr><td>");
Lars Hjemlif4f13392007-05-16 04:21:06 +0200128 header(sha1, path, 0644, sha2, path, 0644);
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200129 if (cgit_diff_files(sha1, sha2, print_line))
130 cgit_print_error("Error running diff");
Ondrej Jirman0928d882007-05-26 01:14:25 +0200131 html("</td></tr>");
Lars Hjemli6a8749d2007-05-13 23:13:12 +0200132 break;
133 case OBJ_TREE:
134 cgit_diff_tree(sha1, sha2, filepair_cb);
135 break;
136 default:
137 cgit_print_error(fmt("Unhandled object type: %s",
138 typename(type)));
139 break;
140 }
Ondrej Jirman0928d882007-05-26 01:14:25 +0200141 html("</table>");
Lars Hjemli36aba002006-12-20 22:48:27 +0100142}