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>

2 files changed, 4 insertions, 1 deletions

diff --git a/cgit.c b/cgit.c
index f5135d9..b936a70 100644
--- a/cgit.c
+++ b/cgit.c
@@ -71,49 +71,49 @@ static void cgit_print_repo_page(struct cacheitem *item)
 	if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
 		cgit_print_snapshot(item, cgit_query_sha1, "zip",
 				    cgit_repo->url, cgit_query_name);
 		return;
 	}
 
 	if (cgit_cmd == CMD_BLOB) {
 		cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
 		return;
 	}
 
 	show_search = (cgit_cmd == CMD_LOG);
 	cgit_print_docstart(title, item);
 	if (!cgit_cmd) {
 		cgit_print_pageheader("summary", show_search);
 		cgit_print_summary();
 		cgit_print_docend();
 		return;
 	}
 
 	cgit_print_pageheader(cgit_query_page, show_search);
 
 	switch(cgit_cmd) {
 	case CMD_LOG:
-		cgit_print_log(cgit_query_head, cgit_query_ofs,
+		cgit_print_log(cgit_query_sha1, cgit_query_ofs,
 			       cgit_max_commit_count, cgit_query_search,
 			       cgit_query_path, 1);
 		break;
 	case CMD_TREE:
 		cgit_print_tree(cgit_query_sha1, cgit_query_path);
 		break;
 	case CMD_COMMIT:
 		cgit_print_commit(cgit_query_sha1);
 		break;
 	case CMD_DIFF:
 		cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
 				cgit_query_path);
 		break;
 	default:
 		cgit_print_error("Invalid request");
 	}
 	cgit_print_docend();
 }
 
 static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 {
 	static char buf[PATH_MAX];
 	int stdout2;
 
diff --git a/ui-log.c b/ui-log.c
index 8d774b0..95cb453 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -38,48 +38,51 @@ void print_commit(struct commit *commit)
 		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>");