update TODO

[stagit.git] / stagit.c

diff --git a/stagit.c b/stagit.c
index 434abb8fb359199fdc20b9881a455f8a09f62474..bb7cd738343b63541cc66c117d487aec9ab7f386 100644 (file)
--- a/stagit.c
+++ b/stagit.c
@@ -125,7 +125,7 @@ commitinfo_getstats(struct commitinfo *ci)
 
                delta = git_patch_get_delta(patch);
 
-               /* check binary data */
+               /* skip stats for binary data */
                if (delta->flags & GIT_DIFF_FLAG_BINARY)
                        continue;
 
@@ -297,19 +297,18 @@ printtime(FILE *fp, const git_time *intime)
 {
        struct tm *intm;
        time_t t;
-       int offset, sign = '+';
        char out[32];
 
-       offset = intime->offset * 60;
-       t = (time_t)intime->time + offset;
+       t = (time_t)intime->time + (intime->offset * 60);
        if (!(intm = gmtime(&t)))
                return;
        strftime(out, sizeof(out), "%a %b %e %H:%M:%S", intm);
-       if (offset < 0) {
-               offset = -offset;
-               sign = '-';
-       }
-       fprintf(fp, "%s %c%02d%02d", out, sign, offset / 60, offset % 60);
+       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
@@ -454,7 +453,7 @@ printshowfile(FILE *fp, struct commitinfo *ci)
            ci->ndeltas   > 1000   ||
            ci->addcount  > 100000 ||
            ci->delcount  > 100000) {
-               fprintf(fp, "(diff is too large, output suppressed)");
+               fputs("Diff is too large, output suppressed.\n", fp);
                return;
        }
 
@@ -462,7 +461,7 @@ printshowfile(FILE *fp, struct commitinfo *ci)
        fputs("<b>Diffstat:</b>\n<table>", fp);
        for (i = 0; i < ci->ndeltas; i++) {
                delta = git_patch_get_delta(ci->deltas[i]->patch);
-               fputs("<tr><td>", fp);
+               fprintf(fp, "<tr><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);
@@ -482,7 +481,7 @@ printshowfile(FILE *fp, struct commitinfo *ci)
                memset(&linestr, '+', add);
                memset(&linestr[add], '-', del);
 
-               fprintf(fp, "</td><td> | </td><td class=\"num\">%zu</td><td><span class=\"i\">",
+               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);
@@ -499,13 +498,13 @@ 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 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,
+               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);
 
                /* check binary data */
                if (delta->flags & GIT_DIFF_FLAG_BINARY) {
-                       fputs("Binary files differ\n", fp);
+                       fputs("Binary files differ.\n", fp);
                        continue;
                }
 
@@ -723,7 +722,6 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
        for (p = fpath, tmp[0] = '\0'; *p; p++) {
                if (*p == '/' && strlcat(tmp, "../", sizeof(tmp)) >= sizeof(tmp))
                        errx(1, "path truncated: '../%s'", tmp);
-               p++;
        }
        relpath = tmp;
 
@@ -735,7 +733,7 @@ writeblob(git_object *obj, const char *fpath, const char *filename, git_off_t fi
        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))
@@ -868,12 +866,10 @@ writefiles(FILE *fp, const git_oid *id, const char *branch)
              "<td>Mode</td><td>Name</td><td class=\"num\">Size</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, branch, "");
 
-err:
        fputs("</tbody></table>", fp);
 
        git_commit_free(commit);
@@ -944,9 +940,8 @@ writerefs(FILE *fp)
                        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;