commit - 9a9d12ca5b1ad66d4721888f3d3e8a94e09fab42
commit + 626b25b61a29df29022bc49ccbbfc75c8b4d88bb
blob - 12819268eddbfa9b3a5d68d8897c937bb20f7cd4
blob + f7c5a935c98101e547c6c513143bf0096ae1c610
--- gotweb/files/cgi-bin/gw_tmpl/tree.tmpl
+++ gotweb/files/cgi-bin/gw_tmpl/tree.tmpl
@@search@@
</div>
<div id="content">
- @@content@@
+ <div id='tree_title_wrapper'>
+ <div id='tree_title'>Tree</div>
+ </div>
+ <div id='tree_content'>
+ @@content@@
+ </div>
</div>
@@siteowner@@
</div>
blob - 5b464436c34dd972182e3168a8e323fcbc125a61
blob + e08faa04d31c5ed22df061b0a81fc782682c4aea
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
char *, char *, int);
static const struct got_error *gw_output_file_blame(struct gw_trans *);
static const struct got_error *gw_output_blob_buf(struct gw_trans *);
-static const struct got_error *gw_get_repo_tree(char **, struct gw_trans *);
+static const struct got_error *gw_output_repo_tree(struct gw_trans *);
static const struct got_error *gw_get_diff(struct gw_trans *,
struct gw_header *);
static const struct got_error *gw_get_repo_tags(char **, struct gw_trans *,
const struct got_error *error = NULL;
struct gw_header *header = NULL, *n_header = NULL;
char *age = NULL, *escaped_commit_msg = NULL;
- char *href_diff = NULL, *href_tree = NULL;
+ char *href_diff = NULL, *href_blob = NULL;
enum kcgi_err kerr = KCGI_OK;
if ((header = gw_init_header()) == NULL)
/* XXX: create gen code for this */
/* build tree nav */
- if (asprintf(&href_tree, "?path=%s&action=tree&commit=%s",
+ if (asprintf(&href_blob, "?path=%s&action=tree&commit=%s",
gw_trans->repo_name, n_header->commit_id) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
- KATTR_HREF, href_tree, KATTR__MAX);
+ KATTR_HREF, href_blob, KATTR__MAX);
if (kerr != KCGI_OK)
goto done;
khtml_puts(gw_trans->gw_html_req, "tree");
gw_free_headers(n_header);
free(age);
free(href_diff);
- free(href_tree);
+ free(href_blob);
free(escaped_commit_msg);
if (error == NULL && kerr != KCGI_OK)
error = gw_kcgi_error(kerr);
const struct got_error *error = NULL;
struct gw_header *header = NULL, *n_header = NULL;
char *age = NULL, *age_html = NULL;
- char *href_diff = NULL, *href_tree = NULL;
+ char *href_diff = NULL, *href_blob = NULL;
char *newline, *smallerthan;
enum kcgi_err kerr = KCGI_OK;
goto done;
/* build tree nav */
- if (asprintf(&href_tree, "?path=%s&action=tree&commit=%s",
+ if (asprintf(&href_blob, "?path=%s&action=tree&commit=%s",
gw_trans->repo_name, n_header->commit_id) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
- KATTR_HREF, href_tree, KATTR__MAX);
+ KATTR_HREF, href_blob, KATTR__MAX);
if (kerr != KCGI_OK)
goto done;
khtml_puts(gw_trans->gw_html_req, "tree");
age_html = NULL;
free(href_diff);
href_diff = NULL;
- free(href_tree);
- href_tree = NULL;
+ free(href_blob);
+ href_blob = NULL;
}
done:
got_ref_list_free(&header->refs);
free(age);
free(age_html);
free(href_diff);
- free(href_tree);
+ free(href_blob);
if (error == NULL && kerr != KCGI_OK)
error = gw_kcgi_error(kerr);
return error;
if (error)
goto done;
- error = gw_get_repo_tree(&tree_html, gw_trans);
- if (error)
- goto done;
- error = gw_get_time_str(&age, header->committer_time, TM_LONG);
- if (error)
+ /* tree header */
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
+ "tree_header_wrapper", KATTR__MAX);
+ if (kerr != KCGI_OK)
goto done;
- if (asprintf(&age_html, header_age_html, age ? age : "") == -1) {
- error = got_error_from_errno("asprintf");
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
+ "tree_header", KATTR__MAX);
+ if (kerr != KCGI_OK)
goto done;
- }
+ error = gw_gen_tree_header(gw_trans, header->tree_id);
+ if (error)
+ goto done;
+ error = gw_get_time_str(&age, header->committer_time,
+ TM_LONG);
+ if (error)
+ goto done;
+ error = gw_gen_age_header(gw_trans, age ?age : "");
+ if (error)
+ goto done;
+ /*
+ * XXX: keeping this for now, since kcgihtml does not convert
+ * \n into <br /> yet.
+ */
error = gw_html_escape(&escaped_commit_msg, header->commit_msg);
if (error)
goto done;
- if (asprintf(&tree_html_disp, tree_header, age_html,
- gw_gen_commit_msg_header_old(escaped_commit_msg),
- tree_html ? tree_html : "") == -1) {
- error = got_error_from_errno("asprintf");
+ error = gw_gen_commit_msg_header(gw_trans, header->commit_msg);
+ if (error)
goto done;
- }
-
- if (asprintf(&tree, tree_wrapper, tree_html_disp) == -1) {
- error = got_error_from_errno("asprintf");
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
+ if (kerr != KCGI_OK)
goto done;
- }
-
- kerr = khttp_puts(gw_trans->gw_req, tree);
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
+ "dotted_line", KATTR__MAX);
if (kerr != KCGI_OK)
- error = gw_kcgi_error(kerr);
+ goto done;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ goto done;
+
+ /* tree */
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV, KATTR_ID,
+ "tree", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ error = gw_output_repo_tree(gw_trans);
+ if (error)
+ goto done;
+
+ /* tree content close */
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ goto done;
done:
got_ref_list_free(&header->refs);
gw_free_headers(header);
free(age);
free(age_html);
free(escaped_commit_msg);
+ if (error == NULL && kerr != KCGI_OK)
+ error = gw_kcgi_error(kerr);
return error;
}
}
static const struct got_error *
-gw_get_repo_tree(char **tree_html, struct gw_trans *gw_trans)
+gw_output_repo_tree(struct gw_trans *gw_trans)
{
const struct got_error *error = NULL;
struct got_repository *repo = NULL;
struct got_object_id *tree_id = NULL, *commit_id = NULL;
struct got_tree_object *tree = NULL;
- struct buf *diffbuf = NULL;
- size_t newsize;
- char *path = NULL, *in_repo_path = NULL, *tree_row = NULL;
+ char *path = NULL, *in_repo_path = NULL;
char *id_str = NULL;
char *build_folder = NULL;
- char *url_html = NULL;
+ char *href_blob = NULL, *href_blame = NULL;
const char *class = NULL;
int nentries, i, class_flip = 0;
+ enum kcgi_err kerr = KCGI_OK;
- *tree_html = NULL;
-
- error = buf_alloc(&diffbuf, 0);
- if (error)
- return error;
-
error = got_repo_open(&repo, gw_trans->repo_path, NULL);
if (error)
goto done;
"asprintf");
goto done;
}
-
- if (asprintf(&url_html, folder_html,
+ if (asprintf(&href_blob,
+ "?path=%s&action=%s&commit=%s&folder=%s",
gw_trans->repo_name, gw_trans->action_name,
- gw_trans->commit, build_folder,
- got_tree_entry_get_name(te), modestr) == -1) {
+ gw_trans->commit, build_folder) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
- if (asprintf(&tree_row, tree_line, class, url_html,
- class) == -1) {
- error = got_error_from_errno("asprintf");
+
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV,
+ KATTR_ID, "tree_wrapper", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV,
+ KATTR_ID, "tree_line", KATTR_CLASS, class,
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
+ KATTR_HREF, href_blob, KATTR_CLASS,
+ "diff_directory", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_puts(gw_trans->gw_html_req,
+ got_tree_entry_get_name(te));
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_puts(gw_trans->gw_html_req, modestr);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV,
+ KATTR_ID, "tree_line_blank", KATTR_CLASS, class,
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
goto done;
- }
+ kerr = khtml_entity(gw_trans->gw_html_req,
+ KENTITY_nbsp);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
+ if (kerr != KCGI_OK)
+ goto done;
} else {
- if (asprintf(&url_html, file_html, gw_trans->repo_name,
- "blob", gw_trans->commit,
+ if (asprintf(&href_blob,
+ "?path=%s&action=%s&commit=%s&file=%s&folder=%s",
+ gw_trans->repo_name, "blob", gw_trans->commit,
got_tree_entry_get_name(te),
- gw_trans->repo_folder ? gw_trans->repo_folder : "",
- got_tree_entry_get_name(te), modestr) == -1) {
+ gw_trans->repo_folder ?
+ gw_trans->repo_folder : "") == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
-
- if (asprintf(&tree_row, tree_line_with_navs, class,
- url_html, class, gw_trans->repo_name, "blob",
- gw_trans->commit, got_tree_entry_get_name(te),
- gw_trans->repo_folder ? gw_trans->repo_folder : "",
- "blob", gw_trans->repo_name,
- "blame", gw_trans->commit,
+ if (asprintf(&href_blame,
+ "?path=%s&action=%s&commit=%s&file=%s&folder=%s",
+ gw_trans->repo_name, "blame", gw_trans->commit,
got_tree_entry_get_name(te),
- gw_trans->repo_folder ? gw_trans->repo_folder : "",
- "blame") == -1) {
+ gw_trans->repo_folder ?
+ gw_trans->repo_folder : "") == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
- }
- error = buf_puts(&newsize, diffbuf, tree_row);
- if (error)
- goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV,
+ KATTR_ID, "tree_wrapper", KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV,
+ KATTR_ID, "tree_line", KATTR_CLASS, class,
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
+ KATTR_HREF, href_blob, KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_puts(gw_trans->gw_html_req,
+ got_tree_entry_get_name(te));
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_puts(gw_trans->gw_html_req, modestr);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 2);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_DIV,
+ KATTR_ID, "tree_line_navs", KATTR_CLASS, class,
+ KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
+ KATTR_HREF, href_blob, KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_puts(gw_trans->gw_html_req, "blob");
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 1);
+ if (kerr != KCGI_OK)
+ goto done;
+
+ kerr = khtml_puts(gw_trans->gw_html_req, " | ");
+ if (kerr != KCGI_OK)
+ goto done;
+
+ kerr = khtml_attr(gw_trans->gw_html_req, KELEM_A,
+ KATTR_HREF, href_blame, KATTR__MAX);
+ if (kerr != KCGI_OK)
+ goto done;
+ kerr = khtml_puts(gw_trans->gw_html_req, "blame");
+ if (kerr != KCGI_OK)
+ goto done;
+
+ kerr = khtml_closeelem(gw_trans->gw_html_req, 3);
+ if (kerr != KCGI_OK)
+ goto done;
+ }
free(id_str);
id_str = NULL;
- free(url_html);
- url_html = NULL;
- free(tree_row);
- tree_row = NULL;
+ free(href_blob);
+ href_blob = NULL;
free(build_folder);
build_folder = NULL;
- }
-
- if (buf_len(diffbuf) > 0) {
- error = buf_putc(diffbuf, '\0');
- if (error)
- goto done;
- *tree_html = strdup(buf_get(diffbuf));
- if (*tree_html == NULL) {
- error = got_error_from_errno("strdup");
- goto done;
- }
}
done:
if (tree)
got_object_tree_close(tree);
if (repo)
got_repo_close(repo);
-
free(id_str);
- free(url_html);
- free(tree_row);
+ free(href_blob);
+ free(href_blame);
free(in_repo_path);
free(tree_id);
- free(diffbuf);
free(build_folder);
+ if (error == NULL && kerr != KCGI_OK)
+ error = gw_kcgi_error(kerr);
return error;
}
blob - 1617f6a64115dadc73eafbdeb76126acb349e749
blob + 1db328d580e1c59bd7e63c626e34ff016996ef82
--- gotweb/gotweb_ui.h
+++ gotweb/gotweb_ui.h
"<a href='?path=%s&action=briefs&headref=%s'>commit briefs</a> | " \
"<a href='?path=%s&action=commits&headref=%s'>commits</a>";
-char *folder_html =
- "<a href='?path=%s&action=%s&commit=%s&folder=%s' " \
- "class='diff_directory'>%s%s</a>";
-
-char *file_html =
- "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=%s'>%s%s</a>";
-
/* headers */
char *header_commit_html =
"<div id='header_commit_msg_title'>Message:</div>" \
"<div id='header_commit_msg'>%s</div>";
-/* tree.tmpl */
-
-char *tree_wrapper =
- "<div id='tree_title_wrapper'>" \
- "<div id='tree_title'>Tree</div></div>" \
- "<div id='tree_content'>%s</div>";
-
-char *tree_header =
- "<div id='tree_header_wrapper'>" \
- "<div id='tree_header'>%s%s</div>" \
- "</div>" \
- "<div id='dotted_line'></div>" \
- "<div id='tree'>%s</div>" \
- "</div>";
-
-char *tree_line =
- "<div id='tree_wrapper'>" \
- "<div id='tree_line' class='%s'>%s</div>" \
- "<div id='tree_line_blank' class='%s'> </div>" \
- "</div>";
-
-char *tree_line_with_navs =
- "<div id='tree_wrapper'>" \
- "<div id='tree_line' class='%s'>%s</div>" \
- "<div id='tree_line_navs' class='%s'>" \
- "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=%s'>%s</a> | " \
- "<a href='?path=%s&action=%s&commit=%s&file=%s&folder=%s'>%s</a>" \
- "</div>" \
- "</div>";
-
/* tag.tmpl */
char *tag_wrapper =
