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