diff options
| author | Lars Hjemli | 2010-06-22 16:16:24 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2010-06-22 16:16:24 +0200 |
| commit | 6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d (patch) | |
| tree | f03c3c3621b343493fb3c834ba3b8e4ebfe09471 | |
| parent | Merge branch 'jh/context-lines' (diff) | |
| parent | ui-log.c: allow commit range as search expression (diff) | |
| download | cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.gz cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.zip | |
Merge branch 'lh/range-search'
| -rw-r--r-- | ui-log.c | 11 | ||||
| -rw-r--r-- | ui-shared.c | 1 |
2 files changed, 8 insertions, 4 deletions
| diff --git a/ui-log.c b/ui-log.c index 5eb5c81..33ec8a9 100644 --- a/ui-log.c +++ b/ui-log.c | |||
| @@ -149,10 +149,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
| 149 | 149 | ||
| 150 | argv[1] = disambiguate_ref(tip); | 150 | argv[1] = disambiguate_ref(tip); |
| 151 | 151 | ||
| 152 | if (grep && pattern && (!strcmp(grep, "grep") || | 152 | if (grep && pattern) { |
| 153 | !strcmp(grep, "author") || | 153 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
| 154 | !strcmp(grep, "committer"))) | 154 | !strcmp(grep, "committer")) |
| 155 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 155 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
| 156 | if (!strcmp(grep, "range")) | ||
| 157 | argv[1] = pattern; | ||
| 158 | } | ||
| 156 | 159 | ||
| 157 | if (path) { | 160 | if (path) { |
| 158 | argv[argc++] = "--"; | 161 | argv[argc++] = "--"; |
| diff --git a/ui-shared.c b/ui-shared.c index c99bcec..c398d7a 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
| @@ -830,6 +830,7 @@ void cgit_print_pageheader(struct cgit_context *ctx) | |||
| 830 | html_option("grep", "log msg", ctx->qry.grep); | 830 | html_option("grep", "log msg", ctx->qry.grep); |
| 831 | html_option("author", "author", ctx->qry.grep); | 831 | html_option("author", "author", ctx->qry.grep); |
| 832 | html_option("committer", "committer", ctx->qry.grep); | 832 | html_option("committer", "committer", ctx->qry.grep); |
| 833 | html_option("range", "range", ctx->qry.grep); | ||
| 833 | html("</select>\n"); | 834 | html("</select>\n"); |
| 834 | html("<input class='txt' type='text' size='10' name='q' value='"); | 835 | html("<input class='txt' type='text' size='10' name='q' value='"); |
| 835 | html_attr(ctx->qry.search); | 836 | html_attr(ctx->qry.search); |