summaryrefslogtreecommitdiffstatshomepage
path: root/ui-repolist.c
diff options
context:
space:
mode:
authorLars Hjemli2008-04-13 12:48:44 +0200
committerLars Hjemli2008-04-13 12:48:44 +0200
commit76ba6287bfb533baca7285b107b5d975581d449d (patch)
tree22445a77f5b87280ec980f9b4da5a511f1f27faf /ui-repolist.c
parent4a842288260a0b0c4a3d4032d441f7fd2afee699 (diff)
parent28d781f34b2c2d4c2b994ef3953d1cf37d8f28f0 (diff)
downloadcgit-76ba6287bfb533baca7285b107b5d975581d449d.tar
cgit-76ba6287bfb533baca7285b107b5d975581d449d.tar.gz
cgit-76ba6287bfb533baca7285b107b5d975581d449d.zip
Merge branch 'lh/layout'
* lh/layout: Make repository search case insensitive Remove 'patch' link from tab, add to commit view Implement minimal freetext search in the repolist More layout fixes Minor fixup in tree-view css Reintroduce the branch switcher Add fixed link to index page from repo header Include diff in commit view Replace sidebar/logo
Diffstat (limited to 'ui-repolist.c')
-rw-r--r--ui-repolist.c51
1 files changed, 38 insertions, 13 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index eeeaf3d..7a7e95a 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -44,20 +44,23 @@ static void print_modtime(struct cgit_repo *repo)
cgit_print_age(s.st_mtime, -1, NULL);
}
-void cgit_print_repolist()
+int is_match(struct cgit_repo *repo)
{
- int i, columns = 4;
- char *last_group = NULL;
-
- if (ctx.cfg.enable_index_links)
- columns++;
-
- ctx.page.title = ctx.cfg.root_title;
- cgit_print_http_headers(&ctx);
- cgit_print_docstart(&ctx);
- cgit_print_pageheader(&ctx);
+ if (!ctx.qry.search)
+ return 1;
+ if (repo->url && strcasestr(repo->url, ctx.qry.search))
+ return 1;
+ if (repo->name && strcasestr(repo->name, ctx.qry.search))
+ return 1;
+ if (repo->desc && strcasestr(repo->desc, ctx.qry.search))
+ return 1;
+ if (repo->owner && strcasestr(repo->owner, ctx.qry.search))
+ return 1;
+ return 0;
+}
- html("<table summary='repository list' class='list nowrap'>");
+void print_header(int columns)
+{
if (ctx.cfg.index_header) {
htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>",
columns);
@@ -70,11 +73,31 @@ void cgit_print_repolist()
"<th class='left'>Owner</th>"
"<th class='left'>Idle</th>");
if (ctx.cfg.enable_index_links)
- html("<th>Links</th>");
+ html("<th class='left'>Links</th>");
html("</tr>\n");
+}
+void cgit_print_repolist()
+{
+ int i, columns = 4, hits = 0, header = 0;
+ char *last_group = NULL;
+
+ if (ctx.cfg.enable_index_links)
+ columns++;
+
+ ctx.page.title = ctx.cfg.root_title;
+ cgit_print_http_headers(&ctx);
+ cgit_print_docstart(&ctx);
+ cgit_print_pageheader(&ctx);
+
+ html("<table summary='repository list' class='list nowrap'>");
for (i=0; i<cgit_repolist.count; i++) {
ctx.repo = &cgit_repolist.repos[i];
+ if (!is_match(ctx.repo))
+ continue;
+ if (!header++)
+ print_header(columns);
+ hits++;
if ((last_group == NULL && ctx.repo->group != NULL) ||
(last_group != NULL && ctx.repo->group == NULL) ||
(last_group != NULL && ctx.repo->group != NULL &&
@@ -110,5 +133,7 @@ void cgit_print_repolist()
html("</tr>\n");
}
html("</table>");
+ if (!hits)
+ cgit_print_error("No repositories found");
cgit_print_docend();
}
8 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425
/* shared.c: global vars + some callback functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */

#include "cgit.h"

struct repolist cgit_repolist;
struct repoinfo *cgit_repo;
int cgit_cmd;

const char *cgit_version = CGIT_VERSION;

char *cgit_root_title   = "Git repository browser";
char *cgit_css          = "/cgit.css";
char *cgit_logo         = "/git-logo.png";
char *cgit_index_header = NULL;
char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
char *cgit_module_link  = "./?repo=%s&page=commit&id=%s";
char *cgit_agefile      = "info/web/last-modified";
char *cgit_virtual_root = NULL;
char *cgit_script_name  = CGIT_SCRIPT_NAME;
char *cgit_cache_root   = CGIT_CACHE_ROOT;
char *cgit_repo_group   = NULL;

int cgit_nocache               =  0;
int cgit_snapshots             =  0;
int cgit_enable_index_links    =  0;
int cgit_enable_log_filecount  =  0;
int cgit_enable_log_linecount  =  0;
int cgit_max_lock_attempts     =  5;
int cgit_cache_root_ttl        =  5;
int cgit_cache_repo_ttl        =  5;
int cgit_cache_dynamic_ttl     =  5;
int cgit_cache_static_ttl      = -1;
int cgit_cache_max_create_time =  5;
int cgit_summary_log           =  0;
int cgit_renamelimit           = -1;

int cgit_max_msg_len = 60;
int cgit_max_repodesc_len = 60;
int cgit_max_commit_count = 50;

int cgit_query_has_symref = 0;
int cgit_query_has_sha1   = 0;

char *cgit_querystring  = NULL;
char *cgit_query_repo   = NULL;
char *cgit_query_page   = NULL;
char *cgit_query_head   = NULL;
char *cgit_query_search = NULL;
char *cgit_query_sha1   = NULL;
char *cgit_query_sha2   = NULL;
char *cgit_query_path   = NULL;
char *cgit_query_name   = NULL;
int   cgit_query_ofs    = 0;

int htmlfd = 0;


int cgit_get_cmd_index(const char *cmd)
{
	static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
			       "snapshot", "tag", NULL};
	int i;

	for(i = 0; cmds[i]; i++)
		if (!strcmp(cmd, cmds[i]))
			return i + 1;
	return 0;
}

int chk_zero(int result, char *msg)
{
	if (result != 0)
		die("%s: %s", msg, strerror(errno));
	return result;
}

int chk_positive(int result, char *msg)
{
	if (result <= 0)
		die("%s: %s", msg, strerror(errno));
	return result;
}

int chk_non_negative(int result, char *msg)
{
    	if (result < 0)
	    	die("%s: %s",msg, strerror(errno));
	return result;
}

struct repoinfo *add_repo(const char *url)
{
	struct repoinfo *ret;

	if (++cgit_repolist.count > cgit_repolist.length) {
		if (cgit_repolist.length == 0)
			cgit_repolist.length = 8;
		else
			cgit_repolist.length *= 2;
		cgit_repolist.repos = xrealloc(cgit_repolist.repos,
					       cgit_repolist.length *
					       sizeof(struct repoinfo));
	}

	ret = &cgit_repolist.repos[cgit_repolist.count-1];
	ret->url = trim_end(url, '/');
	ret->name = ret->url;
	ret->path = NULL;
	ret->desc = NULL;
	ret->owner = NULL;
	ret->group = cgit_repo_group;
	ret->defbranch = "master";
	ret->snapshots = cgit_snapshots;
	ret->enable_log_filecount = cgit_enable_log_filecount;
	ret->enable_log_linecount = cgit_enable_log_linecount;
	ret->module_link = cgit_module_link;
	ret->readme = NULL;
	return ret;
}

struct repoinfo *cgit_get_repoinfo(const char *url)
{
	int i;
	struct repoinfo *repo;

	for (i=0; i<cgit_repolist.count; i++) {
		repo = &cgit_repolist.repos[i];
		if (!strcmp(repo->url, url))
			return repo;
	}
	return NULL;
}

void cgit_global_config_cb(const char *name, const char *value)
{
	if (!strcmp(name, "root-title"))
		cgit_root_title = xstrdup(value);
	else if (!strcmp(name, "css"))
		cgit_css = xstrdup(value);
	else if (!strcmp(name, "logo"))
		cgit_logo = xstrdup(value);
	else if (!strcmp(name, "index-header"))
		cgit_index_header = xstrdup(value);
	else if (!strcmp(name, "logo-link"))
		cgit_logo_link = xstrdup(value);
	else if (!strcmp(name, "module-link"))
		cgit_module_link = xstrdup(value);
	else if (!strcmp(name, "virtual-root"))
		cgit_virtual_root = trim_end(value, '/');
	else if (!strcmp(name, "nocache"))
		cgit_nocache = atoi(value);
	else if (!strcmp(name, "snapshots"))
		cgit_snapshots = cgit_parse_snapshots_mask(value);
	else if (!strcmp(name, "enable-index-links"))
		cgit_enable_index_links = atoi(value);
	else if (!strcmp(name, "enable-log-filecount"))
		cgit_enable_log_filecount = atoi(value);
	else if (!strcmp(name, "enable-log-linecount"))
		cgit_enable_log_linecount = atoi(value);
	else if (!strcmp(name, "cache-root"))
		cgit_cache_root = xstrdup(value);
	else if (!strcmp(name, "cache-root-ttl"))
		cgit_cache_root_ttl = atoi(value);
	else if (!strcmp(name, "cache-repo-ttl"))
		cgit_cache_repo_ttl = atoi(value);
	else if (!strcmp(name, "cache-static-ttl"))
		cgit_cache_static_ttl = atoi(value);
	else if (!strcmp(name, "cache-dynamic-ttl"))
		cgit_cache_dynamic_ttl = atoi(value);
	else if (!strcmp(name, "max-message-length"))
		cgit_max_msg_len = atoi(value);
	else if (!strcmp(name, "max-repodesc-length"))
		cgit_max_repodesc_len = atoi(value);
	else if (!strcmp(name, "max-commit-count"))
		cgit_max_commit_count = atoi(value);
	else if (!strcmp(name, "summary-log"))
		cgit_summary_log = atoi(value);
	else if (!strcmp(name, "agefile"))
		cgit_agefile = xstrdup(value);
	else if (!strcmp(name, "renamelimit"))
		cgit_renamelimit = atoi(value);
	else if (!strcmp(name, "repo.group"))
		cgit_repo_group = xstrdup(value);
	else if (!strcmp(name, "repo.url"))
		cgit_repo = add_repo(value);
	else if (!strcmp(name, "repo.name"))
		cgit_repo->name = xstrdup(value);
	else if (cgit_repo && !strcmp(name, "repo.path"))
		cgit_repo->path = trim_end(value, '/');
	else if (cgit_repo && !strcmp(name, "repo.desc"))
		cgit_repo->desc = xstrdup(value);
	else if (cgit_repo && !strcmp(name, "repo.owner"))
		cgit_repo->owner = xstrdup(value);
	else if (cgit_repo && !strcmp(name, "repo.defbranch"))
		cgit_repo->defbranch = xstrdup(value);
	else if (cgit_repo && !strcmp(name, "repo.snapshots"))
		cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
	else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
		cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
	else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
		cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
	else if (cgit_repo && !strcmp(name, "repo.module-link"))
		cgit_repo->module_link= xstrdup(value);
	else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
		if (*value == '/')
			cgit_repo->readme = xstrdup(value);
		else
			cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
	} else if (!strcmp(name, "include"))
		cgit_read_config(value, cgit_global_config_cb);
}

void cgit_querystring_cb(const char *name, const char *value)
{
	if (!strcmp(name,"r")) {
		cgit_query_repo = xstrdup(value);
		cgit_repo = cgit_get_repoinfo(value);
	} else if (!strcmp(name, "p")) {
		cgit_query_page = xstrdup(value);
		cgit_cmd = cgit_get_cmd_index(value);
	} else if (!strcmp(name, "url")) {
		cgit_parse_url(value);
	} else if (!strcmp(name, "q")) {
		cgit_query_search = xstrdup(value);
	} else if (!strcmp(name, "h")) {
		cgit_query_head = xstrdup(value);
		cgit_query_has_symref = 1;
	} else if (!strcmp(name, "id")) {
		cgit_query_sha1 = xstrdup(value);
		cgit_query_has_sha1 = 1;
	} else if (!strcmp(name, "id2")) {
		cgit_query_sha2 = xstrdup(value);
		cgit_query_has_sha1 = 1;
	} else if (!strcmp(name, "ofs")) {
		cgit_query_ofs = atoi(value);
	} else if (!strcmp(name, "path")) {
		cgit_query_path = trim_end(value, '/');
	} else if (!strcmp(name, "name")) {
		cgit_query_name = xstrdup(value);
	}
}

void *cgit_free_commitinfo(struct commitinfo *info)
{
	free(info->author);
	free(info->author_email);
	free(info->committer);
	free(info->committer_email);
	free(info->subject);
	free(info);
	return NULL;
}

int hextoint(char c)
{
	if (c >= 'a' && c <= 'f')
		return 10 + c - 'a';
	else if (c >= 'A' && c <= 'F')
		return 10 + c - 'A';
	else if (c >= '0' && c <= '9')
		return c - '0';
	else
		return -1;
}

char *trim_end(const char *str, char c)
{
	int len;
	char *s, *t;

	if (str == NULL)
		return NULL;
	t = (char *)str;
	len = strlen(t);
	while(len > 0 && t[len - 1] == c)
		len--;

	if (len == 0)
		return NULL;

	c = t[len];
	t[len] = '\0';
	s = xstrdup(t);
	t[len] = c;
	return s;
}

void cgit_diff_tree_cb(struct diff_queue_struct *q,
		       struct diff_options *options, void *data)
{
	int i;

	for (i = 0; i < q->nr; i++) {
		if (q->queue[i]->status == 'U')
			continue;
		((filepair_fn)data)(q->queue[i]);
	}
}

static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
{
	enum object_type type;

	if (is_null_sha1(sha1)) {
		file->ptr = (char *)"";
		file->size = 0;
	} else {
		file->ptr = read_sha1_file(sha1, &type, 
		                           (unsigned long *)&file->size);
	}
	return 1;
}

/*
 * Receive diff-buffers from xdiff and concatenate them as
 * needed across multiple callbacks.
 *
 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
 * ripped from git and modified to use globals instead of
 * a special callback-struct.
 */
char *diffbuf = NULL;
int buflen = 0;

int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
{
	int i;

	for (i = 0; i < nbuf; i++) {
		if (mb[i].ptr[mb[i].size-1] != '\n') {
			/* Incomplete line */
			diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
			memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
			buflen += mb[i].size;
			continue;
		}

		/* we have a complete line */
		if (!diffbuf) {
			((linediff_fn)priv)(mb[i].ptr, mb[i].size);
			continue;
		}
		diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
		memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
		((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
		free(diffbuf);
		diffbuf = NULL;
		buflen = 0;
	}
	if (diffbuf) {
		((linediff_fn)priv)(diffbuf, buflen);
		free(diffbuf);
		diffbuf = NULL;
		buflen = 0;
	}
	return 0;
}

int cgit_diff_files(const unsigned char *old_sha1,
		     const unsigned char *new_sha1,
		     linediff_fn fn)
{
	mmfile_t file1, file2;
	xpparam_t diff_params;
	xdemitconf_t emit_params;
	xdemitcb_t emit_cb;

	if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
		return 1;

	diff_params.flags = XDF_NEED_MINIMAL;
	emit_params.ctxlen = 3;
	emit_params.flags = XDL_EMIT_FUNCNAMES;
	emit_params.find_func = NULL;
	emit_cb.outf = filediff_cb;
	emit_cb.priv = fn;
	xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
	return 0;
}

void cgit_diff_tree(const unsigned char *old_sha1,
		    const unsigned char *new_sha1,
		    filepair_fn fn, const char *prefix)
{
	struct diff_options opt;
	int ret;
	int prefixlen;

	diff_setup(&opt);
	opt.output_format = DIFF_FORMAT_CALLBACK;
	opt.detect_rename = 1;
	opt.rename_limit = cgit_renamelimit;
	opt.recursive = 1;
	opt.format_callback = cgit_diff_tree_cb;
	opt.format_callback_data = fn;
	if (prefix) {
		opt.nr_paths = 1;
		opt.paths = &prefix;
		prefixlen = strlen(prefix);
		opt.pathlens = &prefixlen;
	}
	diff_setup_done(&opt);

	if (old_sha1 && !is_null_sha1(old_sha1))
		ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
	else
		ret = diff_root_tree_sha1(new_sha1, "", &opt);
	diffcore_std(&opt);
	diff_flush(&opt);
}

void cgit_diff_commit(struct commit *commit, filepair_fn fn)
{
	unsigned char *old_sha1 = NULL;

	if (commit->parents)
		old_sha1 = commit->parents->item->object.sha1;
	cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
}