]> gitweb.ps.run Git - ps-cgit/blob - ui-diff.c
Add support for commitdiff via h parameter
[ps-cgit] / 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 *head, 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         struct commit *commit;
75
76         if (head && !old_hex && !new_hex) {
77                 get_sha1(head, sha1);
78                 commit = lookup_commit_reference(sha1);
79                 if (commit && !parse_commit(commit)) {
80                         html("<table class='diff'>");
81                         cgit_diff_commit(commit, filepair_cb);
82                         html("</td></tr></table>");
83                 }
84                 return;
85         }
86
87         get_sha1(old_hex, sha1);
88         get_sha1(new_hex, sha2);
89
90         type = sha1_object_info(sha1, &size);
91         if (type == OBJ_BAD) {
92                 type = sha1_object_info(sha2, &size);
93                 if (type == OBJ_BAD) {
94                         cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
95                         return;
96                 }
97         }
98
99         html("<table class='diff'>");
100         switch(type) {
101         case OBJ_BLOB:
102                 html("<tr><td>");
103                 header(sha1, path, sha2, path);
104                 if (cgit_diff_files(sha1, sha2, print_line))
105                         cgit_print_error("Error running diff");
106                 html("</tr></td>");
107                 break;
108         case OBJ_TREE:
109                 cgit_diff_tree(sha1, sha2, filepair_cb);
110                 break;
111         default:
112                 cgit_print_error(fmt("Unhandled object type: %s",
113                                      typename(type)));
114                 break;
115         }
116         html("</td></tr></table>");
117 }