History

Merge branch 'lh/readme'

Lars Hjemli committed 16 years ago

Commit e76a1ea2 parents 857696d 515edb06 files · +43 −24Browse files

Unified · Split

6 files
  1. cgit.c +3 −5
  2. cgit.h +1 −0
  3. cgitrc.5.txt +5 −1
  4. scan-tree.c +5 −3
  5. shared.c +1 −1
  6. ui-summary.c +28 −14
cgit.c+3−5
@@ -72,11 +72,7 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) · 71 unmodified lines
72 else if (!strcmp(name, "section"))72 else if (!strcmp(name, "section"))
73 repo->section = xstrdup(value);73 repo->section = xstrdup(value);
74 else if (!strcmp(name, "readme") && value != NULL) {74 else if (!strcmp(name, "readme") && value != NULL) {
75 char *colon;75 repo->readme = xstrdup(value);
76 if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0'))
77 repo->readme = xstrdup(value);
78 else
79 repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
80 } else if (ctx.cfg.enable_filter_overrides) {76 } else if (ctx.cfg.enable_filter_overrides) {
81 if (!strcmp(name, "about-filter"))77 if (!strcmp(name, "about-filter"))
82 repo->about_filter = new_filter(value, 0);78 repo->about_filter = new_filter(value, 0);
@@ -97,6 +93,8 @@ void config_cb(const char *name, const char *value) · 14 unmodified lines
97 ctx.repo->path = trim_end(value, '/');93 ctx.repo->path = trim_end(value, '/');
98 else if (ctx.repo && !prefixcmp(name, "repo."))94 else if (ctx.repo && !prefixcmp(name, "repo."))
99 repo_config(ctx.repo, name + 5, value);95 repo_config(ctx.repo, name + 5, value);
96 else if (!strcmp(name, "readme"))
97 ctx.cfg.readme = xstrdup(value);
100 else if (!strcmp(name, "root-title"))98 else if (!strcmp(name, "root-title"))
101 ctx.cfg.root_title = xstrdup(value);99 ctx.cfg.root_title = xstrdup(value);
102 else if (!strcmp(name, "root-desc"))100 else if (!strcmp(name, "root-desc"))
cgit.h+1−0
@@ -168,6 +168,7 @@ struct cgit_config { · 167 unmodified lines
168 char *logo_link;168 char *logo_link;
169 char *module_link;169 char *module_link;
170 char *project_list;170 char *project_list;
171 char *readme;
171 char *robots;172 char *robots;
172 char *root_title;173 char *root_title;
173 char *root_desc;174 char *root_desc;
cgitrc.5.txt+5−1
@@ -234,6 +234,10 @@ project-list:: · 233 unmodified lines
234 should loaded as git repositories. This must be defined prior to234 should loaded as git repositories. This must be defined prior to
235 scan-path. Default value: none. See also: scan-path.235 scan-path. Default value: none. See also: scan-path.
236 236
237readme::
238 Text which will be used as default value for "repo.readme". Default
239 value: none.
240
237remove-suffix::241remove-suffix::
238 If set to "1" and scan-path is enabled, if any repositories are found242 If set to "1" and scan-path is enabled, if any repositories are found
239 with a suffix of ".git", this suffix will be removed for the url and243 with a suffix of ".git", this suffix will be removed for the url and
@@ -373,7 +377,7 @@ repo.readme:: · 133 unmodified lines
373 A path (relative to <repo.path>) which specifies a file to include377 A path (relative to <repo.path>) which specifies a file to include
374 verbatim as the "About" page for this repo. You may also specify a378 verbatim as the "About" page for this repo. You may also specify a
375 git refspec by head or by hash by prepending the refspec followed by379 git refspec by head or by hash by prepending the refspec followed by
376 a colon. For example, "master:docs/readme.mkd" Default value: none.380 a colon. For example, "master:docs/readme.mkd" Default value: <readme>.
377 381
378repo.snapshots::382repo.snapshots::
379 A mask of allowed snapshot-formats for this repo, restricted by the383 A mask of allowed snapshot-formats for this repo, restricted by the
scan-tree.c+5−3
@@ -110,9 +110,11 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) · 109 unmodified lines
110 if (!stat(p, &st))110 if (!stat(p, &st))
111 readfile(p, &repo->desc, &size);111 readfile(p, &repo->desc, &size);
112 112
113 p = fmt("%s/README.html", path);113 if (!repo->readme) {
114 if (!stat(p, &st))114 p = fmt("%s/README.html", path);
115 repo->readme = "README.html";115 if (!stat(p, &st))
116 repo->readme = "README.html";
117 }
116 118
117 p = fmt("%s/cgitrc", path);119 p = fmt("%s/cgitrc", path);
118 if (!stat(p, &st)) {120 if (!stat(p, &st)) {
shared.c+1−1
@@ -62,7 +62,7 @@ struct cgit_repo *cgit_add_repo(const char *url) · 61 unmodified lines
62 ret->enable_subject_links = ctx.cfg.enable_subject_links;62 ret->enable_subject_links = ctx.cfg.enable_subject_links;
63 ret->max_stats = ctx.cfg.max_stats;63 ret->max_stats = ctx.cfg.max_stats;
64 ret->module_link = ctx.cfg.module_link;64 ret->module_link = ctx.cfg.module_link;
65 ret->readme = NULL;65 ret->readme = ctx.cfg.readme;
66 ret->mtime = -1;66 ret->mtime = -1;
67 ret->about_filter = ctx.cfg.about_filter;67 ret->about_filter = ctx.cfg.about_filter;
68 ret->commit_filter = ctx.cfg.commit_filter;68 ret->commit_filter = ctx.cfg.commit_filter;
ui-summary.c+28−14
@@ -70,33 +70,47 @@ void cgit_print_summary() · 69 unmodified lines
70 70
71void cgit_print_repo_readme(char *path)71void cgit_print_repo_readme(char *path)
72{72{
73 char *slash, *tmp, *colon, *ref = 0;73 char *slash, *tmp, *colon, *ref;
74 74
75 if (!ctx.repo->readme)75 if (!ctx.repo->readme || !(*ctx.repo->readme))
76 return;76 return;
77 77
78 ref = NULL;
79
80 /* Check if the readme is tracked in the git repo. */
81 colon = strchr(ctx.repo->readme, ':');
82 if (colon && strlen(colon) > 1) {
83 *colon = '\0';
84 ref = ctx.repo->readme;
85 ctx.repo->readme = colon + 1;
86 if (!(*ctx.repo->readme))
87 return;
88 }
89
90 /* Prepend repo path to relative readme path unless tracked. */
91 if (!ref && *ctx.repo->readme != '/')
92 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
93 ctx.repo->readme));
94
95 /* If a subpath is specified for the about page, make it relative
96 * to the directory containing the configured readme.
97 */
78 if (path) {98 if (path) {
79 slash = strrchr(ctx.repo->readme, '/');99 slash = strrchr(ctx.repo->readme, '/');
80 if (!slash) {100 if (!slash) {
81 slash = strchr(ctx.repo->readme, ':');101 if (!colon)
82 if (!slash)
83 return;102 return;
103 slash = colon;
84 }104 }
85 tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);105 tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
86 strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);106 strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
87 strcpy(tmp + (slash - ctx.repo->readme + 1), path);107 strcpy(tmp + (slash - ctx.repo->readme + 1), path);
88 } else108 } else
89 tmp = ctx.repo->readme;109 tmp = ctx.repo->readme;
90 colon = strchr(tmp, ':');110
91 if (colon && strlen(colon) > 1) {111 /* Print the calculated readme, either from the git repo or from the
92 *colon = '\0';112 * filesystem, while applying the about-filter.
93 ref = tmp;113 */
94 tmp = colon + 1;
95 while ((*tmp == '/' || *tmp == ':') && *tmp != '\0')
96 ++tmp;
97 if (!(*tmp))
98 return;
99 }
100 html("<div id='summary'>");114 html("<div id='summary'>");
101 if (ctx.repo->about_filter)115 if (ctx.repo->about_filter)
102 cgit_open_filter(ctx.repo->about_filter);116 cgit_open_filter(ctx.repo->about_filter);