author | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 12:58:45 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 12:58:45 (UTC) |
commit | cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e (patch) (side-by-side diff) | |
tree | c303d75883492c89ed3243eadb31bdf2f3b9e660 /ui-log.c | |
parent | 42a7eb9c73457319a3fd5441ff26046fc9b31dad (diff) | |
download | cgit-cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e.zip cgit-cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e.tar.gz cgit-cd79c16844b4006d4fd6f4b82d2f6e7e19b20c8e.tar.bz2 |
ui-log: honor id=sha1 on querystring
This teaches ui-log to prefer id=sha1 and fallback to h=rev if no id-
parameter is specified. With this change, summary, log, commit and tree
views now passes current branch using h parameter and current revision
using id parameter.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -30,64 +30,67 @@ void print_commit(struct commit *commit) info = cgit_parse_commit(commit); html("<tr><td>"); cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); html("</td><td>"); cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, sha1_to_hex(commit->object.sha1)); if (cgit_repo->enable_log_filecount) { files = 0; lines = 0; cgit_diff_commit(commit, inspect_files); html("</td><td class='right'>"); htmlf("%d", files); if (cgit_repo->enable_log_linecount) { html("</td><td class='right'>"); htmlf("%d", lines); } } html("</td><td>"); html_txt(info->author); html("</td></tr>\n"); cgit_free_commitinfo(info); } void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) { struct rev_info rev; struct commit *commit; const char *argv[] = {NULL, tip, NULL, NULL, NULL}; int argc = 2; int i; + if (!tip) + argv[1] = cgit_query_head; + if (grep) argv[argc++] = fmt("--grep=%s", grep); if (path) { argv[argc++] = "--"; argv[argc++] = path; } init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; rev.commit_format = CMIT_FMT_DEFAULT; rev.verbose_header = 1; rev.show_root_diff = 0; setup_revisions(argc, argv, &rev, NULL); if (rev.grep_filter) { rev.grep_filter->regflags |= REG_ICASE; compile_grep_patterns(rev.grep_filter); } prepare_revision_walk(&rev); html("<table class='list nowrap'>"); html("<tr class='nohover'><th class='left'>Age</th>" "<th class='left'>Message</th>"); if (cgit_repo->enable_log_filecount) { html("<th class='left'>Files</th>"); if (cgit_repo->enable_log_linecount) html("<th class='left'>Lines</th>"); } html("<th class='left'>Author</th></tr>\n"); if (ofs<0) ofs = 0; |