author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:37:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 10:37:37 (UTC) |
commit | 3c32fe07717f27fc891b66ccd06057fb810d03ad (patch) (unidiff) | |
tree | 04897b3eac6432c43284e7da79161e47856d078b /cgit.h | |
parent | 9c8be943f72b6f1bda5a31ce401899c3dd734e98 (diff) | |
parent | ab67164d6217fcda5ef3e07aefa3dd6eee6b65a3 (diff) | |
download | cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.zip cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.gz cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.bz2 |
Merge branch 'full-log'
Conflicts:
cgit.c
cgit.h
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -78,96 +78,97 @@ struct commitinfo { | |||
78 | char *committer; | 78 | char *committer; |
79 | char *committer_email; | 79 | char *committer_email; |
80 | unsigned long committer_date; | 80 | unsigned long committer_date; |
81 | char *subject; | 81 | char *subject; |
82 | char *msg; | 82 | char *msg; |
83 | char *msg_encoding; | 83 | char *msg_encoding; |
84 | }; | 84 | }; |
85 | 85 | ||
86 | struct taginfo { | 86 | struct taginfo { |
87 | char *tagger; | 87 | char *tagger; |
88 | char *tagger_email; | 88 | char *tagger_email; |
89 | unsigned long tagger_date; | 89 | unsigned long tagger_date; |
90 | char *msg; | 90 | char *msg; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | struct refinfo { | 93 | struct refinfo { |
94 | const char *refname; | 94 | const char *refname; |
95 | struct object *object; | 95 | struct object *object; |
96 | union { | 96 | union { |
97 | struct taginfo *tag; | 97 | struct taginfo *tag; |
98 | struct commitinfo *commit; | 98 | struct commitinfo *commit; |
99 | }; | 99 | }; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | struct reflist { | 102 | struct reflist { |
103 | struct refinfo **refs; | 103 | struct refinfo **refs; |
104 | int alloc; | 104 | int alloc; |
105 | int count; | 105 | int count; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | struct cgit_query { | 108 | struct cgit_query { |
109 | int has_symref; | 109 | int has_symref; |
110 | int has_sha1; | 110 | int has_sha1; |
111 | char *raw; | 111 | char *raw; |
112 | char *repo; | 112 | char *repo; |
113 | char *page; | 113 | char *page; |
114 | char *search; | 114 | char *search; |
115 | char *grep; | 115 | char *grep; |
116 | char *head; | 116 | char *head; |
117 | char *sha1; | 117 | char *sha1; |
118 | char *sha2; | 118 | char *sha2; |
119 | char *path; | 119 | char *path; |
120 | char *name; | 120 | char *name; |
121 | char *mimetype; | 121 | char *mimetype; |
122 | char *url; | 122 | char *url; |
123 | int ofs; | 123 | int ofs; |
124 | int nohead; | 124 | int nohead; |
125 | char *sort; | 125 | char *sort; |
126 | int showmsg; | ||
126 | }; | 127 | }; |
127 | 128 | ||
128 | struct cgit_config { | 129 | struct cgit_config { |
129 | char *agefile; | 130 | char *agefile; |
130 | char *cache_root; | 131 | char *cache_root; |
131 | char *clone_prefix; | 132 | char *clone_prefix; |
132 | char *css; | 133 | char *css; |
133 | char *favicon; | 134 | char *favicon; |
134 | char *footer; | 135 | char *footer; |
135 | char *index_header; | 136 | char *index_header; |
136 | char *index_info; | 137 | char *index_info; |
137 | char *logo; | 138 | char *logo; |
138 | char *logo_link; | 139 | char *logo_link; |
139 | char *module_link; | 140 | char *module_link; |
140 | char *repo_group; | 141 | char *repo_group; |
141 | char *robots; | 142 | char *robots; |
142 | char *root_title; | 143 | char *root_title; |
143 | char *root_desc; | 144 | char *root_desc; |
144 | char *root_readme; | 145 | char *root_readme; |
145 | char *script_name; | 146 | char *script_name; |
146 | char *virtual_root; | 147 | char *virtual_root; |
147 | int cache_size; | 148 | int cache_size; |
148 | int cache_dynamic_ttl; | 149 | int cache_dynamic_ttl; |
149 | int cache_max_create_time; | 150 | int cache_max_create_time; |
150 | int cache_repo_ttl; | 151 | int cache_repo_ttl; |
151 | int cache_root_ttl; | 152 | int cache_root_ttl; |
152 | int cache_static_ttl; | 153 | int cache_static_ttl; |
153 | int enable_index_links; | 154 | int enable_index_links; |
154 | int enable_log_filecount; | 155 | int enable_log_filecount; |
155 | int enable_log_linecount; | 156 | int enable_log_linecount; |
156 | int local_time; | 157 | int local_time; |
157 | int max_repo_count; | 158 | int max_repo_count; |
158 | int max_commit_count; | 159 | int max_commit_count; |
159 | int max_lock_attempts; | 160 | int max_lock_attempts; |
160 | int max_msg_len; | 161 | int max_msg_len; |
161 | int max_repodesc_len; | 162 | int max_repodesc_len; |
162 | int nocache; | 163 | int nocache; |
163 | int renamelimit; | 164 | int renamelimit; |
164 | int snapshots; | 165 | int snapshots; |
165 | int summary_branches; | 166 | int summary_branches; |
166 | int summary_log; | 167 | int summary_log; |
167 | int summary_tags; | 168 | int summary_tags; |
168 | }; | 169 | }; |
169 | 170 | ||
170 | struct cgit_page { | 171 | struct cgit_page { |
171 | time_t modified; | 172 | time_t modified; |
172 | time_t expires; | 173 | time_t expires; |
173 | size_t size; | 174 | size_t size; |