author | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 11:55:52 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 11:55:52 (UTC) |
commit | e189344a7dfe6fa1b07434d5170e6441dcbaf788 (patch) (unidiff) | |
tree | f1500b97f95a710dba27469510114388be435d01 | |
parent | c1ad6cb77889880ad0189a689840fbfa6e5cbc80 (diff) | |
download | cgit-e189344a7dfe6fa1b07434d5170e6441dcbaf788.zip cgit-e189344a7dfe6fa1b07434d5170e6441dcbaf788.tar.gz cgit-e189344a7dfe6fa1b07434d5170e6441dcbaf788.tar.bz2 |
Add knobs to enable/disable files/lines changed in log view
These columns can cause lots of IO on the server, so add settings to
explicitly enable them. Also, add per repo settings to optionally disable
the columns if sitewide enabled.
While at it, do not allow repo.snapshot to enable snapshots if the global
setting is disabled.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | cgitrc | 10 | ||||
-rw-r--r-- | shared.c | 14 | ||||
-rw-r--r-- | ui-log.c | 33 |
4 files changed, 48 insertions, 13 deletions
@@ -35,12 +35,14 @@ struct repoinfo { | |||
35 | char *path; | 35 | char *path; |
36 | char *desc; | 36 | char *desc; |
37 | char *owner; | 37 | char *owner; |
38 | char *defbranch; | 38 | char *defbranch; |
39 | char *module_link; | 39 | char *module_link; |
40 | int snapshots; | 40 | int snapshots; |
41 | int enable_log_filecount; | ||
42 | int enable_log_linecount; | ||
41 | }; | 43 | }; |
42 | 44 | ||
43 | struct repolist { | 45 | struct repolist { |
44 | int length; | 46 | int length; |
45 | int count; | 47 | int count; |
46 | struct repoinfo *repos; | 48 | struct repoinfo *repos; |
@@ -78,12 +80,14 @@ extern char *cgit_module_link; | |||
78 | extern char *cgit_virtual_root; | 80 | extern char *cgit_virtual_root; |
79 | extern char *cgit_script_name; | 81 | extern char *cgit_script_name; |
80 | extern char *cgit_cache_root; | 82 | extern char *cgit_cache_root; |
81 | 83 | ||
82 | extern int cgit_nocache; | 84 | extern int cgit_nocache; |
83 | extern int cgit_snapshots; | 85 | extern int cgit_snapshots; |
86 | extern int cgit_enable_log_filecount; | ||
87 | extern int cgit_enable_log_linecount; | ||
84 | extern int cgit_max_lock_attempts; | 88 | extern int cgit_max_lock_attempts; |
85 | extern int cgit_cache_root_ttl; | 89 | extern int cgit_cache_root_ttl; |
86 | extern int cgit_cache_repo_ttl; | 90 | extern int cgit_cache_repo_ttl; |
87 | extern int cgit_cache_dynamic_ttl; | 91 | extern int cgit_cache_dynamic_ttl; |
88 | extern int cgit_cache_static_ttl; | 92 | extern int cgit_cache_static_ttl; |
89 | extern int cgit_cache_max_create_time; | 93 | extern int cgit_cache_max_create_time; |
@@ -9,12 +9,20 @@ | |||
9 | 9 | ||
10 | 10 | ||
11 | ## Enable/disable snapshots by default. This can be overridden per repo | 11 | ## Enable/disable snapshots by default. This can be overridden per repo |
12 | #snapshots=0 | 12 | #snapshots=0 |
13 | 13 | ||
14 | 14 | ||
15 | ## Enable/disable display of 'number of files changed' in log view | ||
16 | #enable-log-filecount=0 | ||
17 | |||
18 | |||
19 | ## Enable/disable display of 'number of lines changed' in log view | ||
20 | #enable-log-linecount=0 | ||
21 | |||
22 | |||
15 | ## Specify a root for virtual urls. This makes cgit generate urls like | 23 | ## Specify a root for virtual urls. This makes cgit generate urls like |
16 | ## | 24 | ## |
17 | ## http://localhost/git/repo/log/?id=master | 25 | ## http://localhost/git/repo/log/?id=master |
18 | ## | 26 | ## |
19 | ## instead of | 27 | ## instead of |
20 | ## | 28 | ## |
@@ -94,7 +102,9 @@ | |||
94 | #repo.url=cgit | 102 | #repo.url=cgit |
95 | #repo.name=cgit | 103 | #repo.name=cgit |
96 | #repo.desc=the caching cgi for git | 104 | #repo.desc=the caching cgi for git |
97 | #repo.path=/pub/git/cgit | 105 | #repo.path=/pub/git/cgit |
98 | #repo.owner=Lars Hjemli | 106 | #repo.owner=Lars Hjemli |
99 | #repo.snapshots=1 # override a sitewide snapshot-setting | 107 | #repo.snapshots=1 # override a sitewide snapshot-setting |
108 | #repo.enable-log-filecount=0 # override the default filecount setting | ||
109 | #repo.enable-log-linecount=0 # override the default linecount setting | ||
100 | #repo.module-link=/git/%s/commit/?id=%s # override the standard module-link | 110 | #repo.module-link=/git/%s/commit/?id=%s # override the standard module-link |
@@ -19,12 +19,14 @@ char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | |||
19 | char *cgit_virtual_root = NULL; | 19 | char *cgit_virtual_root = NULL; |
20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 22 | ||
23 | int cgit_nocache = 0; | 23 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; | 24 | int cgit_snapshots = 0; |
25 | int cgit_enable_log_filecount = 0; | ||
26 | int cgit_enable_log_linecount = 0; | ||
25 | int cgit_max_lock_attempts = 5; | 27 | int cgit_max_lock_attempts = 5; |
26 | int cgit_cache_root_ttl = 5; | 28 | int cgit_cache_root_ttl = 5; |
27 | int cgit_cache_repo_ttl = 5; | 29 | int cgit_cache_repo_ttl = 5; |
28 | int cgit_cache_dynamic_ttl = 5; | 30 | int cgit_cache_dynamic_ttl = 5; |
29 | int cgit_cache_static_ttl = -1; | 31 | int cgit_cache_static_ttl = -1; |
30 | int cgit_cache_max_create_time = 5; | 32 | int cgit_cache_max_create_time = 5; |
@@ -82,12 +84,14 @@ struct repoinfo *add_repo(const char *url) | |||
82 | ret->name = ret->url; | 84 | ret->name = ret->url; |
83 | ret->path = NULL; | 85 | ret->path = NULL; |
84 | ret->desc = NULL; | 86 | ret->desc = NULL; |
85 | ret->owner = NULL; | 87 | ret->owner = NULL; |
86 | ret->defbranch = "master"; | 88 | ret->defbranch = "master"; |
87 | ret->snapshots = cgit_snapshots; | 89 | ret->snapshots = cgit_snapshots; |
90 | ret->enable_log_filecount = cgit_enable_log_filecount; | ||
91 | ret->enable_log_linecount = cgit_enable_log_linecount; | ||
88 | ret->module_link = cgit_module_link; | 92 | ret->module_link = cgit_module_link; |
89 | return ret; | 93 | return ret; |
90 | } | 94 | } |
91 | 95 | ||
92 | void cgit_global_config_cb(const char *name, const char *value) | 96 | void cgit_global_config_cb(const char *name, const char *value) |
93 | { | 97 | { |
@@ -104,12 +108,16 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
104 | else if (!strcmp(name, "virtual-root")) | 108 | else if (!strcmp(name, "virtual-root")) |
105 | cgit_virtual_root = xstrdup(value); | 109 | cgit_virtual_root = xstrdup(value); |
106 | else if (!strcmp(name, "nocache")) | 110 | else if (!strcmp(name, "nocache")) |
107 | cgit_nocache = atoi(value); | 111 | cgit_nocache = atoi(value); |
108 | else if (!strcmp(name, "snapshots")) | 112 | else if (!strcmp(name, "snapshots")) |
109 | cgit_snapshots = atoi(value); | 113 | cgit_snapshots = atoi(value); |
114 | else if (!strcmp(name, "enable-log-filecount")) | ||
115 | cgit_enable_log_filecount = atoi(value); | ||
116 | else if (!strcmp(name, "enable-log-linecount")) | ||
117 | cgit_enable_log_linecount = atoi(value); | ||
110 | else if (!strcmp(name, "cache-root")) | 118 | else if (!strcmp(name, "cache-root")) |
111 | cgit_cache_root = xstrdup(value); | 119 | cgit_cache_root = xstrdup(value); |
112 | else if (!strcmp(name, "cache-root-ttl")) | 120 | else if (!strcmp(name, "cache-root-ttl")) |
113 | cgit_cache_root_ttl = atoi(value); | 121 | cgit_cache_root_ttl = atoi(value); |
114 | else if (!strcmp(name, "cache-repo-ttl")) | 122 | else if (!strcmp(name, "cache-repo-ttl")) |
115 | cgit_cache_repo_ttl = atoi(value); | 123 | cgit_cache_repo_ttl = atoi(value); |
@@ -133,13 +141,17 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
133 | cgit_repo->desc = xstrdup(value); | 141 | cgit_repo->desc = xstrdup(value); |
134 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 142 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
135 | cgit_repo->owner = xstrdup(value); | 143 | cgit_repo->owner = xstrdup(value); |
136 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 144 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
137 | cgit_repo->defbranch = xstrdup(value); | 145 | cgit_repo->defbranch = xstrdup(value); |
138 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 146 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
139 | cgit_repo->snapshots = atoi(value); | 147 | cgit_repo->snapshots = cgit_snapshots * atoi(value); |
148 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | ||
149 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | ||
150 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | ||
151 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | ||
140 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 152 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
141 | cgit_repo->module_link= xstrdup(value); | 153 | cgit_repo->module_link= xstrdup(value); |
142 | else if (!strcmp(name, "include")) | 154 | else if (!strcmp(name, "include")) |
143 | cgit_read_config(value, cgit_global_config_cb); | 155 | cgit_read_config(value, cgit_global_config_cb); |
144 | } | 156 | } |
145 | 157 | ||
@@ -16,13 +16,14 @@ void count_lines(char *line, int size) | |||
16 | lines++; | 16 | lines++; |
17 | } | 17 | } |
18 | 18 | ||
19 | void inspect_files(struct diff_filepair *pair) | 19 | void inspect_files(struct diff_filepair *pair) |
20 | { | 20 | { |
21 | files++; | 21 | files++; |
22 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 22 | if (cgit_repo->enable_log_linecount) |
23 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | ||
23 | } | 24 | } |
24 | 25 | ||
25 | void print_commit(struct commit *commit) | 26 | void print_commit(struct commit *commit) |
26 | { | 27 | { |
27 | char buf[32]; | 28 | char buf[32]; |
28 | struct commitinfo *info; | 29 | struct commitinfo *info; |
@@ -36,19 +37,23 @@ void print_commit(struct commit *commit) | |||
36 | html("</td><td>"); | 37 | html("</td><td>"); |
37 | char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); | 38 | char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); |
38 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); | 39 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
39 | html_link_open(url, NULL, NULL); | 40 | html_link_open(url, NULL, NULL); |
40 | html_ntxt(cgit_max_msg_len, info->subject); | 41 | html_ntxt(cgit_max_msg_len, info->subject); |
41 | html_link_close(); | 42 | html_link_close(); |
42 | files = 0; | 43 | if (cgit_repo->enable_log_filecount) { |
43 | lines = 0; | 44 | files = 0; |
44 | cgit_diff_commit(commit, inspect_files); | 45 | lines = 0; |
45 | html("</td><td class='right'>"); | 46 | cgit_diff_commit(commit, inspect_files); |
46 | htmlf("%d", files); | 47 | html("</td><td class='right'>"); |
47 | html("</td><td class='right'>"); | 48 | htmlf("%d", files); |
48 | htmlf("%d", lines); | 49 | if (cgit_repo->enable_log_linecount) { |
50 | html("</td><td class='right'>"); | ||
51 | htmlf("%d", lines); | ||
52 | } | ||
53 | } | ||
49 | html("</td><td>"); | 54 | html("</td><td>"); |
50 | html_txt(info->author); | 55 | html_txt(info->author); |
51 | html("</td></tr>\n"); | 56 | html("</td></tr>\n"); |
52 | cgit_free_commitinfo(info); | 57 | cgit_free_commitinfo(info); |
53 | } | 58 | } |
54 | 59 | ||
@@ -78,16 +83,20 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) | |||
78 | compile_grep_patterns(rev.grep_filter); | 83 | compile_grep_patterns(rev.grep_filter); |
79 | } | 84 | } |
80 | prepare_revision_walk(&rev); | 85 | prepare_revision_walk(&rev); |
81 | 86 | ||
82 | html("<table class='list nowrap'>"); | 87 | html("<table class='list nowrap'>"); |
83 | html("<tr class='nohover'><th class='left'>Date</th>" | 88 | html("<tr class='nohover'><th class='left'>Date</th>" |
84 | "<th class='left'>Message</th>" | 89 | "<th class='left'>Message</th>"); |
85 | "<th class='left'>Files</th>" | 90 | |
86 | "<th class='left'>Lines</th>" | 91 | if (cgit_repo->enable_log_filecount) { |
87 | "<th class='left'>Author</th></tr>\n"); | 92 | html("<th class='left'>Files</th>"); |
93 | if (cgit_repo->enable_log_linecount) | ||
94 | html("<th class='left'>Lines</th>"); | ||
95 | } | ||
96 | html("<th class='left'>Author</th></tr>\n"); | ||
88 | 97 | ||
89 | if (ofs<0) | 98 | if (ofs<0) |
90 | ofs = 0; | 99 | ofs = 0; |
91 | 100 | ||
92 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 101 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
93 | free(commit->buffer); | 102 | free(commit->buffer); |