ba39e1a14e6dfed2c2bc9352eb76106423a660eb
galt
Wed Mar 3 22:00:03 2010 -0800
added files view for user
diff --git git-reports.c git-reports.c
index 6eb52c3..7669bfa 100644
--- git-reports.c
+++ git-reports.c
@@ -45,6 +45,14 @@
struct files *files;
};
+
+struct comFile
+ {
+ struct comFile *next;
+ struct files *f;
+ struct commit *commit;
+ };
+
void usage(char *msg)
/* Explain usage and exit. */
{
@@ -264,8 +272,8 @@
}
-void doUser(char *u, struct commit *commits, int *saveUlc, int *saveUfc)
-/* process one user */
+void doUserCommits(char *u, struct commit *commits, int *saveUlc, int *saveUfc)
+/* process one user, commit-view */
{
@@ -430,6 +438,141 @@
}
+
+
+int slComFileCmp(const void *va, const void *vb)
+/* Compare two slNames. */
+{
+const struct comFile *a = *((struct comFile **)va);
+const struct comFile *b = *((struct comFile **)vb);
+int result = strcmp(a->f->path, b->f->path);
+if (result == 0)
+ result = a->commit->commitNumber - b->commit->commitNumber;
+return result;
+}
+
+
+void doUserFiles(char *u, struct commit *commits)
+/* process one user's files-view (or all if u is NULL) */
+{
+
+// TODO handle u is NULL
+// http://hgwdev.cse.ucsc.edu/cvs-reports/branch/user/galt/index-by-file.html
+char userPath[1024];
+safef(userPath, sizeof(userPath), "%s/%s/%s/%s/index-by-file.html", outDir, outPrefix, "user", u);
+
+FILE *h = mustOpen(userPath, "w");
+fprintf(h, "\n\n%s Files View\n\n\n", u);
+fprintf(h, "Files for %s
\n", u);
+
+//switch to grouped by file view, user index
+fprintf(h, "%s to %s (%s to %s) %s
\n", startTag, endTag, startDate, endDate, title);
+
+fprintf(h, "\n");
+
+
+int userLinesChanged = 0;
+int userFileCount = 0;
+
+char *cDiff = NULL, *cHtml = NULL, *fDiff = NULL, *fHtml = NULL;
+char *relativePath = NULL;
+
+struct commit *c = NULL;
+struct files *f = NULL;
+
+/*
+struct comFile
+ {
+ struct comFile *next;
+ struct files *f;
+ struct commit *commit;
+ }
+*/
+
+struct comFile *comFiles = NULL, *cf = NULL;
+
+// pre-filter for u if u is not NULL
+for(c = commits; c; c = c->next)
+ {
+ if (!u || (u && sameString(c->author, u)))
+ {
+ for(f = c->files; f; f = f->next)
+ {
+ AllocVar(cf);
+ cf->f = f;
+ cf->commit = c;
+ slAddHead(&comFiles, cf);
+ }
+ }
+ }
+// sort by file path, and then by reverse commitNumber
+// so that newest commit is on top.
+slSort(&comFiles, slComFileCmp);
+
+char *lastPath = "";
+
+for(cf = comFiles; cf; cf = cf->next)
+ {
+ c = cf->commit;
+ f = cf->f;
+
+ if (!sameString(f->path, lastPath))
+ {
+ lastPath = f->path;
+ fprintf(h, "%s\n", f->path);
+ }
+
+ char path[1024];
+
+ // context unified
+ safef(path, sizeof(path), "%s/%s%s", "context", f->path, c->commitId);
+ relativePath = cloneString(path);
+ safef(path, sizeof(path), "%s.html", relativePath);
+ cHtml = cloneString(path);
+ safef(path, sizeof(path), "%s.diff", relativePath);
+ cDiff = cloneString(path);
+
+
+
+ // full text (up to 10,000 lines)
+ freeMem(relativePath);
+ safef(path, sizeof(path), "%s/%s%s", "full", f->path, c->commitId);
+ relativePath = cloneString(path);
+ safef(path, sizeof(path), "%s.html", relativePath);
+ fHtml = cloneString(path);
+ safef(path, sizeof(path), "%s.diff", relativePath);
+ fDiff = cloneString(path);
+
+ // make file view links
+ fprintf(h, " %s - lines changed %d, "
+ "context: html, text, "
+ "full: html, text\n"
+ , c->commitId, f->linesChanged
+ , cHtml, cDiff, fHtml, fDiff);
+
+ //fprintf(h, " %s\n", c->commitId);
+ //fprintf(h, " %s\n", c->date);
+ fprintf(h, " %s\n", c->comment);
+
+ freeMem(relativePath);
+ freeMem(cDiff);
+ freeMem(cHtml);
+ freeMem(fDiff);
+ freeMem(fHtml);
+
+ userLinesChanged += f->linesChanged;
+ ++userFileCount;
+
+ fprintf(h, "\n");
+ }
+fprintf(h, "\n \n