summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c8
-rw-r--r--cgit.css2
-rw-r--r--cgit.h2
-rw-r--r--cgit.pngbin1840 -> 1488 bytes
-rw-r--r--cgitrc.5.txt9
-rw-r--r--ui-diff.c12
-rw-r--r--ui-diff.h6
-rw-r--r--ui-shared.c18
-rw-r--r--ui-ssdiff.c34
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
@@ -70,15 +70,19 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *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);
diff --git a/cgit.css b/cgit.css
index 008cff8..1d90057 100644
--- a/cgit.css
+++ b/cgit.css
@@ -290,13 +290,13 @@ table.blob td.linenumbers {
}
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 {
diff --git a/cgit.h b/cgit.h
index 74aa340..b5f00fc 100644
--- a/cgit.h
+++ b/cgit.h
@@ -68,12 +68,14 @@ struct cgit_repo {
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;
diff --git a/cgit.png b/cgit.png
index d7f70bc..0bdf5a7 100644
--- a/cgit.png
+++ b/cgit.png
Binary files differ
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index a832830..c3698a6 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -384,12 +384,21 @@ repo.enable-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::
diff --git a/ui-diff.c b/ui-diff.c
index 7ff7e46..a53425d 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -31,12 +31,23 @@ static struct fileinfo {
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) {
@@ -281,12 +292,13 @@ 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);
diff --git a/ui-diff.h b/ui-diff.h
index 70b2926..12d0c62 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -4,7 +4,13 @@
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
@@ -753,23 +753,33 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
}
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);
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 408e620..2481585 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,9 +1,10 @@
#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 {
@@ -188,38 +189,51 @@ 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);