Use standard tree-diff function when showing diffstat for single commit

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 84930cb50df30988a7930f44cb8ea64edd31f851..dee83098c93a0113a9feb24b4aa364fc13cc1c40 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -14,38 +14,47 @@ static int print_entry(const unsigned char *sha1, const char *base,
                       int stage)
 {
        char *name;
                       int stage)
 {
        char *name;

-       char type[20];
-       unsigned long size;
+       enum object_type type;
+       unsigned long size = 0;

 
 

-       if (sha1_object_info(sha1, type, &size)) {
-               cgit_print_error(fmt("Bad object name: %s", 
-                                    sha1_to_hex(sha1)));
+       name = xstrdup(pathname);
+       type = sha1_object_info(sha1, &size);
+       if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
+               htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+                     name,
+                     sha1_to_hex(sha1));

                return 0;
        }
                return 0;
        }

-       name = xstrdup(pathname);
-       html("<tr><td>");
-       if (S_ISDIR(mode)) {
-               html("<div class='ls-dir'><a href='");
+       html("<tr><td class='filemode'>");
+       html_filemode(mode);
+       html("</td><td ");
+       if (S_ISDIRLNK(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", 
                html_attr(cgit_pageurl(cgit_query_repo, "tree", 

-                                      fmt("id=%s", sha1_to_hex(sha1))));
+                                      fmt("id=%s&path=%s%s/", 
+                                          sha1_to_hex(sha1),
+                                          cgit_query_path ? cgit_query_path : "",
+                                          pathname)));

        } else {
        } else {

-               html("<div class='ls-blob'><a href='");
+               html("class='ls-blob'><a href='");

                html_attr(cgit_pageurl(cgit_query_repo, "view",
                html_attr(cgit_pageurl(cgit_query_repo, "view",

-                                     fmt("id=%s", sha1_to_hex(sha1))));
+                                     fmt("id=%s&path=%s%s", sha1_to_hex(sha1),
+                                         cgit_query_path ? cgit_query_path : "",
+                                         pathname)));

        }
        }

-       html("'>");
-       html_txt(name);
-       if (S_ISDIR(mode))
-               html("/");
-       html("</a></div></td>");
+       htmlf("'>%s</a></div></td>", name);

        htmlf("<td class='filesize'>%li</td>", size);
        htmlf("<td class='filesize'>%li</td>", size);

-       htmlf("<td class='filemode'>%06o</td>", mode);

        html("</tr>\n");
        free(name);
        return 0;
 }
 
        html("</tr>\n");
        free(name);
        return 0;
 }
 

-void cgit_print_tree(const char *hex)
+void cgit_print_tree(const char *hex, char *path)

 {
        struct tree *tree;
        unsigned char sha1[20];
 {
        struct tree *tree;
        unsigned char sha1[20];


@@ -60,11 +69,13 @@ void cgit_print_tree(const char *hex)
                return;
        }
 
                return;
        }
 

-       html("<h2>Tree content</h2>\n");
+       html_txt(path);

        html("<table class='list'>\n");
        html("<table class='list'>\n");

-       html("<tr><th>Name</th>");
-       html("<th class='filesize'>Size</th>");
-       html("<th class='filemode'>Mode</th></tr>\n");
+       html("<tr class='nohover'>");
+       html("<th class='left'>Mode</th>");
+       html("<th class='left'>Name</th>");
+       html("<th class='right'>Size</th>");
+       html("</tr>\n");

        read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
        html("</table>\n");
 }
        read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
        html("</table>\n");
 }