#include <sys/stat.h>
#include <err.h>
+#include <errno.h>
#include <inttypes.h>
#include <libgen.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
-#include "git2.h"
+#include <git2.h>
+
+#include "compat.h"
+#include "config.h"
+
+struct commitinfo {
+ const git_oid *id;
+
+ char oid[GIT_OID_HEXSZ + 1];
+ char parentoid[GIT_OID_HEXSZ + 1];
+
+ const git_signature *author;
+ 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;
+
+ size_t addcount;
+ size_t delcount;
+ size_t filecount;
+};
static git_repository *repo;
static char description[255];
static int hasreadme, haslicense;
-int
-writeheader(FILE *fp)
+void
+commitinfo_free(struct commitinfo *ci)
{
- fputs("<!DOCTYPE HTML>"
- "<html dir=\"ltr\" lang=\"en\">\n<head>\n"
- "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n"
- "<meta http-equiv=\"Content-Language\" content=\"en\" />\n", fp);
- fprintf(fp, "<title>%s%s%s</title>\n", name, description[0] ? " - " : "", description);
- fprintf(fp, "<link rel=\"icon\" type=\"image/png\" href=\"%sfavicon.png\" />\n", relpath);
- fprintf(fp, "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"%s Atom Feed\" href=\"%satom.xml\" />\n",
- name, relpath);
- fprintf(fp, "<link rel=\"stylesheet\" type=\"text/css\" href=\"%sstyle.css\" />\n", relpath);
- fputs("</head>\n<body>\n", fp);
- fprintf(fp, "<h1><img src=\"%slogo.png\" alt=\"\" /> %s <span class=\"desc\">%s</span></h1>\n",
- relpath, name, description);
- fprintf(fp, "<a href=\"%slog.html\">Log</a> | ", relpath);
- fprintf(fp, "<a href=\"%sfiles.html\">Files</a>", relpath);
- /*fprintf(fp, "| <a href=\"%sstats.html\">Stats</a>", relpath);*/
- if (hasreadme)
- fprintf(fp, " | <a href=\"%sreadme.html\">README</a>", relpath);
- if (haslicense)
- fprintf(fp, " | <a href=\"%slicense.html\">LICENSE</a>", relpath);
- fputs("\n<hr/>\n<pre>", fp);
+ if (!ci)
+ return;
- return 0;
+ git_diff_stats_free(ci->stats);
+ git_diff_free(ci->diff);
+ git_tree_free(ci->commit_tree);
+ git_tree_free(ci->parent_tree);
+ git_commit_free(ci->commit);
}
-int
-writefooter(FILE *fp)
+struct commitinfo *
+commitinfo_getbyoid(const git_oid *id)
{
- return !fputs("</pre>\n</body>\n</html>", fp);
+ 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;
+
+ /* TODO: show tags when commit has it */
+ 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->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; /* TODO: handle error */
+ 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);
+
+ /* TODO: show tag when commit has it */
+
+ return ci;
+
+err:
+ commitinfo_free(ci);
+ free(ci);
+
+ return NULL;
}
FILE *
return b;
}
+int
+mkdirp(const char *path)
+{
+ char tmp[PATH_MAX], *p;
+
+ strlcpy(tmp, path, sizeof(tmp)); /* TODO: bring in libutil? */
+ for (p = tmp + (tmp[0] == '/'); *p; p++) {
+ if (*p != '/')
+ continue;
+ *p = '\0';
+ if (mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != EEXIST)
+ return -1;
+ *p = '/';
+ }
+ if (mkdir(tmp, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno != EEXIST)
+ return -1;
+ return 0;
+}
+
void
-printtimez(FILE *fp, const git_time *intime)
+printtimeformat(FILE *fp, const git_time *intime, const char *fmt)
{
struct tm *intm;
time_t t;
- int offset, hours, minutes;
- char sign, out[32];
-
- offset = intime->offset;
- if (offset < 0) {
- sign = '-';
- offset = -offset;
- } else {
- sign = '+';
- }
-
- hours = offset / 60;
- minutes = offset % 60;
+ char out[32];
t = (time_t) intime->time + (intime->offset * 60);
-
intm = gmtime(&t);
- strftime(out, sizeof(out), "%Y-%m-%dT%H:%M:%SZ", intm);
+ strftime(out, sizeof(out), fmt, intm);
fputs(out, fp);
}
void
-printtime(FILE *fp, const git_time *intime)
+printtimez(FILE *fp, const git_time *intime)
{
- struct tm *intm;
- time_t t;
- int offset, hours, minutes;
- char sign, out[32];
+ printtimeformat(fp, intime, "%Y-%m-%dT%H:%M:%SZ");
+}
- offset = intime->offset;
- if (offset < 0) {
- sign = '-';
- offset = -offset;
- } else {
- sign = '+';
- }
+void
+printtime(FILE *fp, const git_time *intime)
+{
+ printtimeformat(fp, intime, "%a %b %e %T %Y");
+}
- hours = offset / 60;
- minutes = offset % 60;
+void
+printtimeshort(FILE *fp, const git_time *intime)
+{
+ printtimeformat(fp, intime, "%Y-%m-%d %H:%M");
+}
- t = (time_t) intime->time + (intime->offset * 60);
+int
+writeheader(FILE *fp)
+{
+ fputs("<!DOCTYPE HTML>"
+ "<html dir=\"ltr\" lang=\"en\">\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, name, strlen(name));
+ if (description[0])
+ fputs(" - ", fp);
+ xmlencode(fp, description, strlen(description));
+ fprintf(fp, "</title>\n<link rel=\"icon\" type=\"image/png\" href=\"%sfavicon.png\" />\n", relpath);
+ fprintf(fp, "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"%s Atom Feed\" href=\"%satom.xml\" />\n",
+ name, relpath);
+ fprintf(fp, "<link rel=\"stylesheet\" type=\"text/css\" href=\"%sstyle.css\" />\n", relpath);
+ fputs("</head>\n<body>\n<table><tr><td>", fp);
+ fprintf(fp, "<a href=\"../%s\"><img src=\"%slogo.png\" alt=\"\" width=\"32\" height=\"32\" /></a>",
+ relpath, relpath);
+ fputs("</td><td><h1>", fp);
+ xmlencode(fp, name, strlen(name));
+ fputs("</h1><span class=\"desc\">", fp);
+ xmlencode(fp, description, strlen(description));
+ fputs("</span></td></tr><tr><td></td><td>\n", fp);
+ fprintf(fp, "<a href=\"%slog.html\">Log</a> | ", relpath);
+ fprintf(fp, "<a href=\"%sfiles.html\">Files</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);
+ fputs("</td></tr></table>\n<hr/><div id=\"content\">\n", fp);
- intm = gmtime(&t);
- strftime(out, sizeof(out), "%a %b %e %T %Y", intm);
+ return 0;
+}
- fprintf(fp, "%s %c%02d%02d", out, sign, hours, minutes);
+int
+writefooter(FILE *fp)
+{
+ return !fputs("</div></body>\n</html>", fp);
}
void
-printcommit(FILE *fp, git_commit *commit)
+writeblobhtml(FILE *fp, const git_blob *blob)
{
- const git_signature *sig;
- char buf[GIT_OID_HEXSZ + 1];
- int i, count;
- const char *msg;
+ off_t i = 0;
+ size_t n = 1;
+ char *nfmt = "<a href=\"#l%d\" id=\"l%d\">%d</a>\n";
+ 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);
+
+ if (len) {
+ fprintf(fp, nfmt, n, n, n);
+ while (i < len - 1) {
+ if (s[i] == '\n') {
+ n++;
+ fprintf(fp, nfmt, n, n, n);
+ }
+ i++;
+ }
+ }
+
+ fputs("</pre></td><td><pre>\n", fp);
+ xmlencode(fp, s, (size_t)len);
+ fputs("</pre></td></tr></table>\n", fp);
+}
+void
+printcommit(FILE *fp, struct commitinfo *ci)
+{
/* TODO: show tag when commit has it */
- git_oid_tostr(buf, sizeof(buf), git_commit_id(commit));
fprintf(fp, "<b>commit</b> <a href=\"%scommit/%s.html\">%s</a>\n",
- relpath, buf, buf);
+ relpath, ci->oid, ci->oid);
- if (git_oid_tostr(buf, sizeof(buf), git_commit_parent_id(commit, 0)))
+ if (ci->parentoid[0])
fprintf(fp, "<b>parent</b> <a href=\"%scommit/%s.html\">%s</a>\n",
- relpath, buf, buf);
+ relpath, ci->parentoid, ci->parentoid);
+#if 0
if ((count = (int)git_commit_parentcount(commit)) > 1) {
fprintf(fp, "<b>Merge:</b>");
for (i = 0; i < count; i++) {
}
fputc('\n', fp);
}
- if ((sig = git_commit_author(commit)) != NULL) {
+#endif
+ if (ci->author) {
fprintf(fp, "<b>Author:</b> ");
- xmlencode(fp, sig->name, strlen(sig->name));
+ xmlencode(fp, ci->author->name, strlen(ci->author->name));
fprintf(fp, " <<a href=\"mailto:");
- xmlencode(fp, sig->email, strlen(sig->email));
+ xmlencode(fp, ci->author->email, strlen(ci->author->email));
fputs("\">", fp);
- xmlencode(fp, sig->email, strlen(sig->email));
+ xmlencode(fp, ci->author->email, strlen(ci->author->email));
fputs("</a>>\n<b>Date:</b> ", fp);
- printtime(fp, &sig->when);
+ printtime(fp, &(ci->author->when));
fputc('\n', fp);
}
fputc('\n', fp);
- if ((msg = git_commit_message(commit)))
- xmlencode(fp, msg, strlen(msg));
+ if (ci->msg)
+ xmlencode(fp, ci->msg, strlen(ci->msg));
+
fputc('\n', fp);
}
void
-printshowfile(git_commit *commit)
+printshowfile(struct commitinfo *ci)
{
- const git_diff_delta *delta = NULL;
- const git_diff_hunk *hunk = NULL;
- const git_diff_line *line = NULL;
- git_commit *parent = NULL;
- git_tree *commit_tree = NULL, *parent_tree = NULL;
- git_patch *patch = NULL;
- git_diff *diff = NULL;
- git_diff_stats *diffstats = NULL;
- git_buf diffstatsbuf;
- size_t i, j, k, ndeltas, nhunks = 0, nhunklines = 0;
- char buf[GIT_OID_HEXSZ + 1], path[PATH_MAX];
+ 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;
- int error;
-
- git_oid_tostr(buf, sizeof(buf), git_commit_id(commit));
- snprintf(path, sizeof(path), "commit/%s.html", buf);
- fp = efopen(path, "w+b");
+ size_t i, j, k;
+ char path[PATH_MAX];
- memset(&diffstatsbuf, 0, sizeof(diffstatsbuf));
+ 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);
- printcommit(fp, commit);
+ fputs("<pre>\n", fp);
+ printcommit(fp, ci);
- if ((error = git_commit_parent(&parent, commit, 0)))
- return;
- if ((error = git_commit_tree(&commit_tree, commit)))
- goto err;
- if ((error = git_commit_tree(&parent_tree, parent)))
- goto err;
- if ((error = git_diff_tree_to_tree(&diff, repo, parent_tree, commit_tree, NULL)))
- goto err;
+ memset(&statsbuf, 0, sizeof(statsbuf));
/* diff stat */
- if (!git_diff_get_stats(&diffstats, diff)) {
- if (!git_diff_stats_to_buf(&diffstatsbuf, diffstats,
+ if (ci->stats) {
+ if (!git_diff_stats_to_buf(&statsbuf, ci->stats,
GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_SHORT, 80)) {
- fprintf(fp, "<b>Diffstat:</b>\n");
- fputs(diffstatsbuf.ptr, fp);
+ if (statsbuf.ptr && statsbuf.ptr[0]) {
+ fprintf(fp, "<b>Diffstat:</b>\n");
+ fputs(statsbuf.ptr, fp);
+ }
}
- git_diff_stats_free(diffstats);
}
+
fputs("<hr/>", fp);
- ndeltas = git_diff_num_deltas(diff);
+ ndeltas = git_diff_num_deltas(ci->diff);
for (i = 0; i < ndeltas; i++) {
- if (git_patch_from_diff(&patch, diff, i)) {
+ if (git_patch_from_diff(&patch, ci->diff, i)) {
git_patch_free(patch);
break; /* TODO: handle error */
}
delta = git_patch_get_delta(patch);
- fprintf(fp, "<b>diff --git a/<a href=\"%sfile/%s\">%s</a> b/<a href=\"%sfile/%s\">%s</a></b>\n",
+ 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);
- /* TODO: add --- and +++ lines */
-
-#if 0
- switch (delta->flags) {
- case GIT_DIFF_FLAG_BINARY:
- /* "Binary files /dev/null and b/favicon.png differ" or so */
- continue; /* TODO: binary data */
- case GIT_DIFF_FLAG_NOT_BINARY: break;
- case GIT_DIFF_FLAG_VALID_ID: break; /* TODO: check */
- case GIT_DIFF_FLAG_EXISTS: break; /* TODO: check */
+ /* check binary data */
+ if (delta->flags & GIT_DIFF_FLAG_BINARY) {
+ fputs("Binary files differ\n", fp);
+ git_patch_free(patch);
+ continue;
}
-#endif
nhunks = git_patch_num_hunks(patch);
for (j = 0; j < nhunks; j++) {
if (git_patch_get_line_in_hunk(&line, patch, j, k))
break;
if (line->old_lineno == -1)
- fprintf(fp, "<span class=\"i\"><a href=\"#h%zu-%zu\" id=\"h%zu-%zu\">+",
+ fprintf(fp, "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"i\">+",
j, k, j, k);
else if (line->new_lineno == -1)
- fprintf(fp, "<span class=\"d\"><a href=\"#h%zu-%zu\" id=\"h%zu-%zu\">-",
+ fprintf(fp, "<a href=\"#h%zu-%zu\" id=\"h%zu-%zu\" class=\"d\">-",
j, k, j, k);
else
fputc(' ', fp);
xmlencode(fp, line->content, line->content_len);
if (line->old_lineno == -1 || line->new_lineno == -1)
- fputs("</a></span>", fp);
+ fputs("</a>", fp);
}
}
git_patch_free(patch);
}
- git_diff_free(diff);
+ git_buf_free(&statsbuf);
+ fputs( "</pre>\n", fp);
writefooter(fp);
fclose(fp);
return;
-
-err:
- git_buf_free(&diffstatsbuf);
- fclose(fp);
}
-int
+void
writelog(FILE *fp)
{
+ struct commitinfo *ci;
git_revwalk *w = NULL;
git_oid id;
- git_commit *commit = NULL;
- const git_signature *author;
- git_diff_stats *stats;
- git_tree *commit_tree = NULL, *parent_tree = NULL;
- git_commit *parent = NULL;
- git_diff *diff = NULL;
- size_t i, nfiles, ndel, nadd;
- const char *summary;
- char buf[GIT_OID_HEXSZ + 1];
- int error;
+ size_t len;
mkdir("commit", 0755);
git_revwalk_new(&w, repo);
git_revwalk_push_head(w);
+ git_revwalk_sorting(w, GIT_SORT_TIME);
+ git_revwalk_simplify_first_parent(w);
/* TODO: also make "expanded" log ? (with message body) */
- i = 0; /* DEBUG: to limit commits */
- fputs("<table><thead>\n<tr><td>Commit message</td><td>Author</td><td align=\"right\">Age</td>"
- "<td align=\"right\">Files</td><td align=\"right\">+</td><td align=\"right\">-</td></tr>\n</thead><tbody>\n", fp);
+ 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)) {
- /* DEBUG */
- if (i++ > 100)
- break;
-
relpath = "";
- if (git_commit_lookup(&commit, repo, &id))
- return 1; /* TODO: error */
- if ((error = git_commit_parent(&parent, commit, 0)))
- continue; /* TODO: handle error */
- if ((error = git_commit_tree(&commit_tree, commit)))
- continue; /* TODO: handle error */
- if ((error = git_commit_tree(&parent_tree, parent)))
- continue; /* TODO: handle error */
- if ((error = git_diff_tree_to_tree(&diff, repo, parent_tree, commit_tree, NULL)))
- continue; /* TODO: handle error */
- if (git_diff_get_stats(&stats, diff))
- continue; /* TODO: handle error */
-
- git_oid_tostr(buf, sizeof(buf), git_commit_id(commit));
-
- ndel = git_diff_stats_deletions(stats);
- nadd = git_diff_stats_insertions(stats);
- nfiles = git_diff_stats_files_changed(stats);
-
- /* TODO: show tag when commit has it */
-
- /* TODO: collect stats per author and make stats.html page */
- author = git_commit_author(commit);
- summary = git_commit_summary(commit);
+ if (!(ci = commitinfo_getbyoid(&id)))
+ break;
fputs("<tr><td>", fp);
- if (summary) {
- fprintf(fp, "<a href=\"%scommit/%s.html\">", relpath, buf);
- xmlencode(fp, summary, strlen(summary));
+ 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);
}
fputs("</td><td>", fp);
- if (author)
- xmlencode(fp, author->name, strlen(author->name));
- fputs("</td><td align=\"right\">", fp);
- printtime(fp, &author->when);
- fputs("</td><td align=\"right\">", fp);
- fprintf(fp, "%zu", nfiles);
- fputs("</td><td align=\"right\">", fp);
- fprintf(fp, "+%zu", nadd);
- fputs("</td><td align=\"right\">", fp);
- fprintf(fp, "-%zu", ndel);
+ 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(commit);
+ printshowfile(ci);
- git_diff_free(diff);
- git_commit_free(commit);
+ commitinfo_free(ci);
}
fprintf(fp, "</tbody></table>");
+
git_revwalk_free(w);
relpath = "";
-
- return 0;
}
void
-printcommitatom(FILE *fp, git_commit *commit)
+printcommitatom(FILE *fp, struct commitinfo *ci)
{
- const git_signature *sig;
- char buf[GIT_OID_HEXSZ + 1];
- int i, count;
- const char *msg, *summary;
-
fputs("<entry>\n", fp);
- /* TODO: show tag when commit has it */
- git_oid_tostr(buf, sizeof(buf), git_commit_id(commit));
- fprintf(fp, "<id>%s</id>\n", buf);
-
- sig = git_commit_author(commit);
-
- if (sig) {
+ fprintf(fp, "<id>%s</id>\n", ci->oid);
+ if (ci->author) {
fputs("<updated>", fp);
- printtimez(fp, &sig->when);
+ printtimez(fp, &(ci->author->when));
fputs("</updated>\n", fp);
}
-
- if ((summary = git_commit_summary(commit))) {
+ if (ci->summary) {
fputs("<title type=\"text\">", fp);
- xmlencode(fp, summary, strlen(summary));
+ xmlencode(fp, ci->summary, strlen(ci->summary));
fputs("</title>\n", fp);
}
fputs("<content type=\"text\">", fp);
- fprintf(fp, "commit %s\n", buf);
- if (git_oid_tostr(buf, sizeof(buf), git_commit_parent_id(commit, 0)))
- fprintf(fp, "parent %s\n", buf);
+ fprintf(fp, "commit %s\n", ci->oid);
+ if (ci->parentoid[0])
+ fprintf(fp, "parent %s\n", ci->parentoid);
+#if 0
if ((count = (int)git_commit_parentcount(commit)) > 1) {
fprintf(fp, "Merge:");
for (i = 0; i < count; i++) {
}
fputc('\n', fp);
}
+#endif
- if (sig) {
+ if (ci->author) {
fprintf(fp, "Author: ");
- xmlencode(fp, sig->name, strlen(sig->name));
+ xmlencode(fp, ci->author->name, strlen(ci->author->name));
fprintf(fp, " <");
- xmlencode(fp, sig->email, strlen(sig->email));
+ xmlencode(fp, ci->author->email, strlen(ci->author->email));
fprintf(fp, ">\nDate: ");
- printtime(fp, &sig->when);
+ printtime(fp, &(ci->author->when));
}
fputc('\n', fp);
- if ((msg = git_commit_message(commit)))
- xmlencode(fp, msg, strlen(msg));
+ if (ci->msg)
+ xmlencode(fp, ci->msg, strlen(ci->msg));
fputs("\n</content>\n", fp);
- if (sig) {
+ if (ci->author) {
fputs("<author><name>", fp);
- xmlencode(fp, sig->name, strlen(sig->name));
+ xmlencode(fp, ci->author->name, strlen(ci->author->name));
fputs("</name>\n<email>", fp);
- xmlencode(fp, sig->email, strlen(sig->email));
+ xmlencode(fp, ci->author->email, strlen(ci->author->email));
fputs("</email>\n</author>\n", fp);
}
fputs("</entry>\n", fp);
int
writeatom(FILE *fp)
{
+ struct commitinfo *ci;
git_revwalk *w = NULL;
git_oid id;
- git_commit *c = NULL;
size_t i, m = 100; /* max */
fputs("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\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++) {
- if (git_commit_lookup(&c, repo, &id))
- return 1; /* TODO: error */
- printcommitatom(fp, c);
- git_commit_free(c);
+ if (!(ci = commitinfo_getbyoid(&id)))
+ break;
+ printcommitatom(fp, ci);
+ commitinfo_free(ci);
}
git_revwalk_free(w);
}
int
-writefiles(FILE *fp)
+writeblob(git_object *obj, const char *filename, git_off_t filesize)
{
- git_index *index;
- const git_index_entry *entry;
- size_t count, i;
+ char fpath[PATH_MAX];
+ char tmp[PATH_MAX] = "";
+ char *p;
+ FILE *fp;
+
+ snprintf(fpath, sizeof(fpath), "file/%s.html", filename);
+ if (mkdirp(dirname(fpath)))
+ return 1;
+
+ p = fpath;
+ while (*p) {
+ if (*p == '/')
+ strlcat(tmp, "../", sizeof(tmp));
+ p++;
+ }
+ relpath = tmp;
- git_repository_index(&index, repo);
+ fp = efopen(fpath, "w");
+ writeheader(fp);
+ fputs("<p> ", fp);
+ xmlencode(fp, filename, strlen(filename));
+ fprintf(fp, " (%" PRIu32 "b)", filesize);
+ fputs("</p><hr/>", fp);
+
+ if (git_blob_is_binary((git_blob *)obj)) {
+ fprintf(fp, "<p>Binary file</p>\n");
+ } else {
+ writeblobhtml(fp, (git_blob *)obj);
+ if (ferror(fp))
+ err(1, "fwrite");
+ }
+ writefooter(fp);
+ fclose(fp);
- count = git_index_entrycount(index);
- fputs("<table><thead>\n<tr><td>Mode</td><td>Name</td><td align=\"right\">Size</td></tr>\n</thead><tbody>\n", fp);
+ relpath = "";
+ return 0;
+}
+
+int
+writefilestree(FILE *fp, git_tree *tree, const char *path)
+{
+ const git_tree_entry *entry = NULL;
+ const char *filename;
+ char filepath[PATH_MAX];
+ git_object *obj = NULL;
+ git_off_t filesize;
+ size_t count, i;
+ int ret;
+
+ count = git_tree_entrycount(tree);
for (i = 0; i < count; i++) {
- entry = git_index_get_byindex(index, i);
+ if (!(entry = git_tree_entry_byindex(tree, i)))
+ return -1;
+
+ filename = git_tree_entry_name(entry);
+ if (git_tree_entry_to_object(&obj, repo, entry))
+ return -1;
+ switch (git_object_type(obj)) {
+ case GIT_OBJ_BLOB:
+ break;
+ case GIT_OBJ_TREE:
+ ret = writefilestree(fp, (git_tree *)obj, filename);
+ git_object_free(obj);
+ if (ret)
+ return ret;
+ continue;
+ default:
+ git_object_free(obj);
+ continue;
+ }
+ if (path[0]) {
+ snprintf(filepath, sizeof(filepath), "%s/%s", path, filename);
+ filename = filepath;
+ }
+
+ filesize = git_blob_rawsize((git_blob *)obj);
+
fputs("<tr><td>", fp);
- fprintf(fp, "%u", entry->mode); /* TODO: fancy print, like: "-rw-r--r--" */
+ /* TODO: fancy print, like: "-rw-r--r--" */
+ fprintf(fp, "%u", git_tree_entry_filemode_raw(entry));
fprintf(fp, "</td><td><a href=\"%sfile/", relpath);
- xmlencode(fp, entry->path, strlen(entry->path));
- fputs("\">", fp);
- xmlencode(fp, entry->path, strlen(entry->path));
- fputs("</a></td><td align=\"right\">", fp);
- fprintf(fp, "%" PRIu64, entry->file_size);
+ xmlencode(fp, filename, strlen(filename));
+ fputs(".html\">", fp);
+ xmlencode(fp, filename, strlen(filename));
+ fputs("</a></td><td class=\"num\">", fp);
+ fprintf(fp, "%" PRIu32, filesize);
fputs("</td></tr>\n", fp);
+
+ writeblob(obj, filename, filesize);
}
- fputs("</tbody></table>", fp);
return 0;
}
-void
-writeblobhtml(FILE *fp, const git_blob *blob)
+int
+writefiles(FILE *fp)
{
- xmlencode(fp, git_blob_rawcontent(blob), (size_t)git_blob_rawsize(blob));
+ const git_oid *id;
+ git_tree *tree = NULL;
+ git_object *obj = NULL;
+ git_commit *commit = NULL;
+
+ fputs("<table id=\"files\"><thead>\n"
+ "<tr><td>Mode</td><td>Name</td><td>Size</td></tr>\n"
+ "</thead><tbody>\n", fp);
+
+ if (git_revparse_single(&obj, repo, "HEAD"))
+ return -1;
+ id = git_object_id(obj);
+ if (git_commit_lookup(&commit, repo, id))
+ return -1;
+ if (git_commit_tree(&tree, commit)) {
+ git_commit_free(commit);
+ return -1;
+ }
+ git_commit_free(commit);
+
+ writefilestree(fp, tree, "");
+
+ git_commit_free(commit);
+ git_tree_free(tree);
+
+ fputs("</tbody></table>", fp);
+
+ return 0;
}
int
git_libgit2_init();
- if ((status = git_repository_open(&repo, repodir)) < 0) {
+ 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;
/* read description or .git/description */
snprintf(path, sizeof(path), "%s%s%s",
repodir, repodir[strlen(repodir)] == '/' ? "" : "/", "description");
- if (!(fpread = fopen(path, "r+b"))) {
+ if (!(fpread = fopen(path, "r"))) {
snprintf(path, sizeof(path), "%s%s%s",
repodir, repodir[strlen(repodir)] == '/' ? "" : "/", ".git/description");
- fpread = fopen(path, "r+b");
+ fpread = fopen(path, "r");
}
if (fpread) {
if (!fgets(description, sizeof(description), fpread))
/* check LICENSE */
haslicense = !git_revparse_single(&obj, repo, "HEAD:LICENSE");
+ git_object_free(obj);
/* check README */
hasreadme = !git_revparse_single(&obj, repo, "HEAD:README");
+ git_object_free(obj);
- /* read LICENSE */
- if (!git_revparse_single(&obj, repo, "HEAD:LICENSE")) {
- fp = efopen("license.html", "w+b");
- writeheader(fp);
- writeblobhtml(fp, (git_blob *)obj);
- if (ferror(fp))
- err(1, "fwrite");
- writefooter(fp);
-
- fclose(fp);
- }
-
- /* read README */
- if (!git_revparse_single(&obj, repo, "HEAD:README")) {
- fp = efopen("readme.html", "w+b");
- writeheader(fp);
- writeblobhtml(fp, (git_blob *)obj);
- if (ferror(fp))
- err(1, "fwrite");
- writefooter(fp);
- fclose(fp);
- }
-
- fp = efopen("log.html", "w+b");
+ fp = efopen("log.html", "w");
writeheader(fp);
writelog(fp);
writefooter(fp);
fclose(fp);
- fp = efopen("files.html", "w+b");
+ fp = efopen("files.html", "w");
writeheader(fp);
writefiles(fp);
writefooter(fp);
fclose(fp);
/* Atom feed */
- fp = efopen("atom.xml", "w+b");
+ fp = efopen("atom.xml", "w");
writeatom(fp);
fclose(fp);
projects / stagit.git / blobdiff