commit - a416cdeba9cb2aea1da0825973a3fca65f1b2f33
commit + 8087c3c56bccad29ed74f1200794a00d923b62f8
blob - 3ea47833b3f3410756fa80dd2f323be2bc2b3b29
blob + 9f6342de645d8a808670982c188a766e1a3e7974
--- gotweb/files/htdocs/gotweb/gotweb.css
+++ gotweb/files/htdocs/gotweb/gotweb.css
width: 100%;
border-top: 1px dotted #444444;
}
+#solid_line {
+ clear: left;
+ float: left;
+ width: 100%;
+ border-top: 1px solid #444444;
+}
#header {
overflow: auto;
width: 100%;
padding-right: 10px;
padding-top: 5px;
padding-bottom: 5px;
+}
+#commit_commit_title {
+ clear: left;
+ float: left;
+ width: 6.5em;
+ padding-left: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_commit {
+ float: left;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_diff_title {
+ clear: left;
+ float: left;
+ width: 6.5em;
+ padding-left: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_diff {
+ float: left;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_author_title {
+ clear: left;
+ float: left;
+ width: 6.5em;
+ padding-left: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_author {
+ float: left;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_committer_title {
+ clear: left;
+ float: left;
+ width: 6.5em;
+ padding-left: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_committer {
+ float: left;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_age_title {
+ clear: left;
+ float: left;
+ width: 6.5em;
+ padding-left: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_age {
+ float: left;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_log_title {
+ clear: left;
+ float: left;
+ width: 6.5em;
+ padding-left: 10px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+}
+#commit_log {
+ float: left;
+ width: 72%;
+ padding-top: 2px;
+ padding-bottom: 2px;
}
/* index.tmpl */
clear: left;
float: left;
background-color: #f5fcfb;
+ padding-top: 3px;
+ padding-bottom: 3px;
width: 100%;
}
-#logs_commit {
+#log {
clear: left;
float: left;
+ padding-left: 20px;
+ padding-top: 20px;
+ padding-bottom: 20px;
+}
+
+/* tree.tmpl */
+
+#log_tree_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#log_tree_title_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+ background-color: LightSlateGray;
+ color: #ffffff;
+}
+#log_tree_title {
padding-left: 10px;
padding-top: 5px;
- padding-bottom: 2px;
+ padding-bottom: 5px;
}
-#logs_author {
+#log_tree_content {
clear: left;
float: left;
+ width: 100%;
+}
+#log_tree_row_wrapper {
+ clear: left;
+ float: left;
+ background-color: #f5fcfb;
+ width: 100%;
+}
+#log_tree_commit {
+ clear: left;
+ float: left;
padding-left: 10px;
- padding-top: 2px;
+ padding-top: 5px;
padding-bottom: 2px;
}
-#logs_age {
+#log_tree {
clear: left;
float: left;
+ padding: 20px;
+}
+
+/* commit.tmpl */
+
+#log_commit_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+}
+#log_commit_title_wrapper {
+ clear: left;
+ float: left;
+ width: 100%;
+ background-color: LightSlateGray;
+ color: #ffffff;
+}
+#log_commit_title {
padding-left: 10px;
- padding-top: 2px;
+ padding-top: 5px;
padding-bottom: 5px;
}
-
-#log {
+#log_commit_content {
clear: left;
float: left;
- padding-left: 20px;
- padding-top: 2px;
- padding-bottom: 20px;
+ width: 100%;
}
+#log_commit_row_wrapper {
+ clear: left;
+ float: left;
+ background-color: #f5fcfb;
+ width: 100%;
+}
+#log_commit_commit {
+ clear: left;
+ float: left;
+ padding-left: 10px;
+ padding-top: 5px;
+ padding-bottom: 2px;
+}
+#log_commit {
+ clear: left;
+ float: left;
+ padding: 20px;
+}
/* summary.tmpl */
blob - debc3faf3bd9431c7b47c2827fed1d20c6d3db67
blob + 5da34cc020cd786d0b2691068406cc3c797d4360
--- gotweb/gotweb.c
+++ gotweb/gotweb.c
char *commit;
char *repo_file;
char *action_name;
+ char *headref;
unsigned int action;
unsigned int page;
unsigned int repos_total;
KEY_COMMIT_ID,
KEY_FILE,
KEY_PAGE,
+ KEY_HEADREF,
KEY__MAX
};
TM_LONG,
};
+enum logs {
+ LOGBRIEF,
+ LOGCOMMIT,
+ LOGFULL,
+ LOGTREE,
+};
+
struct buf {
/* buffer handle, buffer size, and data length */
u_char *cb_buf;
{ kvalid_stringne, "commit" },
{ kvalid_stringne, "file" },
{ kvalid_int, "page" },
+ { kvalid_stringne, "headref" },
};
static struct gw_dir *gw_init_gw_dir(char *);
static const struct got_error* gw_blame(struct trans *);
static const struct got_error* gw_blob(struct trans *);
-static const struct got_error* gw_blob_diff(struct trans *);
+static const struct got_error* gw_blobdiff(struct trans *);
static const struct got_error* gw_commit(struct trans *);
-static const struct got_error* gw_commit_diff(struct trans *);
+static const struct got_error* gw_commitdiff(struct trans *);
static const struct got_error* gw_history(struct trans *);
static const struct got_error* gw_index(struct trans *);
static const struct got_error* gw_log(struct trans *);
static struct gw_query_action gw_query_funcs[] = {
{ GW_BLAME, "blame", gw_blame, "gw_tmpl/index.tmpl" },
{ GW_BLOB, "blob", gw_blob, "gw_tmpl/index.tmpl" },
- { GW_BLOBDIFF, "blobdiff", gw_blob_diff, "gw_tmpl/index.tmpl" },
+ { GW_BLOBDIFF, "blobdiff", gw_blobdiff, "gw_tmpl/index.tmpl" },
{ GW_COMMIT, "commit", gw_commit, "gw_tmpl/index.tmpl" },
- { GW_COMMITDIFF, "commit_diff", gw_commit_diff, "gw_tmpl/index.tmpl" },
+ { GW_COMMITDIFF, "commitdiff", gw_commitdiff, "gw_tmpl/index.tmpl" },
{ GW_ERR, NULL, NULL, "gw_tmpl/index.tmpl" },
{ GW_HISTORY, "history", gw_history, "gw_tmpl/index.tmpl" },
{ GW_INDEX, "index", gw_index, "gw_tmpl/index.tmpl" },
}
static const struct got_error *
-gw_blob_diff(struct trans *gw_trans)
+gw_blobdiff(struct trans *gw_trans)
{
const struct got_error *error = NULL;
gw_commit(struct trans *gw_trans)
{
const struct got_error *error = NULL;
+ char *log, *log_html;
+ error = apply_unveil(gw_trans->gw_dir->path, NULL);
+ if (error)
+ return error;
+
+ log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGCOMMIT);
+
+ if (log != NULL && strcmp(log, "") != 0) {
+ if ((asprintf(&log_html, log_commit, log)) == -1)
+ return got_error_from_errno("asprintf");
+ khttp_puts(gw_trans->gw_req, log_html);
+ free(log_html);
+ free(log);
+ }
return error;
}
static const struct got_error *
-gw_commit_diff(struct trans *gw_trans)
+gw_commitdiff(struct trans *gw_trans)
{
const struct got_error *error = NULL;
{
const struct got_error *error = NULL;
char *log, *log_html;
+
+ error = apply_unveil(gw_trans->gw_dir->path, NULL);
+ if (error)
+ return error;
log = gw_get_repo_log(gw_trans, NULL, NULL,
- gw_trans->gw_conf->got_max_commits_display, 1);
+ gw_trans->gw_conf->got_max_commits_display, LOGFULL);
if (log != NULL && strcmp(log, "") != 0) {
if ((asprintf(&log_html, logs, log)) == -1)
gw_logbriefs(struct trans *gw_trans)
{
const struct got_error *error = NULL;
- char *logbriefs, *logbriefs_html;
+ char *log, *log_html;
- logbriefs = gw_get_repo_log(gw_trans, NULL, NULL,
- gw_trans->gw_conf->got_max_commits_display, 0);
+ error = apply_unveil(gw_trans->gw_dir->path, NULL);
+ if (error)
+ return error;
- if (logbriefs != NULL && strcmp(logbriefs, "") != 0) {
- if ((asprintf(&logbriefs_html, summary_logbriefs,
- logbriefs)) == -1)
+ log = gw_get_repo_log(gw_trans, NULL, NULL,
+ gw_trans->gw_conf->got_max_commits_display, LOGBRIEF);
+
+ if (log != NULL && strcmp(log, "") != 0) {
+ if ((asprintf(&log_html, summary_logbriefs,
+ log)) == -1)
return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, logbriefs_html);
- free(logbriefs_html);
- free(logbriefs);
+ khttp_puts(gw_trans->gw_req, log_html);
+ free(log_html);
+ free(log);
}
return error;
}
{
const struct got_error *error = NULL;
char *description_html, *repo_owner_html, *repo_age_html,
- *cloneurl_html, *logbriefs, *tags, *heads, *logbriefs_html,
- *tags_html, *heads_html, *age;
+ *cloneurl_html, *log, *log_html, *tags, *heads, *tags_html,
+ *heads_html, *age;
error = apply_unveil(gw_trans->gw_dir->path, NULL);
if (error)
}
khttp_puts(gw_trans->gw_req, div_end);
- logbriefs = gw_get_repo_log(gw_trans, NULL, NULL, D_MAXSLCOMMDISP, 0);
+ log = gw_get_repo_log(gw_trans, NULL, NULL, D_MAXSLCOMMDISP, 0);
tags = gw_get_repo_tags(gw_trans);
heads = gw_get_repo_heads(gw_trans);
- if (logbriefs != NULL && strcmp(logbriefs, "") != 0) {
- if ((asprintf(&logbriefs_html, summary_logbriefs,
- logbriefs)) == -1)
+ if (log != NULL && strcmp(log, "") != 0) {
+ if ((asprintf(&log_html, summary_logbriefs,
+ log)) == -1)
return got_error_from_errno("asprintf");
- khttp_puts(gw_trans->gw_req, logbriefs_html);
- free(logbriefs_html);
- free(logbriefs);
+ khttp_puts(gw_trans->gw_req, log_html);
+ free(log_html);
+ free(log);
}
if (tags != NULL && strcmp(tags, "") != 0) {
gw_tree(struct trans *gw_trans)
{
const struct got_error *error = NULL;
+ char *log, *log_html;
+
+ error = apply_unveil(gw_trans->gw_dir->path, NULL);
+ if (error)
+ return error;
+
+ log = gw_get_repo_log(gw_trans, NULL, gw_trans->commit, 1, LOGTREE);
+ if (log != NULL && strcmp(log, "") != 0) {
+ if ((asprintf(&log_html, log_tree, log)) == -1)
+ return got_error_from_errno("asprintf");
+ khttp_puts(gw_trans->gw_req, log_html);
+ free(log_html);
+ free(log);
+ }
return error;
}
if ((p = gw_trans->gw_req->fieldmap[KEY_FILE]))
if ((asprintf(&gw_trans->repo_file, "%s",
+ p->parsed.s)) == -1)
+ return got_error_from_errno("asprintf");
+
+ if ((p = gw_trans->gw_req->fieldmap[KEY_HEADREF]))
+ if ((asprintf(&gw_trans->headref, "%s",
p->parsed.s)) == -1)
return got_error_from_errno("asprintf");
SIMPLEQ_INIT(&refs);
if (gw_trans->gw_conf->got_show_repo_age == false) {
- asprintf(&repo_age, "");
+ if ((asprintf(&repo_age, "")) == -1)
+ return NULL;
return repo_age;
}
error = got_repo_open(&repo, dir, NULL);
static char *
gw_get_repo_log(struct trans *gw_trans, const char *search_pattern,
- char *start_commit, int limit, int full_log)
+ char *start_commit, int limit, int log_type)
{
const struct got_error *error;
struct got_repository *repo = NULL;
struct got_reflist_head refs;
struct got_reflist_entry *re;
struct got_commit_object *commit = NULL;
- struct got_object_id *id = NULL;
+ struct got_object_id *id1 = NULL, *id2 = NULL;
+ struct got_object_qid *parent_id;
struct got_commit_graph *graph = NULL;
- char *logbriefs = NULL, *id_str = NULL, *path = NULL,
- *in_repo_path = NULL, *commit_row = NULL, *commit_age = NULL,
- *commit_author = NULL, *commit_log = NULL, *commit_log0, *newline,
- *logbriefs_navs_html = NULL;
+ char *logs = NULL, *id_str1 = NULL, *id_str2 = NULL,
+ *path = NULL, *refs_str_disp = NULL,
+ *refs_str = NULL, *in_repo_path = NULL, *commit_row = NULL,
+ *commit_commit = NULL, *commit_commit_disp = NULL,
+ *commit_age_diff = NULL, *commit_age_diff_disp = NULL,
+ *commit_age_long = NULL, *commit_age_long_disp = NULL,
+ *commit_author = NULL, *commit_author_disp = NULL,
+ *commit_committer = NULL, *commit_committer_disp = NULL,
+ *commit_log = NULL, *commit_log_disp = NULL,
+ *commit_parent = NULL, *commit_diff_disp = NULL, *commit_log0,
+ *newline, *logbriefs_navs_html = NULL,
+ *log_tree_html = NULL, *log_commit_html = NULL;
regex_t regex;
int have_match;
size_t newsize;
- struct buf *diffbuf;
+ struct buf *diffbuf = NULL;
time_t committer_time;
if (search_pattern &&
if (start_commit == NULL) {
struct got_reference *head_ref;
- error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
+ error = got_ref_open(&head_ref, repo, gw_trans->headref, 0);
if (error != NULL)
- return NULL;
- error = got_ref_resolve(&id, repo, head_ref);
+ goto done;
+ error = got_ref_resolve(&id1, repo, head_ref);
got_ref_close(head_ref);
if (error != NULL)
- return NULL;
- error = got_object_open_as_commit(&commit, repo, id);
+ goto done;
+ error = got_object_open_as_commit(&commit, repo, id1);
} else {
struct got_reference *ref;
error = got_ref_open(&ref, repo, start_commit, 0);
if (error == NULL) {
int obj_type;
- error = got_ref_resolve(&id, repo, ref);
+ error = got_ref_resolve(&id1, repo, ref);
got_ref_close(ref);
if (error != NULL)
goto done;
- error = got_object_get_type(&obj_type, repo, id);
+ error = got_object_get_type(&obj_type, repo, id1);
if (error != NULL)
goto done;
if (obj_type == GOT_OBJ_TYPE_TAG) {
struct got_tag_object *tag;
- error = got_object_open_as_tag(&tag, repo, id);
+ error = got_object_open_as_tag(&tag, repo, id1);
if (error != NULL)
goto done;
if (got_object_tag_get_object_type(tag) !=
error = got_error(GOT_ERR_OBJ_TYPE);
goto done;
}
- free(id);
- id = got_object_id_dup(
+ free(id1);
+ id1 = got_object_id_dup(
got_object_tag_get_object_id(tag));
- if (id == NULL)
+ if (id1 == NULL)
error = got_error_from_errno(
"got_object_id_dup");
got_object_tag_close(tag);
error = got_error(GOT_ERR_OBJ_TYPE);
goto done;
}
- error = got_object_open_as_commit(&commit, repo, id);
+ error = got_object_open_as_commit(&commit, repo, id1);
if (error != NULL)
goto done;
}
if (commit == NULL) {
- error = got_repo_match_object_id_prefix(&id,
+ error = got_repo_match_object_id_prefix(&id1,
start_commit, GOT_OBJ_TYPE_COMMIT, repo);
if (error != NULL)
- return NULL;
+ goto done;
}
+ error = got_repo_match_object_id_prefix(&id1,
+ start_commit, GOT_OBJ_TYPE_COMMIT, repo);
+ if (error != NULL)
+ goto done;
}
if (error != NULL)
goto done;
-
error = got_repo_map_path(&in_repo_path, repo, gw_trans->repo_path, 1);
if (error != NULL)
goto done;
if (error)
goto done;
- error = got_commit_graph_open(&graph, id, path, 0, repo);
+ error = got_commit_graph_open(&graph, id1, path, 0, repo);
if (error)
goto done;
- error = got_commit_graph_iter_start(graph, id, repo, NULL, NULL);
+ error = got_commit_graph_iter_start(graph, id1, repo, NULL, NULL);
if (error)
goto done;
for (;;) {
- struct got_commit_object *commit_disp;
-
- error = got_commit_graph_iter_next(&id, graph);
+ error = got_commit_graph_iter_next(&id1, graph);
if (error) {
if (error->code == GOT_ERR_ITER_COMPLETED) {
error = NULL;
else
continue;
}
- if (id == NULL)
+ if (id1 == NULL)
break;
- error = got_object_open_as_commit(&commit_disp, repo, id);
+ error = got_object_open_as_commit(&commit, repo, id1);
if (error)
break;
if (search_pattern) {
- error = match_logmsg(&have_match, id, commit_disp,
+ error = match_logmsg(&have_match, id1, commit,
®ex);
if (error) {
- got_object_commit_close(commit_disp);
+ got_object_commit_close(commit);
break;
}
if (have_match == 0) {
- got_object_commit_close(commit_disp);
+ got_object_commit_close(commit);
continue;
}
}
SIMPLEQ_FOREACH(re, &refs, entry) {
+ char *s;
const char *name;
struct got_tag_object *tag = NULL;
int cmp;
}
}
cmp = got_object_id_cmp(tag ?
- got_object_tag_get_object_id(tag) : re->id, id);
+ got_object_tag_get_object_id(tag) : re->id, id1);
if (tag)
got_object_tag_close(tag);
if (cmp != 0)
continue;
+ s = refs_str;
+ if ((asprintf(&refs_str, "%s%s%s", s ? s : "",
+ s ? ", " : "", name)) == -1) {
+ error = got_error_from_errno("asprintf");
+ free(s);
+ goto done;
+ }
+ free(s);
}
- got_ref_list_free(&refs);
+ if (refs_str == NULL)
+ refs_str_disp = strdup("");
+ else {
+ if ((asprintf(&refs_str_disp, "(%s)",
+ refs_str)) == -1) {
+ error = got_error_from_errno("asprintf");
+ free(refs_str);
+ goto done;
+ }
+ }
/* commit id */
- error = got_object_id_str(&id_str, id);
+ error = got_object_id_str(&id_str1, id1);
if (error)
- break;
+ goto done;
+ if (gw_trans->action == GW_COMMIT) {
+ parent_id =
+ SIMPLEQ_FIRST(
+ got_object_commit_get_parent_ids(commit));
+ if (parent_id != NULL) {
+ id2 = got_object_id_dup(parent_id->id);
+ free (parent_id);
+ error = got_object_id_str(&id_str2, id2);
+ if (error)
+ goto done;
+ } else
+ id_str2 = strdup("/dev/null");
+ }
+
committer_time =
- got_object_commit_get_committer_time(commit_disp);
+ got_object_commit_get_committer_time(commit);
- if (full_log) {
-
- asprintf(&commit_age, "%s",
- gw_get_time_str(committer_time, TM_LONG));
- asprintf(&commit_author, "%s",
- got_object_commit_get_author(commit_disp));
- error = got_object_commit_get_logmsg(&commit_log0,
- commit_disp);
- if (error)
- commit_log = strdup("");
- else
- commit_log = gw_html_escape(commit_log0);
- asprintf(&logbriefs_navs_html, logbriefs_navs,
- gw_trans->repo_name, id_str, gw_trans->repo_name,
- id_str, gw_trans->repo_name, id_str,
- gw_trans->repo_name, id_str);
- asprintf(&commit_row, logs_row, id_str,
- gw_html_escape(commit_author), commit_age,
- commit_log, logbriefs_navs_html);
- error = buf_append(&newsize, diffbuf, commit_row,
- strlen(commit_row));
- } else {
- asprintf(&commit_age, "%s",
- gw_get_time_str(committer_time, TM_DIFF));
- asprintf(&commit_author, "%s",
- got_object_commit_get_author(commit_disp));
- error = got_object_commit_get_logmsg(&commit_log0,
- commit_disp);
- if (error)
- commit_log = strdup("");
- else {
- commit_log = commit_log0;
- while (*commit_log == '\n')
- commit_log++;
- newline = strchr(commit_log, '\n');
- if (newline)
- *newline = '\0';
+ if ((asprintf(&commit_parent, "%s", id_str2)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_diff_disp, commit_diff_html, id_str2,
+ id_str1)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_commit, "%s", id_str1)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_commit_disp, commit_commit_html,
+ commit_commit, refs_str_disp)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_age_long, "%s",
+ gw_get_time_str(committer_time, TM_LONG))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_age_long_disp, commit_age_html,
+ commit_age_long)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_age_diff, "%s",
+ gw_get_time_str(committer_time, TM_DIFF))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_age_diff_disp, commit_age_html,
+ commit_age_diff)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_author, "%s",
+ got_object_commit_get_author(commit))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_author_disp, commit_author_html,
+ gw_html_escape(commit_author))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_committer, "%s",
+ got_object_commit_get_committer(commit))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_committer_disp, commit_committer_html,
+ gw_html_escape(commit_committer))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if (strcmp(commit_author, commit_committer) == 0) {
+ free(commit_committer_disp);
+ commit_committer_disp = strdup("");
+ }
+
+ error = got_object_commit_get_logmsg(&commit_log0, commit);
+ if (error)
+ goto done;
+
+ switch(log_type) {
+ case (LOGBRIEF):
+ commit_log = commit_log0;
+ while (*commit_log == '\n')
+ commit_log++;
+ newline = strchr(commit_log, '\n');
+ if (newline)
+ *newline = '\0';
+
+ if ((asprintf(&logbriefs_navs_html, logbriefs_navs,
+ gw_trans->repo_name, id_str1, gw_trans->repo_name,
+ id_str1, gw_trans->repo_name, id_str1,
+ gw_trans->repo_name, id_str1)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
}
- asprintf(&logbriefs_navs_html, logbriefs_navs,
- gw_trans->repo_name, id_str, gw_trans->repo_name,
- id_str, gw_trans->repo_name, id_str,
- gw_trans->repo_name, id_str);
- asprintf(&commit_row, logbriefs_row, commit_age,
- commit_author, commit_log, logbriefs_navs_html);
- error = buf_append(&newsize, diffbuf, commit_row,
- strlen(commit_row));
+
+ if ((asprintf(&commit_row, logbriefs_row,
+ commit_age_diff, commit_author, commit_log,
+ logbriefs_navs_html)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ free(logbriefs_navs_html);
+ logbriefs_navs_html = NULL;
+ break;
+ case (LOGFULL):
+ commit_log = commit_log0;
+ while (*commit_log == '\n')
+ commit_log++;
+ newline = strchr(commit_log, '\n');
+ if (newline)
+ *newline = '\n';
+
+ if ((asprintf(&logbriefs_navs_html, logbriefs_navs,
+ gw_trans->repo_name, id_str1, gw_trans->repo_name,
+ id_str1, gw_trans->repo_name, id_str1,
+ gw_trans->repo_name, id_str1)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ if ((asprintf(&commit_row, logs_row, commit_commit_disp,
+ commit_author_disp, commit_committer_disp,
+ commit_age_long_disp, gw_html_escape(commit_log),
+ logbriefs_navs_html)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ free(logbriefs_navs_html);
+ logbriefs_navs_html = NULL;
+ break;
+ case (LOGTREE):
+ commit_log = gw_html_escape(commit_log0);
+
+ log_tree_html = strdup("log tree here");
+
+ if ((asprintf(&commit_row, log_tree_row, commit_log,
+ log_tree_html)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ free(log_tree_html);
+ break;
+ case (LOGCOMMIT):
+ commit_log = commit_log0;
+ while (*commit_log == '\n')
+ commit_log++;
+ newline = strchr(commit_log, '\n');
+ if (newline)
+ *newline = '\n';
+
+ if ((asprintf(&commit_log_disp, commit_log_html,
+ gw_html_escape(commit_log))) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+
+ log_commit_html = strdup("commit here");
+
+ if ((asprintf(&commit_row, log_commit_row,
+ commit_diff_disp, commit_commit_disp,
+ commit_author_disp, commit_committer_disp,
+ commit_age_long_disp, commit_log_disp,
+ log_commit_html)) == -1) {
+ error = got_error_from_errno("asprintf");
+ goto done;
+ }
+ free(commit_log_disp);
+ free(log_commit_html);
+
+ break;
+ default:
+ return NULL;
}
- free(commit_age);
+ error = buf_append(&newsize, diffbuf, commit_row,
+ strlen(commit_row));
+
+ free(commit_parent);
+ free(commit_diff_disp);
+ free(commit_age_diff);
+ free(commit_age_diff_disp);
+ free(commit_age_long);
+ free(commit_age_long_disp);
free(commit_author);
+ free(commit_author_disp);
+ free(commit_committer);
+ free(commit_committer_disp);
free(commit_log0);
- free(logbriefs_navs_html);
free(commit_row);
- free(id_str);
- commit_age = NULL;
- commit_author = NULL;
- commit_log = NULL;
- logbriefs_navs_html = NULL;
- commit_row = NULL;
- id_str = NULL;
+ free(refs_str_disp);
+ free(refs_str);
+ refs_str = NULL;
+ free(id_str1);
+ id_str1 = NULL;
+ free(id_str2);
+ id_str2 = NULL;
- got_object_commit_close(commit_disp);
if (error || (limit && --limit == 0))
break;
}
- logbriefs = strdup(diffbuf->cb_buf);
- got_object_commit_close(commit);
- free(path);
- free(id);
- buf_free(diffbuf);
+ if (error)
+ goto done;
+ logs = strdup(diffbuf->cb_buf);
+done:
+ buf_free(diffbuf);
+ if (commit != NULL)
+ got_object_commit_close(commit);
+ if (search_pattern)
+ regfree(®ex);
+ if (graph)
+ got_commit_graph_close(graph);
if (repo) {
error = got_repo_close(repo);
if (error != NULL)
return NULL;
}
-
- if (search_pattern)
- regfree(®ex);
- return logbriefs;
-done:
- if (repo)
- got_repo_close(repo);
- got_ref_list_free(&refs);
-
- if (search_pattern)
- regfree(®ex);
- got_commit_graph_close(graph);
- return NULL;
+ if (error) {
+ khttp_puts(gw_trans->gw_req, "Error: ");
+ khttp_puts(gw_trans->gw_req, error->msg);
+ return NULL;
+ } else
+ return logs;
}
static char *
break;
case ('\n'):
strcat(buf, "<br />");
+ case ('|'):
+ strcat(buf, " ");
default:
strcat(buf, &c[0]);
break;
gw_trans->repos_total = 0;
gw_trans->repo_path = NULL;
gw_trans->commit = NULL;
+ gw_trans->headref = strdup(GOT_REF_HEAD);
gw_trans->mime = KMIME_TEXT_HTML;
gw_trans->gw_tmpl->key = templs;
gw_trans->gw_tmpl->keysz = TEMPL__MAX;
free(gw_trans->repo_name);
free(gw_trans->repo_file);
free(gw_trans->action_name);
+ free(gw_trans->headref);
TAILQ_FOREACH_SAFE(dir, &gw_trans->gw_dirs, entry, tdir) {
free(dir->name);
blob - 25d69ce16df0b108a8fb05099e9f4ad392c39f38
blob + 9f8f89567c941bf2dd7ec45f6aaa139d6f190bc3
--- gotweb/gotweb_ui.h
+++ gotweb/gotweb_ui.h
"<a href='?path=%s&action=log&headref=%s'>log</a> | " \
"<a href='?path=%s&action=tree&headref=%s'>commit</a>";
+char *commit_diff_html =
+ "<div id='commit_diff_title'>Diff:</div>" \
+ "<div id='commit_diff'>%s %s</div>";
+
+char *commit_commit_html =
+ "<div id='commit_commit_title'>Commit:</div>" \
+ "<div id='commit_commit'>%s %s</div>";
+
+char *commit_author_html =
+ "<div id='commit_author_title'>Author:</div>" \
+ "<div id='commit_author'>%s</div>";
+
+char *commit_committer_html =
+ "<div id='commit_committer_title'>Committer:</div>" \
+ "<div id='commit_committer'>%s</div>";
+
+char *commit_age_html =
+ "<div id='commit_age_title'>Date:</div>" \
+ "<div id='commit_age'>%s</div>";
+
+char *commit_log_html =
+ "<div id='commit_log_title'>Log:</div>" \
+ "<div id='commit_log'>%s</div>";
+
/* log.tmpl */
char *logs_wrapper =
"<div id='logs_content'>%s</div>";
char *logs_row =
- "<div id='logs_row_wrapper'>" \
- "<div id='logs_commit'>Commit: %s</div>" \
- "<div id='logs_author'>From: %s</div>" \
- "<div id='logs_age'>Date: %s</div>" \
- "</div>" \
+ "<div id='logs_row_wrapper'>%s%s%s%s</div>" \
"<div id='dotted_line'></div>" \
"<div id='log'>%s</div>" \
"<div id='navs_wrapper'>" \
"<div id='navs'>%s</div>" \
"</div>" \
"</div>" \
- "<div id='dotted_line'></div>";
+ "<div id='solid_line'></div>";
char *logs_navs =
"<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \
"<a href='?path=%s&action=tree&commit=%s'>tree</a> | " \
"<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a>";
+/* tree.tmpl */
+
+char *log_tree_wrapper =
+ "<div id='log_tree_wrapper'>";
+
+char *log_tree =
+ "<div id='log_tree_title_wrapper'>" \
+ "<div id='log_tree_title'>Tree</div></div>" \
+ "<div id='log_tree_content'>%s</div>";
+
+char *log_tree_row =
+ "<div id='log_tree_row_wrapper'>" \
+ "<div id='log_tree_commit'>%s</div>" \
+ "</div>" \
+ "<div id='dotted_line'></div>" \
+ "<div id='log_tree'>%s</div>" \
+ "</div>";
+
+char *log_tree_navs =
+ "<a href='?path=%s&action=commit&commit=%s'>commit</a> | " \
+ "<a href='?path=%s&action=commitdiff&commit=%s'>diff</a> | " \
+ "<a href='?path=%s&action=tree&commit=%s'>tree</a> | " \
+ "<a href='?path=%s&action=snapshot&commit=%s'>snapshot</a>";
+
+/* commit.tmpl */
+
+char *log_commit_wrapper =
+ "<div id='log_commit_wrapper'>";
+
+char *log_commit =
+ "<div id='log_commit_title_wrapper'>" \
+ "<div id='log_commit_title'>Commit</div></div>" \
+ "<div id='log_commit_content'>%s</div>";
+
+char *log_commit_row =
+ "<div id='log_commit_row_wrapper'>" \
+ "<div id='log_commit_commit'>%s%s%s%s%s%s</div>" \
+ "</div>" \
+ "<div id='dotted_line'></div>" \
+ "<div id='log_commit'>%s</div>" \
+ "</div>";
+
/* index.tmpl */
char *index_projects_header =
