summaryrefslogtreecommitdiffabout
path: root/cgit.c
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 /cgit.c
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 (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c1
1 files changed, 1 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"));