summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-10-11 17:05:50 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-10-11 17:05:50 (UTC)
commit5632ba35d133ee29d46c031cdd4b4a37097b8ca1 (patch) (unidiff)
tree6e95881e8ec6bb812a82668fd45e4ca28b8d0f97
parentcb1cc0d82d764051d8376281fcb556153f074c1a (diff)
downloadcgit-5632ba35d133ee29d46c031cdd4b4a37097b8ca1.zip
cgit-5632ba35d133ee29d46c031cdd4b4a37097b8ca1.tar.gz
cgit-5632ba35d133ee29d46c031cdd4b4a37097b8ca1.tar.bz2
Add cgit_query.nohead flag
This flag is set when no HEAD is specified in the querystring. Currently it has no users, but it will be used by ui-snapshot to invoke a DWIM-mode where the revision is extracted from the snapshot name. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c1
-rw-r--r--cgit.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 5a93fcd..c82587b 100644
--- a/cgit.c
+++ b/cgit.c
@@ -209,96 +209,97 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
209 if (!strcmp(refname, info->req_ref)) 209 if (!strcmp(refname, info->req_ref))
210 info->match = 1; 210 info->match = 1;
211 if (!info->first_ref) 211 if (!info->first_ref)
212 info->first_ref = xstrdup(refname); 212 info->first_ref = xstrdup(refname);
213 return info->match; 213 return info->match;
214} 214}
215 215
216char *find_default_branch(struct cgit_repo *repo) 216char *find_default_branch(struct cgit_repo *repo)
217{ 217{
218 struct refmatch info; 218 struct refmatch info;
219 char *ref; 219 char *ref;
220 220
221 info.req_ref = repo->defbranch; 221 info.req_ref = repo->defbranch;
222 info.first_ref = NULL; 222 info.first_ref = NULL;
223 info.match = 0; 223 info.match = 0;
224 for_each_branch_ref(find_current_ref, &info); 224 for_each_branch_ref(find_current_ref, &info);
225 if (info.match) 225 if (info.match)
226 ref = info.req_ref; 226 ref = info.req_ref;
227 else 227 else
228 ref = info.first_ref; 228 ref = info.first_ref;
229 if (ref) 229 if (ref)
230 ref = xstrdup(ref); 230 ref = xstrdup(ref);
231 return ref; 231 return ref;
232} 232}
233 233
234static int prepare_repo_cmd(struct cgit_context *ctx) 234static int prepare_repo_cmd(struct cgit_context *ctx)
235{ 235{
236 char *tmp; 236 char *tmp;
237 unsigned char sha1[20]; 237 unsigned char sha1[20];
238 int nongit = 0; 238 int nongit = 0;
239 239
240 setenv("GIT_DIR", ctx->repo->path, 1); 240 setenv("GIT_DIR", ctx->repo->path, 1);
241 setup_git_directory_gently(&nongit); 241 setup_git_directory_gently(&nongit);
242 if (nongit) { 242 if (nongit) {
243 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, 243 ctx->page.title = fmt("%s - %s", ctx->cfg.root_title,
244 "config error"); 244 "config error");
245 tmp = fmt("Not a git repository: '%s'", ctx->repo->path); 245 tmp = fmt("Not a git repository: '%s'", ctx->repo->path);
246 ctx->repo = NULL; 246 ctx->repo = NULL;
247 cgit_print_http_headers(ctx); 247 cgit_print_http_headers(ctx);
248 cgit_print_docstart(ctx); 248 cgit_print_docstart(ctx);
249 cgit_print_pageheader(ctx); 249 cgit_print_pageheader(ctx);
250 cgit_print_error(tmp); 250 cgit_print_error(tmp);
251 cgit_print_docend(); 251 cgit_print_docend();
252 return 1; 252 return 1;
253 } 253 }
254 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); 254 ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
255 255
256 if (!ctx->qry.head) { 256 if (!ctx->qry.head) {
257 ctx->qry.nohead = 1;
257 ctx->qry.head = find_default_branch(ctx->repo); 258 ctx->qry.head = find_default_branch(ctx->repo);
258 ctx->repo->defbranch = ctx->qry.head; 259 ctx->repo->defbranch = ctx->qry.head;
259 } 260 }
260 261
261 if (!ctx->qry.head) { 262 if (!ctx->qry.head) {
262 cgit_print_http_headers(ctx); 263 cgit_print_http_headers(ctx);
263 cgit_print_docstart(ctx); 264 cgit_print_docstart(ctx);
264 cgit_print_pageheader(ctx); 265 cgit_print_pageheader(ctx);
265 cgit_print_error("Repository seems to be empty"); 266 cgit_print_error("Repository seems to be empty");
266 cgit_print_docend(); 267 cgit_print_docend();
267 return 1; 268 return 1;
268 } 269 }
269 270
270 if (get_sha1(ctx->qry.head, sha1)) { 271 if (get_sha1(ctx->qry.head, sha1)) {
271 tmp = xstrdup(ctx->qry.head); 272 tmp = xstrdup(ctx->qry.head);
272 ctx->qry.head = ctx->repo->defbranch; 273 ctx->qry.head = ctx->repo->defbranch;
273 cgit_print_http_headers(ctx); 274 cgit_print_http_headers(ctx);
274 cgit_print_docstart(ctx); 275 cgit_print_docstart(ctx);
275 cgit_print_pageheader(ctx); 276 cgit_print_pageheader(ctx);
276 cgit_print_error(fmt("Invalid branch: %s", tmp)); 277 cgit_print_error(fmt("Invalid branch: %s", tmp));
277 cgit_print_docend(); 278 cgit_print_docend();
278 return 1; 279 return 1;
279 } 280 }
280 return 0; 281 return 0;
281} 282}
282 283
283static void process_request(void *cbdata) 284static void process_request(void *cbdata)
284{ 285{
285 struct cgit_context *ctx = cbdata; 286 struct cgit_context *ctx = cbdata;
286 struct cgit_cmd *cmd; 287 struct cgit_cmd *cmd;
287 288
288 cmd = cgit_get_cmd(ctx); 289 cmd = cgit_get_cmd(ctx);
289 if (!cmd) { 290 if (!cmd) {
290 ctx->page.title = "cgit error"; 291 ctx->page.title = "cgit error";
291 ctx->repo = NULL; 292 ctx->repo = NULL;
292 cgit_print_http_headers(ctx); 293 cgit_print_http_headers(ctx);
293 cgit_print_docstart(ctx); 294 cgit_print_docstart(ctx);
294 cgit_print_pageheader(ctx); 295 cgit_print_pageheader(ctx);
295 cgit_print_error("Invalid request"); 296 cgit_print_error("Invalid request");
296 cgit_print_docend(); 297 cgit_print_docend();
297 return; 298 return;
298 } 299 }
299 300
300 if (cmd->want_repo && !ctx->repo) { 301 if (cmd->want_repo && !ctx->repo) {
301 cgit_print_http_headers(ctx); 302 cgit_print_http_headers(ctx);
302 cgit_print_docstart(ctx); 303 cgit_print_docstart(ctx);
303 cgit_print_pageheader(ctx); 304 cgit_print_pageheader(ctx);
304 cgit_print_error(fmt("No repository selected")); 305 cgit_print_error(fmt("No repository selected"));
diff --git a/cgit.h b/cgit.h
index d07185c..91db98a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -75,96 +75,97 @@ struct commitinfo {
75 char *author_email; 75 char *author_email;
76 unsigned long author_date; 76 unsigned long author_date;
77 char *committer; 77 char *committer;
78 char *committer_email; 78 char *committer_email;
79 unsigned long committer_date; 79 unsigned long committer_date;
80 char *subject; 80 char *subject;
81 char *msg; 81 char *msg;
82 char *msg_encoding; 82 char *msg_encoding;
83}; 83};
84 84
85struct taginfo { 85struct taginfo {
86 char *tagger; 86 char *tagger;
87 char *tagger_email; 87 char *tagger_email;
88 unsigned long tagger_date; 88 unsigned long tagger_date;
89 char *msg; 89 char *msg;
90}; 90};
91 91
92struct refinfo { 92struct refinfo {
93 const char *refname; 93 const char *refname;
94 struct object *object; 94 struct object *object;
95 union { 95 union {
96 struct taginfo *tag; 96 struct taginfo *tag;
97 struct commitinfo *commit; 97 struct commitinfo *commit;
98 }; 98 };
99}; 99};
100 100
101struct reflist { 101struct reflist {
102 struct refinfo **refs; 102 struct refinfo **refs;
103 int alloc; 103 int alloc;
104 int count; 104 int count;
105}; 105};
106 106
107struct cgit_query { 107struct cgit_query {
108 int has_symref; 108 int has_symref;
109 int has_sha1; 109 int has_sha1;
110 char *raw; 110 char *raw;
111 char *repo; 111 char *repo;
112 char *page; 112 char *page;
113 char *search; 113 char *search;
114 char *grep; 114 char *grep;
115 char *head; 115 char *head;
116 char *sha1; 116 char *sha1;
117 char *sha2; 117 char *sha2;
118 char *path; 118 char *path;
119 char *name; 119 char *name;
120 char *mimetype; 120 char *mimetype;
121 char *url; 121 char *url;
122 int ofs; 122 int ofs;
123 int nohead;
123}; 124};
124 125
125struct cgit_config { 126struct cgit_config {
126 char *agefile; 127 char *agefile;
127 char *cache_root; 128 char *cache_root;
128 char *clone_prefix; 129 char *clone_prefix;
129 char *css; 130 char *css;
130 char *favicon; 131 char *favicon;
131 char *footer; 132 char *footer;
132 char *index_header; 133 char *index_header;
133 char *index_info; 134 char *index_info;
134 char *logo; 135 char *logo;
135 char *logo_link; 136 char *logo_link;
136 char *module_link; 137 char *module_link;
137 char *repo_group; 138 char *repo_group;
138 char *robots; 139 char *robots;
139 char *root_title; 140 char *root_title;
140 char *root_desc; 141 char *root_desc;
141 char *root_readme; 142 char *root_readme;
142 char *script_name; 143 char *script_name;
143 char *virtual_root; 144 char *virtual_root;
144 int cache_size; 145 int cache_size;
145 int cache_dynamic_ttl; 146 int cache_dynamic_ttl;
146 int cache_max_create_time; 147 int cache_max_create_time;
147 int cache_repo_ttl; 148 int cache_repo_ttl;
148 int cache_root_ttl; 149 int cache_root_ttl;
149 int cache_static_ttl; 150 int cache_static_ttl;
150 int enable_index_links; 151 int enable_index_links;
151 int enable_log_filecount; 152 int enable_log_filecount;
152 int enable_log_linecount; 153 int enable_log_linecount;
153 int local_time; 154 int local_time;
154 int max_repo_count; 155 int max_repo_count;
155 int max_commit_count; 156 int max_commit_count;
156 int max_lock_attempts; 157 int max_lock_attempts;
157 int max_msg_len; 158 int max_msg_len;
158 int max_repodesc_len; 159 int max_repodesc_len;
159 int nocache; 160 int nocache;
160 int renamelimit; 161 int renamelimit;
161 int snapshots; 162 int snapshots;
162 int summary_branches; 163 int summary_branches;
163 int summary_log; 164 int summary_log;
164 int summary_tags; 165 int summary_tags;
165}; 166};
166 167
167struct cgit_page { 168struct cgit_page {
168 time_t modified; 169 time_t modified;
169 time_t expires; 170 time_t expires;
170 size_t size; 171 size_t size;