summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-08-17 08:17:23 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-08-17 08:17:23 (UTC)
commitcb92d05b6b729cd0e219b43d7a79aff832a9c1ac (patch) (unidiff)
tree3324266f779b12bcf9f80ad5ee2f18f535832549
parent0730ee6ea4af45e29e7c74d4a32bde9d2d6c8104 (diff)
parent435a1da8d1c43bff2f2ccd5649ea8510eec0b2af (diff)
downloadcgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.zip
cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.gz
cgit-cb92d05b6b729cd0e219b43d7a79aff832a9c1ac.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
-rw-r--r--ui-tag.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index 66dd140..5816f3d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -156,48 +156,51 @@ void config_cb(const char *name, const char *value)
156 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); 156 ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
157 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) 157 else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
158 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); 158 ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
159 else if (ctx.repo && !strcmp(name, "repo.max-stats")) 159 else if (ctx.repo && !strcmp(name, "repo.max-stats"))
160 ctx.repo->max_stats = cgit_find_stats_period(value, NULL); 160 ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
161 else if (ctx.repo && !strcmp(name, "repo.module-link")) 161 else if (ctx.repo && !strcmp(name, "repo.module-link"))
162 ctx.repo->module_link= xstrdup(value); 162 ctx.repo->module_link= xstrdup(value);
163 else if (ctx.repo && !strcmp(name, "repo.about-filter")) 163 else if (ctx.repo && !strcmp(name, "repo.about-filter"))
164 ctx.repo->about_filter = new_filter(value, 0); 164 ctx.repo->about_filter = new_filter(value, 0);
165 else if (ctx.repo && !strcmp(name, "repo.commit-filter")) 165 else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
166 ctx.repo->commit_filter = new_filter(value, 0); 166 ctx.repo->commit_filter = new_filter(value, 0);
167 else if (ctx.repo && !strcmp(name, "repo.source-filter")) 167 else if (ctx.repo && !strcmp(name, "repo.source-filter"))
168 ctx.repo->source_filter = new_filter(value, 1); 168 ctx.repo->source_filter = new_filter(value, 1);
169 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { 169 else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
170 if (*value == '/') 170 if (*value == '/')
171 ctx.repo->readme = xstrdup(value); 171 ctx.repo->readme = xstrdup(value);
172 else 172 else
173 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); 173 ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
174 } else if (!strcmp(name, "include")) 174 } else if (!strcmp(name, "include"))
175 parse_configfile(value, config_cb); 175 parse_configfile(value, config_cb);
176} 176}
177 177
178static void querystring_cb(const char *name, const char *value) 178static void querystring_cb(const char *name, const char *value)
179{ 179{
180 if (!value)
181 value = "";
182
180 if (!strcmp(name,"r")) { 183 if (!strcmp(name,"r")) {
181 ctx.qry.repo = xstrdup(value); 184 ctx.qry.repo = xstrdup(value);
182 ctx.repo = cgit_get_repoinfo(value); 185 ctx.repo = cgit_get_repoinfo(value);
183 } else if (!strcmp(name, "p")) { 186 } else if (!strcmp(name, "p")) {
184 ctx.qry.page = xstrdup(value); 187 ctx.qry.page = xstrdup(value);
185 } else if (!strcmp(name, "url")) { 188 } else if (!strcmp(name, "url")) {
186 ctx.qry.url = xstrdup(value); 189 ctx.qry.url = xstrdup(value);
187 cgit_parse_url(value); 190 cgit_parse_url(value);
188 } else if (!strcmp(name, "qt")) { 191 } else if (!strcmp(name, "qt")) {
189 ctx.qry.grep = xstrdup(value); 192 ctx.qry.grep = xstrdup(value);
190 } else if (!strcmp(name, "q")) { 193 } else if (!strcmp(name, "q")) {
191 ctx.qry.search = xstrdup(value); 194 ctx.qry.search = xstrdup(value);
192 } else if (!strcmp(name, "h")) { 195 } else if (!strcmp(name, "h")) {
193 ctx.qry.head = xstrdup(value); 196 ctx.qry.head = xstrdup(value);
194 ctx.qry.has_symref = 1; 197 ctx.qry.has_symref = 1;
195 } else if (!strcmp(name, "id")) { 198 } else if (!strcmp(name, "id")) {
196 ctx.qry.sha1 = xstrdup(value); 199 ctx.qry.sha1 = xstrdup(value);
197 ctx.qry.has_sha1 = 1; 200 ctx.qry.has_sha1 = 1;
198 } else if (!strcmp(name, "id2")) { 201 } else if (!strcmp(name, "id2")) {
199 ctx.qry.sha2 = xstrdup(value); 202 ctx.qry.sha2 = xstrdup(value);
200 ctx.qry.has_sha1 = 1; 203 ctx.qry.has_sha1 = 1;
201 } else if (!strcmp(name, "ofs")) { 204 } else if (!strcmp(name, "ofs")) {
202 ctx.qry.ofs = atoi(value); 205 ctx.qry.ofs = atoi(value);
203 } else if (!strcmp(name, "path")) { 206 } else if (!strcmp(name, "path")) {
diff --git a/ui-tag.c b/ui-tag.c
index a9c8670..c2d72af 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -16,49 +16,52 @@ static void print_tag_content(char *buf)
16 16
17 if (!buf) 17 if (!buf)
18 return; 18 return;
19 19
20 html("<div class='commit-subject'>"); 20 html("<div class='commit-subject'>");
21 p = strchr(buf, '\n'); 21 p = strchr(buf, '\n');
22 if (p) 22 if (p)
23 *p = '\0'; 23 *p = '\0';
24 html_txt(buf); 24 html_txt(buf);
25 html("</div>"); 25 html("</div>");
26 if (p) { 26 if (p) {
27 html("<div class='commit-msg'>"); 27 html("<div class='commit-msg'>");
28 html_txt(++p); 28 html_txt(++p);
29 html("</div>"); 29 html("</div>");
30 } 30 }
31} 31}
32 32
33void cgit_print_tag(char *revname) 33void cgit_print_tag(char *revname)
34{ 34{
35 unsigned char sha1[20]; 35 unsigned char sha1[20];
36 struct object *obj; 36 struct object *obj;
37 struct tag *tag; 37 struct tag *tag;
38 struct taginfo *info; 38 struct taginfo *info;
39 39
40 if (get_sha1(revname, sha1)) { 40 if (!revname)
41 revname = ctx.qry.head;
42
43 if (get_sha1(fmt("refs/tags/%s", revname), sha1)) {
41 cgit_print_error(fmt("Bad tag reference: %s", revname)); 44 cgit_print_error(fmt("Bad tag reference: %s", revname));
42 return; 45 return;
43 } 46 }
44 obj = parse_object(sha1); 47 obj = parse_object(sha1);
45 if (!obj) { 48 if (!obj) {
46 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1))); 49 cgit_print_error(fmt("Bad object id: %s", sha1_to_hex(sha1)));
47 return; 50 return;
48 } 51 }
49 if (obj->type == OBJ_TAG) { 52 if (obj->type == OBJ_TAG) {
50 tag = lookup_tag(sha1); 53 tag = lookup_tag(sha1);
51 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) { 54 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
52 cgit_print_error(fmt("Bad tag object: %s", revname)); 55 cgit_print_error(fmt("Bad tag object: %s", revname));
53 return; 56 return;
54 } 57 }
55 html("<table class='commit-info'>\n"); 58 html("<table class='commit-info'>\n");
56 htmlf("<tr><td>Tag name</td><td>"); 59 htmlf("<tr><td>Tag name</td><td>");
57 html_txt(revname); 60 html_txt(revname);
58 htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1)); 61 htmlf(" (%s)</td></tr>\n", sha1_to_hex(sha1));
59 if (info->tagger_date > 0) { 62 if (info->tagger_date > 0) {
60 html("<tr><td>Tag date</td><td>"); 63 html("<tr><td>Tag date</td><td>");
61 cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time); 64 cgit_print_date(info->tagger_date, FMT_LONGDATE, ctx.cfg.local_time);
62 html("</td></tr>\n"); 65 html("</td></tr>\n");
63 } 66 }
64 if (info->tagger) { 67 if (info->tagger) {