X-Git-Url: https://git.armaanb.net/?p=stagit.git;a=blobdiff_plain;f=stagit.c;h=a6cfebc043b62d54695612a0482ff097a061fb2e;hp=86c39200c2cf50340e098b5f125e6d1d42250734;hb=028c7526bac907c91ef8afc6c3ae0f6d424bd229;hpb=187daac42007c87e6af9317a20446e3b81907f63

diff --git a/stagit.c b/stagit.c
index 86c3920..a6cfebc 100644
--- a/stagit.c
+++ b/stagit.c
@@ -56,12 +56,16 @@ static char *name = "";
 static char *strippedname = "";
 static char description[255];
 static char cloneurl[1024];
-static int haslicense, hasreadme, hassubmodules;
+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 char lastoidstr[GIT_OID_HEXSZ + 2]; /* id + newline + NUL byte */
 static FILE *rcachefp, *wcachefp;
 static const char *cachefile;
 
@@ -72,7 +76,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);
 }
@@ -92,6 +96,7 @@ 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;
@@ -109,10 +114,20 @@ commitinfo_getstats(struct commitinfo *ci)
 	}
 
 	git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION);
-	opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH;
+	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");
@@ -120,6 +135,7 @@ commitinfo_getstats(struct commitinfo *ci)
 	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;
@@ -358,12 +374,15 @@ writeheader(FILE *fp, const char *title)
 	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 (hassubmodules)
-		fprintf(fp, " | <a href=\"%sfile/.gitmodules.html\">Submodules</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);
 }
 
@@ -442,6 +461,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);
 
@@ -460,7 +480,22 @@ 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);
-		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);
@@ -497,9 +532,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) {
@@ -571,7 +612,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)) {
@@ -582,7 +622,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);
 
@@ -602,6 +642,10 @@ writelog(FILE *fp, const git_oid *oid)
 		} 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);
 		}
 
 		if (cachefile)
@@ -697,7 +741,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++) {
@@ -819,7 +862,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)) {
@@ -844,7 +887,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)
@@ -1015,7 +1060,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;
@@ -1038,10 +1082,7 @@ main(int argc, char *argv[])
 			errno = 0;
 			nlogcommits = strtoll(argv[++i], &p, 10);
 			if (argv[i][0] == '\0' || *p != '\0' ||
-			    nlogcommits <= 0)
-				usage(argv[0]);
-			if (errno == ERANGE && (nlogcommits == LLONG_MAX ||
-			    nlogcommits == LLONG_MIN))
+			    nlogcommits <= 0 || errno)
 				usage(argv[0]);
 		}
 	}
@@ -1065,8 +1106,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;
 	}
 
@@ -1114,17 +1154,24 @@ main(int argc, char *argv[])
 	}
 
 	/* check LICENSE */
-	haslicense = (!git_revparse_single(&obj, repo, "HEAD:LICENSE") &&
-		git_object_type(obj) == GIT_OBJ_BLOB);
-	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") &&
-		git_object_type(obj) == GIT_OBJ_BLOB);
-	git_object_free(obj);
+	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);
+	}
 
-	hassubmodules = (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") &&
-		git_object_type(obj) == GIT_OBJ_BLOB);
+	if (!git_revparse_single(&obj, repo, "HEAD:.gitmodules") &&
+	    git_object_type(obj) == GIT_OBJ_BLOB)
+		submodules = ".gitmodules";
 	git_object_free(obj);
 
 	/* log for HEAD */