mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui-diff: add links to pre- and postversion of blobs

Browse Source 
Each diff header now links to the old and new version of each file

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Lars Hjemli 2007-10-01 12:30:29 +02:00
parent 97aec64973
commit e238ebe187
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ui-diff.c
View File

@ -9,6 +9,9 @@
#include "cgit.h" #include "cgit.h"
unsigned char old_rev_sha1[20];
unsigned char new_rev_sha1[20];
/* /*
* print a single line returned from xdiff * print a single line returned from xdiff
*/ */
@ -67,9 +70,17 @@ static void header(unsigned char *sha1, char *path1, int mode1,
htmlf("..%.6o", mode2); htmlf("..%.6o", mode2);
} }
html("<br/>--- a/"); html("<br/>--- a/");
html_txt(path1); if (mode1 != 0)
cgit_tree_link(path1, NULL, NULL, cgit_query_head,
sha1_to_hex(old_rev_sha1), path1);
else
html_txt(path1);
html("<br/>+++ b/"); html("<br/>+++ b/");
html_txt(path2); if (mode2 != 0)
cgit_tree_link(path2, NULL, NULL, cgit_query_head,
sha1_to_hex(new_rev_sha1), path2);
else
html_txt(path2);
} }
html("</div>"); html("</div>");
} }
@ -91,15 +102,14 @@ static void filepair_cb(struct diff_filepair *pair)
void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
{ {
unsigned char sha1[20], sha2[20];
enum object_type type; enum object_type type;
unsigned long size; unsigned long size;
struct commit *commit, *commit2; struct commit *commit, *commit2;
if (!new_rev) if (!new_rev)
new_rev = cgit_query_head; new_rev = cgit_query_head;
get_sha1(new_rev, sha1); get_sha1(new_rev, new_rev_sha1);
type = sha1_object_info(sha1, &size); type = sha1_object_info(new_rev_sha1, &size);
if (type == OBJ_BAD) { if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object name: %s", new_rev)); cgit_print_error(fmt("Bad object name: %s", new_rev));
return; return;
@ -110,30 +120,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi
return; return;
} }
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(new_rev_sha1);
if (!commit || parse_commit(commit)) if (!commit || parse_commit(commit))
cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
if (old_rev) if (old_rev)
get_sha1(old_rev, sha2); get_sha1(old_rev, old_rev_sha1);
else if (commit->parents && commit->parents->item) else if (commit->parents && commit->parents->item)
hashcpy(sha2, commit->parents->item->object.sha1); hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
else else
hashclr(sha2); hashclr(old_rev_sha1);
if (!is_null_sha1(sha2)) { if (!is_null_sha1(old_rev_sha1)) {
type = sha1_object_info(sha2, &size); type = sha1_object_info(old_rev_sha1, &size);
if (type == OBJ_BAD) { if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
return; return;
} }
commit2 = lookup_commit_reference(sha2); commit2 = lookup_commit_reference(old_rev_sha1);
if (!commit2 || parse_commit(commit2)) if (!commit2 || parse_commit(commit2))
cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
} }
html("<table class='diff'>"); html("<table class='diff'>");
html("<tr><td>"); html("<tr><td>");
cgit_diff_tree(sha2, sha1, filepair_cb, prefix); cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
html("</td></tr>"); html("</td></tr>");
html("</table>"); html("</table>");
} }