|
diff --git a/ui-log.c b/ui-log.c index ba2ab03..f3132c9 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -40,32 +40,36 @@ void show_commit_decorations(struct commit *commit) |
40 | { |
40 | { |
41 | struct name_decoration *deco; |
41 | struct name_decoration *deco; |
42 | static char buf[1024]; |
42 | static char buf[1024]; |
43 | |
43 | |
44 | buf[sizeof(buf) - 1] = 0; |
44 | buf[sizeof(buf) - 1] = 0; |
45 | deco = lookup_decoration(&name_decoration, &commit->object); |
45 | deco = lookup_decoration(&name_decoration, &commit->object); |
46 | while (deco) { |
46 | while (deco) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, |
49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, |
50 | 0, NULL, NULL, ctx.qry.showmsg); |
50 | 0, NULL, NULL, ctx.qry.showmsg); |
51 | } |
51 | } |
52 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
52 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
53 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
53 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
54 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
54 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
55 | } |
55 | } |
| |
56 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
| |
57 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
| |
58 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
| |
59 | } |
56 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
60 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
57 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
61 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
58 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
62 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
59 | sha1_to_hex(commit->object.sha1), NULL, |
63 | sha1_to_hex(commit->object.sha1), NULL, |
60 | 0, NULL, NULL, ctx.qry.showmsg); |
64 | 0, NULL, NULL, ctx.qry.showmsg); |
61 | } |
65 | } |
62 | else { |
66 | else { |
63 | strncpy(buf, deco->name, sizeof(buf) - 1); |
67 | strncpy(buf, deco->name, sizeof(buf) - 1); |
64 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
68 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
65 | sha1_to_hex(commit->object.sha1)); |
69 | sha1_to_hex(commit->object.sha1)); |
66 | } |
70 | } |
67 | deco = deco->next; |
71 | deco = deco->next; |
68 | } |
72 | } |
69 | } |
73 | } |
70 | |
74 | |
71 | void print_commit(struct commit *commit) |
75 | void print_commit(struct commit *commit) |
@@ -144,33 +148,33 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern |
144 | |
148 | |
145 | if (grep && pattern && (!strcmp(grep, "grep") || |
149 | if (grep && pattern && (!strcmp(grep, "grep") || |
146 | !strcmp(grep, "author") || |
150 | !strcmp(grep, "author") || |
147 | !strcmp(grep, "committer"))) |
151 | !strcmp(grep, "committer"))) |
148 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
149 | |
153 | |
150 | if (path) { |
154 | if (path) { |
151 | argv[argc++] = "--"; |
155 | argv[argc++] = "--"; |
152 | argv[argc++] = path; |
156 | argv[argc++] = path; |
153 | } |
157 | } |
154 | init_revisions(&rev, NULL); |
158 | init_revisions(&rev, NULL); |
155 | rev.abbrev = DEFAULT_ABBREV; |
159 | rev.abbrev = DEFAULT_ABBREV; |
156 | rev.commit_format = CMIT_FMT_DEFAULT; |
160 | rev.commit_format = CMIT_FMT_DEFAULT; |
157 | rev.verbose_header = 1; |
161 | rev.verbose_header = 1; |
158 | rev.show_root_diff = 0; |
162 | rev.show_root_diff = 0; |
159 | setup_revisions(argc, argv, &rev, NULL); |
163 | setup_revisions(argc, argv, &rev, NULL); |
160 | load_ref_decorations(); |
164 | load_ref_decorations(DECORATE_FULL_REFS); |
161 | rev.show_decorations = 1; |
165 | rev.show_decorations = 1; |
162 | rev.grep_filter.regflags |= REG_ICASE; |
166 | rev.grep_filter.regflags |= REG_ICASE; |
163 | compile_grep_patterns(&rev.grep_filter); |
167 | compile_grep_patterns(&rev.grep_filter); |
164 | prepare_revision_walk(&rev); |
168 | prepare_revision_walk(&rev); |
165 | |
169 | |
166 | if (pager) |
170 | if (pager) |
167 | html("<table class='list nowrap'>"); |
171 | html("<table class='list nowrap'>"); |
168 | |
172 | |
169 | html("<tr class='nohover'><th class='left'>Age</th>" |
173 | html("<tr class='nohover'><th class='left'>Age</th>" |
170 | "<th class='left'>Commit message"); |
174 | "<th class='left'>Commit message"); |
171 | if (pager) { |
175 | if (pager) { |
172 | html(" ("); |
176 | html(" ("); |
173 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
177 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
174 | NULL, ctx.qry.head, ctx.qry.sha1, |
178 | NULL, ctx.qry.head, ctx.qry.sha1, |
175 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, |
179 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, |
176 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
180 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
|