Use GIT-1.5.4.rc4

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 1037c823a3fc0f3034066603f79307d6a87aa594..c1388779a483a57166ac5d082625f5984a452a59 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -15,8 +15,9 @@ int header = 0;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;
-       unsigned char *buf;
+       char *buf;
        unsigned long size, lineno, start, idx;
+       const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
@@ -32,21 +33,27 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
-       html("<table class='blob'>\n");
+       html(" blob: <a href='");
+       html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+       htmlf("'>%s</a>",sha1_to_hex(sha1));
+
+       html("<table summary='blob content' class='blob'>\n");
        idx = 0;
        start = 0;
        lineno = 0;
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';
-                       htmlf("<tr><td class='no'>%d</td><td class='txt'>",
-                             ++lineno);
+                       htmlf(linefmt, ++lineno);
                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }
+       htmlf(linefmt, ++lineno);
+       html_txt(buf + start);
+       html("</td></tr>\n");
        html("</table>\n");
 }
 
@@ -64,7 +71,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                       cgit_query_path ? "/" : "", name);
 
        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));
@@ -74,7 +81,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        html("<tr><td class='ls-mode'>");
        html_filemode(mode);
        html("</td><td>");
-       if (S_ISDIRLNK(mode)) {
+       if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,
@@ -92,8 +99,8 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
-       cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev,
-                     fullpath);
+       cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
+                     fullpath, 0, NULL, NULL);
        html("</td></tr>\n");
        free(name);
        return 0;
@@ -101,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 static void ls_head()
 {
-       html("<table class='list'>\n");
+       html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");