Merge branch 'br/misc'

* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link

9 files changed, 74 insertions, 17 deletions

diff --git a/cgit.c b/cgit.c
index 71f3fc8..916feb4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -60,35 +60,39 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
         else if (!strcmp(name, "enable-commit-graph"))
                 repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 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"))
                 repo->module_link= xstrdup(value);
         else if (!strcmp(name, "section"))
                 repo->section = xstrdup(value);
-        else if (!strcmp(name, "readme") && value != NULL) {
+        else if (!strcmp(name, "readme") && value != NULL)
                 repo->readme = xstrdup(value);
-        } else if (ctx.cfg.enable_filter_overrides) {
+        else if (!strcmp(name, "logo") && value != NULL)
+                repo->logo = xstrdup(value);
+        else if (!strcmp(name, "logo-link") && value != NULL)
+                repo->logo_link = xstrdup(value);
+        else if (ctx.cfg.enable_filter_overrides) {
                 if (!strcmp(name, "about-filter"))
                         repo->about_filter = new_filter(value, 0);
                 else if (!strcmp(name, "commit-filter"))
                         repo->commit_filter = new_filter(value, 0);
                 else if (!strcmp(name, "source-filter"))
                         repo->source_filter = new_filter(value, 1);
         }
 }
 
 void config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
                 ctx.cfg.section = xstrdup(value);
         else if (!strcmp(name, "repo.url"))
                 ctx.repo = cgit_add_repo(value);
         else if (ctx.repo && !strcmp(name, "repo.path"))
diff --git a/cgit.css b/cgit.css
index 008cff8..1d90057 100644
--- a/cgit.css
+++ b/cgit.css
@@ -280,33 +280,33 @@ table.blob td.lines {
         margin: 0; padding: 0 0 0 0.5em;
         vertical-align: top;
         color: black;
 }
 
 table.blob td.linenumbers {
         margin: 0; padding: 0 0.5em 0 0.5em;
         vertical-align: top;
         text-align: right;
         border-right: 1px solid gray;
 }
 
 table.blob pre {
         padding: 0; margin: 0;
 }
 
-table.blob a.no {
+table.blob a.no, table.ssdiff a.no {
         color: gray;
         text-align: right;
         text-decoration: none;
 }
 
 table.blob a.no a:hover {
         color: black;
 }
 
 table.bin-blob {
         margin-top: 0.5em;
         border: solid 1px black;
 }
 
 table.bin-blob th {
         font-family: monospace;
diff --git a/cgit.h b/cgit.h
index 74aa340..b5f00fc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -58,32 +58,34 @@ struct cgit_filter {
         int pipe_fh[2];
         int pid;
         int exitstatus;
 };
 
 struct cgit_repo {
         char *url;
         char *name;
         char *path;
         char *desc;
         char *owner;
         char *defbranch;
         char *module_link;
         char *readme;
         char *section;
         char *clone_url;
+        char *logo;
+        char *logo_link;
         int snapshots;
         int enable_commit_graph;
         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;
         struct cgit_filter *commit_filter;
         struct cgit_filter *source_filter;
 };
 
 typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name,
               const char *value);
 
diff --git a/cgit.png b/cgit.png
index d7f70bc..0bdf5a7 100644
--- a/cgit.png
+++ b/cgit.png
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a832830..c3698a6 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -374,32 +374,41 @@ repo.enable-commit-graph::
 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::
         A flag which can be used to disable the global setting
         `enable-log-linecount'. Default value: none.
 
 repo.enable-remote-branches::
         Flag which, when set to "1", will make cgit display remote branches
         in the summary and refs views. Default value: <enable-remote-branches>.
 
 repo.enable-subject-links::
         A flag which can be used to override the global setting
         `enable-subject-links'. Default value: none.
 
+repo.logo::
+        Url which specifies the source of an image which will be used as a logo
+        on this repo's pages. Default value: global logo.
+
+repo.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: global logo-link.
+
 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::
         The value to show as repository name. Default value: <repo.url>.
 
 repo.owner::
         A value used to identify the owner of the repository. Default value:
         none.
 
 repo.path::
         An absolute path to the repository directory. For non-bare repositories
         this is the .git-directory. Default value: none.
 
diff --git a/ui-diff.c b/ui-diff.c
index 7ff7e46..a53425d 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -21,32 +21,43 @@ static int lines_added, lines_removed;
 static struct fileinfo {
         char status;
         unsigned char old_sha1[20];
         unsigned char new_sha1[20];
         unsigned short old_mode;
         unsigned short new_mode;
         char *old_path;
         char *new_path;
         unsigned int added;
         unsigned int removed;
         unsigned long old_size;
         unsigned long new_size;
         int binary:1;
 } *items;
 
 static int use_ssdiff = 0;
+static struct diff_filepair *current_filepair;
+
+struct diff_filespec *cgit_get_current_old_file(void)
+{
+        return current_filepair->one;
+}
+
+struct diff_filespec *cgit_get_current_new_file(void)
+{
+        return current_filepair->two;
+}
 
 static void print_fileinfo(struct fileinfo *info)
 {
         char *class;
 
         switch (info->status) {
         case DIFF_STATUS_ADDED:
                 class = "add";
                 break;
         case DIFF_STATUS_COPIED:
                 class = "cpy";
                 break;
         case DIFF_STATUS_DELETED:
                 class = "del";
                 break;
         case DIFF_STATUS_MODIFIED:
@@ -271,32 +282,33 @@ static void print_ssdiff_link()
                         cgit_diff_link("Unidiff", NULL, NULL, ctx.qry.head,
                                        ctx.qry.sha1, ctx.qry.sha2, ctx.qry.path, 1);
                 else
                         cgit_diff_link("Side-by-side diff", NULL, NULL,
                                        ctx.qry.head, ctx.qry.sha1,
                                        ctx.qry.sha2, ctx.qry.path, 1);
         }
 }
 
 static void filepair_cb(struct diff_filepair *pair)
 {
         unsigned long old_size = 0;
         unsigned long new_size = 0;
         int binary = 0;
         linediff_fn print_line_fn = print_line;
 
+        current_filepair = pair;
         if (use_ssdiff) {
                 cgit_ssdiff_header_begin();
                 print_line_fn = cgit_ssdiff_line_cb;
         }
         header(pair->one->sha1, pair->one->path, pair->one->mode,
                pair->two->sha1, pair->two->path, pair->two->mode);
         if (use_ssdiff)
                 cgit_ssdiff_header_end();
         if (S_ISGITLINK(pair->one->mode) || S_ISGITLINK(pair->two->mode)) {
                 if (S_ISGITLINK(pair->one->mode))
                         print_line_fn(fmt("-Subproject %s", sha1_to_hex(pair->one->sha1)), 52);
                 if (S_ISGITLINK(pair->two->mode))
                         print_line_fn(fmt("+Subproject %s", sha1_to_hex(pair->two->sha1)), 52);
                 if (use_ssdiff)
                         cgit_ssdiff_footer();
                 return;
diff --git a/ui-diff.h b/ui-diff.h
index 70b2926..12d0c62 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -1,10 +1,16 @@
 #ifndef UI_DIFF_H
 #define UI_DIFF_H
 
 extern void cgit_print_diffstat(const unsigned char *old_sha1,
                                 const unsigned char *new_sha1);
 
 extern void cgit_print_diff(const char *new_hex, const char *old_hex,
                             const char *prefix);
 
+extern struct diff_filespec *cgit_get_current_old_file(void);
+extern struct diff_filespec *cgit_get_current_new_file(void);
+
+extern unsigned char old_rev_sha1[20];
+extern unsigned char new_rev_sha1[20];
+
 #endif /* UI_DIFF_H */
diff --git a/ui-shared.c b/ui-shared.c
index ae29615..7efae7a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -743,43 +743,53 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
         ctx->qry.path = p = path;
         while (p < end) {
                 if (!(q = strchr(p, '/')))
                         q = end;
                 *q = '\0';
                 html_txt("/");
                 cgit_self_link(p, NULL, NULL, ctx);
                 if (q < end)
                         *q = '/';
                 p = q + 1;
         }
         ctx->qry.path = old_path;
 }
 
 static void print_header(struct cgit_context *ctx)
 {
+        char *logo = NULL, *logo_link = NULL;
+
         html("<table id='header'>\n");
         html("<tr>\n");
 
-        if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+        if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
+                logo = ctx->repo->logo;
+        else
+                logo = ctx->cfg.logo;
+        if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
+                logo_link = ctx->repo->logo_link;
+        else
+                logo_link = ctx->cfg.logo_link;
+        if (logo && *logo) {
                 html("<td class='logo' rowspan='2'><a href='");
-                if (ctx->cfg.logo_link)
-                        html_attr(ctx->cfg.logo_link);
+                if (logo_link && *logo_link)
+                        html_attr(logo_link);
                 else
                         html_attr(cgit_rooturl());
                 html("'><img src='");
-                html_attr(ctx->cfg.logo);
+                html_attr(logo);
                 html("' alt='cgit logo'/></a></td>\n");
         }
 
         html("<td class='main'>");
         if (ctx->repo) {
                 cgit_index_link("index", NULL, NULL, NULL, 0);
                 html(" : ");
                 cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                 html("</td><td class='form'>");
                 html("<form method='get' action=''>\n");
                 cgit_add_hidden_formfields(0, 1, ctx->qry.page);
                 html("<select name='h' onchange='this.form.submit();'>\n");
                 for_each_branch_ref(print_branch_option, ctx->qry.head);
                 html("</select> ");
                 html("<input type='submit' name='' value='switch'/>");
                 html("</form>");
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 408e620..2481585 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,19 +1,20 @@
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "ui-diff.h"
 
 extern int use_ssdiff;
 
 static int current_old_line, current_new_line;
 
 struct deferred_lines {
         int line_no;
         char *line;
         struct deferred_lines *next;
 };
 
 static struct deferred_lines *deferred_old, *deferred_old_last;
 static struct deferred_lines *deferred_new, *deferred_new_last;
 
 static char *longest_common_subsequence(char *A, char *B)
 {
@@ -178,58 +179,71 @@ static void print_part_with_lcs(char *class, char *line, char *lcs)
                 } else if (line[i] == lcs[j]) {
                         same = 1;
                         htmlf("</span>");
                         j += 1;
                 }
                 html_txt(c);
         }
 }
 
 static void print_ssdiff_line(char *class,
                               int old_line_no,
                               char *old_line,
                               int new_line_no,
                               char *new_line, int individual_chars)
 {
         char *lcs = NULL;
+
         if (old_line)
                 old_line = replace_tabs(old_line + 1);
         if (new_line)
                 new_line = replace_tabs(new_line + 1);
         if (individual_chars && old_line && new_line)
                 lcs = longest_common_subsequence(old_line, new_line);
-        html("<tr>");
-        if (old_line_no > 0)
-                htmlf("<td class='lineno'>%d</td><td class='%s'>",
-                      old_line_no, class);
-        else if (old_line)
+        html("<tr>\n");
+        if (old_line_no > 0) {
+                struct diff_filespec *old_file = cgit_get_current_old_file();
+                char *lineno_str = fmt("n%d", old_line_no);
+                char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str);
+                html("<td class='lineno'><a class='no' href='");
+                html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str));
+                htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+                html("</td>");
+                htmlf("<td class='%s'>", class);
+        } else if (old_line)
                 htmlf("<td class='lineno'></td><td class='%s'>", class);
         else
                 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
         if (old_line) {
                 if (lcs)
                         print_part_with_lcs("del", old_line, lcs);
                 else
                         html_txt(old_line);
         }
 
-        html("</td>");
-        if (new_line_no > 0)
-                htmlf("<td class='lineno'>%d</td><td class='%s'>",
-                      new_line_no, class);
-        else if (new_line)
+        html("</td>\n");
+        if (new_line_no > 0) {
+                struct diff_filespec *new_file = cgit_get_current_new_file();
+                char *lineno_str = fmt("n%d", new_line_no);
+                char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str);
+                html("<td class='lineno'><a class='no' href='");
+                html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str));
+                htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1);
+                html("</td>");
+                htmlf("<td class='%s'>", class);
+        } else if (new_line)
                 htmlf("<td class='lineno'></td><td class='%s'>", class);
         else
                 htmlf("<td class='lineno'></td><td class='%s_dark'>", class);
         if (new_line) {
                 if (lcs)
                         print_part_with_lcs("add", new_line, lcs);
                 else
                         html_txt(new_line);
         }
 
         html("</td></tr>");
         if (lcs)
                 free(lcs);
         if (new_line)
                 free(new_line);
         if (old_line)