author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:24 (UTC) |
commit | 6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d (patch) (unidiff) | |
tree | f03c3c3621b343493fb3c834ba3b8e4ebfe09471 /ui-log.c | |
parent | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (diff) | |
parent | a579fb02561c98a146c9e707d098d2b10aa02015 (diff) | |
download | cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.zip cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.gz cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.bz2 |
Merge branch 'lh/range-search'
-rw-r--r-- | ui-log.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -128,52 +128,55 @@ static const char *disambiguate_ref(const char *ref) | |||
128 | unsigned char sha1[20]; | 128 | unsigned char sha1[20]; |
129 | const char *longref; | 129 | const char *longref; |
130 | 130 | ||
131 | longref = fmt("refs/heads/%s", ref); | 131 | longref = fmt("refs/heads/%s", ref); |
132 | if (get_sha1(longref, sha1) == 0) | 132 | if (get_sha1(longref, sha1) == 0) |
133 | return longref; | 133 | return longref; |
134 | 134 | ||
135 | return ref; | 135 | return ref; |
136 | } | 136 | } |
137 | 137 | ||
138 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 138 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
139 | char *path, int pager) | 139 | char *path, int pager) |
140 | { | 140 | { |
141 | struct rev_info rev; | 141 | struct rev_info rev; |
142 | struct commit *commit; | 142 | struct commit *commit; |
143 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; | 143 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
144 | int argc = 2; | 144 | int argc = 2; |
145 | int i, columns = 3; | 145 | int i, columns = 3; |
146 | 146 | ||
147 | if (!tip) | 147 | if (!tip) |
148 | tip = ctx.qry.head; | 148 | tip = ctx.qry.head; |
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++] = "--"; |
159 | argv[argc++] = path; | 162 | argv[argc++] = path; |
160 | } | 163 | } |
161 | init_revisions(&rev, NULL); | 164 | init_revisions(&rev, NULL); |
162 | rev.abbrev = DEFAULT_ABBREV; | 165 | rev.abbrev = DEFAULT_ABBREV; |
163 | rev.commit_format = CMIT_FMT_DEFAULT; | 166 | rev.commit_format = CMIT_FMT_DEFAULT; |
164 | rev.verbose_header = 1; | 167 | rev.verbose_header = 1; |
165 | rev.show_root_diff = 0; | 168 | rev.show_root_diff = 0; |
166 | setup_revisions(argc, argv, &rev, NULL); | 169 | setup_revisions(argc, argv, &rev, NULL); |
167 | load_ref_decorations(DECORATE_FULL_REFS); | 170 | load_ref_decorations(DECORATE_FULL_REFS); |
168 | rev.show_decorations = 1; | 171 | rev.show_decorations = 1; |
169 | rev.grep_filter.regflags |= REG_ICASE; | 172 | rev.grep_filter.regflags |= REG_ICASE; |
170 | compile_grep_patterns(&rev.grep_filter); | 173 | compile_grep_patterns(&rev.grep_filter); |
171 | prepare_revision_walk(&rev); | 174 | prepare_revision_walk(&rev); |
172 | 175 | ||
173 | if (pager) | 176 | if (pager) |
174 | html("<table class='list nowrap'>"); | 177 | html("<table class='list nowrap'>"); |
175 | 178 | ||
176 | html("<tr class='nohover'><th class='left'>Age</th>" | 179 | html("<tr class='nohover'><th class='left'>Age</th>" |
177 | "<th class='left'>Commit message"); | 180 | "<th class='left'>Commit message"); |
178 | if (pager) { | 181 | if (pager) { |
179 | html(" ("); | 182 | html(" ("); |