isort branches and tags by time (descending) and add tags.xml for releases - stagit-gemini - Stagit for gemini protocol Openbsd Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/stagit-gemini.git URL:git://thinkerwim.org/stagit-gemini.git thinkerwim.org 70 1Log /git/stagit-gemini/log.gph thinkerwim.org 70 1Files /git/stagit-gemini/files.gph thinkerwim.org 70 1Refs /git/stagit-gemini/refs.gph thinkerwim.org 70 1README /git/stagit-gemini/file/README.gph thinkerwim.org 70 1LICENSE /git/stagit-gemini/file/LICENSE.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 4dded587b089f4c2fda9694a908157a549c6cc1a /git/stagit-gemini/commit/4dded587b089f4c2fda9694a908157a549c6cc1a.gph thinkerwim.org 70 1parent de86bac090f236501ee9f211d2bd55aa39c38ac7 /git/stagit-gemini/commit/de86bac090f236501ee9f211d2bd55aa39c38ac7.gph thinkerwim.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org thinkerwim.org 70 iDate: Sun, 19 Jul 2020 18:56:10 +0200 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 isort branches and tags by time (descending) and add tags.xml for releases Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iSimilar to the recent changes to stagit (HTML version). Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.1 | 6 ++++-- Err thinkerwim.openbsd.amsterdam 70 i M stagit-gopher.c | 294 ++++++++++++++++++++----------- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i2 files changed, 192 insertions(+), 108 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher.1 b/stagit-gopher.1 /git/stagit-gemini/file/stagit-gopher.1.gph thinkerwim.org 70 i@@ -1,4 +1,4 @@ Err thinkerwim.openbsd.amsterdam 70 i-.Dd February 6, 2019 Err thinkerwim.openbsd.amsterdam 70 i+.Dd July 19, 2020 Err thinkerwim.openbsd.amsterdam 70 i .Dt STAGIT-GOPHER 1 Err thinkerwim.openbsd.amsterdam 70 i .Os Err thinkerwim.openbsd.amsterdam 70 i .Sh NAME Err thinkerwim.openbsd.amsterdam 70 i@@ -46,7 +46,9 @@ cannot be used at the same time. Err thinkerwim.openbsd.amsterdam 70 i The following files will be written: Err thinkerwim.openbsd.amsterdam 70 i .Bl -tag -width Ds Err thinkerwim.openbsd.amsterdam 70 i .It atom.xml Err thinkerwim.openbsd.amsterdam 70 i-Atom XML feed Err thinkerwim.openbsd.amsterdam 70 i+Atom XML feed of the last 100 commits. Err thinkerwim.openbsd.amsterdam 70 i+.It tags.xml Err thinkerwim.openbsd.amsterdam 70 i+Atom XML feed of the tags. Err thinkerwim.openbsd.amsterdam 70 i .It files.gph Err thinkerwim.openbsd.amsterdam 70 i List of files in the latest tree, linking to the file. Err thinkerwim.openbsd.amsterdam 70 i .It log.gph Err thinkerwim.openbsd.amsterdam 70 1diff --git a/stagit-gopher.c b/stagit-gopher.c /git/stagit-gemini/file/stagit-gopher.c.gph thinkerwim.org 70 i@@ -50,6 +50,12 @@ struct commitinfo { Err thinkerwim.openbsd.amsterdam 70 i size_t ndeltas; Err thinkerwim.openbsd.amsterdam 70 i }; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i+/* reference and associated data for sorting */ Err thinkerwim.openbsd.amsterdam 70 i+struct referenceinfo { Err thinkerwim.openbsd.amsterdam 70 i+ struct git_reference *ref; Err thinkerwim.openbsd.amsterdam 70 i+ struct commitinfo *ci; Err thinkerwim.openbsd.amsterdam 70 i+}; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i static git_repository *repo; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i static const char *relpath = ""; Err thinkerwim.openbsd.amsterdam 70 i@@ -288,6 +294,104 @@ err: Err thinkerwim.openbsd.amsterdam 70 i return NULL; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i+int Err thinkerwim.openbsd.amsterdam 70 i+refs_cmp(const void *v1, const void *v2) Err thinkerwim.openbsd.amsterdam 70 i+{ Err thinkerwim.openbsd.amsterdam 70 i+ struct referenceinfo *r1 = (struct referenceinfo *)v1; Err thinkerwim.openbsd.amsterdam 70 i+ struct referenceinfo *r2 = (struct referenceinfo *)v2; Err thinkerwim.openbsd.amsterdam 70 i+ time_t t1, t2; Err thinkerwim.openbsd.amsterdam 70 i+ int r; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ if ((r = git_reference_is_tag(r1->ref) - git_reference_is_tag(r2->ref))) Err thinkerwim.openbsd.amsterdam 70 i+ return r; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ t1 = r1->ci->author ? r1->ci->author->when.time : 0; Err thinkerwim.openbsd.amsterdam 70 i+ t2 = r2->ci->author ? r2->ci->author->when.time : 0; Err thinkerwim.openbsd.amsterdam 70 i+ if ((r = t1 > t2 ? -1 : (t1 == t2 ? 0 : 1))) Err thinkerwim.openbsd.amsterdam 70 i+ return r; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ return strcmp(git_reference_shorthand(r1->ref), Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_shorthand(r2->ref)); Err thinkerwim.openbsd.amsterdam 70 i+} Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+int Err thinkerwim.openbsd.amsterdam 70 i+getrefs(struct referenceinfo **pris, size_t *prefcount) Err thinkerwim.openbsd.amsterdam 70 i+{ Err thinkerwim.openbsd.amsterdam 70 i+ struct referenceinfo *ris = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ struct commitinfo *ci = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_iterator *it = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ const git_oid *id = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ git_object *obj = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ git_reference *dref = NULL, *r, *ref = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ size_t i, refcount; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ *pris = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ *prefcount = 0; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ if (git_reference_iterator_new(&it, repo)) Err thinkerwim.openbsd.amsterdam 70 i+ return -1; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ for (refcount = 0; !git_reference_next(&ref, it); ) { Err thinkerwim.openbsd.amsterdam 70 i+ if (!git_reference_is_branch(ref) && !git_reference_is_tag(ref)) { Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_free(ref); Err thinkerwim.openbsd.amsterdam 70 i+ ref = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ continue; Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ switch (git_reference_type(ref)) { Err thinkerwim.openbsd.amsterdam 70 i+ case GIT_REF_SYMBOLIC: Err thinkerwim.openbsd.amsterdam 70 i+ if (git_reference_resolve(&dref, ref)) Err thinkerwim.openbsd.amsterdam 70 i+ goto err; Err thinkerwim.openbsd.amsterdam 70 i+ r = dref; Err thinkerwim.openbsd.amsterdam 70 i+ break; Err thinkerwim.openbsd.amsterdam 70 i+ case GIT_REF_OID: Err thinkerwim.openbsd.amsterdam 70 i+ r = ref; Err thinkerwim.openbsd.amsterdam 70 i+ break; Err thinkerwim.openbsd.amsterdam 70 i+ default: Err thinkerwim.openbsd.amsterdam 70 i+ continue; Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ if (!git_reference_target(r) || Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_peel(&obj, r, GIT_OBJ_ANY)) Err thinkerwim.openbsd.amsterdam 70 i+ goto err; Err thinkerwim.openbsd.amsterdam 70 i+ if (!(id = git_object_id(obj))) Err thinkerwim.openbsd.amsterdam 70 i+ goto err; Err thinkerwim.openbsd.amsterdam 70 i+ if (!(ci = commitinfo_getbyoid(id))) Err thinkerwim.openbsd.amsterdam 70 i+ break; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ if (!(ris = reallocarray(ris, refcount + 1, sizeof(*ris)))) Err thinkerwim.openbsd.amsterdam 70 i+ err(1, "realloc"); Err thinkerwim.openbsd.amsterdam 70 i+ ris[refcount].ci = ci; Err thinkerwim.openbsd.amsterdam 70 i+ ris[refcount].ref = r; Err thinkerwim.openbsd.amsterdam 70 i+ refcount++; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i+ obj = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_free(dref); Err thinkerwim.openbsd.amsterdam 70 i+ dref = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_iterator_free(it); Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ /* sort by type, date then shorthand name */ Err thinkerwim.openbsd.amsterdam 70 i+ qsort(ris, refcount, sizeof(*ris), refs_cmp); Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ *pris = ris; Err thinkerwim.openbsd.amsterdam 70 i+ *prefcount = refcount; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ return 0; Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+err: Err thinkerwim.openbsd.amsterdam 70 i+ git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_free(dref); Err thinkerwim.openbsd.amsterdam 70 i+ commitinfo_free(ci); Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; i < refcount; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ commitinfo_free(ris[i].ci); Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_free(ris[i].ref); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ free(ris); Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ return -1; Err thinkerwim.openbsd.amsterdam 70 i+} Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i FILE * Err thinkerwim.openbsd.amsterdam 70 i efopen(const char *name, const char *flags) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i@@ -760,7 +864,7 @@ err: Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i void Err thinkerwim.openbsd.amsterdam 70 i-printcommitatom(FILE *fp, struct commitinfo *ci) Err thinkerwim.openbsd.amsterdam 70 i+printcommitatom(FILE *fp, struct commitinfo *ci, const char *tag) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -777,6 +881,11 @@ printcommitatom(FILE *fp, struct commitinfo *ci) Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i if (ci->summary) { Err thinkerwim.openbsd.amsterdam 70 i fputs("", fp); Err thinkerwim.openbsd.amsterdam 70 i+ if (tag) { Err thinkerwim.openbsd.amsterdam 70 i+ fputs("[", fp); Err thinkerwim.openbsd.amsterdam 70 i+ xmlencode(fp, tag, strlen(tag)); Err thinkerwim.openbsd.amsterdam 70 i+ fputs("] ", fp); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i xmlencode(fp, ci->summary, strlen(ci->summary)); Err thinkerwim.openbsd.amsterdam 70 i fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -812,8 +921,10 @@ printcommitatom(FILE *fp, struct commitinfo *ci) Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i int Err thinkerwim.openbsd.amsterdam 70 i-writeatom(FILE *fp) Err thinkerwim.openbsd.amsterdam 70 i+writeatom(FILE *fp, int all) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i+ struct referenceinfo *ris = NULL; Err thinkerwim.openbsd.amsterdam 70 i+ size_t refcount = 0; Err thinkerwim.openbsd.amsterdam 70 i struct commitinfo *ci; Err thinkerwim.openbsd.amsterdam 70 i git_revwalk *w = NULL; Err thinkerwim.openbsd.amsterdam 70 i git_oid id; Err thinkerwim.openbsd.amsterdam 70 i@@ -826,17 +937,34 @@ writeatom(FILE *fp) Err thinkerwim.openbsd.amsterdam 70 i xmlencode(fp, description, strlen(description)); Err thinkerwim.openbsd.amsterdam 70 i fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- git_revwalk_new(&w, repo); Err thinkerwim.openbsd.amsterdam 70 i- git_revwalk_push_head(w); Err thinkerwim.openbsd.amsterdam 70 i- git_revwalk_simplify_first_parent(w); Err thinkerwim.openbsd.amsterdam 70 i+ /* all commits or only tags? */ Err thinkerwim.openbsd.amsterdam 70 i+ if (all) { Err thinkerwim.openbsd.amsterdam 70 i+ git_revwalk_new(&w, repo); Err thinkerwim.openbsd.amsterdam 70 i+ git_revwalk_push_head(w); Err thinkerwim.openbsd.amsterdam 70 i+ git_revwalk_simplify_first_parent(w); Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; i < m && !git_revwalk_next(&id, w); i++) { Err thinkerwim.openbsd.amsterdam 70 i+ if (!(ci = commitinfo_getbyoid(&id))) Err thinkerwim.openbsd.amsterdam 70 i+ break; Err thinkerwim.openbsd.amsterdam 70 i+ printcommitatom(fp, ci, ""); Err thinkerwim.openbsd.amsterdam 70 i+ commitinfo_free(ci); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ git_revwalk_free(w); Err thinkerwim.openbsd.amsterdam 70 i+ } else { Err thinkerwim.openbsd.amsterdam 70 i+ /* references: tags */ Err thinkerwim.openbsd.amsterdam 70 i+ if (getrefs(&ris, &refcount) != -1) { Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; i < refcount; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ if (!git_reference_is_tag(ris[i].ref)) Err thinkerwim.openbsd.amsterdam 70 i+ continue; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; i < m && !git_revwalk_next(&id, w); i++) { Err thinkerwim.openbsd.amsterdam 70 i- if (!(ci = commitinfo_getbyoid(&id))) Err thinkerwim.openbsd.amsterdam 70 i- break; Err thinkerwim.openbsd.amsterdam 70 i- printcommitatom(fp, ci); Err thinkerwim.openbsd.amsterdam 70 i- commitinfo_free(ci); Err thinkerwim.openbsd.amsterdam 70 i+ printcommitatom(fp, ris[i].ci, Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_shorthand(ris[i].ref)); Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ commitinfo_free(ris[i].ci); Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_free(ris[i].ref); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ free(ris); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i- git_revwalk_free(w); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -1012,115 +1140,63 @@ writefiles(FILE *fp, const git_oid *id) Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i int Err thinkerwim.openbsd.amsterdam 70 i-refs_cmp(const void *v1, const void *v2) Err thinkerwim.openbsd.amsterdam 70 i-{ Err thinkerwim.openbsd.amsterdam 70 i- git_reference *r1 = (*(git_reference **)v1); Err thinkerwim.openbsd.amsterdam 70 i- git_reference *r2 = (*(git_reference **)v2); Err thinkerwim.openbsd.amsterdam 70 i- int r; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- if ((r = git_reference_is_branch(r1) - git_reference_is_branch(r2))) Err thinkerwim.openbsd.amsterdam 70 i- return r; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- return strcmp(git_reference_shorthand(r1), Err thinkerwim.openbsd.amsterdam 70 i- git_reference_shorthand(r2)); Err thinkerwim.openbsd.amsterdam 70 i-} Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i-int Err thinkerwim.openbsd.amsterdam 70 i writerefs(FILE *fp) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i+ struct referenceinfo *ris = NULL; Err thinkerwim.openbsd.amsterdam 70 i struct commitinfo *ci; Err thinkerwim.openbsd.amsterdam 70 i- const git_oid *id = NULL; Err thinkerwim.openbsd.amsterdam 70 i- git_object *obj = NULL; Err thinkerwim.openbsd.amsterdam 70 i- git_reference *dref = NULL, *r, *ref = NULL; Err thinkerwim.openbsd.amsterdam 70 i- git_reference_iterator *it = NULL; Err thinkerwim.openbsd.amsterdam 70 i- git_reference **refs = NULL; Err thinkerwim.openbsd.amsterdam 70 i size_t count, i, j, refcount; Err thinkerwim.openbsd.amsterdam 70 i const char *titles[] = { "Branches", "Tags" }; Err thinkerwim.openbsd.amsterdam 70 i- const char *name; Err thinkerwim.openbsd.amsterdam 70 i+ const char *ids[] = { "branches", "tags" }; Err thinkerwim.openbsd.amsterdam 70 i+ const char *s; Err thinkerwim.openbsd.amsterdam 70 i char buf[256]; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- if (git_reference_iterator_new(&it, repo)) Err thinkerwim.openbsd.amsterdam 70 i+ if (getrefs(&ris, &refcount) == -1) Err thinkerwim.openbsd.amsterdam 70 i return -1; Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- for (refcount = 0; !git_reference_next(&ref, it); refcount++) { Err thinkerwim.openbsd.amsterdam 70 i- if (!(refs = reallocarray(refs, refcount + 1, sizeof(git_reference *)))) Err thinkerwim.openbsd.amsterdam 70 i- err(1, "realloc"); Err thinkerwim.openbsd.amsterdam 70 i- refs[refcount] = ref; Err thinkerwim.openbsd.amsterdam 70 i- } Err thinkerwim.openbsd.amsterdam 70 i- git_reference_iterator_free(it); Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- /* sort by type then shorthand name */ Err thinkerwim.openbsd.amsterdam 70 i- qsort(refs, refcount, sizeof(git_reference *), refs_cmp); Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- for (j = 0; j < 2; j++) { Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0, count = 0; i < refcount; i++) { Err thinkerwim.openbsd.amsterdam 70 i- if (!(git_reference_is_branch(refs[i]) && j == 0) && Err thinkerwim.openbsd.amsterdam 70 i- !(git_reference_is_tag(refs[i]) && j == 1)) Err thinkerwim.openbsd.amsterdam 70 i- continue; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- switch (git_reference_type(refs[i])) { Err thinkerwim.openbsd.amsterdam 70 i- case GIT_REF_SYMBOLIC: Err thinkerwim.openbsd.amsterdam 70 i- if (git_reference_resolve(&dref, refs[i])) Err thinkerwim.openbsd.amsterdam 70 i- goto err; Err thinkerwim.openbsd.amsterdam 70 i- r = dref; Err thinkerwim.openbsd.amsterdam 70 i- break; Err thinkerwim.openbsd.amsterdam 70 i- case GIT_REF_OID: Err thinkerwim.openbsd.amsterdam 70 i- r = refs[i]; Err thinkerwim.openbsd.amsterdam 70 i- break; Err thinkerwim.openbsd.amsterdam 70 i- default: Err thinkerwim.openbsd.amsterdam 70 i- continue; Err thinkerwim.openbsd.amsterdam 70 i- } Err thinkerwim.openbsd.amsterdam 70 i- if (!git_reference_target(r) || Err thinkerwim.openbsd.amsterdam 70 i- git_reference_peel(&obj, r, GIT_OBJ_ANY)) Err thinkerwim.openbsd.amsterdam 70 i- goto err; Err thinkerwim.openbsd.amsterdam 70 i- if (!(id = git_object_id(obj))) Err thinkerwim.openbsd.amsterdam 70 i- goto err; Err thinkerwim.openbsd.amsterdam 70 i- if (!(ci = commitinfo_getbyoid(id))) Err thinkerwim.openbsd.amsterdam 70 i- break; Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- /* print header if it has an entry (first). */ Err thinkerwim.openbsd.amsterdam 70 i- if (++count == 1) { Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, "%s\n", titles[j]); Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, " %-32.32s", "Name"); Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, " %-16.16s", "Last commit date"); Err thinkerwim.openbsd.amsterdam 70 i- fprintf(fp, " %s\n", "Author"); Err thinkerwim.openbsd.amsterdam 70 i- } Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0, j = 0, count = 0; i < refcount; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ if (j == 0 && git_reference_is_tag(ris[i].ref)) { Err thinkerwim.openbsd.amsterdam 70 i+ /* table footer */ Err thinkerwim.openbsd.amsterdam 70 i+ if (count) Err thinkerwim.openbsd.amsterdam 70 i+ fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i+ count = 0; Err thinkerwim.openbsd.amsterdam 70 i+ j = 1; Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- name = git_reference_shorthand(r); Err thinkerwim.openbsd.amsterdam 70 i+ /* print header if it has an entry (first). */ Err thinkerwim.openbsd.amsterdam 70 i+ if (++count == 1) { Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, "%s\n", titles[j]); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, " %-32.32s", "Name"); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, " %-16.16s", "Last commit date"); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, " %s\n", "Author"); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i- fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i- utf8pad(buf, sizeof(buf), name, 32, ' '); Err thinkerwim.openbsd.amsterdam 70 i+ ci = ris[i].ci; Err thinkerwim.openbsd.amsterdam 70 i+ s = git_reference_shorthand(ris[i].ref); Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i+ utf8pad(buf, sizeof(buf), s, 32, ' '); Err thinkerwim.openbsd.amsterdam 70 i+ gphlink(fp, buf, strlen(buf)); Err thinkerwim.openbsd.amsterdam 70 i+ fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i+ if (ci->author) Err thinkerwim.openbsd.amsterdam 70 i+ printtimeshort(fp, &(ci->author->when)); Err thinkerwim.openbsd.amsterdam 70 i+ else Err thinkerwim.openbsd.amsterdam 70 i+ fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i+ fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i+ if (ci->author) { Err thinkerwim.openbsd.amsterdam 70 i+ utf8pad(buf, sizeof(buf), ci->author->name, 25, '\0'); Err thinkerwim.openbsd.amsterdam 70 i gphlink(fp, buf, strlen(buf)); Err thinkerwim.openbsd.amsterdam 70 i- fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i- if (ci->author) Err thinkerwim.openbsd.amsterdam 70 i- printtimeshort(fp, &(ci->author->when)); Err thinkerwim.openbsd.amsterdam 70 i- else Err thinkerwim.openbsd.amsterdam 70 i- fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i- fputs(" ", fp); Err thinkerwim.openbsd.amsterdam 70 i- if (ci->author) { Err thinkerwim.openbsd.amsterdam 70 i- utf8pad(buf, sizeof(buf), ci->author->name, 25, '\0'); Err thinkerwim.openbsd.amsterdam 70 i- gphlink(fp, buf, strlen(buf)); Err thinkerwim.openbsd.amsterdam 70 i- } Err thinkerwim.openbsd.amsterdam 70 i- fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- commitinfo_free(ci); Err thinkerwim.openbsd.amsterdam 70 i- git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i- obj = NULL; Err thinkerwim.openbsd.amsterdam 70 i- git_reference_free(dref); Err thinkerwim.openbsd.amsterdam 70 i- dref = NULL; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i- /* table footer */ Err thinkerwim.openbsd.amsterdam 70 i- if (count) Err thinkerwim.openbsd.amsterdam 70 i- fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i+ fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i+ /* table footer */ Err thinkerwim.openbsd.amsterdam 70 i+ if (count) Err thinkerwim.openbsd.amsterdam 70 i+ fputs("\n", fp); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i-err: Err thinkerwim.openbsd.amsterdam 70 i- git_object_free(obj); Err thinkerwim.openbsd.amsterdam 70 i- git_reference_free(dref); Err thinkerwim.openbsd.amsterdam 70 i- Err thinkerwim.openbsd.amsterdam 70 i- for (i = 0; i < refcount; i++) Err thinkerwim.openbsd.amsterdam 70 i- git_reference_free(refs[i]); Err thinkerwim.openbsd.amsterdam 70 i- free(refs); Err thinkerwim.openbsd.amsterdam 70 i+ for (i = 0; i < refcount; i++) { Err thinkerwim.openbsd.amsterdam 70 i+ commitinfo_free(ris[i].ci); Err thinkerwim.openbsd.amsterdam 70 i+ git_reference_free(ris[i].ref); Err thinkerwim.openbsd.amsterdam 70 i+ } Err thinkerwim.openbsd.amsterdam 70 i+ free(ris); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i return 0; Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -1311,6 +1387,7 @@ main(int argc, char *argv[]) Err thinkerwim.openbsd.amsterdam 70 i writelog(fp, head); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i fprintf(fp, "\n[0|Atom feed|%s/atom.xml|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i+ fprintf(fp, "\n[0|Atom feed (tags)|%s/tags.xml|server|port]\n", relpath); Err thinkerwim.openbsd.amsterdam 70 i writefooter(fp); Err thinkerwim.openbsd.amsterdam 70 i fclose(fp); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i@@ -1331,7 +1408,12 @@ main(int argc, char *argv[]) Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* Atom feed */ Err thinkerwim.openbsd.amsterdam 70 i fp = efopen("atom.xml", "w"); Err thinkerwim.openbsd.amsterdam 70 i- writeatom(fp); Err thinkerwim.openbsd.amsterdam 70 i+ writeatom(fp, 1); Err thinkerwim.openbsd.amsterdam 70 i+ fclose(fp); Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ /* Atom feed for tags / releases */ Err thinkerwim.openbsd.amsterdam 70 i+ fp = efopen("tags.xml", "w"); Err thinkerwim.openbsd.amsterdam 70 i+ writeatom(fp, 0); Err thinkerwim.openbsd.amsterdam 70 i fclose(fp); Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i /* rename new cache file on success */ Err thinkerwim.openbsd.amsterdam 70 .