Merge branch 'rt/plain-binary'

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/.gitignore b/.gitignore
index 1e016e5a7af46cd1542695a8c363d66db6d34c68..487728b0a37d9bb96b0ea58f78f0165c92b84df4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,10 @@
 cgit
 cgit.conf
 VERSION
+cgitrc.5
+cgitrc.5.fo
+cgitrc.5.html
+cgitrc.5.pdf
+cgitrc.5.xml
 *.o
 *.d

diff --git a/Makefile b/Makefile
index 33c606dafa005437604873875cddf47c8badd035..707d4462a778606e1591adaad41e2d555e255dfa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,8 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all libgit test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git \
+       doc man-doc html-doc clean-doc
 
 all: cgit
 
@@ -149,8 +150,22 @@ uninstall:
        rm -f $(CGIT_DATA_PATH)/cgit.css
        rm -f $(CGIT_DATA_PATH)/cgit.png
 
-clean:
+doc: man-doc html-doc pdf-doc
+
+man-doc: cgitrc.5.txt
+       a2x -f manpage cgitrc.5.txt
+
+html-doc: cgitrc.5.txt
+       a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+
+pdf-doc: cgitrc.5.txt
+       a2x -f pdf cgitrc.5.txt
+
+clean: clean-doc
        rm -f cgit VERSION *.o *.d
 
+clean-doc:
+       rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
+
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git

diff --git a/cgit-doc.css b/cgit-doc.css
new file mode 100644 (file)
index 0000000..5a399b6
--- /dev/null
+++ b/cgit-doc.css
@@ -0,0 +1,3 @@
+div.variablelist dt {
+       margin-top: 1em;
+}

diff --git a/cgit.c b/cgit.c
index 64d95f9a3a7bb56197988e6730c4576173811db0..19adadd2e3a9277aa25916eb1747ee3cbae63f75 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -285,6 +285,8 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        if (get_sha1(ctx->qry.head, sha1)) {
                tmp = xstrdup(ctx->qry.head);
                ctx->qry.head = ctx->repo->defbranch;
+               ctx->page.status = 404;
+               ctx->page.statusmsg = "not found";
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);

diff --git a/cgit.h b/cgit.h
index 5f7af51a68e0a773cac9c2758df51d5f0af90ff6..00aca4c36a46d6dc8737b32ea794c917dcfc825e 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -181,6 +181,8 @@ struct cgit_page {
        char *charset;
        char *filename;
        char *title;
+       int status;
+       char *statusmsg;
 };
 
 struct cgit_context {

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index fd299ae091e422c17f925fb695ae3111a3045fcd..7879f75efc6b9be86659207e44d88c5d1b07eddf 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -1,14 +1,14 @@
-CGITRC
-======
+CGITRC(5)
+========
 
 
 NAME
 ----
-       cgitrc - runtime configuration for cgit
+cgitrc - runtime configuration for cgit
 
 
-DESCRIPTION
------------
+SYNOPSIS
+--------
 Cgitrc contains all runtime settings for cgit, including the list of git
 repositories, formatted as a line-separated list of NAME=VALUE pairs. Blank
 lines, and lines starting with '#', are ignored.
@@ -16,166 +16,166 @@ lines, and lines starting with '#', are ignored.
 
 GLOBAL SETTINGS
 ---------------
-agefile
+agefile::
        Specifies a path, relative to each repository path, which can be used
        to specify the date and time of the youngest commit in the repository.
        The first line in the file is used as input to the "parse_date"
        function in libgit. Recommended timestamp-format is "yyyy-mm-dd
        hh:mm:ss". Default value: "info/web/last-modified".
 
-cache-root
+cache-root::
        Path used to store the cgit cache entries. Default value:
        "/var/cache/cgit".
 
-cache-dynamic-ttl
+cache-dynamic-ttl::
        Number which specifies the time-to-live, in minutes, for the cached
        version of repository pages accessed without a fixed SHA1. Default
        value: "5".
 
-cache-repo-ttl
+cache-repo-ttl::
        Number which specifies the time-to-live, in minutes, for the cached
        version of the repository summary page. Default value: "5".
 
-cache-root-ttl
+cache-root-ttl::
        Number which specifies the time-to-live, in minutes, for the cached
        version of the repository index page. Default value: "5".
 
-cache-size
+cache-size::
        The maximum number of entries in the cgit cache. Default value: "0"
        (i.e. caching is disabled).
 
-cache-static-ttl
+cache-static-ttl::
        Number which specifies the time-to-live, in minutes, for the cached
        version of repository pages accessed with a fixed SHA1. Default value:
        "5".
 
-clone-prefix
+clone-prefix::
        Space-separated list of common prefixes which, when combined with a
        repository url, generates valid clone urls for the repository. This
        setting is only used if `repo.clone-url` is unspecified. Default value:
        none.
 
-css
+css::
        Url which specifies the css document to include in all cgit pages.
        Default value: "/cgit.css".
 
-enable-index-links
+enable-index-links::
        Flag which, when set to "1", will make cgit generate extra links for
        each repo in the repository index (specifically, to the "summary",
        "commit" and "tree" pages). Default value: "0".
 
-enable-log-filecount
+enable-log-filecount::
        Flag which, when set to "1", will make cgit print the number of
        modified files for each commit on the repository log page. Default
        value: "0".
 
-enable-log-linecount
+enable-log-linecount::
        Flag which, when set to "1", will make cgit print the number of added
        and removed lines for each commit on the repository log page. Default
        value: "0".
 
-favicon
+favicon::
        Url used as link to a shortcut icon for cgit. If specified, it is
        suggested to use the value "/favicon.ico" since certain browsers will
        ignore other values. Default value: none.
 
-footer
+footer::
        The content of the file specified with this option will be included
        verbatim at the bottom of all pages (i.e. it replaces the standard
        "generated by..." message. Default value: none.
 
-header
+header::
        The content of the file specified with this option will be included
        verbatim at the top of all pages. Default value: none.
 
-include
+include::
        Name of a configfile to include before the rest of the current config-
        file is parsed. Default value: none.
 
-index-header
+index-header::
        The content of the file specified with this option will be included
        verbatim above the repository index. This setting is deprecated, and
        will not be supported by cgit-1.0 (use root-readme instead). Default
        value: none.
 
-index-info
+index-info::
        The content of the file specified with this option will be included
        verbatim below the heading on the repository index page. This setting
        is deprecated, and will not be supported by cgit-1.0 (use root-desc
        instead). Default value: none.
 
-local-time
+local-time::
        Flag which, if set to "1", makes cgit print commit and tag times in the
        servers timezone. Default value: "0".
 
-logo
+logo::
        Url which specifies the source of an image which will be used as a logo
        on all cgit pages.
 
-logo-link
+logo-link::
        Url loaded when clicking on the cgit logo image. If unspecified the
        calculated url of the repository index page will be used. Default
        value: none.
 
-max-commit-count
+max-commit-count::
        Specifies the number of entries to list per page in "log" view. Default
        value: "50".
 
-max-message-length
+max-message-length::
        Specifies the maximum number of commit message characters to display in
        "log" view. Default value: "80".
 
-max-repo-count
+max-repo-count::
        Specifies the number of entries to list per page on the repository
        index page. Default value: "50".
 
-max-repodesc-length
+max-repodesc-length::
        Specifies the maximum number of repo description characters to display
        on the repository index page. Default value: "80".
 
-max-stats
+max-stats::
        Set the default maximum statistics period. Valid values are "week",
        "month", "quarter" and "year". If unspecified, statistics are
        disabled. Default value: none. See also: "repo.max-stats".
 
-module-link
+module-link::
        Text which will be used as the formatstring for a hyperlink when a
        submodule is printed in a directory listing. The arguments for the
        formatstring are the path and SHA1 of the submodule commit. Default
        value: "./?repo=%s&page=commit&id=%s"
 
-nocache
+nocache::
        If set to the value "1" caching will be disabled. This settings is
        deprecated, and will not be honored starting with cgit-1.0. Default
        value: "0".
 
-renamelimit
+renamelimit::
        Maximum number of files to consider when detecting renames. The value
         "-1" uses the compiletime value in git (for further info, look at
          `man git-diff`). Default value: "-1".
 
-repo.group
+repo.group::
        A value for the current repository group, which all repositories
        specified after this setting will inherit. Default value: none.
 
-robots
+robots::
        Text used as content for the "robots" meta-tag. Default value:
        "index, nofollow".
 
-root-desc
+root-desc::
        Text printed below the heading on the repository index page. Default
        value: "a fast webinterface for the git dscm".
 
-root-readme:
+root-readme::
        The content of the file specified with this option will be included
        verbatim below the "about" link on the repository index page. Default
        value: none.
 
-root-title
+root-title::
        Text printed as heading on the repository index page. Default value:
        "Git Repository Browser".
 
-snapshots
+snapshots::
        Text which specifies the default (and allowed) set of snapshot formats
        supported by cgit. The value is a space-separated list of zero or more
        of the following values:
@@ -185,19 +185,19 @@ snapshots
                "zip"           zip-file
        Default value: none.
 
-summary-branches
+summary-branches::
        Specifies the number of branches to display in the repository "summary"
        view. Default value: "10".
 
-summary-log
+summary-log::
        Specifies the number of log entries to display in the repository
        "summary" view. Default value: "10".
 
-summary-tags
+summary-tags::
        Specifies the number of tags to display in the repository "summary"
        view. Default value: "10".
 
-virtual-root
+virtual-root::
        Url which, if specified, will be used as root for all cgit links. It
        will also cause cgit to generate 'virtual urls', i.e. urls like
        '/cgit/tree/README' as opposed to '?r=cgit&p=tree&path=README'. Default
@@ -207,51 +207,51 @@ virtual-root
 
 REPOSITORY SETTINGS
 -------------------
-repo.clone-url
+repo.clone-url::
        A list of space-separated urls which can be used to clone this repo.
        Default value: none.
 
-repo.defbranch
+repo.defbranch::
        The name of the default branch for this repository. If no such branch
        exists in the repository, the first branch name (when sorted) is used
        as default instead. Default value: "master".
 
-repo.desc
+repo.desc::
        The value to show as repository description. Default value: none.
 
-repo.enable-log-filecount
+repo.enable-log-filecount::
        A flag which can be used to disable the global setting
        `enable-log-filecount'. Default value: none.
 
-repo.enable-log-linecount
+repo.enable-log-linecount::
        A flag which can be used to disable the global setting
        `enable-log-linecount'. Default value: none.
 
-repo.max-stats
+repo.max-stats::
        Override the default maximum statistics period. Valid values are equal
        to the values specified for the global "max-stats" setting. Default
        value: none.
 
-repo.name
+repo.name::
        The value to show as repository name. Default value: <repo.url>.
 
-repo.owner
+repo.owner::
        A value used to identify the owner of the repository. Default value:
        none.
 
-repo.path
+repo.path::
        An absolute path to the repository directory. For non-bare repositories
        this is the .git-directory. Default value: none.
 
-repo.readme
+repo.readme::
        A path (relative to <repo.path>) which specifies a file to include
        verbatim as the "About" page for this repo. Default value: none.
 
-repo.snapshots
+repo.snapshots::
        A mask of allowed snapshot-formats for this repo, restricted by the
        "snapshots" global setting. Default value: <snapshots>.
 
-repo.url
+repo.url::
        The relative url used to access the repository. This must be the first
        setting specified for each repo. Default value: none.
 
@@ -259,6 +259,7 @@ repo.url
 EXAMPLE CGITRC FILE
 -------------------
 
+....
 # Enable caching of up to 1000 output entriess
 cache-size=1000
 
@@ -368,6 +369,7 @@ repo.enable-log-linecount=0
 
 # Restrict the max statistics period for this repo
 repo.max-stats=month
+....
 
 
 BUGS

diff --git a/ui-atom.c b/ui-atom.c
index a6ea3eecf58ec6fd0db3aab018522ecca5e98acd..e5c31d9dd066fd7e7a63da846ab6add0b9aea0e6 100644 (file)
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -52,7 +52,8 @@ void add_entry(struct commit *commit, char *host)
        cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
        html("</published>\n");
        if (host) {
-               html("<link rel='alternate' type='text/html' href='http://");
+               html("<link rel='alternate' type='text/html' href='");
+               html(cgit_httpscheme());
                html_attr(host);
                html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
                if (ctx.cfg.virtual_root)
@@ -113,7 +114,8 @@ void cgit_print_atom(char *tip, char *path, int max_count)
        html_txt(ctx.repo->desc);
        html("</subtitle>\n");
        if (host) {
-               html("<link rel='alternate' type='text/html' href='http://");
+               html("<link rel='alternate' type='text/html' href='");
+               html(cgit_httpscheme());
                html_attr(host);
                html_attr(cgit_repourl(ctx.repo->url));
                html("'/>\n");

diff --git a/ui-shared.c b/ui-shared.c
index de77bbfadf86dd08e794145395ca1e20e1f63e9c..29036d0a92ba45643e7db53af2671113fcbff7be 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,17 @@ void cgit_print_error(char *msg)
        html("</div>\n");
 }
 
+char *cgit_httpscheme()
+{
+       char *https;
+
+       https = getenv("HTTPS");
+       if (https != NULL && strcmp(https, "on") == 0)
+               return "https://";
+       else
+               return "http://";
+}
+
 char *cgit_hosturl()
 {
        char *host, *port;
@@ -456,6 +467,8 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
 
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
+       if (ctx->page.status)
+               htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
@@ -492,7 +505,8 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html("'/>\n");
        }
        if (host && ctx->repo) {
-               html("<link rel='alternate' title='Atom feed' href='http://");
+               html("<link rel='alternate' title='Atom feed' href='");
+               html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));

diff --git a/ui-shared.h b/ui-shared.h
index 5a3821f20e1e973f1446845d2641f5e5bc13f5a1..bff482604428c201e3a3c4c2d07d2642923a23f3 100644 (file)
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,6 +1,7 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
+extern char *cgit_httpscheme();
 extern char *cgit_hosturl();
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,