Merge branch 'lh/range-search'

This commit is contained in:
Lars Hjemli 2010-06-22 16:16:24 +02:00
commit 6654d5b7bd
2 changed files with 8 additions and 4 deletions

View File

@ -149,10 +149,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
argv[1] = disambiguate_ref(tip);
if (grep && pattern && (!strcmp(grep, "grep") ||
!strcmp(grep, "author") ||
!strcmp(grep, "committer")))
argv[argc++] = fmt("--%s=%s", grep, pattern);
if (grep && pattern) {
if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
!strcmp(grep, "committer"))
argv[argc++] = fmt("--%s=%s", grep, pattern);
if (!strcmp(grep, "range"))
argv[1] = pattern;
}
if (path) {
argv[argc++] = "--";

View File

@ -830,6 +830,7 @@ void cgit_print_pageheader(struct cgit_context *ctx)
html_option("grep", "log msg", ctx->qry.grep);
html_option("author", "author", ctx->qry.grep);
html_option("committer", "committer", ctx->qry.grep);
html_option("range", "range", ctx->qry.grep);
html("</select>\n");
html("<input class='txt' type='text' size='10' name='q' value='");
html_attr(ctx->qry.search);