Add submodule links in tree listing
authorLars Hjemli <hjemli@gmail.com>
Fri, 11 May 2007 10:12:48 +0000 (12:12 +0200)
committerLars Hjemli <hjemli@gmail.com>
Fri, 11 May 2007 10:12:48 +0000 (12:12 +0200)
When a submodule occurs in a tree, generate a link to show the
module/commit. The link is specified as a sprintf string in /etc/cgitrc,
using parameters 'module-link' and 'repo.module-link'. This should probably
be extended with repo.module-link.$path.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
cgit.css
cgit.h
cgitrc
html.c
shared.c
ui-tree.c

index 640bbc913ee504a75ef11faa6500274f432bd4f6..ef4bc624ebc43710a537e07a8c33ded4806420f1 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -141,7 +141,7 @@ div.error {
        margin: 1em 2em;
 }
 
-div.ls-blob, div.ls-dir {
+td.ls-blob, td.ls-dir, td.ls-mod {
        font-family: monospace;
 }
 
diff --git a/cgit.h b/cgit.h
index 292e488b8a06d3bf4eb5dc34e8a629fd5735681e..b7f8827f3e581b1d9de4aa9f98ebdad299e07c41 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -33,6 +33,7 @@ struct repoinfo {
        char *path;
        char *desc;
        char *owner;
+       char *module_link;
        int snapshots;
 };
 
@@ -70,6 +71,7 @@ extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_logo_link;
+extern char *cgit_module_link;
 extern char *cgit_virtual_root;
 extern char *cgit_cache_root;
 
diff --git a/cgitrc b/cgitrc
index 3bae642b696aab1d06ca3e41cfee77cad557da50..f217b394e5413b5cb34543d86f85d2b684b8b9f2 100644 (file)
--- a/cgitrc
+++ b/cgitrc
 #logo-link=http://www.kernel.org/pub/software/scm/git/docs/
 
 
+## Url loaded when clicking a submodule link
+#module-link=./?repo=%s&page=commit&id=%s
+
+
 ## Number of chars shown of commit subject message (in log view)
 #max-message-length=60
 
@@ -81,4 +85,5 @@
 #repo.desc=the caching cgi for git
 #repo.path=/pub/git/cgit
 #repo.owner=Lars Hjemli
-#repo.snapshots=1    # override a sitewide snapshot-setting
+#repo.snapshots=1                              # override a sitewide snapshot-setting
+#repo.module-link=/git/%s/commit/?id=%s                # override the standard module-link
diff --git a/html.c b/html.c
index c0b2ed48317957c6ce9c337542ac89c89ea88206..175b4b687efb75d443b847738775a1de92e97cf6 100644 (file)
--- a/html.c
+++ b/html.c
@@ -158,10 +158,11 @@ void html_filemode(unsigned short mode)
                html("d");
        else if (S_ISLNK(mode))
                html("l");
+       else if (S_ISDIRLNK(mode))
+               html("m");
        else
                html("-");
        html_fileperm(mode >> 6);
        html_fileperm(mode >> 3);
        html_fileperm(mode);
 }
-
index 531d8c0fdd9bd47a9488cee364b036447ae80d4e..19d2df04d9071dea4cd7bf238e6090c6f89a46ac 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -15,6 +15,7 @@ char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
+char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
 char *cgit_virtual_root = NULL;
 
 char *cgit_cache_root   = "/var/cache/cgit";
@@ -85,6 +86,7 @@ struct repoinfo *add_repo(const char *url)
        ret->desc = NULL;
        ret->owner = NULL;
        ret->snapshots = cgit_snapshots;
+       ret->module_link = cgit_module_link;
        return ret;
 }
 
@@ -98,6 +100,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_logo = xstrdup(value);
        else if (!strcmp(name, "logo-link"))
                cgit_logo_link = xstrdup(value);
+       else if (!strcmp(name, "module-link"))
+               cgit_module_link = xstrdup(value);
        else if (!strcmp(name, "virtual-root"))
                cgit_virtual_root = xstrdup(value);
        else if (!strcmp(name, "nocache"))
@@ -128,6 +132,8 @@ void cgit_global_config_cb(const char *name, const char *value)
                cgit_repo->owner = xstrdup(value);
        else if (cgit_repo && !strcmp(name, "repo.snapshots"))
                cgit_repo->snapshots = atoi(value);
+       else if (cgit_repo && !strcmp(name, "repo.module-link"))
+               cgit_repo->module_link= xstrdup(value);
 }
 
 void cgit_repo_config_cb(const char *name, const char *value)
index 60f756089a082869bc7b96fb7c883a8650554f4b..dee83098c93a0113a9feb24b4aa364fc13cc1c40 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -15,11 +15,11 @@ static int print_entry(const unsigned char *sha1, const char *base,
 {
        char *name;
        enum object_type type;
-       unsigned long size;
+       unsigned long size = 0;
 
        name = xstrdup(pathname);
        type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD) {
+       if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
                htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                      name,
                      sha1_to_hex(sha1));
@@ -27,26 +27,27 @@ static int print_entry(const unsigned char *sha1, const char *base,
        }
        html("<tr><td class='filemode'>");
        html_filemode(mode);
-       html("</td><td>");
+       html("</td><td ");
        if (S_ISDIRLNK(mode)) {
-               htmlf("<div class='ls-dirlnk'>%s => submodule</div>", name);
+               htmlf("class='ls-mod'><a href='");
+               html_attr(fmt(cgit_repo->module_link,
+                             name,
+                             sha1_to_hex(sha1)));
        } else if (S_ISDIR(mode)) {
-               html("<div class='ls-dir'><a href='");
+               html("class='ls-dir'><a href='");
                html_attr(cgit_pageurl(cgit_query_repo, "tree", 
                                       fmt("id=%s&path=%s%s/", 
                                           sha1_to_hex(sha1),
                                           cgit_query_path ? cgit_query_path : "",
                                           pathname)));
-               htmlf("'>%s</a></div>", name);
        } else {
-               html("<div class='ls-blob'><a href='");
+               html("class='ls-blob'><a href='");
                html_attr(cgit_pageurl(cgit_query_repo, "view",
                                      fmt("id=%s&path=%s%s", sha1_to_hex(sha1),
                                          cgit_query_path ? cgit_query_path : "",
                                          pathname)));
-               htmlf("'>%s</a></div>", name);
        }
-       html("</div></td>");
+       htmlf("'>%s</a></div></td>", name);
        htmlf("<td class='filesize'>%li</td>", size);
        html("</tr>\n");
        free(name);