#include <sys/stat.h>
+#include <sys/types.h>
#include <err.h>
#include <errno.h>
-#include <inttypes.h>
#include <libgen.h>
#include <limits.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <unistd.h>
#include <git2.h>
#include "compat.h"
-#include "config.h"
+
+struct deltainfo {
+ git_patch *patch;
+
+ size_t addcount;
+ size_t delcount;
+};
struct commitinfo {
const git_oid *id;
char parentoid[GIT_OID_HEXSZ + 1];
const git_signature *author;
+ const git_signature *committer;
const char *summary;
const char *msg;
- git_diff_stats *stats;
- git_diff *diff;
- git_commit *commit;
- git_commit *parent;
- git_tree *commit_tree;
- git_tree *parent_tree;
+ git_diff *diff;
+ git_commit *commit;
+ git_commit *parent;
+ git_tree *commit_tree;
+ git_tree *parent_tree;
size_t addcount;
size_t delcount;
size_t filecount;
+
+ struct deltainfo **deltas;
+ size_t ndeltas;
};
static git_repository *repo;
static const char *relpath = "";
static const char *repodir;
-static char *name;
-static char *stripped_name;
+static char *name = "";
+static char *strippedname = "";
static char description[255];
static char cloneurl[1024];
-static int hasreadme, haslicense;
+static char *submodules;
+static char *licensefiles[] = { "HEAD:LICENSE", "HEAD:LICENSE.md", "HEAD:COPYING" };
+static char *license;
+static char *readmefiles[] = { "HEAD:README", "HEAD:README.md" };
+static char *readme;
+static long long nlogcommits = -1; /* < 0 indicates not used */
+
+/* cache */
+static git_oid lastoid;
+static char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */
+static FILE *rcachefp, *wcachefp;
+static const char *cachefile;
+
+void
+joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
+{
+ int r;
+
+ r = snprintf(buf, bufsiz, "%s%s%s",
+ path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
+ if (r < 0 || (size_t)r >= bufsiz)
+ errx(1, "path truncated: '%s%s%s'",
+ path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
+}
+
+void
+deltainfo_free(struct deltainfo *di)
+{
+ if (!di)
+ return;
+ git_patch_free(di->patch);
+ memset(di, 0, sizeof(*di));
+ free(di);
+}
+
+int
+commitinfo_getstats(struct commitinfo *ci)
+{
+ struct deltainfo *di;
+ git_diff_options opts;
+ git_diff_find_options fopts;
+ const git_diff_delta *delta;
+ const git_diff_hunk *hunk;
+ const git_diff_line *line;
+ git_patch *patch = NULL;
+ size_t ndeltas, nhunks, nhunklines;
+ size_t i, j, k;
+
+ if (git_tree_lookup(&(ci->commit_tree), repo, git_commit_tree_id(ci->commit)))
+ goto err;
+ if (!git_commit_parent(&(ci->parent), ci->commit, 0)) {
+ if (git_tree_lookup(&(ci->parent_tree), repo, git_commit_tree_id(ci->parent))) {
+ ci->parent = NULL;
+ ci->parent_tree = NULL;
+ }
+ }
+
+ git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION);
+ opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH |
+ GIT_DIFF_IGNORE_SUBMODULES |
+ GIT_DIFF_INCLUDE_TYPECHANGE;
+ if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts))
+ goto err;
+
+ if (git_diff_find_init_options(&fopts, GIT_DIFF_FIND_OPTIONS_VERSION))
+ goto err;
+ /* find renames and copies, exact matches (no heuristic) for renames. */
+ fopts.flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES |
+ GIT_DIFF_FIND_EXACT_MATCH_ONLY;
+ if (git_diff_find_similar(ci->diff, &fopts))
+ goto err;
+
+ ndeltas = git_diff_num_deltas(ci->diff);
+ if (ndeltas && !(ci->deltas = calloc(ndeltas, sizeof(struct deltainfo *))))
+ err(1, "calloc");
+
+ for (i = 0; i < ndeltas; i++) {
+ if (git_patch_from_diff(&patch, ci->diff, i))
+ goto err;
+
+ if (!(di = calloc(1, sizeof(struct deltainfo))))
+ err(1, "calloc");
+ di->patch = patch;
+ ci->deltas[i] = di;
+
+ delta = git_patch_get_delta(patch);
+
+ /* skip stats for binary data */
+ if (delta->flags & GIT_DIFF_FLAG_BINARY)
+ continue;
+
+ nhunks = git_patch_num_hunks(patch);
+ for (j = 0; j < nhunks; j++) {
+ if (git_patch_get_hunk(&hunk, &nhunklines, patch, j))
+ break;
+ for (k = 0; ; k++) {
+ if (git_patch_get_line_in_hunk(&line, patch, j, k))
+ break;
+ if (line->old_lineno == -1) {
+ di->addcount++;
+ ci->addcount++;
+ } else if (line->new_lineno == -1) {
+ di->delcount++;
+ ci->delcount++;
+ }
+ }
+ }
+ }
+ ci->ndeltas = i;
+ ci->filecount = i;
+
+ return 0;
+
+err:
+ git_diff_free(ci->diff);
+ ci->diff = NULL;
+ git_tree_free(ci->commit_tree);
+ ci->commit_tree = NULL;
+ git_tree_free(ci->parent_tree);
+ ci->parent_tree = NULL;
+ git_commit_free(ci->parent);
+ ci->parent = NULL;
+
+ if (ci->deltas)
+ for (i = 0; i < ci->ndeltas; i++)
+ deltainfo_free(ci->deltas[i]);
+ free(ci->deltas);
+ ci->deltas = NULL;
+ ci->ndeltas = 0;
+ ci->addcount = 0;
+ ci->delcount = 0;
+ ci->filecount = 0;
+
+ return -1;
+}
void
commitinfo_free(struct commitinfo *ci)
{
+ size_t i;
+
if (!ci)
return;
+ if (ci->deltas)
+ for (i = 0; i < ci->ndeltas; i++)
+ deltainfo_free(ci->deltas[i]);
- git_diff_stats_free(ci->stats);
+ free(ci->deltas);
git_diff_free(ci->diff);
git_tree_free(ci->commit_tree);
git_tree_free(ci->parent_tree);
git_commit_free(ci->commit);
+ git_commit_free(ci->parent);
+ memset(ci, 0, sizeof(*ci));
+ free(ci);
}
struct commitinfo *
commitinfo_getbyoid(const git_oid *id)
{
struct commitinfo *ci;
- git_diff_options opts;
- int error;
if (!(ci = calloc(1, sizeof(struct commitinfo))))
err(1, "calloc");
- ci->id = id;
if (git_commit_lookup(&(ci->commit), repo, id))
goto err;
+ ci->id = id;
git_oid_tostr(ci->oid, sizeof(ci->oid), git_commit_id(ci->commit));
git_oid_tostr(ci->parentoid, sizeof(ci->parentoid), git_commit_parent_id(ci->commit, 0));
ci->author = git_commit_author(ci->commit);
+ ci->committer = git_commit_committer(ci->commit);
ci->summary = git_commit_summary(ci->commit);
ci->msg = git_commit_message(ci->commit);
- if ((error = git_commit_tree(&(ci->commit_tree), ci->commit)))
- goto err;
- if (!(error = git_commit_parent(&(ci->parent), ci->commit, 0))) {
- if ((error = git_commit_tree(&(ci->parent_tree), ci->parent)))
- goto err;
- } else {
- ci->parent = NULL;
- ci->parent_tree = NULL;
- }
-
- git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION);
- opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH;
- if ((error = git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts)))
- goto err;
- if (git_diff_get_stats(&(ci->stats), ci->diff))
- goto err;
-
- ci->addcount = git_diff_stats_insertions(ci->stats);
- ci->delcount = git_diff_stats_deletions(ci->stats);
- ci->filecount = git_diff_stats_files_changed(ci->stats);
-
return ci;
err:
commitinfo_free(ci);
- free(ci);
return NULL;
}
FILE *fp;
if (!(fp = fopen(name, flags)))
- err(1, "fopen");
+ err(1, "fopen: '%s'", name);
return fp;
}
switch(*s) {
case '<': fputs("<", fp); break;
case '>': fputs(">", fp); break;
- case '\'': fputs("'", fp); break;
+ case '\'': fputs("'", fp); break;
case '&': fputs("&", fp); break;
case '"': fputs(""", fp); break;
default: fputc(*s, fp);
}
}
-/* Some implementations of dirname(3) return a pointer to a static
- * internal buffer (OpenBSD). Others modify the contents of `path` (POSIX).
- * This is a wrapper function that is compatible with both versions.
- * The program will error out if dirname(3) failed, this can only happen
- * with the OpenBSD version. */
-char *
-xdirname(const char *path)
-{
- char *p, *b;
-
- if (!(p = strdup(path)))
- err(1, "strdup");
- if (!(b = dirname(p)))
- err(1, "dirname");
- if (!(b = strdup(b)))
- err(1, "strdup");
- free(p);
-
- return b;
-}
-
-/* Some implementations of basename(3) return a pointer to a static
- * internal buffer (OpenBSD). Others modify the contents of `path` (POSIX).
- * This is a wrapper function that is compatible with both versions.
- * The program will error out if basename(3) failed, this can only happen
- * with the OpenBSD version. */
-char *
-xbasename(const char *path)
-{
- char *p, *b;
-
- if (!(p = strdup(path)))
- err(1, "strdup");
- if (!(b = basename(p)))
- err(1, "basename");
- if (!(b = strdup(b)))
- err(1, "strdup");
- free(p);
-
- return b;
-}
-
int
mkdirp(const char *path)
{
char tmp[PATH_MAX], *p;
- strlcpy(tmp, path, sizeof(tmp));
+ if (strlcpy(tmp, path, sizeof(tmp)) >= sizeof(tmp))
+ errx(1, "path truncated: '%s'", path);
for (p = tmp + (tmp[0] == '/'); *p; p++) {
if (*p != '/')
continue;
}
void
-printtimeformat(FILE *fp, const git_time *intime, const char *fmt)
+printtimez(FILE *fp, const git_time *intime)
{
struct tm *intm;
time_t t;
char out[32];
- t = (time_t) intime->time + (intime->offset * 60);
- intm = gmtime(&t);
- strftime(out, sizeof(out), fmt, intm);
+ t = (time_t)intime->time;
+ if (!(intm = gmtime(&t)))
+ return;
+ strftime(out, sizeof(out), "%Y-%m-%dT%H:%M:%SZ", intm);
fputs(out, fp);
}
-void
-printtimez(FILE *fp, const git_time *intime)
-{
- printtimeformat(fp, intime, "%Y-%m-%dT%H:%M:%SZ");
-}
-
void
printtime(FILE *fp, const git_time *intime)
{
- printtimeformat(fp, intime, "%a %b %e %T %Y");
+ struct tm *intm;
+ time_t t;
+ char out[32];
+
+ t = (time_t)intime->time + (intime->offset * 60);
+ if (!(intm = gmtime(&t)))
+ return;
+ strftime(out, sizeof(out), "%a, %e %b %Y %H:%M:%S", intm);
+ if (intime->offset < 0)
+ fprintf(fp, "%s -%02d%02d", out,
+ -(intime->offset) / 60, -(intime->offset) % 60);
+ else
+ fprintf(fp, "%s +%02d%02d", out,
+ intime->offset / 60, intime->offset % 60);
}
void
printtimeshort(FILE *fp, const git_time *intime)
{
- printtimeformat(fp, intime, "%Y-%m-%d %H:%M");
+ struct tm *intm;
+ time_t t;
+ char out[32];
+
+ t = (time_t)intime->time;
+ if (!(intm = gmtime(&t)))
+ return;
+ strftime(out, sizeof(out), "%Y-%m-%d %H:%M", intm);
+ fputs(out, fp);
}
-int
-writeheader(FILE *fp)
+void
+writeheader(FILE *fp, const char *title)
{
- fputs("<!DOCTYPE HTML>"
- "<html dir=\"ltr\" lang=\"en\">\n<head>\n"
+ fputs("<!DOCTYPE html>\n"
+ "<html>\n<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
- "<meta http-equiv=\"Content-Language\" content=\"en\" />\n<title>", fp);
- xmlencode(fp, stripped_name, strlen(stripped_name));
+ "<title>", fp);
+ xmlencode(fp, title, strlen(title));
+ if (title[0] && strippedname[0])
+ fputs(" - ", fp);
+ xmlencode(fp, strippedname, strlen(strippedname));
if (description[0])
fputs(" - ", fp);
xmlencode(fp, description, strlen(description));
fprintf(fp, "<a href=\"../%s\"><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></a>",
relpath, relpath);
fputs("</td><td><h1>", fp);
- xmlencode(fp, stripped_name, strlen(stripped_name));
+ xmlencode(fp, strippedname, strlen(strippedname));
fputs("</h1><span class=\"desc\">", fp);
xmlencode(fp, description, strlen(description));
fputs("</span></td></tr>", fp);
if (cloneurl[0]) {
- fputs("<tr class=\"url\"><td></td><td>git clone <a href=\"", fp);
+ fputs("<tr class=\"url\"><td></td><td><span class=\"clone\">git clone <a href=\"", fp);
xmlencode(fp, cloneurl, strlen(cloneurl));
fputs("\">", fp);
xmlencode(fp, cloneurl, strlen(cloneurl));
- fputs("</a></td></tr>", fp);
+ fputs("</a></span></td></tr>", fp);
}
fputs("<tr><td></td><td>\n", fp);
fprintf(fp, "<a href=\"%slog.html\">Log</a> | ", relpath);
fprintf(fp, "<a href=\"%sfiles.html\">Files</a> | ", relpath);
fprintf(fp, "<a href=\"%srefs.html\">Refs</a>", relpath);
- if (hasreadme)
- fprintf(fp, " | <a href=\"%sfile/README.html\">README</a>", relpath);
- if (haslicense)
- fprintf(fp, " | <a href=\"%sfile/LICENSE.html\">LICENSE</a>", relpath);
+ if (submodules)
+ fprintf(fp, " | <a href=\"%sfile/%s.html\">Submodules</a>",
+ relpath, submodules);
+ if (readme)
+ fprintf(fp, " | <a href=\"%sfile/%s.html\">README</a>",
+ relpath, readme);
+ if (license)
+ fprintf(fp, " | <a href=\"%sfile/%s.html\">LICENSE</a>",
+ relpath, license);
fputs("</td></tr></table>\n<hr/>\n<div id=\"content\">\n", fp);
-
- return 0;
}
-int
+void
writefooter(FILE *fp)
{
- return !fputs("</div>\n</body>\n</html>\n", fp);
+ fputs("</div>\n</body>\n</html>\n", fp);
}
int
writeblobhtml(FILE *fp, const git_blob *blob)
{
- off_t i;
- size_t n = 0;
- char *nfmt = "<a href=\"#l%d\" id=\"l%d\">%d</a>\n";
+ size_t n = 0, i, prev;
+ const char *nfmt = "<a href=\"#l%d\" class=\"line\" id=\"l%d\">%7d</a><span class=\"loc\">";
const char *s = git_blob_rawcontent(blob);
git_off_t len = git_blob_rawsize(blob);
- fputs("<table id=\"blob\"><tr><td class=\"num\"><pre>\n", fp);
+ fputs("<pre id=\"blob\">\n", fp);
- if (len) {
- n++;
- fprintf(fp, nfmt, n, n, n);
- for (i = 0; i < len - 1; i++) {
- if (s[i] == '\n') {
- n++;
- fprintf(fp, nfmt, n, n, n);
- }
+ if (len > 0) {
+ for (i = 0, prev = 0; i < (size_t)len; i++) {
+ if (s[i] != '\n')
+ continue;
+ n++;
+ fprintf(fp, nfmt, n, n, n);
+ xmlencode(fp, &s[prev], i - prev + 1);
+ fprintf(fp, "</span>");
+ prev = i + 1;
+ }
+ /* trailing data */
+ if ((len - prev) > 0) {
+ n++;
+ fprintf(fp, nfmt, n, n, n);
+ xmlencode(fp, &s[prev], len - prev);
+ fprintf(fp, "</span>");
}
}
- fputs("</pre></td><td><pre>\n", fp);
- xmlencode(fp, s, (size_t)len);
- fputs("</pre></td></tr></table>\n", fp);
+ fputs("</pre>\n", fp);
return n;
}
}
void
-printshowfile(struct commitinfo *ci)
+printshowfile(FILE *fp, struct commitinfo *ci)
{
const git_diff_delta *delta;
const git_diff_hunk *hunk;
const git_diff_line *line;
git_patch *patch;
- git_buf statsbuf;
- size_t ndeltas, nhunks, nhunklines;
- FILE *fp;
- size_t i, j, k;
- char path[PATH_MAX];
+ size_t nhunks, nhunklines, changed, add, del, total, i, j, k;
+ char linestr[80];
+ int c;
- snprintf(path, sizeof(path), "commit/%s.html", ci->oid);
- /* check if file exists if so skip it */
- if (!access(path, F_OK))
- return;
-
- fp = efopen(path, "w");
- writeheader(fp);
- fputs("<pre>", fp);
printcommit(fp, ci);
- memset(&statsbuf, 0, sizeof(statsbuf));
+ if (!ci->deltas)
+ return;
+
+ if (ci->filecount > 1000 ||
+ ci->ndeltas > 1000 ||
+ ci->addcount > 100000 ||
+ ci->delcount > 100000) {
+ fputs("Diff is too large, output suppressed.\n", fp);
+ return;
+ }
/* diff stat */
- if (ci->stats &&
- !git_diff_stats_to_buf(&statsbuf, ci->stats,
- GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_SHORT, 80)) {
- if (statsbuf.ptr && statsbuf.ptr[0]) {
- fputs("<b>Diffstat:</b>\n", fp);
- xmlencode(fp, statsbuf.ptr, strlen(statsbuf.ptr));
+ fputs("<b>Diffstat:</b>\n<table>", fp);
+ for (i = 0; i < ci->ndeltas; i++) {
+ delta = git_patch_get_delta(ci->deltas[i]->patch);
+
+ switch (delta->status) {
+ case GIT_DELTA_ADDED: c = 'A'; break;
+ case GIT_DELTA_COPIED: c = 'C'; break;
+ case GIT_DELTA_DELETED: c = 'D'; break;
+ case GIT_DELTA_MODIFIED: c = 'M'; break;
+ case GIT_DELTA_RENAMED: c = 'R'; break;
+ case GIT_DELTA_TYPECHANGE: c = 'T'; break;
+ default: c = ' '; break;
}
- }
+ if (c == ' ')
+ fprintf(fp, "<tr><td>%c", c);
+ else
+ fprintf(fp, "<tr><td class=\"%c\">%c", c, c);
- fputs("<hr/>", fp);
+ fprintf(fp, "</td><td><a href=\"#h%zu\">", i);
+ xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+ if (strcmp(delta->old_file.path, delta->new_file.path)) {
+ fputs(" -> ", fp);
+ xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+ }
- ndeltas = git_diff_num_deltas(ci->diff);
- for (i = 0; i < ndeltas; i++) {
- if (git_patch_from_diff(&patch, ci->diff, i)) {
- git_patch_free(patch);
- break;
+ add = ci->deltas[i]->addcount;
+ del = ci->deltas[i]->delcount;
+ changed = add + del;
+ total = sizeof(linestr) - 2;
+ if (changed > total) {
+ if (add)
+ add = ((float)total / changed * add) + 1;
+ if (del)
+ del = ((float)total / changed * del) + 1;
}
+ memset(&linestr, '+', add);
+ memset(&linestr[add], '-', del);
+
+ fprintf(fp, "</a></td><td> | </td><td class=\"num\">%zu</td><td><span class=\"i\">",
+ ci->deltas[i]->addcount + ci->deltas[i]->delcount);
+ fwrite(&linestr, 1, add, fp);
+ fputs("</span><span class=\"d\">", fp);
+ fwrite(&linestr[add], 1, del, fp);
+ fputs("</span></td></tr>\n", fp);
+ }
+ fprintf(fp, "</table></pre><pre>%zu file%s changed, %zu insertion%s(+), %zu deletion%s(-)\n",
+ ci->filecount, ci->filecount == 1 ? "" : "s",
+ ci->addcount, ci->addcount == 1 ? "" : "s",
+ ci->delcount, ci->delcount == 1 ? "" : "s");
+
+ fputs("<hr/>", fp);
+ for (i = 0; i < ci->ndeltas; i++) {
+ patch = ci->deltas[i]->patch;
delta = git_patch_get_delta(patch);
- fprintf(fp, "<b>diff --git a/<a href=\"%sfile/%s.html\">%s</a> b/<a href=\"%sfile/%s.html\">%s</a></b>\n",
- relpath, delta->old_file.path, delta->old_file.path,
- relpath, delta->new_file.path, delta->new_file.path);
+ fprintf(fp, "<b>diff --git a/<a id=\"h%zu\" href=\"%sfile/", i, relpath);
+ xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+ fputs(".html\">", fp);
+ xmlencode(fp, delta->old_file.path, strlen(delta->old_file.path));
+ fprintf(fp, "</a> b/<a href=\"%sfile/", relpath);
+ xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+ fprintf(fp, ".html\">");
+ xmlencode(fp, delta->new_file.path, strlen(delta->new_file.path));
+ fprintf(fp, "</a></b>\n");
/* check binary data */
if (delta->flags & GIT_DIFF_FLAG_BINARY) {
- fputs("Binary files differ\n", fp);
- git_patch_free(patch);
+ fputs("Binary files differ.\n", fp);
continue;
}
if (git_patch_get_hunk(&hunk, &nhunklines, patch, j))
break;
- fprintf(fp, "<a href=\"#h%zu\" id=\"h%zu\" class=\"h\">", j, j);
+ fprintf(fp, "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"h\">", i, j, i, j);
xmlencode(fp, hunk->header, hunk->header_len);
fputs("</a>", fp);
if (git_patch_get_line_in_hunk(&line, patch, j, k))
break;
if (line->old_lineno == -1)
- fprintf(fp, "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"i\">+",
- j, k, j, k);
+ fprintf(fp, "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"i\">+",
+ i, j, k, i, j, k);
else if (line->new_lineno == -1)
- fprintf(fp, "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"d\">-",
- j, k, j, k);
+ fprintf(fp, "<a href=\"#h%zu-%zu-%zu\" id=\"h%zu-%zu-%zu\" class=\"d\">-",
+ i, j, k, i, j, k);
else
fputc(' ', fp);
xmlencode(fp, line->content, line->content_len);
fputs("</a>", fp);
}
}
- git_patch_free(patch);
}
- git_buf_free(&statsbuf);
+}
- fputs("</pre>\n", fp);
- writefooter(fp);
- fclose(fp);
- return;
+void
+writelogline(FILE *fp, struct commitinfo *ci)
+{
+ fputs("<tr><td>", fp);
+ if (ci->author)
+ printtimeshort(fp, &(ci->author->when));
+ fputs("</td><td>", fp);
+ if (ci->summary) {
+ fprintf(fp, "<a href=\"%scommit/%s.html\">", relpath, ci->oid);
+ xmlencode(fp, ci->summary, strlen(ci->summary));
+ fputs("</a>", fp);
+ }
+ fputs("</td><td>", fp);
+ if (ci->author)
+ xmlencode(fp, ci->author->name, strlen(ci->author->name));
+ fputs("</td><td class=\"num\" align=\"right\">", fp);
+ fprintf(fp, "%zu", ci->filecount);
+ fputs("</td><td class=\"num\" align=\"right\">", fp);
+ fprintf(fp, "+%zu", ci->addcount);
+ fputs("</td><td class=\"num\" align=\"right\">", fp);
+ fprintf(fp, "-%zu", ci->delcount);
+ fputs("</td></tr>\n", fp);
}
int
struct commitinfo *ci;
git_revwalk *w = NULL;
git_oid id;
- size_t len;
+ char path[PATH_MAX], oidstr[GIT_OID_HEXSZ + 1];
+ FILE *fpfile;
+ int r;
git_revwalk_new(&w, repo);
git_revwalk_push(w, oid);
- git_revwalk_sorting(w, GIT_SORT_TIME);
git_revwalk_simplify_first_parent(w);
- fputs("<table id=\"log\"><thead>\n<tr><td>Age</td><td>Commit message</td>"
- "<td>Author</td><td>Files</td><td class=\"num\">+</td>"
- "<td class=\"num\">-</td></tr>\n</thead><tbody>\n", fp);
-
while (!git_revwalk_next(&id, w)) {
relpath = "";
+ if (cachefile && !memcmp(&id, &lastoid, sizeof(id)))
+ break;
+
+ git_oid_tostr(oidstr, sizeof(oidstr), &id);
+ r = snprintf(path, sizeof(path), "commit/%s.html", oidstr);
+ if (r < 0 || (size_t)r >= sizeof(path))
+ errx(1, "path truncated: 'commit/%s.html'", oidstr);
+ r = access(path, F_OK);
+
+ /* optimization: if there are no log lines to write and
+ the commit file already exists: skip the diffstat */
+ if (!nlogcommits && !r)
+ continue;
+
if (!(ci = commitinfo_getbyoid(&id)))
break;
+ /* diffstat: for stagit HTML required for the log.html line */
+ if (commitinfo_getstats(ci) == -1)
+ goto err;
- fputs("<tr><td>", fp);
- if (ci->author)
- printtimeshort(fp, &(ci->author->when));
- fputs("</td><td>", fp);
- if (ci->summary) {
- fprintf(fp, "<a href=\"%scommit/%s.html\">", relpath, ci->oid);
- if ((len = strlen(ci->summary)) > summarylen) {
- xmlencode(fp, ci->summary, summarylen - 1);
- fputs("…", fp);
- } else {
- xmlencode(fp, ci->summary, len);
- }
- fputs("</a>", fp);
+ if (nlogcommits < 0) {
+ writelogline(fp, ci);
+ } else if (nlogcommits > 0) {
+ writelogline(fp, ci);
+ nlogcommits--;
+ if (!nlogcommits && ci->parentoid[0])
+ fputs("<tr><td></td><td colspan=\"5\">"
+ "More commits remaining [...]</td>"
+ "</tr>\n", fp);
}
- fputs("</td><td>", fp);
- if (ci->author)
- xmlencode(fp, ci->author->name, strlen(ci->author->name));
- fputs("</td><td class=\"num\">", fp);
- fprintf(fp, "%zu", ci->filecount);
- fputs("</td><td class=\"num\">", fp);
- fprintf(fp, "+%zu", ci->addcount);
- fputs("</td><td class=\"num\">", fp);
- fprintf(fp, "-%zu", ci->delcount);
- fputs("</td></tr>\n", fp);
-
- relpath = "../";
- printshowfile(ci);
+ if (cachefile)
+ writelogline(wcachefp, ci);
+
+ /* check if file exists if so skip it */
+ if (r) {
+ relpath = "../";
+ fpfile = efopen(path, "w");
+ writeheader(fpfile, ci->summary);
+ fputs("<pre>", fpfile);
+ printshowfile(fpfile, ci);
+ fputs("</pre>\n", fpfile);
+ writefooter(fpfile);
+ fclose(fpfile);
+ }
+err:
commitinfo_free(ci);
}
- fputs("</tbody></table>", fp);
-
git_revwalk_free(w);
relpath = "";
fprintf(fp, "<id>%s</id>\n", ci->oid);
if (ci->author) {
- fputs("<updated>", fp);
+ fputs("<published>", fp);
printtimez(fp, &(ci->author->when));
+ fputs("</published>\n", fp);
+ }
+ if (ci->committer) {
+ fputs("<updated>", fp);
+ printtimez(fp, &(ci->committer->when));
fputs("</updated>\n", fp);
}
if (ci->summary) {
xmlencode(fp, ci->summary, strlen(ci->summary));
fputs("</title>\n", fp);
}
+ fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/%s.html\" />\n",
+ ci->oid);
+
+ if (ci->author) {
+ fputs("<author>\n<name>", fp);
+ xmlencode(fp, ci->author->name, strlen(ci->author->name));
+ fputs("</name>\n<email>", fp);
+ xmlencode(fp, ci->author->email, strlen(ci->author->email));
+ fputs("</email>\n</author>\n", fp);
+ }
fputs("<content type=\"text\">", fp);
fprintf(fp, "commit %s\n", ci->oid);
fputc('\n', fp);
xmlencode(fp, ci->msg, strlen(ci->msg));
}
- fputs("\n</content>\n", fp);
- if (ci->author) {
- fputs("<author><name>", fp);
- xmlencode(fp, ci->author->name, strlen(ci->author->name));
- fputs("</name>\n<email>", fp);
- xmlencode(fp, ci->author->email, strlen(ci->author->email));
- fputs("</email>\n</author>\n", fp);
- }
- fputs("</entry>\n", fp);
+ fputs("\n</content>\n</entry>\n", fp);
}
int
struct commitinfo *ci;
git_revwalk *w = NULL;
git_oid id;
- size_t i, m = 100; /* max */
+ size_t i, m = 100; /* last 'm' commits */
fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<feed xmlns=\"http://www.w3.org/2005/Atom\">\n<title>", fp);
- xmlencode(fp, stripped_name, strlen(stripped_name));
+ xmlencode(fp, strippedname, strlen(strippedname));
fputs(", branch HEAD</title>\n<subtitle>", fp);
xmlencode(fp, description, strlen(description));
fputs("</subtitle>\n", fp);
git_revwalk_new(&w, repo);
git_revwalk_push_head(w);
- git_revwalk_sorting(w, GIT_SORT_TIME);
git_revwalk_simplify_first_parent(w);
for (i = 0; i < m && !git_revwalk_next(&id, w); i++) {
}
git_revwalk_free(w);
- fputs("</feed>", fp);
+ fputs("</feed>\n", fp);
return 0;
}
int
writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t filesize)
{
- char tmp[PATH_MAX] = "";
- char *d;
+ char tmp[PATH_MAX] = "", *d;
const char *p;
int lc = 0;
FILE *fp;
- d = xdirname(fpath);
- if (mkdirp(d)) {
- free(d);
+ if (strlcpy(tmp, fpath, sizeof(tmp)) >= sizeof(tmp))
+ errx(1, "path truncated: '%s'", fpath);
+ if (!(d = dirname(tmp)))
+ err(1, "dirname");
+ if (mkdirp(d))
return -1;
- }
- free(d);
- p = fpath;
- while (*p) {
- if (*p == '/')
- strlcat(tmp, "../", sizeof(tmp));
- p++;
+ for (p = fpath, tmp[0] = '\0'; *p; p++) {
+ if (*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
+ errx(1, "path truncated: '../%s'", tmp);
}
relpath = tmp;
fp = efopen(fpath, "w");
- writeheader(fp);
+ writeheader(fp, filename);
fputs("<p> ", fp);
xmlencode(fp, filename, strlen(filename));
fprintf(fp, " (%juB)", (uintmax_t)filesize);
fputs("</p><hr/>", fp);
if (git_blob_is_binary((git_blob *)obj)) {
- fputs("<p>Binary file</p>\n", fp);
+ fputs("<p>Binary file.</p>\n", fp);
} else {
lc = writeblobhtml(fp, (git_blob *)obj);
if (ferror(fp))
}
int
-writefilestree(FILE *fp, git_tree *tree, const char *branch, const char *path)
+writefilestree(FILE *fp, git_tree *tree, const char *path)
{
const git_tree_entry *entry = NULL;
- const char *filename;
- char filepath[PATH_MAX];
+ git_submodule *module = NULL;
git_object *obj = NULL;
git_off_t filesize;
+ const char *entryname;
+ char filepath[PATH_MAX], entrypath[PATH_MAX];
size_t count, i;
- int lc, ret;
+ int lc, r, ret;
count = git_tree_entrycount(tree);
for (i = 0; i < count; i++) {
if (!(entry = git_tree_entry_byindex(tree, i)) ||
- git_tree_entry_to_object(&obj, repo, entry))
+ !(entryname = git_tree_entry_name(entry)))
return -1;
- filename = git_tree_entry_name(entry);
- switch (git_object_type(obj)) {
- case GIT_OBJ_BLOB:
- break;
- case GIT_OBJ_TREE:
- /* NOTE: recurses */
- ret = writefilestree(fp, (git_tree *)obj, branch,
- filename);
- git_object_free(obj);
- if (ret)
- return ret;
- continue;
- default:
+ joinpath(entrypath, sizeof(entrypath), path, entryname);
+
+ r = snprintf(filepath, sizeof(filepath), "file/%s.html",
+ entrypath);
+ if (r < 0 || (size_t)r >= sizeof(filepath))
+ errx(1, "path truncated: 'file/%s.html'", entrypath);
+
+ if (!git_tree_entry_to_object(&obj, repo, entry)) {
+ switch (git_object_type(obj)) {
+ case GIT_OBJ_BLOB:
+ break;
+ case GIT_OBJ_TREE:
+ /* NOTE: recurses */
+ ret = writefilestree(fp, (git_tree *)obj,
+ entrypath);
+ git_object_free(obj);
+ if (ret)
+ return ret;
+ continue;
+ default:
+ git_object_free(obj);
+ continue;
+ }
+
+ filesize = git_blob_rawsize((git_blob *)obj);
+ lc = writeblob(obj, filepath, entryname, filesize);
+
+ fputs("<tr><td>", fp);
+ fputs(filemode(git_tree_entry_filemode(entry)), fp);
+ fprintf(fp, "</td><td><a href=\"%s", relpath);
+ xmlencode(fp, filepath, strlen(filepath));
+ fputs("\">", fp);
+ xmlencode(fp, entrypath, strlen(entrypath));
+ fputs("</a></td><td class=\"num\" align=\"right\">", fp);
+ if (lc > 0)
+ fprintf(fp, "%dL", lc);
+ else
+ fprintf(fp, "%juB", (uintmax_t)filesize);
+ fputs("</td></tr>\n", fp);
git_object_free(obj);
- continue;
+ } else if (!git_submodule_lookup(&module, repo, entryname)) {
+ fprintf(fp, "<tr><td>m---------</td><td><a href=\"%sfile/.gitmodules.html\">",
+ relpath);
+ xmlencode(fp, entrypath, strlen(entrypath));
+ git_submodule_free(module);
+ fputs("</a></td><td class=\"num\" align=\"right\"></td></tr>\n", fp);
}
- if (path[0])
- snprintf(filepath, sizeof(filepath), "file/%s/%s.html",
- path, filename);
- else
- snprintf(filepath, sizeof(filepath), "file/%s.html",
- filename);
- filesize = git_blob_rawsize((git_blob *)obj);
-
- lc = writeblob(obj, filepath, filename, filesize);
-
- fputs("<tr><td>", fp);
- fputs(filemode(git_tree_entry_filemode(entry)), fp);
- fprintf(fp, "</td><td><a href=\"%s%s\">", relpath, filepath);
- xmlencode(fp, filename, strlen(filename));
- fputs("</a></td><td class=\"num\">", fp);
- if (showlinecount && lc > 0)
- fprintf(fp, "%dL", lc);
- else
- fprintf(fp, "%juB", (uintmax_t)filesize);
- fputs("</td></tr>\n", fp);
}
return 0;
}
int
-writefiles(FILE *fp, const git_oid *id, const char *branch)
+writefiles(FILE *fp, const git_oid *id)
{
git_tree *tree = NULL;
git_commit *commit = NULL;
int ret = -1;
fputs("<table id=\"files\"><thead>\n<tr>"
- "<td>Mode</td><td>Name</td><td class=\"num\">Size</td>"
+ "<td><b>Mode</b></td><td><b>Name</b></td>"
+ "<td class=\"num\" align=\"right\"><b>Size</b></td>"
"</tr>\n</thead><tbody>\n", fp);
- if (git_commit_lookup(&commit, repo, id) ||
- git_commit_tree(&tree, commit))
- goto err;
- ret = writefilestree(fp, tree, branch, "");
+ if (!git_commit_lookup(&commit, repo, id) &&
+ !git_commit_tree(&tree, commit))
+ ret = writefilestree(fp, tree, "");
-err:
fputs("</tbody></table>", fp);
git_commit_free(commit);
{
git_reference *r1 = (*(git_reference **)v1);
git_reference *r2 = (*(git_reference **)v2);
- int t1, t2;
-
- t1 = git_reference_is_branch(r1);
- t2 = git_reference_is_branch(r2);
+ int r;
- if (t1 != t2)
- return t1 - t2;
+ if ((r = git_reference_is_branch(r1) - git_reference_is_branch(r2)))
+ return r;
return strcmp(git_reference_shorthand(r1),
git_reference_shorthand(r2));
git_reference *dref = NULL, *r, *ref = NULL;
git_reference_iterator *it = NULL;
git_reference **refs = NULL;
- size_t count, i, j, refcount = 0;
- const char *cols[] = { "Branch", "Tag" }; /* first column title */
+ size_t count, i, j, refcount;
const char *titles[] = { "Branches", "Tags" };
const char *ids[] = { "branches", "tags" };
const char *name;
default:
continue;
}
- if (!(id = git_reference_target(r)))
- goto err;
- if (git_reference_peel(&obj, r, GIT_OBJ_ANY))
+ if (!git_reference_target(r) ||
+ git_reference_peel(&obj, r, GIT_OBJ_ANY))
goto err;
if (!(id = git_object_id(obj)))
goto err;
/* print header if it has an entry (first). */
if (++count == 1) {
- fprintf(fp, "<h2>%s</h2><table id=\"%s\"><thead>\n<tr><td>%s</td>"
- "<td>Age</td><td>Author</td>\n</tr>\n</thead><tbody>\n",
- titles[j], ids[j], cols[j]);
+ fprintf(fp, "<h2>%s</h2><table id=\"%s\">"
+ "<thead>\n<tr><td><b>Name</b></td>"
+ "<td><b>Last commit date</b></td>"
+ "<td><b>Author</b></td>\n</tr>\n"
+ "</thead><tbody>\n",
+ titles[j], ids[j]);
}
relpath = "";
return 0;
}
+void
+usage(char *argv0)
+{
+ fprintf(stderr, "%s [-c cachefile | -l commits] repodir\n", argv0);
+ exit(1);
+}
+
int
main(int argc, char *argv[])
{
git_object *obj = NULL;
const git_oid *head = NULL;
- const git_error *e = NULL;
+ mode_t mask;
FILE *fp, *fpread;
- char path[PATH_MAX], *p;
- int status;
-
- if (argc != 2) {
- fprintf(stderr, "%s <repodir>\n", argv[0]);
- return 1;
+ char path[PATH_MAX], repodirabs[PATH_MAX + 1], *p;
+ char tmppath[64] = "cache.XXXXXXXXXXXX", buf[BUFSIZ];
+ size_t n;
+ int i, fd;
+
+ for (i = 1; i < argc; i++) {
+ if (argv[i][0] != '-') {
+ if (repodir)
+ usage(argv[0]);
+ repodir = argv[i];
+ } else if (argv[i][1] == 'c') {
+ if (nlogcommits > 0 || i + 1 >= argc)
+ usage(argv[0]);
+ cachefile = argv[++i];
+ } else if (argv[i][1] == 'l') {
+ if (cachefile || i + 1 >= argc)
+ usage(argv[0]);
+ errno = 0;
+ nlogcommits = strtoll(argv[++i], &p, 10);
+ if (argv[i][0] == '\0' || *p != '\0' ||
+ nlogcommits <= 0 || errno)
+ usage(argv[0]);
+ }
}
- repodir = argv[1];
+ if (!repodir)
+ usage(argv[0]);
+
+ if (!realpath(repodir, repodirabs))
+ err(1, "realpath");
git_libgit2_init();
- if ((status = git_repository_open_ext(&repo, repodir,
- GIT_REPOSITORY_OPEN_NO_SEARCH, NULL)) < 0) {
- e = giterr_last();
- fprintf(stderr, "error %d/%d: %s\n", status, e->klass, e->message);
- return status;
+#ifdef __OpenBSD__
+ if (unveil(repodir, "r") == -1)
+ err(1, "unveil: %s", repodir);
+ if (unveil(".", "rwc") == -1)
+ err(1, "unveil: .");
+ if (cachefile && unveil(cachefile, "rwc") == -1)
+ err(1, "unveil: %s", cachefile);
+
+ if (cachefile) {
+ if (pledge("stdio rpath wpath cpath fattr", NULL) == -1)
+ err(1, "pledge");
+ } else {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ err(1, "pledge");
}
+#endif
- /* find HEAD */
- if (git_revparse_single(&obj, repo, "HEAD"))
+ if (git_repository_open_ext(&repo, repodir,
+ GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
+ fprintf(stderr, "%s: cannot open repository\n", argv[0]);
return 1;
- head = git_object_id(obj);
+ }
+
+ /* find HEAD */
+ if (!git_revparse_single(&obj, repo, "HEAD"))
+ head = git_object_id(obj);
git_object_free(obj);
/* use directory name as name */
- name = xbasename(repodir);
+ if ((name = strrchr(repodirabs, '/')))
+ name++;
+ else
+ name = "";
/* strip .git suffix */
- if (!(stripped_name = strdup(name)))
+ if (!(strippedname = strdup(name)))
err(1, "strdup");
- if ((p = strrchr(stripped_name, '.')))
+ if ((p = strrchr(strippedname, '.')))
if (!strcmp(p, ".git"))
*p = '\0';
/* read description or .git/description */
- snprintf(path, sizeof(path), "%s%s%s",
- repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "description");
+ joinpath(path, sizeof(path), repodir, "description");
if (!(fpread = fopen(path, "r"))) {
- snprintf(path, sizeof(path), "%s%s%s",
- repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/description");
+ joinpath(path, sizeof(path), repodir, ".git/description");
fpread = fopen(path, "r");
}
if (fpread) {
}
/* read url or .git/url */
- snprintf(path, sizeof(path), "%s%s%s",
- repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "url");
+ joinpath(path, sizeof(path), repodir, "url");
if (!(fpread = fopen(path, "r"))) {
- snprintf(path, sizeof(path), "%s%s%s",
- repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/url");
+ joinpath(path, sizeof(path), repodir, ".git/url");
fpread = fopen(path, "r");
}
if (fpread) {
}
/* check LICENSE */
- haslicense = !git_revparse_single(&obj, repo, "HEAD:LICENSE");
- git_object_free(obj);
+ for (i = 0; i < sizeof(licensefiles) / sizeof(*licensefiles) && !license; i++) {
+ if (!git_revparse_single(&obj, repo, licensefiles[i]) &&
+ git_object_type(obj) == GIT_OBJ_BLOB)
+ license = licensefiles[i] + strlen("HEAD:");
+ git_object_free(obj);
+ }
+
/* check README */
- hasreadme = !git_revparse_single(&obj, repo, "HEAD:README");
+ for (i = 0; i < sizeof(readmefiles) / sizeof(*readmefiles) && !readme; i++) {
+ if (!git_revparse_single(&obj, repo, readmefiles[i]) &&
+ git_object_type(obj) == GIT_OBJ_BLOB)
+ readme = readmefiles[i] + strlen("HEAD:");
+ git_object_free(obj);
+ }
+
+ if (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") &&
+ git_object_type(obj) == GIT_OBJ_BLOB)
+ submodules = ".gitmodules";
git_object_free(obj);
/* log for HEAD */
fp = efopen("log.html", "w");
relpath = "";
- writeheader(fp);
- mkdir("commit", 0755);
- writelog(fp, head);
+ mkdir("commit", S_IRWXU | S_IRWXG | S_IRWXO);
+ writeheader(fp, "Log");
+ fputs("<table id=\"log\"><thead>\n<tr><td><b>Date</b></td>"
+ "<td><b>Commit message</b></td>"
+ "<td><b>Author</b></td><td class=\"num\" align=\"right\"><b>Files</b></td>"
+ "<td class=\"num\" align=\"right\"><b>+</b></td>"
+ "<td class=\"num\" align=\"right\"><b>-</b></td></tr>\n</thead><tbody>\n", fp);
+
+ if (cachefile && head) {
+ /* read from cache file (does not need to exist) */
+ if ((rcachefp = fopen(cachefile, "r"))) {
+ if (!fgets(lastoidstr, sizeof(lastoidstr), rcachefp))
+ errx(1, "%s: no object id", cachefile);
+ if (git_oid_fromstr(&lastoid, lastoidstr))
+ errx(1, "%s: invalid object id", cachefile);
+ }
+
+ /* write log to (temporary) cache */
+ if ((fd = mkstemp(tmppath)) == -1)
+ err(1, "mkstemp");
+ if (!(wcachefp = fdopen(fd, "w")))
+ err(1, "fdopen: '%s'", tmppath);
+ /* write last commit id (HEAD) */
+ git_oid_tostr(buf, sizeof(buf), head);
+ fprintf(wcachefp, "%s\n", buf);
+
+ writelog(fp, head);
+
+ if (rcachefp) {
+ /* append previous log to log.html and the new cache */
+ while (!feof(rcachefp)) {
+ n = fread(buf, 1, sizeof(buf), rcachefp);
+ if (ferror(rcachefp))
+ err(1, "fread");
+ if (fwrite(buf, 1, n, fp) != n ||
+ fwrite(buf, 1, n, wcachefp) != n)
+ err(1, "fwrite");
+ }
+ fclose(rcachefp);
+ }
+ fclose(wcachefp);
+ } else {
+ if (head)
+ writelog(fp, head);
+ }
+
+ fputs("</tbody></table>", fp);
writefooter(fp);
fclose(fp);
/* files for HEAD */
fp = efopen("files.html", "w");
- writeheader(fp);
- writefiles(fp, head, "HEAD");
+ writeheader(fp, "Files");
+ if (head)
+ writefiles(fp, head);
writefooter(fp);
fclose(fp);
/* summary page with branches and tags */
fp = efopen("refs.html", "w");
- writeheader(fp);
+ writeheader(fp, "Refs");
writerefs(fp);
writefooter(fp);
fclose(fp);
writeatom(fp);
fclose(fp);
+ /* rename new cache file on success */
+ if (cachefile && head) {
+ if (rename(tmppath, cachefile))
+ err(1, "rename: '%s' to '%s'", tmppath, cachefile);
+ umask((mask = umask(0)));
+ if (chmod(cachefile,
+ (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) & ~mask))
+ err(1, "chmod: '%s'", cachefile);
+ }
+
/* cleanup */
git_repository_free(repo);
git_libgit2_shutdown();