|
diff --git a/ui-diff.c b/ui-diff.c index a76a234..0be845f 100644 --- a/ ui-diff.c+++ b/ ui-diff.c |
|
@@ -24,33 +24,33 @@ static void print_line(char *line, int len) |
24 | else if (line[0] == '@') |
24 | else if (line[0] == '@') |
25 | class = "hunk"; |
25 | class = "hunk"; |
26 | |
26 | |
27 | htmlf("<div class='%s'>", class); |
27 | htmlf("<div class='%s'>", class); |
28 | line[len-1] = '\0'; |
28 | line[len-1] = '\0'; |
29 | html_txt(line); |
29 | html_txt(line); |
30 | html("</div>"); |
30 | html("</div>"); |
31 | line[len-1] = c; |
31 | line[len-1] = c; |
32 | } |
32 | } |
33 | |
33 | |
34 | static void header(unsigned char *sha1, char *path1, int mode1, |
34 | static void header(unsigned char *sha1, char *path1, int mode1, |
35 | unsigned char *sha2, char *path2, int mode2) |
35 | unsigned char *sha2, char *path2, int mode2) |
36 | { |
36 | { |
37 | char *abbrev1, *abbrev2; |
37 | char *abbrev1, *abbrev2; |
38 | int subproject; |
38 | int subproject; |
39 | |
39 | |
40 | subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); |
40 | subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); |
41 | html("<div class='head'>"); |
41 | html("<div class='head'>"); |
42 | html("diff --git a/"); |
42 | html("diff --git a/"); |
43 | html_txt(path1); |
43 | html_txt(path1); |
44 | html(" b/"); |
44 | html(" b/"); |
45 | html_txt(path2); |
45 | html_txt(path2); |
46 | |
46 | |
47 | if (is_null_sha1(sha1)) |
47 | if (is_null_sha1(sha1)) |
48 | path1 = "dev/null"; |
48 | path1 = "dev/null"; |
49 | if (is_null_sha1(sha2)) |
49 | if (is_null_sha1(sha2)) |
50 | path2 = "dev/null"; |
50 | path2 = "dev/null"; |
51 | |
51 | |
52 | if (mode1 == 0) |
52 | if (mode1 == 0) |
53 | htmlf("<br/>new file mode %.6o", mode2); |
53 | htmlf("<br/>new file mode %.6o", mode2); |
54 | |
54 | |
55 | if (mode2 == 0) |
55 | if (mode2 == 0) |
56 | htmlf("<br/>deleted file mode %.6o", mode1); |
56 | htmlf("<br/>deleted file mode %.6o", mode1); |
@@ -65,36 +65,36 @@ static void header(unsigned char *sha1, char *path1, int mode1, |
65 | htmlf(" %.6o", mode1); |
65 | htmlf(" %.6o", mode1); |
66 | if (mode2 != mode1) |
66 | if (mode2 != mode1) |
67 | htmlf("..%.6o", mode2); |
67 | htmlf("..%.6o", mode2); |
68 | } |
68 | } |
69 | html("<br/>--- a/"); |
69 | html("<br/>--- a/"); |
70 | html_txt(path1); |
70 | html_txt(path1); |
71 | html("<br/>+++ b/"); |
71 | html("<br/>+++ b/"); |
72 | html_txt(path2); |
72 | html_txt(path2); |
73 | } |
73 | } |
74 | html("</div>"); |
74 | html("</div>"); |
75 | } |
75 | } |
76 | |
76 | |
77 | static void filepair_cb(struct diff_filepair *pair) |
77 | static void filepair_cb(struct diff_filepair *pair) |
78 | { |
78 | { |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
79 | header(pair->one->sha1, pair->one->path, pair->one->mode, |
80 | pair->two->sha1, pair->two->path, pair->two->mode); |
80 | pair->two->sha1, pair->two->path, pair->two->mode); |
81 | if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) { |
81 | if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { |
82 | if (S_ISDIRLNK(pair->one->mode)) |
82 | if (S_ISGITLINK(pair->one->mode)) |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
83 | print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); |
84 | if (S_ISDIRLNK(pair->two->mode)) |
84 | if (S_ISGITLINK(pair->two->mode)) |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
85 | print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); |
86 | return; |
86 | return; |
87 | } |
87 | } |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); |
89 | cgit_print_error("Error running diff"); |
90 | } |
90 | } |
91 | |
91 | |
92 | void cgit_print_diff(const char *new_rev, const char *old_rev) |
92 | void cgit_print_diff(const char *new_rev, const char *old_rev) |
93 | { |
93 | { |
94 | unsigned char sha1[20], sha2[20]; |
94 | unsigned char sha1[20], sha2[20]; |
95 | enum object_type type; |
95 | enum object_type type; |
96 | unsigned long size; |
96 | unsigned long size; |
97 | struct commit *commit, *commit2; |
97 | struct commit *commit, *commit2; |
98 | |
98 | |
99 | if (!new_rev) |
99 | if (!new_rev) |
100 | new_rev = cgit_query_head; |
100 | new_rev = cgit_query_head; |
|