| -rw-r--r-- | html.c | 2 | ||||
| -rw-r--r-- | ui-diff.c | 8 | ||||
| -rw-r--r-- | ui-tree.c | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -113,70 +113,70 @@ void html_attr(char *txt) } t++; } if (t!=txt) html(txt); } void html_hidden(char *name, char *value) { html("<input type='hidden' name='"); html_attr(name); html("' value='"); html_attr(value); html("'/>"); } void html_link_open(char *url, char *title, char *class) { html("<a href='"); html_attr(url); if (title) { html("' title='"); html_attr(title); } if (class) { html("' class='"); html_attr(class); } html("'>"); } void html_link_close(void) { html("</a>"); } void html_fileperm(unsigned short mode) { htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); } void html_filemode(unsigned short mode) { if (S_ISDIR(mode)) html("d"); else if (S_ISLNK(mode)) html("l"); - else if (S_ISDIRLNK(mode)) + else if (S_ISGITLINK(mode)) html("m"); else html("-"); html_fileperm(mode >> 6); html_fileperm(mode >> 3); html_fileperm(mode); } int html_include(const char *filename) { FILE *f; char buf[4096]; size_t len; if (!(f = fopen(filename, "r"))) return -1; while((len = fread(buf, 1, 4096, f)) > 0) write(htmlfd, buf, len); fclose(f); return 0; } @@ -1,132 +1,132 @@ /* ui-diff.c: show diff between two blobs * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" /* * print a single line returned from xdiff */ static void print_line(char *line, int len) { char *class = "ctx"; char c = line[len-1]; if (line[0] == '+') class = "add"; else if (line[0] == '-') class = "del"; else if (line[0] == '@') class = "hunk"; htmlf("<div class='%s'>", class); line[len-1] = '\0'; html_txt(line); html("</div>"); line[len-1] = c; } static void header(unsigned char *sha1, char *path1, int mode1, unsigned char *sha2, char *path2, int mode2) { char *abbrev1, *abbrev2; int subproject; - subproject = (S_ISDIRLNK(mode1) || S_ISDIRLNK(mode2)); + subproject = (S_ISGITLINK(mode1) || S_ISGITLINK(mode2)); html("<div class='head'>"); html("diff --git a/"); html_txt(path1); html(" b/"); html_txt(path2); if (is_null_sha1(sha1)) path1 = "dev/null"; if (is_null_sha1(sha2)) path2 = "dev/null"; if (mode1 == 0) htmlf("<br/>new file mode %.6o", mode2); if (mode2 == 0) htmlf("<br/>deleted file mode %.6o", mode1); if (!subproject) { abbrev1 = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); abbrev2 = xstrdup(find_unique_abbrev(sha2, DEFAULT_ABBREV)); htmlf("<br/>index %s..%s", abbrev1, abbrev2); free(abbrev1); free(abbrev2); if (mode1 != 0 && mode2 != 0) { htmlf(" %.6o", mode1); if (mode2 != mode1) htmlf("..%.6o", mode2); } html("<br/>--- a/"); html_txt(path1); html("<br/>+++ b/"); html_txt(path2); } html("</div>"); } static void filepair_cb(struct diff_filepair *pair) { header(pair->one->sha1, pair->one->path, pair->one->mode, pair->two->sha1, pair->two->path, pair->two->mode); - if (S_ISDIRLNK(pair->one->mode) || S_ISDIRLNK(pair->two->mode)) { - if (S_ISDIRLNK(pair->one->mode)) + if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) { + if (S_ISGITLINK(pair->one->mode)) print_line(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52); - if (S_ISDIRLNK(pair->two->mode)) + if (S_ISGITLINK(pair->two->mode)) print_line(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52); return; } if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) cgit_print_error("Error running diff"); } void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, char *path) { unsigned char sha1[20], sha2[20]; enum object_type type; unsigned long size; struct commit *commit; if (head && !old_hex && !new_hex) { get_sha1(head, sha1); commit = lookup_commit_reference(sha1); if (commit && !parse_commit(commit)) { html("<table class='diff'>"); html("<tr><td>"); cgit_diff_commit(commit, filepair_cb); html("</td></tr>"); html("</table>"); } return; } get_sha1(old_hex, sha1); get_sha1(new_hex, sha2); type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { type = sha1_object_info(sha2, &size); if (type == OBJ_BAD) { cgit_print_error(fmt("Bad object names: %s, %s", old_hex, new_hex)); return; } } html("<table class='diff'>"); switch(type) { case OBJ_BLOB: html("<tr><td>"); header(sha1, path, 0644, sha2, path, 0644); if (cgit_diff_files(sha1, sha2, print_line)) cgit_print_error("Error running diff"); html("</td></tr>"); break; @@ -1,80 +1,80 @@ /* ui-tree.c: functions for tree output * * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ #include "cgit.h" char *curr_rev; static int print_entry(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned int mode, int stage) { char *name; enum object_type type; unsigned long size = 0; name = xstrdup(pathname); type = sha1_object_info(sha1, &size); - if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { + if (type == OBJ_BAD && !S_ISGITLINK(mode)) { htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", name, sha1_to_hex(sha1)); return 0; } html("<tr><td class='filemode'>"); html_filemode(mode); html("</td><td "); - if (S_ISDIRLNK(mode)) { + if (S_ISGITLINK(mode)) { htmlf("class='ls-mod'><a href='"); html_attr(fmt(cgit_repo->module_link, name, sha1_to_hex(sha1))); } else if (S_ISDIR(mode)) { html("class='ls-dir'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s&id=%s&path=%s%s/", curr_rev, sha1_to_hex(sha1), cgit_query_path ? cgit_query_path : "", pathname))); } else { html("class='ls-blob'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "view", fmt("h=%s&id=%s&path=%s%s", curr_rev, sha1_to_hex(sha1), cgit_query_path ? cgit_query_path : "", pathname))); } htmlf("'>%s</a></td>", name); htmlf("<td class='filesize'>%li</td>", size); html("<td class='links'><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "log", fmt("h=%s&path=%s%s", curr_rev, cgit_query_path ? cgit_query_path : "", pathname))); html("'>history</a></td>"); html("</tr>\n"); free(name); return 0; } void cgit_print_tree(const char *rev, const char *hex, char *path) { struct tree *tree; unsigned char sha1[20]; struct commit *commit; curr_rev = xstrdup(rev); get_sha1(rev, sha1); commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) { cgit_print_error(fmt("Invalid head: %s", rev)); return; } |