summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2010-09-25 13:25:32 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-11-07 15:35:54 (UTC)
commitcda1b78ff7afb6c565a2efe503bb3643e1009dc9 (patch) (unidiff)
tree1eee2217375e9d4b083ff13aada3816fddcd8617
parenteca95229acdc3c7c27fdcc1319f5c96da9e3b538 (diff)
downloadcgit-cda1b78ff7afb6c565a2efe503bb3643e1009dc9.zip
cgit-cda1b78ff7afb6c565a2efe503bb3643e1009dc9.tar.gz
cgit-cda1b78ff7afb6c565a2efe503bb3643e1009dc9.tar.bz2
Append path and branch to atom feed title
Currently all atom feeds for a repository get the same title but they are actually unique per path and per branch. Signed-off-by: Chris Mayo <aklhfex@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-atom.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ui-atom.c b/ui-atom.c
index 9331f74..b218456 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -90,44 +90,52 @@ void cgit_print_atom(char *tip, char *path, int max_count)
90 else if (!tip) 90 else if (!tip)
91 argv[1] = ctx.qry.head; 91 argv[1] = ctx.qry.head;
92 92
93 if (path) { 93 if (path) {
94 argv[argc++] = "--"; 94 argv[argc++] = "--";
95 argv[argc++] = path; 95 argv[argc++] = path;
96 } 96 }
97 97
98 init_revisions(&rev, NULL); 98 init_revisions(&rev, NULL);
99 rev.abbrev = DEFAULT_ABBREV; 99 rev.abbrev = DEFAULT_ABBREV;
100 rev.commit_format = CMIT_FMT_DEFAULT; 100 rev.commit_format = CMIT_FMT_DEFAULT;
101 rev.verbose_header = 1; 101 rev.verbose_header = 1;
102 rev.show_root_diff = 0; 102 rev.show_root_diff = 0;
103 rev.max_count = max_count; 103 rev.max_count = max_count;
104 setup_revisions(argc, argv, &rev, NULL); 104 setup_revisions(argc, argv, &rev, NULL);
105 prepare_revision_walk(&rev); 105 prepare_revision_walk(&rev);
106 106
107 host = cgit_hosturl(); 107 host = cgit_hosturl();
108 ctx.page.mimetype = "text/xml"; 108 ctx.page.mimetype = "text/xml";
109 ctx.page.charset = "utf-8"; 109 ctx.page.charset = "utf-8";
110 cgit_print_http_headers(&ctx); 110 cgit_print_http_headers(&ctx);
111 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n"); 111 html("<feed xmlns='http://www.w3.org/2005/Atom'>\n");
112 html("<title>"); 112 html("<title>");
113 html_txt(ctx.repo->name); 113 html_txt(ctx.repo->name);
114 if (path) {
115 html("/");
116 html_txt(path);
117 }
118 if (tip && !ctx.qry.show_all) {
119 html(", branch ");
120 html_txt(tip);
121 }
114 html("</title>\n"); 122 html("</title>\n");
115 html("<subtitle>"); 123 html("<subtitle>");
116 html_txt(ctx.repo->desc); 124 html_txt(ctx.repo->desc);
117 html("</subtitle>\n"); 125 html("</subtitle>\n");
118 if (host) { 126 if (host) {
119 html("<link rel='alternate' type='text/html' href='"); 127 html("<link rel='alternate' type='text/html' href='");
120 html(cgit_httpscheme()); 128 html(cgit_httpscheme());
121 html_attr(host); 129 html_attr(host);
122 html_attr(cgit_repourl(ctx.repo->url)); 130 html_attr(cgit_repourl(ctx.repo->url));
123 html("'/>\n"); 131 html("'/>\n");
124 } 132 }
125 while ((commit = get_revision(&rev)) != NULL) { 133 while ((commit = get_revision(&rev)) != NULL) {
126 add_entry(commit, host); 134 add_entry(commit, host);
127 free(commit->buffer); 135 free(commit->buffer);
128 commit->buffer = NULL; 136 commit->buffer = NULL;
129 free_commit_list(commit->parents); 137 free_commit_list(commit->parents);
130 commit->parents = NULL; 138 commit->parents = NULL;
131 } 139 }
132 html("</feed>\n"); 140 html("</feed>\n");
133} 141}