|
diff --git a/ui-log.c b/ui-log.c index 0947604..4441d1d 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -125,52 +125,55 @@ static const char *disambiguate_ref(const char *ref) |
125 | unsigned char sha1[20]; |
125 | unsigned char sha1[20]; |
126 | const char *longref; |
126 | const char *longref; |
127 | |
127 | |
128 | longref = fmt("refs/heads/%s", ref); |
128 | longref = fmt("refs/heads/%s", ref); |
129 | if (get_sha1(longref, sha1) == 0) |
129 | if (get_sha1(longref, sha1) == 0) |
130 | return longref; |
130 | return longref; |
131 | |
131 | |
132 | return ref; |
132 | return ref; |
133 | } |
133 | } |
134 | |
134 | |
135 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
135 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
136 | char *path, int pager) |
136 | char *path, int pager) |
137 | { |
137 | { |
138 | struct rev_info rev; |
138 | struct rev_info rev; |
139 | struct commit *commit; |
139 | struct commit *commit; |
140 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
140 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
141 | int argc = 2; |
141 | int argc = 2; |
142 | int i, columns = 3; |
142 | int i, columns = 3; |
143 | |
143 | |
144 | if (!tip) |
144 | if (!tip) |
145 | tip = ctx.qry.head; |
145 | tip = ctx.qry.head; |
146 | |
146 | |
147 | argv[1] = disambiguate_ref(tip); |
147 | argv[1] = disambiguate_ref(tip); |
148 | |
148 | |
149 | if (grep && pattern && (!strcmp(grep, "grep") || |
149 | if (grep && pattern) { |
150 | !strcmp(grep, "author") || |
150 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
151 | !strcmp(grep, "committer"))) |
151 | !strcmp(grep, "committer")) |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
| |
153 | if (!strcmp(grep, "range")) |
| |
154 | argv[1] = pattern; |
| |
155 | } |
153 | |
156 | |
154 | if (path) { |
157 | if (path) { |
155 | argv[argc++] = "--"; |
158 | argv[argc++] = "--"; |
156 | argv[argc++] = path; |
159 | argv[argc++] = path; |
157 | } |
160 | } |
158 | init_revisions(&rev, NULL); |
161 | init_revisions(&rev, NULL); |
159 | rev.abbrev = DEFAULT_ABBREV; |
162 | rev.abbrev = DEFAULT_ABBREV; |
160 | rev.commit_format = CMIT_FMT_DEFAULT; |
163 | rev.commit_format = CMIT_FMT_DEFAULT; |
161 | rev.verbose_header = 1; |
164 | rev.verbose_header = 1; |
162 | rev.show_root_diff = 0; |
165 | rev.show_root_diff = 0; |
163 | setup_revisions(argc, argv, &rev, NULL); |
166 | setup_revisions(argc, argv, &rev, NULL); |
164 | load_ref_decorations(DECORATE_FULL_REFS); |
167 | load_ref_decorations(DECORATE_FULL_REFS); |
165 | rev.show_decorations = 1; |
168 | rev.show_decorations = 1; |
166 | rev.grep_filter.regflags |= REG_ICASE; |
169 | rev.grep_filter.regflags |= REG_ICASE; |
167 | compile_grep_patterns(&rev.grep_filter); |
170 | compile_grep_patterns(&rev.grep_filter); |
168 | prepare_revision_walk(&rev); |
171 | prepare_revision_walk(&rev); |
169 | |
172 | |
170 | if (pager) |
173 | if (pager) |
171 | html("<table class='list nowrap'>"); |
174 | html("<table class='list nowrap'>"); |
172 | |
175 | |
173 | html("<tr class='nohover'><th class='left'>Age</th>" |
176 | html("<tr class='nohover'><th class='left'>Age</th>" |
174 | "<th class='left'>Commit message"); |
177 | "<th class='left'>Commit message"); |
175 | if (pager) { |
178 | if (pager) { |
176 | html(" ("); |
179 | html(" ("); |
|