summaryrefslogtreecommitdiffabout
path: root/ui-diff.c
Unidiff
Diffstat (limited to 'ui-diff.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-diff.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/ui-diff.c b/ui-diff.c
index 999b6f3..afe1c90 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -45,53 +45,65 @@ static void header(unsigned char *sha1, char *path1,
45 html_txt(path1); 45 html_txt(path1);
46 html(" b/"); 46 html(" b/");
47 html_txt(path2); 47 html_txt(path2);
48 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); 48 abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV));
49 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); 49 abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV));
50 htmlf("\nindex %s..%s", abbrev1, abbrev2); 50 htmlf("\nindex %s..%s", abbrev1, abbrev2);
51 free(abbrev1); 51 free(abbrev1);
52 free(abbrev2); 52 free(abbrev2);
53 html("\n--- a/"); 53 html("\n--- a/");
54 html_txt(path1); 54 html_txt(path1);
55 html("\n+++ b/"); 55 html("\n+++ b/");
56 html_txt(path2); 56 html_txt(path2);
57 html("</div>"); 57 html("</div>");
58} 58}
59 59
60static void filepair_cb(struct diff_filepair *pair) 60static void filepair_cb(struct diff_filepair *pair)
61{ 61{
62 header(pair->one->sha1, pair->one->path, 62 header(pair->one->sha1, pair->one->path,
63 pair->two->sha1, pair->two->path); 63 pair->two->sha1, pair->two->path);
64 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) 64 if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line))
65 cgit_print_error("Error running diff"); 65 cgit_print_error("Error running diff");
66 html("</tr></td>"); 66 html("</tr></td>");
67} 67}
68 68
69void cgit_print_diff(const char *old_hex, const char *new_hex, char *path) 69void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path)
70{ 70{
71 unsigned char sha1[20], sha2[20]; 71 unsigned char sha1[20], sha2[20];
72 enum object_type type; 72 enum object_type type;
73 unsigned long size; 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 }
74 86
75 get_sha1(old_hex, sha1); 87 get_sha1(old_hex, sha1);
76 get_sha1(new_hex, sha2); 88 get_sha1(new_hex, sha2);
77 89
78 type = sha1_object_info(sha1, &size); 90 type = sha1_object_info(sha1, &size);
79 if (type == OBJ_BAD) { 91 if (type == OBJ_BAD) {
80 type = sha1_object_info(sha2, &size); 92 type = sha1_object_info(sha2, &size);
81 if (type == OBJ_BAD) { 93 if (type == OBJ_BAD) {
82 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); 94 cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex));
83 return; 95 return;
84 } 96 }
85 } 97 }
86 98
87 html("<table class='diff'>"); 99 html("<table class='diff'>");
88 switch(type) { 100 switch(type) {
89 case OBJ_BLOB: 101 case OBJ_BLOB:
90 html("<tr><td>"); 102 html("<tr><td>");
91 header(sha1, path, sha2, path); 103 header(sha1, path, sha2, path);
92 if (cgit_diff_files(sha1, sha2, print_line)) 104 if (cgit_diff_files(sha1, sha2, print_line))
93 cgit_print_error("Error running diff"); 105 cgit_print_error("Error running diff");
94 html("</tr></td>"); 106 html("</tr></td>");
95 break; 107 break;
96 case OBJ_TREE: 108 case OBJ_TREE:
97 cgit_diff_tree(sha1, sha2, filepair_cb); 109 cgit_diff_tree(sha1, sha2, filepair_cb);