aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile11
-rw-r--r--cache.c2
-rw-r--r--cgit.h1
-rw-r--r--cgitrc2
-rw-r--r--cmd.c7
m---------git0
-rw-r--r--ui-atom.c129
-rw-r--r--ui-atom.h6
-rw-r--r--ui-shared.c23
-rw-r--r--ui-shared.h1
10 files changed, 175 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 78aad10..b002d44 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.6 7GIT_VER = 1.6.0.rc1
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
@@ -55,6 +55,7 @@ OBJECTS += configfile.o
55OBJECTS += html.o 55OBJECTS += html.o
56OBJECTS += parsing.o 56OBJECTS += parsing.o
57OBJECTS += shared.o 57OBJECTS += shared.o
58OBJECTS += ui-atom.o
58OBJECTS += ui-blob.o 59OBJECTS += ui-blob.o
59OBJECTS += ui-clone.o 60OBJECTS += ui-clone.o
60OBJECTS += ui-commit.o 61OBJECTS += ui-commit.o
@@ -74,7 +75,7 @@ ifdef NEEDS_LIBICONV
74endif 75endif
75 76
76 77
77.PHONY: all git test install uninstall clean force-version get-git 78.PHONY: all libgit test install uninstall clean force-version get-git
78 79
79all: cgit 80all: cgit
80 81
@@ -91,17 +92,15 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
91CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 92CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
92 93
93 94
94cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a 95cgit: $(OBJECTS) libgit
95 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) 96 $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
96 97
97cgit.o: VERSION 98cgit.o: VERSION
98 99
99-include $(OBJECTS:.o=.d) 100-include $(OBJECTS:.o=.d)
100 101
101git/libgit.a: git 102libgit:
102 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a 103 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
103
104git/xdiff/lib.a: git
105 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a 104 $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
106 105
107test: all 106test: all
diff --git a/cache.c b/cache.c
index 9f02cf5..57068a1 100644
--- a/cache.c
+++ b/cache.c
@@ -416,7 +416,7 @@ int cache_ls(const char *path)
416 fullname, strerror(err), err); 416 fullname, strerror(err), err);
417 continue; 417 continue;
418 } 418 }
419 printf("%s %s %10lld %s\n", 419 printf("%s %s %10zd %s\n",
420 name, 420 name,
421 sprintftime("%Y-%m-%d %H:%M:%S", 421 sprintftime("%Y-%m-%d %H:%M:%S",
422 slot.cache_st.st_mtime), 422 slot.cache_st.st_mtime),
diff --git a/cgit.h b/cgit.h
index b01fa31..a1fa841 100644
--- a/cgit.h
+++ b/cgit.h
@@ -24,6 +24,7 @@
24 */ 24 */
25#define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" 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#define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ"
27 28
28 29
29/* 30/*
diff --git a/cgitrc b/cgitrc
index 9e8a0f2..6a79c43 100644
--- a/cgitrc
+++ b/cgitrc
@@ -44,6 +44,8 @@
44## print all tags. 44## print all tags.
45#summary-tags=0 45#summary-tags=0
46 46
47## Enable/disable display of localtime vs. GMT. Set to 1 for localtime.
48#local-time=0
47 49
48## The "Idle" column on the repository index page can read a timestamp 50## The "Idle" column on the repository index page can read a timestamp
49## from the specified agefile (if this file cannot be found, the mtime 51## from the specified agefile (if this file cannot be found, the mtime
diff --git a/cmd.c b/cmd.c
index 03e165c..40ac53e 100644
--- a/cmd.c
+++ b/cmd.c
@@ -10,6 +10,7 @@
10#include "cmd.h" 10#include "cmd.h"
11#include "cache.h" 11#include "cache.h"
12#include "ui-shared.h" 12#include "ui-shared.h"
13#include "ui-atom.h"
13#include "ui-blob.h" 14#include "ui-blob.h"
14#include "ui-clone.h" 15#include "ui-clone.h"
15#include "ui-commit.h" 16#include "ui-commit.h"
@@ -28,6 +29,11 @@ static void HEAD_fn(struct cgit_context *ctx)
28 cgit_clone_head(ctx); 29 cgit_clone_head(ctx);
29} 30}
30 31
32static void atom_fn(struct cgit_context *ctx)
33{
34 cgit_print_atom(ctx->qry.head, ctx->qry.path, 10);
35}
36
31static void about_fn(struct cgit_context *ctx) 37static void about_fn(struct cgit_context *ctx)
32{ 38{
33 if (ctx->repo) 39 if (ctx->repo)
@@ -119,6 +125,7 @@ struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
119{ 125{
120 static struct cgit_cmd cmds[] = { 126 static struct cgit_cmd cmds[] = {
121 def_cmd(HEAD, 1, 0), 127 def_cmd(HEAD, 1, 0),
128 def_cmd(atom, 1, 0),
122 def_cmd(about, 0, 1), 129 def_cmd(about, 0, 1),
123 def_cmd(blob, 1, 0), 130 def_cmd(blob, 1, 0),
124 def_cmd(commit, 1, 1), 131 def_cmd(commit, 1, 1),
diff --git a/git b/git
Subproject 93310a40eb022a0e36e7c618921931d8ffc31fd Subproject 8e1db3871c767cb17b5e0eeb7bea8d967821a05
diff --git a/ui-atom.c b/ui-atom.c
new file mode 100644
index 0000000..a6ea3ee
--- /dev/null
+++ b/ui-atom.c
@@ -0,0 +1,129 @@
1/* ui-atom.c: functions for atom feeds
2 *
3 * Copyright (C) 2008 Lars Hjemli
4 *
5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text)
7 */
8
9#include "cgit.h"
10#include "html.h"
11#include "ui-shared.h"
12
13void add_entry(struct commit *commit, char *host)
14{
15 char delim = '&';
16 char *hex;
17 char *mail, *t, *t2;
18 struct commitinfo *info;
19
20 info = cgit_parse_commit(commit);
21 hex = sha1_to_hex(commit->object.sha1);
22 html("<entry>\n");
23 html("<title>");
24 html_txt(info->subject);
25 html("</title>\n");
26 html("<updated>");
27 cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
28 html("</updated>\n");
29 html("<author>\n");
30 if (info->author) {
31 html("<name>");
32 html_txt(info->author);
33 html("</name>\n");
34 }
35 if (info->author_email) {
36 mail = xstrdup(info->author_email);
37 t = strchr(mail, '<');
38 if (t)
39 t++;
40 else
41 t = mail;
42 t2 = strchr(t, '>');
43 if (t2)
44 *t2 = '\0';
45 html("<email>");
46 html_txt(t);
47 html("</email>\n");
48 free(mail);
49 }
50 html("</author>\n");
51 html("<published>");
52 cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
53 html("</published>\n");
54 if (host) {
55 html("<link rel='alternate' type='text/html' href='http://");
56 html_attr(host);
57 html_attr(cgit_pageurl(ctx.repo->url, "commit", NULL));
58 if (ctx.cfg.virtual_root)
59 delim = '?';
60 htmlf("%cid=%s", delim, hex);
61 html("'/>\n");
62 }
63 htmlf("<id>%s</id>\n", hex);
64 html("<content type='text'>\n");
65 html_txt(info->msg);
66 html("</content>\n");
67 html("<content type='xhtml'>\n");
68 html("<div xmlns='http://www.w3.org/1999/xhtml'>\n");
69 html("<pre>\n");
70 html_txt(info->msg);
71 html("</pre>\n");
72 html("</div>\n");
73 html("</content>\n");
74 html("</entry>\n");
75 cgit_free_commitinfo(info);
76}
77
78
79void cgit_print_atom(char *tip, char *path, int max_count)
80{
81 char *host;
82 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
83 struct commit *commit;
84 struct rev_info rev;
85 int argc = 2;
86
87 if (!tip)
88 argv[1] = ctx.qry.head;
89
90 if (path) {
91 argv[argc++] = "--";
92 argv[argc++] = path;
93 }
94
95 init_revisions(&rev, NULL);
96 rev.abbrev = DEFAULT_ABBREV;
97 rev.commit_format = CMIT_FMT_DEFAULT;
98 rev.verbose_header = 1;
99 rev.show_root_diff = 0;
100 rev.max_count = max_count;
101 setup_revisions(argc, argv, &rev, NULL);
102 prepare_revision_walk(&rev);
103
104 host = cgit_hosturl();
105 ctx.page.mimetype = "text/xml";
106 ctx.page.charset = "utf-8";
107 cgit_print_http_headers(&ctx);
108 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
109 html("<title>");
110 html_txt(ctx.repo->name);
111 html("</title>\n");
112 html("<subtitle>");
113 html_txt(ctx.repo->desc);
114 html("</subtitle>\n");
115 if (host) {
116 html("<link rel='alternate' type='text/html' href='http://");
117 html_attr(host);
118 html_attr(cgit_repourl(ctx.repo->url));
119 html("'/>\n");
120 }
121 while ((commit = get_revision(&rev)) != NULL) {
122 add_entry(commit, host);
123 free(commit->buffer);
124 commit->buffer = NULL;
125 free_commit_list(commit->parents);
126 commit->parents = NULL;
127 }
128 html("</feed>\n");
129}
diff --git a/ui-atom.h b/ui-atom.h
new file mode 100644
index 0000000..749ffd3
--- /dev/null
+++ b/ui-atom.h
@@ -0,0 +1,6 @@
1#ifndef UI_ATOM_H
2#define UI_ATOM_H
3
4extern void cgit_print_atom(char *tip, char *path, int max_count);
5
6#endif
diff --git a/ui-shared.c b/ui-shared.c
index 197ee37..37c60b2 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -34,6 +34,21 @@ void cgit_print_error(char *msg)
34 html("</div>\n"); 34 html("</div>\n");
35} 35}
36 36
37char *cgit_hosturl()
38{
39 char *host, *port;
40
41 host = getenv("SERVER_NAME");
42 if (!host)
43 return NULL;
44 port = getenv("SERVER_PORT");
45 if (port && atoi(port) != 80)
46 host = xstrdup(fmt("%s:%d", host, atoi(port)));
47 else
48 host = xstrdup(host);
49 return host;
50}
51
37char *cgit_rooturl() 52char *cgit_rooturl()
38{ 53{
39 if (ctx.cfg.virtual_root) 54 if (ctx.cfg.virtual_root)
@@ -428,6 +443,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
428 443
429void cgit_print_docstart(struct cgit_context *ctx) 444void cgit_print_docstart(struct cgit_context *ctx)
430{ 445{
446 char *host = cgit_hosturl();
431 html(cgit_doctype); 447 html(cgit_doctype);
432 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); 448 html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
433 html("<head>\n"); 449 html("<head>\n");
@@ -445,6 +461,13 @@ void cgit_print_docstart(struct cgit_context *ctx)
445 html_attr(ctx->cfg.favicon); 461 html_attr(ctx->cfg.favicon);
446 html("'/>\n"); 462 html("'/>\n");
447 } 463 }
464 if (host && ctx->repo) {
465 html("<link rel='alternate' title='Atom feed' href='http://");
466 html_attr(cgit_hosturl());
467 html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
468 fmt("h=%s", ctx->qry.head)));
469 html("' type='application/atom+xml'/>");
470 }
448 html("</head>\n"); 471 html("</head>\n");
449 html("<body>\n"); 472 html("<body>\n");
450} 473}
diff --git a/ui-shared.h b/ui-shared.h
index 07da4b4..f4123d3 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,6 +1,7 @@
1#ifndef UI_SHARED_H 1#ifndef UI_SHARED_H
2#define UI_SHARED_H 2#define UI_SHARED_H
3 3
4extern char *cgit_hosturl();
4extern char *cgit_repourl(const char *reponame); 5extern char *cgit_repourl(const char *reponame);
5extern char *cgit_fileurl(const char *reponame, const char *pagename, 6extern char *cgit_fileurl(const char *reponame, const char *pagename,
6 const char *filename, const char *query); 7 const char *filename, const char *query);