| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.h | 8 | ||||
| -rw-r--r-- | cmd.c | 3 | ||||
| -rw-r--r-- | parsing.c | 4 | ||||
| -rw-r--r-- | shared.c | 1 | ||||
| -rw-r--r-- | ui-log.c | 17 | ||||
| -rw-r--r-- | ui-refs.c | 37 | ||||
| -rw-r--r-- | ui-repolist.c | 139 | ||||
| -rw-r--r-- | ui-shared.c | 17 | ||||
| -rw-r--r-- | ui-snapshot.c | 94 | ||||
| -rw-r--r-- | ui-snapshot.h | 3 |
12 files changed, 82 insertions, 266 deletions
@@ -7,26 +7,6 @@ SHA1_HEADER = <openssl/sha.h> GIT_VER = 1.6.0.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 -# Define NO_STRCASESTR if you don't have strcasestr. -# -# Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). -# - -#-include config.mak - -# -# Platform specific tweaks -# - -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') -uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') -uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') - -ifeq ($(uname_O),Cygwin) - NO_STRCASESTR = YesPlease - NEEDS_LIBICONV = YesPlease -endif - # # Let the user override the above settings. # @@ -116,9 +96,6 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' ifdef NO_ICONV CFLAGS += -DNO_ICONV endif -ifdef NO_STRCASESTR - CFLAGS += -DNO_STRCASESTR -endif cgit: $(OBJECTS) libgit $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) @@ -154,8 +154,6 @@ static void querystring_cb(const char *name, const char *value) ctx.qry.name = xstrdup(value); } else if (!strcmp(name, "mimetype")) { ctx.qry.mimetype = xstrdup(value); - } else if (!strcmp(name, "s")){ - ctx.qry.sort = xstrdup(value); } else if (!strcmp(name, "showmsg")) { ctx.qry.showmsg = atoi(value); } @@ -61,7 +61,6 @@ struct cgit_repo { int snapshots; int enable_log_filecount; int enable_log_linecount; - time_t mtime; }; struct cgit_repolist { @@ -122,7 +121,6 @@ struct cgit_query { char *url; int ofs; int nohead; - char *sort; int showmsg; }; @@ -236,5 +234,11 @@ extern const char *cgit_repobasename(const char *reponame); extern int cgit_parse_snapshots_mask(const char *str); +/* libgit.a either links against or compiles its own implementation of + * strcasestr(), and we'd like to reuse it. Simply re-declaring it + * seems to do the trick. + */ +extern char *strcasestr(const char *haystack, const char *needle); + #endif /* CGIT_H */ @@ -104,7 +104,8 @@ static void refs_fn(struct cgit_context *ctx) static void snapshot_fn(struct cgit_context *ctx) { - cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, ctx->qry.path, + cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, + cgit_repobasename(ctx->repo->url), ctx->qry.path, ctx->repo->snapshots, ctx->qry.nohead); } @@ -96,9 +96,6 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date) return p; } -#ifdef NO_ICONV -#define reencode(a, b, c) -#else const char *reencode(char **txt, const char *src_enc, const char *dst_enc) { char *tmp; @@ -113,7 +110,6 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) } return *txt; } -#endif struct commitinfo *cgit_parse_commit(struct commit *commit) { @@ -60,7 +60,6 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->enable_log_linecount = ctx.cfg.enable_log_linecount; ret->module_link = ctx.cfg.module_link; ret->readme = NULL; - ret->mtime = -1; return ret; } @@ -78,31 +78,18 @@ void print_commit(struct commit *commit) cgit_free_commitinfo(info); } -static const char *disambiguate_ref(const char *ref) -{ - unsigned char sha1[20]; - const char *longref; - - longref = fmt("refs/heads/%s", ref); - if (get_sha1(longref, sha1) == 0) - return longref; - - return ref; -} void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) { struct rev_info rev; struct commit *commit; - const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; + const char *argv[] = {NULL, tip, NULL, NULL, NULL}; int argc = 2; int i, columns = 3; if (!tip) - tip = ctx.qry.head; - - argv[1] = disambiguate_ref(tip); + argv[1] = ctx.qry.head; if (grep && pattern && (!strcmp(grep, "grep") || !strcmp(grep, "author") || @@ -79,37 +79,12 @@ static int print_branch(struct refinfo *ref) static void print_tag_header() { html("<tr class='nohover'><th class='left'>Tag</th>" - "<th class='left'>Download</th>" + "<th class='left'>Reference</th>" "<th class='left'>Author</th>" "<th class='left' colspan='2'>Age</th></tr>\n"); header = 1; } -static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) -{ - const struct cgit_snapshot_format* f; - char *filename; - const char *basename; - - if (!ref || strlen(ref) < 2) - return; - - basename = cgit_repobasename(repo->url); - if (prefixcmp(ref, basename) != 0) { - if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) - ref++; - if (isdigit(ref[0])) - ref = xstrdup(fmt("%s-%s", basename, ref)); - } - - for (f = cgit_snapshot_formats; f->suffix; f++) { - if (!(repo->snapshots & f->bit)) - continue; - filename = fmt("%s%s", ref, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); - html(" "); - } -} static int print_tag(struct refinfo *ref) { struct tag *tag; @@ -124,10 +99,7 @@ static int print_tag(struct refinfo *ref) html("<tr><td>"); cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); html("</td><td>"); - if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) - print_tag_downloads(ctx.repo, name); - else - cgit_object_link(tag->tagged); + cgit_object_link(tag->tagged); html("</td><td>"); if (info->tagger) html(info->tagger); @@ -141,10 +113,7 @@ static int print_tag(struct refinfo *ref) html("<tr><td>"); html_txt(name); html("</td><td>"); - if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) - print_tag_downloads(ctx.repo, name); - else - cgit_object_link(ref->object); + cgit_object_link(ref->object); html("</td></tr>\n"); } return 0; diff --git a/ui-repolist.c b/ui-repolist.c index 2c13d50..5833140 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -6,10 +6,6 @@ * (see COPYING for full license text) */ -/* This is needed for strcasestr to be defined by <string.h> */ -#define _GNU_SOURCE 1 -#include <string.h> - #include <time.h> #include "cgit.h" @@ -32,38 +28,21 @@ time_t read_agefile(char *path) return 0; } -static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime) +static void print_modtime(struct cgit_repo *repo) { char *path; struct stat s; - struct cgit_repo *r = (struct cgit_repo *)repo; - if (repo->mtime != -1) { - *mtime = repo->mtime; - return 1; - } path = fmt("%s/%s", repo->path, ctx.cfg.agefile); if (stat(path, &s) == 0) { - *mtime = read_agefile(path); - r->mtime = *mtime; - return 1; + cgit_print_age(read_agefile(path), -1, NULL); + return; } path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch); - if (stat(path, &s) == 0) - *mtime = s.st_mtime; - else - *mtime = 0; - - r->mtime = *mtime; - return (r->mtime != 0); -} - -static void print_modtime(struct cgit_repo *repo) -{ - time_t t; - if (get_repo_modtime(repo, &t)) - cgit_print_age(t, -1, NULL); + if (stat(path, &s) != 0) + return; + cgit_print_age(s.st_mtime, -1, NULL); } int is_match(struct cgit_repo *repo) @@ -90,23 +69,13 @@ int is_in_url(struct cgit_repo *repo) return 0; } -void print_sort_header(const char *title, const char *sort) -{ - htmlf("<th class='left'><a href='./?s=%s", sort); - if (ctx.qry.search) { - html("&q="); - html_url_arg(ctx.qry.search); - } - htmlf("'>%s</a></th>", title); -} - void print_header(int columns) { - html("<tr class='nohover'>"); - print_sort_header("Name", "name"); - print_sort_header("Description", "desc"); - print_sort_header("Owner", "owner"); - print_sort_header("Idle", "idle"); + html("<tr class='nohover'>" + "<th class='left'>Name</th>" + "<th class='left'>Description</th>" + "<th class='left'>Owner</th>" + "<th class='left'>Idle</th>"); if (ctx.cfg.enable_index_links) html("<th class='left'>Links</th>"); html("</tr>\n"); @@ -123,86 +92,10 @@ void print_pager(int items, int pagelen, char *search) html("</div>"); } -static int cmp(const char *s1, const char *s2) -{ - if (s1 && s2) - return strcmp(s1, s2); - if (s1 && !s2) - return -1; - if (s2 && !s1) - return 1; - return 0; -} - -static int sort_name(const void *a, const void *b) -{ - const struct cgit_repo *r1 = a; - const struct cgit_repo *r2 = b; - - return cmp(r1->name, r2->name); -} - -static int sort_desc(const void *a, const void *b) -{ - const struct cgit_repo *r1 = a; - const struct cgit_repo *r2 = b; - - return cmp(r1->desc, r2->desc); -} - -static int sort_owner(const void *a, const void *b) -{ - const struct cgit_repo *r1 = a; - const struct cgit_repo *r2 = b; - - return cmp(r1->owner, r2->owner); -} - -static int sort_idle(const void *a, const void *b) -{ - const struct cgit_repo *r1 = a; - const struct cgit_repo *r2 = b; - time_t t1, t2; - - t1 = t2 = 0; - get_repo_modtime(r1, &t1); - get_repo_modtime(r2, &t2); - return t2 - t1; -} - -struct sortcolumn { - const char *name; - int (*fn)(const void *a, const void *b); -}; - -struct sortcolumn sortcolumn[] = { - {"name", sort_name}, - {"desc", sort_desc}, - {"owner", sort_owner}, - {"idle", sort_idle}, - {NULL, NULL} -}; - -int sort_repolist(char *field) -{ - struct sortcolumn *column; - - for (column = &sortcolumn[0]; column->name; column++) { - if (strcmp(field, column->name)) - continue; - qsort(cgit_repolist.repos, cgit_repolist.count, - sizeof(struct cgit_repo), column->fn); - return 1; - } - return 0; -} - - void cgit_print_repolist() { int i, columns = 4, hits = 0, header = 0; char *last_group = NULL; - int sorted = 0; if (ctx.cfg.enable_index_links) columns++; @@ -215,9 +108,6 @@ void cgit_print_repolist() if (ctx.cfg.index_header) html_include(ctx.cfg.index_header); - if(ctx.qry.sort) - sorted = sort_repolist(ctx.qry.sort); - html("<table summary='repository list' class='list nowrap'>"); for (i=0; i<cgit_repolist.count; i++) { ctx.repo = &cgit_repolist.repos[i]; @@ -230,11 +120,10 @@ void cgit_print_repolist() continue; if (!header++) print_header(columns); - if (!sorted && - ((last_group == NULL && ctx.repo->group != NULL) || + if ((last_group == NULL && ctx.repo->group != NULL) || (last_group != NULL && ctx.repo->group == NULL) || (last_group != NULL && ctx.repo->group != NULL && - strcmp(ctx.repo->group, last_group)))) { + strcmp(ctx.repo->group, last_group))) { htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>", columns); html_txt(ctx.repo->group); @@ -242,7 +131,7 @@ void cgit_print_repolist() last_group = ctx.repo->group; } htmlf("<tr><td class='%s'>", - !sorted && ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); + ctx.repo->group ? "sublevel-repo" : "toplevel-repo"); cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL); html("</td><td>"); html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL); diff --git a/ui-shared.c b/ui-shared.c index 95dfeb4..dc39e64 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -371,14 +371,11 @@ void cgit_patch_link(char *name, char *title, char *class, char *head, void cgit_object_link(struct object *obj) { - char *page, *shortrev, *fullrev, *name; + char *page, *rev, *name; - fullrev = sha1_to_hex(obj->sha1); - shortrev = xstrdup(fullrev); - shortrev[10] = '\0'; if (obj->type == OBJ_COMMIT) { - cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, - ctx.qry.head, fullrev); + cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, + ctx.qry.head, sha1_to_hex(obj->sha1)); return; } else if (obj->type == OBJ_TREE) page = "tree"; @@ -386,8 +383,9 @@ void cgit_object_link(struct object *obj) page = "tag"; else page = "blob"; - name = fmt("%s %s...", typename(obj->type), shortrev); - reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); + rev = sha1_to_hex(obj->sha1); + name = fmt("%s %s", typename(obj->type), rev); + reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); } void cgit_print_date(time_t secs, char *format, int local_time) @@ -717,7 +715,8 @@ void cgit_print_snapshot_links(const char *repo, const char *head, continue; filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, f->suffix); - cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); + cgit_snapshot_link(filename, NULL, NULL, (char *)head, + (char *)hex, filename); html("<br/>"); } } diff --git a/ui-snapshot.c b/ui-snapshot.c index 6f09151..9c4d086 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -114,53 +114,58 @@ static int make_snapshot(const struct cgit_snapshot_format *format, return 0; } -/* Try to guess the requested revision from the requested snapshot name. - * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become - * "cgit-0.7.2". If this is a valid commit object name we've got a winner. - * Otherwise, if the snapshot name has a prefix matching the result from - * repo_basename(), we strip the basename and any following '-' and '_' - * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once - * more. If this still isn't a valid commit object name, we check if pre- - * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives - * us something valid. - */ -static const char *get_ref_from_filename(const char *url, const char *filename, - const struct cgit_snapshot_format *format) -{ - const char *reponame; - unsigned char sha1[20]; - char *snapshot; - - snapshot = xstrdup(filename); - snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; - fprintf(stderr, "snapshot=%s\n", snapshot); +char *dwim_filename = NULL; +const char *dwim_refname = NULL; - if (get_sha1(snapshot, sha1) == 0) - return snapshot; - - reponame = cgit_repobasename(url); - fprintf(stderr, "reponame=%s\n", reponame); - if (prefixcmp(snapshot, reponame) == 0) { - snapshot += strlen(reponame); - while (snapshot && (*snapshot == '-' || *snapshot == '_')) - snapshot++; +static int ref_cb(const char *refname, const unsigned char *sha1, int flags, + void *cb_data) +{ + const char *r = refname; + while (r && *r) { + fprintf(stderr, " cmp %s with %s:", dwim_filename, r); + if (!strcmp(dwim_filename, r)) { + fprintf(stderr, "MATCH!\n"); + dwim_refname = refname; + return 1; + } + fprintf(stderr, "no match\n"); + if (isdigit(*r)) + break; + r++; } + return 0; +} - if (get_sha1(snapshot, sha1) == 0) - return snapshot; - - snapshot = fmt("v%s", snapshot); - if (get_sha1(snapshot, sha1) == 0) - return snapshot; - - return NULL; +/* Try to guess the requested revision by combining repo name and tag name + * and comparing this to the requested snapshot name. E.g. the requested + * snapshot is "cgit-0.7.2.tar.gz" while repo name is "cgit" and tag name + * is "v0.7.2". First, the reponame is stripped off, leaving "-0.7.2.tar.gz". + * Next, any '-' and '_' characters are stripped, leaving "0.7.2.tar.gz". + * Finally, the requested format suffix is removed and we end up with "0.7.2". + * Then we test each tag against this dwimmed filename, and for each tag + * we even try to remove any leading characters which are non-digits. I.e. + * we first compare with "v0.7.2", then with "0.7.2" and we've got a match. + */ +static const char *get_ref_from_filename(const char *url, const char *filename, + const struct cgit_snapshot_format *fmt) +{ + const char *reponame = cgit_repobasename(url); + fprintf(stderr, "reponame=%s, filename=%s\n", reponame, filename); + if (prefixcmp(filename, reponame)) + return NULL; + filename += strlen(reponame); + while (filename && (*filename == '-' || *filename == '_')) + filename++; + dwim_filename = xstrdup(filename); + dwim_filename[strlen(filename) - strlen(fmt->suffix)] = '\0'; + for_each_tag_ref(ref_cb, NULL); + return dwim_refname; } -void cgit_print_snapshot(const char *head, const char *hex, +void cgit_print_snapshot(const char *head, const char *hex, const char *prefix, const char *filename, int snapshots, int dwim) { const struct cgit_snapshot_format* f; - char *prefix = NULL; f = get_format(filename); if (!f) { @@ -173,20 +178,11 @@ void cgit_print_snapshot(const char *head, const char *hex, return; } - if (!hex && dwim) { + if (!hex && dwim) hex = get_ref_from_filename(ctx.repo->url, filename, f); - if (hex != NULL) { - prefix = xstrdup(filename); - prefix[strlen(filename) - strlen(f->suffix)] = '\0'; - } - } if (!hex) hex = head; - if (!prefix) - prefix = xstrdup(cgit_repobasename(ctx.repo->url)); - make_snapshot(f, hex, prefix, filename); - free(prefix); } diff --git a/ui-snapshot.h b/ui-snapshot.h index b6ede52..3540303 100644 --- a/ui-snapshot.h +++ b/ui-snapshot.h @@ -2,6 +2,7 @@ #define UI_SNAPSHOT_H extern void cgit_print_snapshot(const char *head, const char *hex, - const char *filename, int snapshot, int dwim); + const char *prefix, const char *filename, + int snapshot, int dwim); #endif /* UI_SNAPSHOT_H */ |