author | Jason A. Donenfeld <Jason@zx2c4.com> | 2010-08-03 22:45:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-20 16:57:30 (UTC) |
commit | 379e80e3a83481d3639c5d312eeddcce57c486b2 (patch) (unidiff) | |
tree | 474ac38e3812008532d4ebd0b095ac835b5478b5 | |
parent | aec9c245e7eaf444c7ae1851e3eda3b30748950f (diff) | |
download | cgit-379e80e3a83481d3639c5d312eeddcce57c486b2.zip cgit-379e80e3a83481d3639c5d312eeddcce57c486b2.tar.gz cgit-379e80e3a83481d3639c5d312eeddcce57c486b2.tar.bz2 |
Support refspecs in about-filter.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 4 | ||||
-rw-r--r-- | cgitrc.5.txt | 4 | ||||
-rw-r--r-- | ui-blob.c | 35 | ||||
-rw-r--r-- | ui-blob.h | 1 | ||||
-rw-r--r-- | ui-summary.c | 26 |
5 files changed, 63 insertions, 7 deletions
@@ -1,11 +1,12 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
7 | */ | 8 | */ |
8 | 9 | ||
9 | #include "cgit.h" | 10 | #include "cgit.h" |
10 | #include "cache.h" | 11 | #include "cache.h" |
11 | #include "cmd.h" | 12 | #include "cmd.h" |
@@ -66,17 +67,18 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
66 | repo->enable_subject_links = atoi(value); | 67 | repo->enable_subject_links = atoi(value); |
67 | else if (!strcmp(name, "max-stats")) | 68 | else if (!strcmp(name, "max-stats")) |
68 | repo->max_stats = cgit_find_stats_period(value, NULL); | 69 | repo->max_stats = cgit_find_stats_period(value, NULL); |
69 | else if (!strcmp(name, "module-link")) | 70 | else if (!strcmp(name, "module-link")) |
70 | repo->module_link= xstrdup(value); | 71 | repo->module_link= xstrdup(value); |
71 | else if (!strcmp(name, "section")) | 72 | else if (!strcmp(name, "section")) |
72 | repo->section = xstrdup(value); | 73 | repo->section = xstrdup(value); |
73 | else if (!strcmp(name, "readme") && value != NULL) { | 74 | else if (!strcmp(name, "readme") && value != NULL) { |
74 | if (*value == '/') | 75 | char *colon; |
76 | if (*value == '/' || ((colon = strchr(value, ':')) != NULL && colon != value && *(colon + 1) != '\0')) | ||
75 | repo->readme = xstrdup(value); | 77 | repo->readme = xstrdup(value); |
76 | else | 78 | else |
77 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); | 79 | repo->readme = xstrdup(fmt("%s/%s", repo->path, value)); |
78 | } else if (ctx.cfg.enable_filter_overrides) { | 80 | } else if (ctx.cfg.enable_filter_overrides) { |
79 | if (!strcmp(name, "about-filter")) | 81 | if (!strcmp(name, "about-filter")) |
80 | repo->about_filter = new_filter(value, 0); | 82 | repo->about_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "commit-filter")) | 83 | else if (!strcmp(name, "commit-filter")) |
82 | repo->commit_filter = new_filter(value, 0); | 84 | repo->commit_filter = new_filter(value, 0); |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 5d77973..c643fae 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -366,17 +366,19 @@ repo.owner:: | |||
366 | none. | 366 | none. |
367 | 367 | ||
368 | repo.path:: | 368 | repo.path:: |
369 | An absolute path to the repository directory. For non-bare repositories | 369 | An absolute path to the repository directory. For non-bare repositories |
370 | this is the .git-directory. Default value: none. | 370 | this is the .git-directory. Default value: none. |
371 | 371 | ||
372 | repo.readme:: | 372 | repo.readme:: |
373 | A path (relative to <repo.path>) which specifies a file to include | 373 | A path (relative to <repo.path>) which specifies a file to include |
374 | verbatim as the "About" page for this repo. Default value: none. | 374 | 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 by | ||
376 | a colon. For example, "master:docs/readme.mkd" Default value: none. | ||
375 | 377 | ||
376 | repo.snapshots:: | 378 | repo.snapshots:: |
377 | A mask of allowed snapshot-formats for this repo, restricted by the | 379 | A mask of allowed snapshot-formats for this repo, restricted by the |
378 | "snapshots" global setting. Default value: <snapshots>. | 380 | "snapshots" global setting. Default value: <snapshots>. |
379 | 381 | ||
380 | repo.section:: | 382 | repo.section:: |
381 | Override the current section name for this repository. Default value: | 383 | Override the current section name for this repository. Default value: |
382 | none. | 384 | none. |
@@ -1,35 +1,68 @@ | |||
1 | /* ui-blob.c: show blob content | 1 | /* ui-blob.c: show blob content |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
7 | */ | 8 | */ |
8 | 9 | ||
9 | #include "cgit.h" | 10 | #include "cgit.h" |
10 | #include "html.h" | 11 | #include "html.h" |
11 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
12 | 13 | ||
13 | static char *match_path; | 14 | static char *match_path; |
14 | static unsigned char *matched_sha1; | 15 | static unsigned char *matched_sha1; |
16 | static int found_path; | ||
15 | 17 | ||
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, | 18 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
17 | const char *pathname, unsigned mode, int stage, void *cbdata) { | 19 | const char *pathname, unsigned mode, int stage, void *cbdata) { |
18 | if(strncmp(base,match_path,baselen) | 20 | if(strncmp(base,match_path,baselen) |
19 | || strcmp(match_path+baselen,pathname) ) | 21 | || strcmp(match_path+baselen,pathname) ) |
20 | return READ_TREE_RECURSIVE; | 22 | return READ_TREE_RECURSIVE; |
21 | memmove(matched_sha1,sha1,20); | 23 | memmove(matched_sha1,sha1,20); |
24 | found_path = 1; | ||
22 | return 0; | 25 | return 0; |
23 | } | 26 | } |
24 | 27 | ||
25 | void cgit_print_blob(const char *hex, char *path, const char *head) | 28 | int cgit_print_file(char *path, const char *head) |
26 | { | 29 | { |
30 | unsigned char sha1[20]; | ||
31 | enum object_type type; | ||
32 | char *buf; | ||
33 | unsigned long size; | ||
34 | struct commit *commit; | ||
35 | const char *paths[] = {path, NULL}; | ||
36 | if (get_sha1(head, sha1)) | ||
37 | return -1; | ||
38 | type = sha1_object_info(sha1, &size); | ||
39 | if(type == OBJ_COMMIT && path) { | ||
40 | commit = lookup_commit_reference(sha1); | ||
41 | match_path = path; | ||
42 | matched_sha1 = sha1; | ||
43 | found_path = 0; | ||
44 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); | ||
45 | if (!found_path) | ||
46 | return -1; | ||
47 | type = sha1_object_info(sha1, &size); | ||
48 | } | ||
49 | if (type == OBJ_BAD) | ||
50 | return -1; | ||
51 | buf = read_sha1_file(sha1, &type, &size); | ||
52 | if (!buf) | ||
53 | return -1; | ||
54 | buf[size] = '\0'; | ||
55 | write(htmlfd, buf, size); | ||
56 | return 0; | ||
57 | } | ||
27 | 58 | ||
59 | void cgit_print_blob(const char *hex, char *path, const char *head) | ||
60 | { | ||
28 | unsigned char sha1[20]; | 61 | unsigned char sha1[20]; |
29 | enum object_type type; | 62 | enum object_type type; |
30 | char *buf; | 63 | char *buf; |
31 | unsigned long size; | 64 | unsigned long size; |
32 | struct commit *commit; | 65 | struct commit *commit; |
33 | const char *paths[] = {path, NULL}; | 66 | const char *paths[] = {path, NULL}; |
34 | 67 | ||
35 | if (hex) { | 68 | if (hex) { |
@@ -1,6 +1,7 @@ | |||
1 | #ifndef UI_BLOB_H | 1 | #ifndef UI_BLOB_H |
2 | #define UI_BLOB_H | 2 | #define UI_BLOB_H |
3 | 3 | ||
4 | extern int cgit_print_file(char *path, const char *head); | ||
4 | extern void cgit_print_blob(const char *hex, char *path, const char *head); | 5 | extern void cgit_print_blob(const char *hex, char *path, const char *head); |
5 | 6 | ||
6 | #endif /* UI_BLOB_H */ | 7 | #endif /* UI_BLOB_H */ |
diff --git a/ui-summary.c b/ui-summary.c index a2c018e..02f191e 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -1,20 +1,22 @@ | |||
1 | /* ui-summary.c: functions for generating repo summary page | 1 | /* ui-summary.c: functions for generating repo summary page |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
5 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
7 | */ | 8 | */ |
8 | 9 | ||
9 | #include "cgit.h" | 10 | #include "cgit.h" |
10 | #include "html.h" | 11 | #include "html.h" |
11 | #include "ui-log.h" | 12 | #include "ui-log.h" |
12 | #include "ui-refs.h" | 13 | #include "ui-refs.h" |
14 | #include "ui-blob.h" | ||
13 | 15 | ||
14 | int urls = 0; | 16 | int urls = 0; |
15 | 17 | ||
16 | static void print_url(char *base, char *suffix) | 18 | static void print_url(char *base, char *suffix) |
17 | { | 19 | { |
18 | if (!base || !*base) | 20 | if (!base || !*base) |
19 | return; | 21 | return; |
20 | if (urls++ == 0) { | 22 | if (urls++ == 0) { |
@@ -63,30 +65,46 @@ void cgit_print_summary() | |||
63 | print_urls(ctx.repo->clone_url, NULL); | 65 | print_urls(ctx.repo->clone_url, NULL); |
64 | else if (ctx.cfg.clone_prefix) | 66 | else if (ctx.cfg.clone_prefix) |
65 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); | 67 | print_urls(ctx.cfg.clone_prefix, ctx.repo->url); |
66 | html("</table>"); | 68 | html("</table>"); |
67 | } | 69 | } |
68 | 70 | ||
69 | void cgit_print_repo_readme(char *path) | 71 | void cgit_print_repo_readme(char *path) |
70 | { | 72 | { |
71 | char *slash, *tmp; | 73 | char *slash, *tmp, *colon, *ref = 0; |
72 | 74 | ||
73 | if (!ctx.repo->readme) | 75 | if (!ctx.repo->readme) |
74 | return; | 76 | return; |
75 | 77 | ||
76 | if (path) { | 78 | if (path) { |
77 | slash = strrchr(ctx.repo->readme, '/'); | 79 | slash = strrchr(ctx.repo->readme, '/'); |
78 | if (!slash) | 80 | if (!slash) { |
79 | return; | 81 | slash = strchr(ctx.repo->readme, ':'); |
82 | if (!slash) | ||
83 | return; | ||
84 | } | ||
80 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); | 85 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); |
81 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); | 86 | strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1); |
82 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); | 87 | strcpy(tmp + (slash - ctx.repo->readme + 1), path); |
83 | } else | 88 | } else |
84 | tmp = ctx.repo->readme; | 89 | tmp = ctx.repo->readme; |
90 | colon = strchr(tmp, ':'); | ||
91 | if (colon && strlen(colon) > 1) { | ||
92 | *colon = '\0'; | ||
93 | ref = tmp; | ||
94 | tmp = colon + 1; | ||
95 | while ((*tmp == '/' || *tmp == ':') && *tmp != '\0') | ||
96 | ++tmp; | ||
97 | if (!(*tmp)) | ||
98 | return; | ||
99 | } | ||
85 | html("<div id='summary'>"); | 100 | html("<div id='summary'>"); |
86 | if (ctx.repo->about_filter) | 101 | if (ctx.repo->about_filter) |
87 | cgit_open_filter(ctx.repo->about_filter); | 102 | cgit_open_filter(ctx.repo->about_filter); |
88 | html_include(tmp); | 103 | if (ref) |
104 | cgit_print_file(tmp, ref); | ||
105 | else | ||
106 | html_include(tmp); | ||
89 | if (ctx.repo->about_filter) | 107 | if (ctx.repo->about_filter) |
90 | cgit_close_filter(ctx.repo->about_filter); | 108 | cgit_close_filter(ctx.repo->about_filter); |
91 | html("</div>"); | 109 | html("</div>"); |
92 | } | 110 | } |