author | Lars Hjemli <hjemli@gmail.com> | 2007-06-29 18:32:08 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-29 18:32:08 (UTC) |
commit | 16a3d2779ccd56bf7954d98da547247d8796544b (patch) (unidiff) | |
tree | 86d2ed41adc3de842c7518d614ea49ca0200e4d2 /ui-summary.c | |
parent | f69250358a74efa5d7d9c562b2cdd80fad1430f1 (diff) | |
parent | 103940fe6b0914dc42b8b033d1d328f38135ca5f (diff) | |
download | cgit-16a3d2779ccd56bf7954d98da547247d8796544b.zip cgit-16a3d2779ccd56bf7954d98da547247d8796544b.tar.gz cgit-16a3d2779ccd56bf7954d98da547247d8796544b.tar.bz2 |
Merge branch 'lh/menu'
* lh/menu:
Add ofs argument to cgit_log_link and use it in ui-log.c
Add trim_end() and use it to remove trailing slashes from repo paths
Do not include current path in the "tree" menu link
Add setting to enable/disable extra links on index page
Change S/L/T to summary/log/tree
Change "files" to "tree"
Include querystring as part of cached filename for repo summary page
Add more menuitems on repo pages
-rw-r--r-- | ui-summary.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-summary.c b/ui-summary.c index 03dd078..b4bc6d8 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -6,49 +6,49 @@ | |||
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | static int header; | 11 | static int header; |
12 | 12 | ||
13 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | 13 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, |
14 | int flags, void *cb_data) | 14 | int flags, void *cb_data) |
15 | { | 15 | { |
16 | struct commit *commit; | 16 | struct commit *commit; |
17 | struct commitinfo *info; | 17 | struct commitinfo *info; |
18 | char buf[256]; | 18 | char buf[256]; |
19 | char *ref; | 19 | char *ref; |
20 | 20 | ||
21 | ref = xstrdup(refname); | 21 | ref = xstrdup(refname); |
22 | strncpy(buf, refname, sizeof(buf)); | 22 | strncpy(buf, refname, sizeof(buf)); |
23 | commit = lookup_commit(sha1); | 23 | commit = lookup_commit(sha1); |
24 | // object is not really parsed at this point, because of some fallout | 24 | // object is not really parsed at this point, because of some fallout |
25 | // from previous calls to git functions in cgit_print_log() | 25 | // from previous calls to git functions in cgit_print_log() |
26 | commit->object.parsed = 0; | 26 | commit->object.parsed = 0; |
27 | if (commit && !parse_commit(commit)){ | 27 | if (commit && !parse_commit(commit)){ |
28 | info = cgit_parse_commit(commit); | 28 | info = cgit_parse_commit(commit); |
29 | html("<tr><td>"); | 29 | html("<tr><td>"); |
30 | cgit_log_link(ref, NULL, NULL, ref, NULL, NULL); | 30 | cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0); |
31 | html("</td><td>"); | 31 | html("</td><td>"); |
32 | cgit_print_age(commit->date, -1, NULL); | 32 | cgit_print_age(commit->date, -1, NULL); |
33 | html("</td><td>"); | 33 | html("</td><td>"); |
34 | html_txt(info->author); | 34 | html_txt(info->author); |
35 | html("</td><td>"); | 35 | html("</td><td>"); |
36 | cgit_commit_link(info->subject, NULL, NULL, ref, NULL); | 36 | cgit_commit_link(info->subject, NULL, NULL, ref, NULL); |
37 | html("</td></tr>\n"); | 37 | html("</td></tr>\n"); |
38 | cgit_free_commitinfo(info); | 38 | cgit_free_commitinfo(info); |
39 | } else { | 39 | } else { |
40 | html("<tr><td>"); | 40 | html("<tr><td>"); |
41 | html_txt(buf); | 41 | html_txt(buf); |
42 | html("</td><td colspan='3'>"); | 42 | html("</td><td colspan='3'>"); |
43 | htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); | 43 | htmlf("*** bad ref %s ***", sha1_to_hex(sha1)); |
44 | html("</td></tr>\n"); | 44 | html("</td></tr>\n"); |
45 | } | 45 | } |
46 | free(ref); | 46 | free(ref); |
47 | return 0; | 47 | return 0; |
48 | } | 48 | } |
49 | 49 | ||
50 | 50 | ||
51 | static void cgit_print_object_ref(struct object *obj) | 51 | static void cgit_print_object_ref(struct object *obj) |
52 | { | 52 | { |
53 | char *page, *arg, *url; | 53 | char *page, *arg, *url; |
54 | 54 | ||