commit - ac67fee49c78c55c9b711b975fbf8d481e521c74
commit + ac15152e219bed9c7f41007a39c3cbce83ea9386
blob - 3cffce10df8b3b0b5171ca588350df135c1cbf7f
blob + b61f9292109e3986171a8d14865d128e2087e905
--- gotwebd/files/htdocs/gotwebd/gotweb.css
+++ gotwebd/files/htdocs/gotwebd/gotweb.css
.tree_line_blank {
padding: 1px;
width: 9.5em;
+}
+#tree_content h2 {
+ margin-top: 40px;
+ padding: 0 20px 0;
+}
+#tree_content pre {
+ padding: 0 20px 20px;
+ white-space: pre-wrap;
}
#diff {
blob - 769fcfb189a08622b7b60081be7781b819637fad
blob + 811b305e2a8b1fc494ec5bb3fde95f5c9da249d7
--- gotwebd/got_operations.c
+++ gotwebd/got_operations.c
}
int
-got_output_repo_tree(struct request *c,
+got_output_repo_tree(struct request *c, char **readme,
int (*cb)(struct template *, struct got_tree_entry *))
{
const struct got_error *error = NULL;
struct got_tree_object *tree = NULL;
struct got_tree_entry *te;
struct repo_dir *repo_dir = t->repo_dir;
+ const char *name;
+ mode_t mode;
char *escaped_name = NULL, *path = NULL;
int nentries, i;
TAILQ_INIT(&refs);
+ *readme = NULL;
rc = TAILQ_FIRST(&t->repo_commits);
for (i = 0; i < nentries; i++) {
te = got_object_tree_get_entry(tree, i);
+
+ name = got_tree_entry_get_name(te);
+ mode = got_tree_entry_get_mode(te);
+ if (!S_ISDIR(mode) && (!strcasecmp(name, "README") ||
+ !strcasecmp(name, "README.md") ||
+ !strcasecmp(name, "README.txt"))) {
+ free(*readme);
+ *readme = strdup(name);
+ }
+
if (cb(c->tp, te) == -1) {
error = got_error(GOT_ERR_CANCELLED);
break;
free(commit_id);
free(tree_id);
if (error) {
+ free(*readme);
+ *readme = NULL;
if (error->code != GOT_ERR_CANCELLED)
log_warnx("%s: %s", __func__, error->msg);
return -1;
const struct got_error *
got_open_blob_for_output(struct got_blob_object **blob, int *fd,
- int *binary, struct request *c)
+ int *binary, struct request *c, const char *directory, const char *file,
+ const char *commitstr)
{
const struct got_error *error = NULL;
- struct transport *t = c->t;
- struct got_repository *repo = t->repo;
- struct querystring *qs = c->t->qs;
+ struct got_repository *repo = c->t->repo;
struct got_commit_object *commit = NULL;
struct got_object_id *commit_id = NULL;
struct got_reflist_head refs;
*fd = -1;
*binary = 0;
- if (asprintf(&path, "%s%s%s", qs->folder ? qs->folder : "",
- qs->folder ? "/" : "", qs->file) == -1) {
+ error = got_ref_list(&refs, repo, "refs/heads",
+ got_ref_cmp_by_name, NULL);
+ if (error)
+ goto done;
+
+ if (asprintf(&path, "%s%s%s", directory ? directory : "",
+ directory ? "/" : "", file) == -1) {
error = got_error_from_errno("asprintf");
goto done;
}
if (error)
goto done;
- error = got_repo_match_object_id(&commit_id, NULL, qs->commit,
+ if (commitstr == NULL)
+ commitstr = GOT_REF_HEAD;
+
+ error = got_repo_match_object_id(&commit_id, NULL, commitstr,
GOT_OBJ_TYPE_COMMIT, &refs, repo);
if (error)
goto done;
*blob = NULL;
}
+ got_ref_list_free(&refs);
free(in_repo_path);
free(commit_id);
free(path);
blob - 5a9e5219a1429b6a682151e03ff69c6f506f26b2
blob + 48e5696942f0483cf0bac6ae07df6e03d218ee3e
--- gotwebd/gotweb.c
+++ gotwebd/gotweb.c
goto err;
error = got_open_blob_for_output(&c->t->blob, &c->t->fd,
- &binary, c);
+ &binary, c, qs->folder, qs->file, qs->commit);
if (error)
goto err;
}
blob - 4cd99ce853542b1e2a0684ce76da6d122f7cf05a
blob + 4efd134dfaaf502699cb7769db9b07549b2ee41b
--- gotwebd/gotwebd.h
+++ gotwebd/gotwebd.h
const struct got_error *got_get_repo_tags(struct request *, size_t);
const struct got_error *got_get_repo_heads(struct request *);
const struct got_error *got_open_diff_for_output(FILE **, struct request *);
-int got_output_repo_tree(struct request *,
+int got_output_repo_tree(struct request *, char **,
int (*)(struct template *, struct got_tree_entry *));
const struct got_error *got_open_blob_for_output(struct got_blob_object **,
- int *, int *, struct request *);
+ int *, int *, struct request *, const char *, const char *, const char *);
int got_output_blob_by_lines(struct template *, struct got_blob_object *,
int (*)(struct template *, const char *, size_t));
const struct got_error *got_output_file_blame(struct request *,
blob - bbcaa81e086ae388fea68770a80f18d48f3b28df
blob + 8080344cb29306239d3e58af9772c1a730874aec
--- gotwebd/pages.tmpl
+++ gotwebd/pages.tmpl
{{ define gotweb_render_tree(struct template *tp) }}
{!
+ const struct got_error *error;
struct request *c = tp->tp_arg;
struct transport *t = c->t;
+ struct querystring *qs = t->qs;
struct repo_commit *rc = TAILQ_FIRST(&t->repo_commits);
+ struct gotweb_url url;
+ char *readme = NULL;
+ int binary;
+ const uint8_t *buf;
+ size_t len;
!}
<header class='subtitle'>
<h2>Tree</h2>
</div>
<hr />
<table id="tree">
- {{ render got_output_repo_tree(c, gotweb_render_tree_item) }}
+ {{ render got_output_repo_tree(c, &readme, gotweb_render_tree_item) }}
</table>
+ {{ if readme }}
+ {!
+ error = got_open_blob_for_output(&t->blob, &t->fd, &binary, c,
+ qs->folder, readme, qs->commit);
+ if (error) {
+ free(readme);
+ return (-1);
+ }
+
+ memset(&url, 0, sizeof(url));
+ url.index_page = -1;
+ url.page = -1;
+ url.action = BLOB;
+ url.path = t->qs->path;
+ url.file = readme;
+ url.folder = t->qs->folder;
+ url.commit = t->qs->commit;
+ !}
+ {{ if !binary }}
+ <h2>
+ <a href="{{ render gotweb_render_url(c, &url) }}">
+ {{ readme }}
+ </a>
+ </h2>
+ <pre>
+ {!
+ for (;;) {
+ error = got_object_blob_read_block(&len, t->blob);
+ if (error) {
+ free(readme);
+ return (-1);
+ }
+ if (len == 0)
+ break;
+ buf = got_object_blob_get_read_buf(t->blob);
+ if (tp_write_htmlescape(tp, buf, len) == -1) {
+ free(readme);
+ return (-1);
+ }
+ }
+ !}
+ </pre>
+ {{ end }}
+ {{ end }}
</div>
+{{ finally }}
+{! free(readme); !}
{{ end }}
{{ define gotweb_render_tree_item(struct template *tp,
