Initial changes.

[stagit.git] / stagit.c

diff --git a/stagit.c b/stagit.c
index 8a7e7fc4d5c02bc6ba6bacb8e981058f8833b789..bb8b404f49b7f70be9aa27284183a904f396a383 100644 (file)
--- a/stagit.c
+++ b/stagit.c
@@ -3,12 +3,13 @@
 
 #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>
@@ -76,7 +77,7 @@ joinpath(char *buf, size_t bufsiz, const char *path, const char *path2)
 
        r = snprintf(buf, bufsiz, "%s%s%s",
                path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
-       if (r == -1 || (size_t)r >= bufsiz)
+       if (r < 0 || (size_t)r >= bufsiz)
                errx(1, "path truncated: '%s%s%s'",
                        path, path[0] && path[strlen(path) - 1] != '/' ? "/" : "", path2);
 }
@@ -122,7 +123,9 @@ commitinfo_getstats(struct commitinfo *ci)
 
        if (git_diff_find_init_options(&fopts, GIT_DIFF_FIND_OPTIONS_VERSION))
                goto err;
-       fopts.flags |= GIT_DIFF_FIND_RENAMES | GIT_DIFF_FIND_COPIES;
+       /* 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;
 
@@ -362,11 +365,11 @@ writeheader(FILE *fp, const char *title)
        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);
@@ -394,7 +397,7 @@ int
 writeblobhtml(FILE *fp, const git_blob *blob)
 {
        size_t n = 0, i, prev;
-       const char *nfmt = "<a href=\"#l%d\" class=\"line\" id=\"l%d\">%7d</a> ";
+       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);
 
@@ -407,6 +410,7 @@ writeblobhtml(FILE *fp, const git_blob *blob)
                        n++;
                        fprintf(fp, nfmt, n, n, n);
                        xmlencode(fp, &s[prev], i - prev + 1);
+                       fprintf(fp, "</span>");
                        prev = i + 1;
                }
                /* trailing data */
@@ -414,6 +418,7 @@ writeblobhtml(FILE *fp, const git_blob *blob)
                        n++;
                        fprintf(fp, nfmt, n, n, n);
                        xmlencode(fp, &s[prev], len - prev);
+                       fprintf(fp, "</span>");
                }
        }
 
@@ -459,6 +464,7 @@ printshowfile(FILE *fp, struct commitinfo *ci)
        git_patch *patch;
        size_t nhunks, nhunklines, changed, add, del, total, i, j, k;
        char linestr[80];
+       int c;
 
        printcommit(fp, ci);
 
@@ -478,7 +484,21 @@ printshowfile(FILE *fp, struct commitinfo *ci)
        for (i = 0; i < ci->ndeltas; i++) {
                delta = git_patch_get_delta(ci->deltas[i]->patch);
 
-               fprintf(fp, "<tr><td><a href=\"#h%zu\">", i);
+               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);
+
+               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(" -&gt; ", fp);
@@ -515,9 +535,15 @@ printshowfile(FILE *fp, struct commitinfo *ci)
        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 id=\"h%zu\" href=\"%sfile/%s.html\">%s</a> b/<a href=\"%sfile/%s.html\">%s</a></b>\n",
-                       i, 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) {
@@ -589,7 +615,6 @@ writelog(FILE *fp, const git_oid *oid)
 
        git_revwalk_new(&w, repo);
        git_revwalk_push(w, oid);
-       git_revwalk_sorting(w, GIT_SORT_TIME);
        git_revwalk_simplify_first_parent(w);
 
        while (!git_revwalk_next(&id, w)) {
@@ -600,7 +625,7 @@ writelog(FILE *fp, const git_oid *oid)
 
                git_oid_tostr(oidstr, sizeof(oidstr), &id);
                r = snprintf(path, sizeof(path), "commit/%s.html", oidstr);
-               if (r == -1 || (size_t)r >= sizeof(path))
+               if (r < 0 || (size_t)r >= sizeof(path))
                        errx(1, "path truncated: 'commit/%s.html'", oidstr);
                r = access(path, F_OK);
 
@@ -671,11 +696,11 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
                xmlencode(fp, ci->summary, strlen(ci->summary));
                fputs("</title>\n", fp);
        }
-       fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/%s.html\" />",
+       fprintf(fp, "<link rel=\"alternate\" type=\"text/html\" href=\"commit/%s.html\" />\n",
                ci->oid);
 
        if (ci->author) {
-               fputs("<author><name>", fp);
+               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));
@@ -719,7 +744,6 @@ writeatom(FILE *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++) {
@@ -841,7 +865,7 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
 
                r = snprintf(filepath, sizeof(filepath), "file/%s.html",
                         entrypath);
-               if (r == -1 || (size_t)r >= sizeof(filepath))
+               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)) {
@@ -866,7 +890,9 @@ writefilestree(FILE *fp, git_tree *tree, const char *path)
 
                        fputs("<tr><td>", fp);
                        fputs(filemode(git_tree_entry_filemode(entry)), fp);
-                       fprintf(fp, "</td><td><a href=\"%s%s\">", relpath, filepath);
+                       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)
@@ -1037,7 +1063,6 @@ 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], repodirabs[PATH_MAX + 1], *p;
@@ -1073,6 +1098,13 @@ main(int argc, char *argv[])
        git_libgit2_init();
 
 #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");
@@ -1084,8 +1116,7 @@ main(int argc, char *argv[])
 
        if (git_repository_open_ext(&repo, repodir,
                GIT_REPOSITORY_OPEN_NO_SEARCH, NULL) < 0) {
-               e = giterr_last();
-               fprintf(stderr, "%s: %s\n", argv[0], e->message);
+               fprintf(stderr, "%s: cannot open repository\n", argv[0]);
                return 1;
        }