subtree(3p/cgit): merge cgit-pink into depot cgit
cgit-pink is a maintained fork of cgit that follows upstream git more closely and already contains a lot of patches we already had applied. Consequently, it seems sensible it becomes our future upstream, we may even be able to upstream some of our custom, less invasive patches. Change-Id: Ia081e4508866f32298986c7160f4890c8a7c8922
This commit is contained in:
commit
40803d9c6d
39 changed files with 185 additions and 1616 deletions
36
third_party/cgit/ui-atom.c
vendored
36
third_party/cgit/ui-atom.c
vendored
|
|
@ -67,17 +67,12 @@ static void add_entry(struct commit *commit, const char *host)
|
|||
html("'/>\n");
|
||||
free(pageurl);
|
||||
}
|
||||
htmlf("<id>%s</id>\n", hex);
|
||||
html("<id>");
|
||||
html_txtf("urn:%s:%s", the_hash_algo->name, hex);
|
||||
html("</id>\n");
|
||||
html("<content type='text'>\n");
|
||||
html_txt(info->msg);
|
||||
html("</content>\n");
|
||||
html("<content type='xhtml'>\n");
|
||||
html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
|
||||
html("<pre>\n");
|
||||
html_txt(info->msg);
|
||||
html("</pre>\n");
|
||||
html("</div>\n");
|
||||
html("</content>\n");
|
||||
html("</entry>\n");
|
||||
cgit_free_commitinfo(info);
|
||||
}
|
||||
|
|
@ -90,6 +85,7 @@ void cgit_print_atom(char *tip, const char *path, int max_count)
|
|||
struct commit *commit;
|
||||
struct rev_info rev;
|
||||
int argc = 2;
|
||||
int first = 1;
|
||||
|
||||
if (ctx.qry.show_all)
|
||||
argv[1] = "--all";
|
||||
|
|
@ -130,18 +126,30 @@ void cgit_print_atom(char *tip, const char *path, int max_count)
|
|||
html_txt(ctx.repo->desc);
|
||||
html("</subtitle>\n");
|
||||
if (host) {
|
||||
char *fullurl = cgit_currentfullurl();
|
||||
char *repourl = cgit_repourl(ctx.repo->url);
|
||||
html("<link rel='alternate' type='text/html' href='");
|
||||
html(cgit_httpscheme());
|
||||
html_attr(host);
|
||||
html_attr(repourl);
|
||||
html("<id>");
|
||||
html_txtf("%s%s%s", cgit_httpscheme(), host, fullurl);
|
||||
html("</id>\n");
|
||||
html("<link rel='self' href='");
|
||||
html_attrf("%s%s%s", cgit_httpscheme(), host, fullurl);
|
||||
html("'/>\n");
|
||||
html("<link rel='alternate' type='text/html' href='");
|
||||
html_attrf("%s%s%s", cgit_httpscheme(), host, repourl);
|
||||
html("'/>\n");
|
||||
free(fullurl);
|
||||
free(repourl);
|
||||
}
|
||||
while ((commit = get_revision(&rev)) != NULL) {
|
||||
if (first) {
|
||||
html("<updated>");
|
||||
html_txt(show_date(commit->date, 0,
|
||||
date_mode_from_type(DATE_ISO8601_STRICT)));
|
||||
html("</updated>\n");
|
||||
first = 0;
|
||||
}
|
||||
add_entry(commit, host);
|
||||
free_commit_buffer(the_repository->parsed_objects, commit);
|
||||
free_commit_list(commit->parents);
|
||||
release_commit_memory(the_repository->parsed_objects, commit);
|
||||
commit->parents = NULL;
|
||||
}
|
||||
html("</feed>\n");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue