]> git.cameronkatri.com Git - cgit.git/blob - ui-diff.c
Change commit-view to expect h parameter, not id
[cgit.git] / ui-diff.c
1 /* 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"
10
11
12 /*
13 * print a single line returned from xdiff
14 */
15 static 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
34 static void header(unsigned char *sha1, char *path1,
35 unsigned char *sha2, char *path2)
36 {
37 char *abbrev1, *abbrev2;
38 if (is_null_sha1(sha1))
39 path1 = "dev/null";
40 if (is_null_sha1(sha2))
41 path2 = "dev/null";
42 html("<tr><td>");
43 html("<div class='head'>");
44 html("diff --git a/");
45 html_txt(path1);
46 html(" b/");
47 html_txt(path2);
48 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
49 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
50 htmlf("\nindex %s..%s", abbrev1, abbrev2);
51 free(abbrev1);
52 free(abbrev2);
53 html("\n--- a/");
54 html_txt(path1);
55 html("\n+++ b/");
56 html_txt(path2);
57 html("</div>");
58 }
59
60 static void filepair_cb(struct diff_filepair *pair)
61 {
62 header(pair->one->sha1, pair->one->path,
63 pair->two->sha1, pair->two->path);
64 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
65 cgit_print_error("Error running diff");
66 html("</tr></td>");
67 }
68
69 void cgit_print_diff(const char *old_hex, const char *new_hex, char *path)
70 {
71 unsigned char sha1[20], sha2[20];
72 enum object_type type;
73 unsigned long size;
74
75 get_sha1(old_hex, sha1);
76 get_sha1(new_hex, sha2);
77
78 type = sha1_object_info(sha1, &size);
79 if (type == OBJ_BAD) {
80 type = sha1_object_info(sha2, &size);
81 if (type == OBJ_BAD) {
82 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
83 return;
84 }
85 }
86
87 html("<table class='diff'>");
88 switch(type) {
89 case OBJ_BLOB:
90 html("<tr><td>");
91 header(sha1, path, sha2, path);
92 if (cgit_diff_files(sha1, sha2, print_line))
93 cgit_print_error("Error running diff");
94 html("</tr></td>");
95 break;
96 case OBJ_TREE:
97 cgit_diff_tree(sha1, sha2, filepair_cb);
98 break;
99 default:
100 cgit_print_error(fmt("Unhandled object type: %s",
101 typename(type)));
102 break;
103 }
104 html("</td></tr></table>");
105 }