author | Lars Hjemli <hjemli@gmail.com> | 2007-11-03 09:42:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-03 09:42:37 (UTC) |
commit | 51140311bb3b0d4d0e859d5045ffe4c74478f5fe (patch) (unidiff) | |
tree | 6575f174e32abd5f5d1f481e5f7f5978525ae416 /ui-log.c | |
parent | df203a293e3ac19245f8761cf7c5808f8735f917 (diff) | |
download | cgit-51140311bb3b0d4d0e859d5045ffe4c74478f5fe.zip cgit-51140311bb3b0d4d0e859d5045ffe4c74478f5fe.tar.gz cgit-51140311bb3b0d4d0e859d5045ffe4c74478f5fe.tar.bz2 |
Add search parameters to cgit_log_link
This makes the [prev] and [next] links work correctly on search results.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -57,75 +57,77 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
57 | struct commit *commit; | 57 | struct commit *commit; |
58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; | 58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
59 | int argc = 2; | 59 | int argc = 2; |
60 | int i; | 60 | int i; |
61 | 61 | ||
62 | if (!tip) | 62 | if (!tip) |
63 | argv[1] = cgit_query_head; | 63 | argv[1] = cgit_query_head; |
64 | 64 | ||
65 | if (grep && pattern && (!strcmp(grep, "grep") || | 65 | if (grep && pattern && (!strcmp(grep, "grep") || |
66 | !strcmp(grep, "author") || | 66 | !strcmp(grep, "author") || |
67 | !strcmp(grep, "committer"))) | 67 | !strcmp(grep, "committer"))) |
68 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 68 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
69 | 69 | ||
70 | if (path) { | 70 | if (path) { |
71 | argv[argc++] = "--"; | 71 | argv[argc++] = "--"; |
72 | argv[argc++] = path; | 72 | argv[argc++] = path; |
73 | } | 73 | } |
74 | init_revisions(&rev, NULL); | 74 | init_revisions(&rev, NULL); |
75 | rev.abbrev = DEFAULT_ABBREV; | 75 | rev.abbrev = DEFAULT_ABBREV; |
76 | rev.commit_format = CMIT_FMT_DEFAULT; | 76 | rev.commit_format = CMIT_FMT_DEFAULT; |
77 | rev.verbose_header = 1; | 77 | rev.verbose_header = 1; |
78 | rev.show_root_diff = 0; | 78 | rev.show_root_diff = 0; |
79 | setup_revisions(argc, argv, &rev, NULL); | 79 | setup_revisions(argc, argv, &rev, NULL); |
80 | if (rev.grep_filter) { | 80 | if (rev.grep_filter) { |
81 | rev.grep_filter->regflags |= REG_ICASE; | 81 | rev.grep_filter->regflags |= REG_ICASE; |
82 | compile_grep_patterns(rev.grep_filter); | 82 | compile_grep_patterns(rev.grep_filter); |
83 | } | 83 | } |
84 | prepare_revision_walk(&rev); | 84 | prepare_revision_walk(&rev); |
85 | 85 | ||
86 | html("<table class='list nowrap'>"); | 86 | html("<table class='list nowrap'>"); |
87 | html("<tr class='nohover'><th class='left'>Age</th>" | 87 | html("<tr class='nohover'><th class='left'>Age</th>" |
88 | "<th class='left'>Message</th>"); | 88 | "<th class='left'>Message</th>"); |
89 | 89 | ||
90 | if (cgit_repo->enable_log_filecount) { | 90 | if (cgit_repo->enable_log_filecount) { |
91 | html("<th class='left'>Files</th>"); | 91 | html("<th class='left'>Files</th>"); |
92 | if (cgit_repo->enable_log_linecount) | 92 | if (cgit_repo->enable_log_linecount) |
93 | html("<th class='left'>Lines</th>"); | 93 | html("<th class='left'>Lines</th>"); |
94 | } | 94 | } |
95 | html("<th class='left'>Author</th></tr>\n"); | 95 | html("<th class='left'>Author</th></tr>\n"); |
96 | 96 | ||
97 | if (ofs<0) | 97 | if (ofs<0) |
98 | ofs = 0; | 98 | ofs = 0; |
99 | 99 | ||
100 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 100 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
101 | free(commit->buffer); | 101 | free(commit->buffer); |
102 | commit->buffer = NULL; | 102 | commit->buffer = NULL; |
103 | free_commit_list(commit->parents); | 103 | free_commit_list(commit->parents); |
104 | commit->parents = NULL; | 104 | commit->parents = NULL; |
105 | } | 105 | } |
106 | 106 | ||
107 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 107 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
108 | print_commit(commit); | 108 | print_commit(commit); |
109 | free(commit->buffer); | 109 | free(commit->buffer); |
110 | commit->buffer = NULL; | 110 | commit->buffer = NULL; |
111 | free_commit_list(commit->parents); | 111 | free_commit_list(commit->parents); |
112 | commit->parents = NULL; | 112 | commit->parents = NULL; |
113 | } | 113 | } |
114 | html("</table>\n"); | 114 | html("</table>\n"); |
115 | 115 | ||
116 | if (pager) { | 116 | if (pager) { |
117 | html("<div class='pager'>"); | 117 | html("<div class='pager'>"); |
118 | if (ofs > 0) { | 118 | if (ofs > 0) { |
119 | cgit_log_link("[prev]", NULL, NULL, cgit_query_head, | 119 | cgit_log_link("[prev]", NULL, NULL, cgit_query_head, |
120 | cgit_query_sha1, cgit_query_path, | 120 | cgit_query_sha1, cgit_query_path, |
121 | ofs - cnt); | 121 | ofs - cnt, cgit_query_grep, |
122 | cgit_query_search); | ||
122 | html(" "); | 123 | html(" "); |
123 | } | 124 | } |
124 | if ((commit = get_revision(&rev)) != NULL) { | 125 | if ((commit = get_revision(&rev)) != NULL) { |
125 | cgit_log_link("[next]", NULL, NULL, cgit_query_head, | 126 | cgit_log_link("[next]", NULL, NULL, cgit_query_head, |
126 | cgit_query_sha1, cgit_query_path, | 127 | cgit_query_sha1, cgit_query_path, |
127 | ofs + cnt); | 128 | ofs + cnt, cgit_query_grep, |
129 | cgit_query_search); | ||
128 | } | 130 | } |
129 | html("</div>"); | 131 | html("</div>"); |
130 | } | 132 | } |
131 | } | 133 | } |