author | Stefan Naewe <stefan.naewe@atlas-elektronik.com> | 2008-08-01 12:54:38 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-08-01 20:09:13 (UTC) |
commit | 0f0ab148c6d444316af10e6b4c7a60630fed45d3 (patch) (unidiff) | |
tree | a52c08e648c5d656866cecf78e757f2f85211b19 /cgit.h | |
parent | a1266edfe6ec1fd678c8f6b60ffbd21d88ff5a93 (diff) | |
download | cgit-0f0ab148c6d444316af10e6b4c7a60630fed45d3.zip cgit-0f0ab148c6d444316af10e6b4c7a60630fed45d3.tar.gz cgit-0f0ab148c6d444316af10e6b4c7a60630fed45d3.tar.bz2 |
Added `local-time` option to cgitrc
When `local-time` is set, commit, tag and patch timestamps will be printed
in the servers timezone. Also, regardless of the value of `local-time`,
these timestamps will now always show the timezone.
Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,214 +1,215 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 19 | #include <utf8.h> |
20 | 20 | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Dateformats used on misc. pages | 23 | * Dateformats used on misc. pages |
24 | */ | 24 | */ |
25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" | 25 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
26 | #define FMT_SHORTDATE "%Y-%m-%d" | 26 | #define FMT_SHORTDATE "%Y-%m-%d" |
27 | 27 | ||
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Limits used for relative dates | 30 | * Limits used for relative dates |
31 | */ | 31 | */ |
32 | #define TM_MIN 60 | 32 | #define TM_MIN 60 |
33 | #define TM_HOUR (TM_MIN * 60) | 33 | #define TM_HOUR (TM_MIN * 60) |
34 | #define TM_DAY (TM_HOUR * 24) | 34 | #define TM_DAY (TM_HOUR * 24) |
35 | #define TM_WEEK (TM_DAY * 7) | 35 | #define TM_WEEK (TM_DAY * 7) |
36 | #define TM_YEAR (TM_DAY * 365) | 36 | #define TM_YEAR (TM_DAY * 365) |
37 | #define TM_MONTH (TM_YEAR / 12.0) | 37 | #define TM_MONTH (TM_YEAR / 12.0) |
38 | 38 | ||
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Default encoding | 41 | * Default encoding |
42 | */ | 42 | */ |
43 | #define PAGE_ENCODING "UTF-8" | 43 | #define PAGE_ENCODING "UTF-8" |
44 | 44 | ||
45 | typedef void (*configfn)(const char *name, const char *value); | 45 | typedef void (*configfn)(const char *name, const char *value); |
46 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 46 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
47 | typedef void (*linediff_fn)(char *line, int len); | 47 | typedef void (*linediff_fn)(char *line, int len); |
48 | 48 | ||
49 | struct cgit_repo { | 49 | struct cgit_repo { |
50 | char *url; | 50 | char *url; |
51 | char *name; | 51 | char *name; |
52 | char *path; | 52 | char *path; |
53 | char *desc; | 53 | char *desc; |
54 | char *owner; | 54 | char *owner; |
55 | char *defbranch; | 55 | char *defbranch; |
56 | char *group; | 56 | char *group; |
57 | char *module_link; | 57 | char *module_link; |
58 | char *readme; | 58 | char *readme; |
59 | char *clone_url; | 59 | char *clone_url; |
60 | int snapshots; | 60 | int snapshots; |
61 | int enable_log_filecount; | 61 | int enable_log_filecount; |
62 | int enable_log_linecount; | 62 | int enable_log_linecount; |
63 | }; | 63 | }; |
64 | 64 | ||
65 | struct cgit_repolist { | 65 | struct cgit_repolist { |
66 | int length; | 66 | int length; |
67 | int count; | 67 | int count; |
68 | struct cgit_repo *repos; | 68 | struct cgit_repo *repos; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | struct commitinfo { | 71 | struct commitinfo { |
72 | struct commit *commit; | 72 | struct commit *commit; |
73 | char *author; | 73 | char *author; |
74 | char *author_email; | 74 | char *author_email; |
75 | unsigned long author_date; | 75 | unsigned long author_date; |
76 | char *committer; | 76 | char *committer; |
77 | char *committer_email; | 77 | char *committer_email; |
78 | unsigned long committer_date; | 78 | unsigned long committer_date; |
79 | char *subject; | 79 | char *subject; |
80 | char *msg; | 80 | char *msg; |
81 | char *msg_encoding; | 81 | char *msg_encoding; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | struct taginfo { | 84 | struct taginfo { |
85 | char *tagger; | 85 | char *tagger; |
86 | char *tagger_email; | 86 | char *tagger_email; |
87 | int tagger_date; | 87 | int tagger_date; |
88 | char *msg; | 88 | char *msg; |
89 | }; | 89 | }; |
90 | 90 | ||
91 | struct refinfo { | 91 | struct refinfo { |
92 | const char *refname; | 92 | const char *refname; |
93 | struct object *object; | 93 | struct object *object; |
94 | union { | 94 | union { |
95 | struct taginfo *tag; | 95 | struct taginfo *tag; |
96 | struct commitinfo *commit; | 96 | struct commitinfo *commit; |
97 | }; | 97 | }; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct reflist { | 100 | struct reflist { |
101 | struct refinfo **refs; | 101 | struct refinfo **refs; |
102 | int alloc; | 102 | int alloc; |
103 | int count; | 103 | int count; |
104 | }; | 104 | }; |
105 | 105 | ||
106 | struct cgit_query { | 106 | struct cgit_query { |
107 | int has_symref; | 107 | int has_symref; |
108 | int has_sha1; | 108 | int has_sha1; |
109 | char *raw; | 109 | char *raw; |
110 | char *repo; | 110 | char *repo; |
111 | char *page; | 111 | char *page; |
112 | char *search; | 112 | char *search; |
113 | char *grep; | 113 | char *grep; |
114 | char *head; | 114 | char *head; |
115 | char *sha1; | 115 | char *sha1; |
116 | char *sha2; | 116 | char *sha2; |
117 | char *path; | 117 | char *path; |
118 | char *name; | 118 | char *name; |
119 | char *mimetype; | 119 | char *mimetype; |
120 | int ofs; | 120 | int ofs; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct cgit_config { | 123 | struct cgit_config { |
124 | char *agefile; | 124 | char *agefile; |
125 | char *cache_root; | 125 | char *cache_root; |
126 | char *clone_prefix; | 126 | char *clone_prefix; |
127 | char *css; | 127 | char *css; |
128 | char *favicon; | 128 | char *favicon; |
129 | char *footer; | 129 | char *footer; |
130 | char *index_header; | 130 | char *index_header; |
131 | char *index_info; | 131 | char *index_info; |
132 | char *logo; | 132 | char *logo; |
133 | char *logo_link; | 133 | char *logo_link; |
134 | char *module_link; | 134 | char *module_link; |
135 | char *repo_group; | 135 | char *repo_group; |
136 | char *robots; | 136 | char *robots; |
137 | char *root_title; | 137 | char *root_title; |
138 | char *root_desc; | 138 | char *root_desc; |
139 | char *root_readme; | 139 | char *root_readme; |
140 | char *script_name; | 140 | char *script_name; |
141 | char *virtual_root; | 141 | char *virtual_root; |
142 | int cache_size; | 142 | int cache_size; |
143 | int cache_dynamic_ttl; | 143 | int cache_dynamic_ttl; |
144 | int cache_max_create_time; | 144 | int cache_max_create_time; |
145 | int cache_repo_ttl; | 145 | int cache_repo_ttl; |
146 | int cache_root_ttl; | 146 | int cache_root_ttl; |
147 | int cache_static_ttl; | 147 | int cache_static_ttl; |
148 | int enable_index_links; | 148 | int enable_index_links; |
149 | int enable_log_filecount; | 149 | int enable_log_filecount; |
150 | int enable_log_linecount; | 150 | int enable_log_linecount; |
151 | int local_time; | ||
151 | int max_repo_count; | 152 | int max_repo_count; |
152 | int max_commit_count; | 153 | int max_commit_count; |
153 | int max_lock_attempts; | 154 | int max_lock_attempts; |
154 | int max_msg_len; | 155 | int max_msg_len; |
155 | int max_repodesc_len; | 156 | int max_repodesc_len; |
156 | int nocache; | 157 | int nocache; |
157 | int renamelimit; | 158 | int renamelimit; |
158 | int snapshots; | 159 | int snapshots; |
159 | int summary_branches; | 160 | int summary_branches; |
160 | int summary_log; | 161 | int summary_log; |
161 | int summary_tags; | 162 | int summary_tags; |
162 | }; | 163 | }; |
163 | 164 | ||
164 | struct cgit_page { | 165 | struct cgit_page { |
165 | time_t modified; | 166 | time_t modified; |
166 | time_t expires; | 167 | time_t expires; |
167 | char *mimetype; | 168 | char *mimetype; |
168 | char *charset; | 169 | char *charset; |
169 | char *filename; | 170 | char *filename; |
170 | char *title; | 171 | char *title; |
171 | }; | 172 | }; |
172 | 173 | ||
173 | struct cgit_context { | 174 | struct cgit_context { |
174 | struct cgit_query qry; | 175 | struct cgit_query qry; |
175 | struct cgit_config cfg; | 176 | struct cgit_config cfg; |
176 | struct cgit_repo *repo; | 177 | struct cgit_repo *repo; |
177 | struct cgit_page page; | 178 | struct cgit_page page; |
178 | }; | 179 | }; |
179 | 180 | ||
180 | struct cgit_snapshot_format { | 181 | struct cgit_snapshot_format { |
181 | const char *suffix; | 182 | const char *suffix; |
182 | const char *mimetype; | 183 | const char *mimetype; |
183 | write_archive_fn_t write_func; | 184 | write_archive_fn_t write_func; |
184 | int bit; | 185 | int bit; |
185 | }; | 186 | }; |
186 | 187 | ||
187 | extern const char *cgit_version; | 188 | extern const char *cgit_version; |
188 | 189 | ||
189 | extern struct cgit_repolist cgit_repolist; | 190 | extern struct cgit_repolist cgit_repolist; |
190 | extern struct cgit_context ctx; | 191 | extern struct cgit_context ctx; |
191 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 192 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
192 | 193 | ||
193 | extern struct cgit_repo *cgit_add_repo(const char *url); | 194 | extern struct cgit_repo *cgit_add_repo(const char *url); |
194 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 195 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
195 | extern void cgit_repo_config_cb(const char *name, const char *value); | 196 | extern void cgit_repo_config_cb(const char *name, const char *value); |
196 | 197 | ||
197 | extern int chk_zero(int result, char *msg); | 198 | extern int chk_zero(int result, char *msg); |
198 | extern int chk_positive(int result, char *msg); | 199 | extern int chk_positive(int result, char *msg); |
199 | extern int chk_non_negative(int result, char *msg); | 200 | extern int chk_non_negative(int result, char *msg); |
200 | 201 | ||
201 | extern char *trim_end(const char *str, char c); | 202 | extern char *trim_end(const char *str, char c); |
202 | extern char *strlpart(char *txt, int maxlen); | 203 | extern char *strlpart(char *txt, int maxlen); |
203 | extern char *strrpart(char *txt, int maxlen); | 204 | extern char *strrpart(char *txt, int maxlen); |
204 | 205 | ||
205 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 206 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
206 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 207 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
207 | int flags, void *cb_data); | 208 | int flags, void *cb_data); |
208 | 209 | ||
209 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 210 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
210 | 211 | ||
211 | extern int cgit_diff_files(const unsigned char *old_sha1, | 212 | extern int cgit_diff_files(const unsigned char *old_sha1, |
212 | const unsigned char *new_sha1, | 213 | const unsigned char *new_sha1, |
213 | linediff_fn fn); | 214 | linediff_fn fn); |
214 | 215 | ||