22 files changed, 435 insertions, 191 deletions

diff --git a/Makefile b/Makefile
index 0a5055b..3a4d974 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CGIT_VERSION = v0.8.3.1
+CGIT_VERSION = v0.8.3.2
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
diff --git a/cgit.c b/cgit.c
index 37154e3..fde0757 100644
--- a/cgit.c
+++ b/cgit.c
@@ -62,6 +62,8 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
                 repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
         else if (!strcmp(name, "enable-remote-branches"))
                 repo->enable_remote_branches = atoi(value);
+        else if (!strcmp(name, "enable-subject-links"))
+                repo->enable_subject_links = atoi(value);
         else if (!strcmp(name, "max-stats"))
                 repo->max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "module-link"))
@@ -141,6 +143,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.enable_log_linecount = atoi(value);
         else if (!strcmp(name, "enable-remote-branches"))
                 ctx.cfg.enable_remote_branches = atoi(value);
+        else if (!strcmp(name, "enable-subject-links"))
+                ctx.cfg.enable_subject_links = atoi(value);
         else if (!strcmp(name, "enable-tree-linenumbers"))
                 ctx.cfg.enable_tree_linenumbers = atoi(value);
         else if (!strcmp(name, "max-stats"))
@@ -165,6 +169,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.commit_filter = new_filter(value, 0);
         else if (!strcmp(name, "embedded"))
                 ctx.cfg.embedded = atoi(value);
+        else if (!strcmp(name, "max-atom-items"))
+                ctx.cfg.max_atom_items = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 ctx.cfg.max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
@@ -250,6 +256,10 @@ static void querystring_cb(const char *name, const char *value)
                 ctx.qry.period = xstrdup(value);
         } else if (!strcmp(name, "ss")) {
                 ctx.qry.ssdiff = atoi(value);
+        } else if (!strcmp(name, "all")) {
+                ctx.qry.show_all = atoi(value);
+        } else if (!strcmp(name, "context")) {
+                ctx.qry.context = atoi(value);
         }
 }
 
@@ -292,6 +302,7 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.summary_branches = 10;
         ctx->cfg.summary_log = 10;
         ctx->cfg.summary_tags = 10;
+        ctx->cfg.max_atom_items = 10;
         ctx->cfg.ssdiff = 0;
         ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
         ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
@@ -424,6 +435,12 @@ static void process_request(void *cbdata)
                 return;
         }
 
+        /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
+         * in-project path limit to be made available at ctx->qry.vpath.
+         * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
+         */
+        ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
+
         if (cmd->want_repo && !ctx->repo) {
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
diff --git a/cgit.css b/cgit.css
index 0cb894a..6e47eb3 100644
--- a/cgit.css
+++ b/cgit.css
@@ -64,7 +64,7 @@ table#header td.sub {
 }
 
 table.tabs {
-        /* border-bottom: solid 2px #ccc; */
+        border-bottom: solid 3px #ccc;
         border-collapse: collapse;
         margin-top: 2em;
         margin-bottom: 0px;
@@ -102,10 +102,16 @@ table.tabs td.form select {
         font-size: 90%;
 }
 
+div.path {
+        margin: 0px;
+        padding: 5px 2em 2px 2em;
+        color: #000;
+        background-color: #eee;
+}
+
 div.content {
         margin: 0px;
         padding: 2em;
-        border-top: solid 3px #ccc;
         border-bottom: solid 3px #ccc;
 }
 
@@ -525,7 +531,10 @@ a.deco {
         border: solid 1px #770000;
 }
 
-div.commit-subject a {
+div.commit-subject a.branch-deco,
+div.commit-subject a.tag-deco,
+div.commit-subject a.remote-deco,
+div.commit-subject a.deco {
         margin-left: 1em;
         font-size: 75%;
 }
diff --git a/cgit.h b/cgit.h
index 568e0c0..2bf6ab0 100644
--- a/cgit.h
+++ b/cgit.h
@@ -73,6 +73,7 @@ struct cgit_repo {
         int enable_log_filecount;
         int enable_log_linecount;
         int enable_remote_branches;
+        int enable_subject_links;
         int max_stats;
         time_t mtime;
         struct cgit_filter *about_filter;
@@ -145,6 +146,9 @@ struct cgit_query {
         char *sort;
         int showmsg;
         int ssdiff;
+        int show_all;
+        int context;
+        char *vpath;
 };
 
 struct cgit_config {
@@ -181,8 +185,10 @@ struct cgit_config {
         int enable_log_filecount;
         int enable_log_linecount;
         int enable_remote_branches;
+        int enable_subject_links;
         int enable_tree_linenumbers;
         int local_time;
+        int max_atom_items;
         int max_repo_count;
         int max_commit_count;
         int max_lock_attempts;
@@ -273,7 +279,7 @@ extern void *cgit_free_commitinfo(struct commitinfo *info);
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            unsigned long *old_size, unsigned long *new_size,
-                           int *binary, linediff_fn fn);
+                           int *binary, int context, linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index d74d9e7..a853522 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -115,6 +115,12 @@ enable-remote-branches::
         in the summary and refs views. Default value: "0". See also:
         "repo.enable-remote-branches".
 
+enable-subject-links::
+        Flag which, when set to "1", will make cgit use the subject of the
+        parent commit as link text when generating links to parent commits
+        in commit view. Default value: "0". See also:
+        "repo.enable-subject-links".
+
 enable-tree-linenumbers::
         Flag which, when set to "1", will make cgit generate linenumber links
         for plaintext blobs printed in the tree view. Default value: "1".
@@ -166,6 +172,10 @@ logo-link::
         calculated url of the repository index page will be used. Default
         value: none.