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) (unidiff) | |
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
@@ -50,24 +50,27 @@ void print_commit(struct commit *commit) | |||
50 | cgit_free_commitinfo(info); | 50 | cgit_free_commitinfo(info); |
51 | } | 51 | } |
52 | 52 | ||
53 | 53 | ||
54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) | 54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
55 | { | 55 | { |
56 | struct rev_info rev; | 56 | struct rev_info rev; |
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) | ||
63 | argv[1] = cgit_query_head; | ||
64 | |||
62 | if (grep) | 65 | if (grep) |
63 | argv[argc++] = fmt("--grep=%s", grep); | 66 | argv[argc++] = fmt("--grep=%s", grep); |
64 | if (path) { | 67 | if (path) { |
65 | argv[argc++] = "--"; | 68 | argv[argc++] = "--"; |
66 | argv[argc++] = path; | 69 | argv[argc++] = path; |
67 | } | 70 | } |
68 | init_revisions(&rev, NULL); | 71 | init_revisions(&rev, NULL); |
69 | rev.abbrev = DEFAULT_ABBREV; | 72 | rev.abbrev = DEFAULT_ABBREV; |
70 | rev.commit_format = CMIT_FMT_DEFAULT; | 73 | rev.commit_format = CMIT_FMT_DEFAULT; |
71 | rev.verbose_header = 1; | 74 | rev.verbose_header = 1; |
72 | rev.show_root_diff = 0; | 75 | rev.show_root_diff = 0; |
73 | setup_revisions(argc, argv, &rev, NULL); | 76 | setup_revisions(argc, argv, &rev, NULL); |