X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9f48df63f6d8d9a8abcc02cd2f08293da7081520..42e459bb1f209df8278f4f4f0ee3f4bcfae80da8:/ui-summary.c
diff --git a/ui-summary.c b/ui-summary.c
index 9388f5f..03dd078 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,35 +8,32 @@
#include "cgit.h"
-int items = 0;
+static int header;
static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
struct commit *commit;
struct commitinfo *info;
- char buf[256], *url;
+ char buf[256];
+ char *ref;
+ ref = xstrdup(refname);
strncpy(buf, refname, sizeof(buf));
commit = lookup_commit(sha1);
+ // object is not really parsed at this point, because of some fallout
+ // from previous calls to git functions in cgit_print_log()
+ commit->object.parsed = 0;
if (commit && !parse_commit(commit)){
info = cgit_parse_commit(commit);
html("| ");
- url = cgit_pageurl(cgit_query_repo, "log",
- fmt("h=%s", refname));
- html_link_open(url, NULL, NULL);
- html_txt(buf);
- html_link_close();
+ cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
html(" | ");
- cgit_print_date(commit->date);
+ cgit_print_age(commit->date, -1, NULL);
html(" | ");
html_txt(info->author);
html(" | ");
- url = cgit_pageurl(cgit_query_repo, "commit",
- fmt("id=%s", sha1_to_hex(sha1)));
- html_link_open(url, NULL, NULL);
- html_ntxt(cgit_max_msg_len, info->subject);
- html_link_close();
+ cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
html(" |
\n");
cgit_free_commitinfo(info);
} else {
@@ -46,29 +43,44 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
html("\n");
}
+ free(ref);
return 0;
}
static void cgit_print_object_ref(struct object *obj)
{
- char *page, *url;
+ char *page, *arg, *url;
- if (obj->type == OBJ_COMMIT)
- page = "commit";
- else if (obj->type == OBJ_TREE)
+ if (obj->type == OBJ_COMMIT) {
+ cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
+ cgit_query_head, sha1_to_hex(obj->sha1));
+ return;
+ } else if (obj->type == OBJ_TREE) {
page = "tree";
- else
+ arg = "id";
+ } else {
page = "view";
+ arg = "id";
+ }
- url = cgit_pageurl(cgit_query_repo, page,
- fmt("id=%s", sha1_to_hex(obj->sha1)));
+ url = cgit_pageurl(cgit_query_repo, page,
+ fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
html_link_open(url, NULL, NULL);
- htmlf("%s %s", typename(obj->type),
+ htmlf("%s %s", typename(obj->type),
sha1_to_hex(obj->sha1));
html_link_close();
}
+static void print_tag_header()
+{
+ html("| Tag | "
+ "Age | "
+ "Author | "
+ "Reference |
|---|
\n");
+ header = 1;
+}
+
static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
int flags, void *cb_data)
{
@@ -76,7 +88,7 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
struct taginfo *info;
struct object *obj;
char buf[256], *url;
-
+
strncpy(buf, refname, sizeof(buf));
obj = parse_object(sha1);
if (!obj)
@@ -85,22 +97,17 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
tag = lookup_tag(sha1);
if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
return 2;
- if (!items) {
- html("| Tag | "
- "Created | "
- "Author | "
- "Reference |
|---|
\n");
- }
- items++;
+ if (!header)
+ print_tag_header();
html("| ");
- url = cgit_pageurl(cgit_query_repo, "view",
+ url = cgit_pageurl(cgit_query_repo, "view",
fmt("id=%s", sha1_to_hex(sha1)));
html_link_open(url, NULL, NULL);
html_txt(buf);
html_link_close();
html(" | ");
if (info->tagger_date > 0)
- cgit_print_date(info->tagger_date);
+ cgit_print_age(info->tagger_date, -1, NULL);
html(" | ");
if (info->tagger)
html(info->tagger);
@@ -108,6 +115,8 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
cgit_print_object_ref(tag->tagged);
html(" |
\n");
} else {
+ if (!header)
+ print_tag_header();
html("| ");
html_txt(buf);
html(" | | ");
@@ -124,6 +133,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
struct taginfo *info;
struct object *obj;
char buf[256], *url;
+ unsigned char fileid[20];
if (prefixcmp(refname, "refs/archives"))
return 0;
@@ -135,30 +145,32 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
tag = lookup_tag(sha1);
if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
return 0;
- hashcpy(sha1, tag->tagged->sha1);
+ hashcpy(fileid, tag->tagged->sha1);
} else if (obj->type != OBJ_BLOB) {
return 0;
+ } else {
+ hashcpy(fileid, sha1);
}
- if (!items) {
- html("");
+ if (!header) {
+ html("");
html("| Downloads |
|---|
");
+ header = 1;
}
- items++;
html("| ");
url = cgit_pageurl(cgit_query_repo, "blob",
- fmt("id=%s&path=%s", sha1_to_hex(sha1),
+ fmt("id=%s&path=%s", sha1_to_hex(fileid),
buf));
html_link_open(url, NULL, NULL);
html_txt(buf);
html_link_close();
- html(" | ");
+ html(" ");
return 0;
}
static void cgit_print_branches()
{
html("| Branch | "
- "Updated | "
+ "Idle | "
"Author | "
"Head commit |
|---|
\n");
for_each_branch_ref(cgit_print_branch_cb, NULL);
@@ -166,30 +178,35 @@ static void cgit_print_branches()
static void cgit_print_tags()
{
- items = 0;
+ header = 0;
for_each_tag_ref(cgit_print_tag_cb, NULL);
}
static void cgit_print_archives()
{
- items = 0;
+ header = 0;
for_each_ref(cgit_print_archive_cb, NULL);
- if (items)
+ if (header)
html(" ");
}
void cgit_print_summary()
{
- html("");
- html("| ");
+ html(" ");
+ cgit_print_archives();
html(" ");
html_txt(cgit_repo->name);
html(" - ");
html_txt(cgit_repo->desc);
html("");
- html(" | ");
- cgit_print_archives();
- html(" | ");
+ if (cgit_repo->readme)
+ html_include(cgit_repo->readme);
+ html("");
+ if (cgit_summary_log > 0)
+ cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, 0);
+ html("");
+ if (cgit_summary_log > 0)
+ html("| | ");
cgit_print_branches();
html("| | ");
cgit_print_tags();
|