*/
#include "cgit.h"
-#include <stdio.h>
struct cgit_repolist cgit_repolist;
struct cgit_context ctx;
ret->path = NULL;
ret->desc = cgit_default_repo_desc;
ret->owner = NULL;
+ ret->homepage = NULL;
ret->section = ctx.cfg.section;
ret->snapshots = ctx.cfg.snapshots;
ret->enable_commit_graph = ctx.cfg.enable_commit_graph;
ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
ret->enable_subject_links = ctx.cfg.enable_subject_links;
+ ret->enable_html_serving = ctx.cfg.enable_html_serving;
ret->max_stats = ctx.cfg.max_stats;
ret->branch_sort = ctx.cfg.branch_sort;
ret->commit_sort = ctx.cfg.commit_sort;
ret->commit_filter = ctx.cfg.commit_filter;
ret->source_filter = ctx.cfg.source_filter;
ret->email_filter = ctx.cfg.email_filter;
+ ret->owner_filter = ctx.cfg.owner_filter;
ret->clone_url = ctx.cfg.clone_url;
ret->submodules.strdup_strings = 1;
+ ret->hide = ret->ignore = 0;
return ret;
}
for (i = 0; i < cgit_repolist.count; i++) {
repo = &cgit_repolist.repos[i];
+ if (repo->ignore)
+ continue;
if (!strcmp(repo->url, url))
return repo;
}
return NULL;
}
-void *cgit_free_commitinfo(struct commitinfo *info)
+void cgit_free_commitinfo(struct commitinfo *info)
{
free(info->author);
free(info->author_email);
free(info->msg);
free(info->msg_encoding);
free(info);
- return NULL;
}
char *trim_end(const char *str, char c)
list->refs[list->count++] = ref;
}
-static struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
+static struct refinfo *cgit_mk_refinfo(const char *refname, const struct object_id *oid)
{
struct refinfo *ref;
ref = xmalloc(sizeof (struct refinfo));
ref->refname = xstrdup(refname);
- ref->object = parse_object(sha1);
+ ref->object = parse_object(oid->hash);
switch (ref->object->type) {
case OBJ_TAG:
ref->tag = cgit_parse_tag((struct tag *)ref->object);
return ref;
}
-static void cgit_free_taginfo(struct taginfo *tag)
+void cgit_free_taginfo(struct taginfo *tag)
{
if (tag->tagger)
free(tag->tagger);
free(list->refs);
}
-int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
+int cgit_refs_cb(const char *refname, const struct object_id *oid, int flags,
void *cb_data)
{
struct reflist *list = (struct reflist *)cb_data;
- struct refinfo *info = cgit_mk_refinfo(refname, sha1);
+ struct refinfo *info = cgit_mk_refinfo(refname, oid);
if (info)
cgit_add_ref(list, info);
return 0;
}
-static void cgit_diff_tree_cb(struct diff_queue_struct *q,
- struct diff_options *options, void *data)
+void cgit_diff_tree_cb(struct diff_queue_struct *q,
+ struct diff_options *options, void *data)
{
int i;
}
}
-static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
+static int load_mmfile(mmfile_t *file, const struct object_id *oid)
{
enum object_type type;
- if (is_null_sha1(sha1)) {
+ if (is_null_oid(oid)) {
file->ptr = (char *)"";
file->size = 0;
} else {
- file->ptr = read_sha1_file(sha1, &type,
+ file->ptr = read_sha1_file(oid->hash, &type,
(unsigned long *)&file->size);
}
return 1;
* ripped from git and modified to use globals instead of
* a special callback-struct.
*/
-char *diffbuf = NULL;
-int buflen = 0;
+static char *diffbuf = NULL;
+static int buflen = 0;
static int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
{
return 0;
}
-int cgit_diff_files(const unsigned char *old_sha1,
- const unsigned char *new_sha1, unsigned long *old_size,
+int cgit_diff_files(const struct object_id *old_oid,
+ const struct object_id *new_oid, unsigned long *old_size,
unsigned long *new_size, int *binary, int context,
int ignorews, linediff_fn fn)
{
xdemitconf_t emit_params;
xdemitcb_t emit_cb;
- if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
+ if (!load_mmfile(&file1, old_oid) || !load_mmfile(&file2, new_oid))
return 1;
*old_size = file1.size;
return 0;
}
-void cgit_diff_tree(const unsigned char *old_sha1,
- const unsigned char *new_sha1,
+void cgit_diff_tree(const struct object_id *old_oid,
+ const struct object_id *new_oid,
filepair_fn fn, const char *prefix, int ignorews)
{
struct diff_options opt;
struct pathspec_item item;
+ memset(&item, 0, sizeof(item));
diff_setup(&opt);
opt.output_format = DIFF_FORMAT_CALLBACK;
opt.detect_rename = 1;
}
diff_setup_done(&opt);
- if (old_sha1 && !is_null_sha1(old_sha1))
- diff_tree_sha1(old_sha1, new_sha1, "", &opt);
+ if (old_oid && !is_null_oid(old_oid))
+ diff_tree_sha1(old_oid->hash, new_oid->hash, "", &opt);
else
- diff_root_tree_sha1(new_sha1, "", &opt);
+ diff_root_tree_sha1(new_oid->hash, "", &opt);
diffcore_std(&opt);
diff_flush(&opt);
}
void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
{
- unsigned char *old_sha1 = NULL;
+ const struct object_id *old_oid = NULL;
if (commit->parents)
- old_sha1 = commit->parents->item->object.sha1;
- cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
+ old_oid = &commit->parents->item->object.oid;
+ cgit_diff_tree(old_oid, &commit->object.oid, fn, prefix,
ctx.qry.ignorews);
}
}
return result;
}
+
+char *get_mimetype_for_filename(const char *filename)
+{
+ char *ext, *mimetype, *token, line[1024], *saveptr;
+ FILE *file;
+ struct string_list_item *mime;
+
+ if (!filename)
+ return NULL;
+
+ ext = strrchr(filename, '.');
+ if (!ext)
+ return NULL;
+ ++ext;
+ if (!ext[0])
+ return NULL;
+ mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
+ if (mime)
+ return xstrdup(mime->util);
+
+ if (!ctx.cfg.mimetype_file)
+ return NULL;
+ file = fopen(ctx.cfg.mimetype_file, "r");
+ if (!file)
+ return NULL;
+ while (fgets(line, sizeof(line), file)) {
+ if (!line[0] || line[0] == '#')
+ continue;
+ mimetype = strtok_r(line, " \t\r\n", &saveptr);
+ while ((token = strtok_r(NULL, " \t\r\n", &saveptr))) {
+ if (!strcasecmp(ext, token)) {
+ fclose(file);
+ return xstrdup(mimetype);
+ }
+ }
+ }
+ fclose(file);
+ return NULL;
+}
git.ckatri.com / cgit.git / blobdiff