author | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-06-26 10:54:44 (UTC) |
commit | 29b37e9781ce1bb04e558c7490d2c29eb1a477e5 (patch) (side-by-side diff) | |
tree | 5a9a7b0b976b442cc8dda6195b804993c603d28d | |
parent | 833b0d2732f808281496df16eb917d6fdb0a274f (diff) | |
parent | 42effc939090b2fbf1b2b76cd1d9c30fabcd230e (diff) | |
download | cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.zip cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.gz cgit-29b37e9781ce1bb04e558c7490d2c29eb1a477e5.tar.bz2 |
Merge branch 'master' of git://git.klever.net/patchwork/cgit
* 'master' of git://git.klever.net/patchwork/cgit:
allow specification of directly linked blobs mimetypes
allow blob extract blobs by head/path combination
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cmd.c | 2 | ||||
-rw-r--r-- | ui-blob.c | 33 | ||||
-rw-r--r-- | ui-blob.h | 2 |
5 files changed, 36 insertions, 4 deletions
@@ -146,2 +146,4 @@ 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); } @@ -118,2 +118,3 @@ struct cgit_query { char *name; + char *mimetype; int ofs; @@ -34,3 +34,3 @@ static void blob_fn(struct cgit_context *ctx) { - cgit_print_blob(ctx->qry.sha1, ctx->qry.path); + cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); } @@ -12,3 +12,14 @@ -void cgit_print_blob(const char *hex, char *path) +static char *match_path; +static unsigned char *matched_sha1; + +static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) { + if(strncmp(base,match_path,baselen) + || strcmp(match_path+baselen,pathname) ) + return READ_TREE_RECURSIVE; + memmove(matched_sha1,sha1,20); + return 0; +} + +void cgit_print_blob(const char *hex, char *path, const char *head) { @@ -19,3 +30,6 @@ void cgit_print_blob(const char *hex, char *path) unsigned long size; + struct commit *commit; + const char *paths[] = {path, NULL}; + if (hex) { if (get_sha1_hex(hex, sha1)){ @@ -24,4 +38,19 @@ void cgit_print_blob(const char *hex, char *path) } + } else { + if (get_sha1(head,sha1)) { + cgit_print_error(fmt("Bad ref: %s", head)); + return; + } + } + + type = sha1_object_info(sha1, &size); + if((!hex) && type == OBJ_COMMIT && path) { + commit = lookup_commit_reference(sha1); + match_path = path; + matched_sha1 = sha1; + read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); type = sha1_object_info(sha1, &size); + } + if (type == OBJ_BAD) { @@ -38,3 +67,3 @@ void cgit_print_blob(const char *hex, char *path) buf[size] = '\0'; - ctx.page.mimetype = NULL; + ctx.page.mimetype = ctx.qry.mimetype; ctx.page.filename = path; @@ -3,3 +3,3 @@ -extern void cgit_print_blob(const char *hex, char *path); +extern void cgit_print_blob(const char *hex, char *path, const char *head); |