author | Lars Hjemli <hjemli@gmail.com> | 2007-11-03 10:33:28 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-03 10:33:28 (UTC) |
commit | 1e4ff4dc501ca82490ac70fb3b623c3857991af3 (patch) (side-by-side diff) | |
tree | ea96bf0ec93653797c42965b308d913a8b6cd2d9 | |
parent | cda7194e300277fbad73595c70ecece02d772190 (diff) | |
download | cgit-1e4ff4dc501ca82490ac70fb3b623c3857991af3.zip cgit-1e4ff4dc501ca82490ac70fb3b623c3857991af3.tar.gz cgit-1e4ff4dc501ca82490ac70fb3b623c3857991af3.tar.bz2 |
Don't include current SHA1 in 'log' menu-item
This ensures that the menu-item always prints the log for the active branch.
Predictability is good.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-shared.c b/ui-shared.c index f9f02bc..ca8dd3d 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -380,154 +380,154 @@ int print_branch_option(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { char *name = (char *)refname; html_option(name, name, cgit_query_head); return 0; } int print_archive_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct tag *tag; struct taginfo *info; struct object *obj; char buf[256], *url; unsigned char fileid[20]; int *header = (int *)cb_data; if (prefixcmp(refname, "refs/archives")) return 0; strncpy(buf, refname+14, sizeof(buf)); obj = parse_object(sha1); if (!obj) return 1; if (obj->type == OBJ_TAG) { tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 0; hashcpy(fileid, tag->tagged->sha1); } else if (obj->type != OBJ_BLOB) { return 0; } else { hashcpy(fileid, sha1); } if (!*header) { html("<p><h1>download</h1>"); *header = 1; } url = cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s&path=%s", sha1_to_hex(fileid), buf)); html_link_open(url, NULL, "menu"); html_txt(strlpart(buf, 20)); html_link_close(); return 0; } void add_hidden_formfields(int incl_head, int incl_search, char *page) { char *url; if (!cgit_virtual_root) { url = fmt("%s/%s", cgit_query_repo, page); if (cgit_query_path) url = fmt("%s/%s", url, cgit_query_path); html_hidden("url", url); } if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) html_hidden("h", cgit_query_head); if (cgit_query_sha1) html_hidden("id", cgit_query_sha1); if (cgit_query_sha2) html_hidden("id2", cgit_query_sha2); if (incl_search) { if (cgit_query_grep) html_hidden("qt", cgit_query_grep); if (cgit_query_search) html_hidden("q", cgit_query_search); } } void cgit_print_pageheader(char *title, int show_search) { static const char *default_info = "This is cgit, a fast webinterface for git repositories"; int header = 0; html("<div id='sidebar'>\n"); html("<a href='"); html_attr(cgit_rooturl()); htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", cgit_logo); html("<div class='infobox'>"); if (cgit_query_repo) { html("<h1>"); html_txt(strrpart(cgit_repo->name, 20)); html("</h1>\n"); html_txt(cgit_repo->desc); if (cgit_repo->owner) { html("<p>\n<h1>owner</h1>\n"); html_txt(cgit_repo->owner); } html("<p>\n<h1>navigate</h1>\n"); reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, NULL, NULL); - cgit_log_link("log", NULL, "menu", cgit_query_head, - cgit_query_sha1, NULL, 0, NULL, NULL); + cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, + 0, NULL, NULL); cgit_tree_link("tree", NULL, "menu", cgit_query_head, cgit_query_sha1, NULL); cgit_commit_link("commit", NULL, "menu", cgit_query_head, cgit_query_sha1); cgit_diff_link("diff", NULL, "menu", cgit_query_head, cgit_query_sha1, cgit_query_sha2, NULL); for_each_ref(print_archive_ref, &header); html("<p>\n<h1>branch</h1>\n"); html("<form method='get' action=''>\n"); add_hidden_formfields(0, 1, cgit_query_page); html("<select name='h' onchange='this.form.submit();'>\n"); for_each_branch_ref(print_branch_option, cgit_query_head); html("</select>\n"); html("</form>\n"); html("<p>\n<h1>search</h1>\n"); html("<form method='get' action='"); if (cgit_virtual_root) html_attr(cgit_fileurl(cgit_query_repo, "log", cgit_query_path, NULL)); html("'>\n"); add_hidden_formfields(1, 0, "log"); html("<select name='qt'>\n"); html_option("grep", "log msg", cgit_query_grep); html_option("author", "author", cgit_query_grep); html_option("committer", "committer", cgit_query_grep); html("</select>\n"); html("<input class='txt' type='text' name='q' value='"); html_attr(cgit_query_search); html("'/>\n"); html("</form>\n"); } else { if (!cgit_index_info || html_include(cgit_index_info)) html(default_info); } html("</div>\n"); html("</div>\n<table class='grid'><tr><td id='content'>\n"); } void cgit_print_snapshot_start(const char *mimetype, const char *filename, struct cacheitem *item) { htmlf("Content-Type: %s\n", mimetype); htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); htmlf("Expires: %s\n", http_date(item->st.st_mtime + ttl_seconds(item->ttl))); html("\n"); } /* vim:set sw=8: */ |