author | Johan Herland <johan@herland.net> | 2010-06-11 12:50:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 08:40:24 (UTC) |
commit | afc40725c1bd5a25446a704995ce3a02270537df (patch) (unidiff) | |
tree | 1a88e21aad2aa40164ad3ed84667a340679d1e3b | |
parent | 7fdff2460440c09d13fc76af3b75e85434e6f563 (diff) | |
download | cgit-afc40725c1bd5a25446a704995ce3a02270537df.zip cgit-afc40725c1bd5a25446a704995ce3a02270537df.tar.gz cgit-afc40725c1bd5a25446a704995ce3a02270537df.tar.bz2 |
ui-log: Preserve path limit in outgoing links
This allows navigation through the 'log' page/command without losing the
active path limit.
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -17,108 +17,111 @@ void count_lines(char *line, int size) | |||
17 | if (size <= 0) | 17 | if (size <= 0) |
18 | return; | 18 | return; |
19 | 19 | ||
20 | if (line[0] == '+') | 20 | if (line[0] == '+') |
21 | add_lines++; | 21 | add_lines++; |
22 | 22 | ||
23 | else if (line[0] == '-') | 23 | else if (line[0] == '-') |
24 | rem_lines++; | 24 | rem_lines++; |
25 | } | 25 | } |
26 | 26 | ||
27 | void inspect_files(struct diff_filepair *pair) | 27 | void inspect_files(struct diff_filepair *pair) |
28 | { | 28 | { |
29 | unsigned long old_size = 0; | 29 | unsigned long old_size = 0; |
30 | unsigned long new_size = 0; | 30 | unsigned long new_size = 0; |
31 | int binary = 0; | 31 | int binary = 0; |
32 | 32 | ||
33 | files++; | 33 | files++; |
34 | if (ctx.repo->enable_log_linecount) | 34 | if (ctx.repo->enable_log_linecount) |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
36 | &new_size, &binary, count_lines); | 36 | &new_size, &binary, count_lines); |
37 | } | 37 | } |
38 | 38 | ||
39 | void show_commit_decorations(struct commit *commit) | 39 | 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, |
50 | 0, NULL, NULL, ctx.qry.showmsg); | 50 | ctx.qry.vpath, 0, NULL, NULL, |
51 | ctx.qry.showmsg); | ||
51 | } | 52 | } |
52 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 53 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
53 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 54 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
54 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 55 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
55 | } | 56 | } |
56 | else if (!prefixcmp(deco->name, "refs/tags/")) { | 57 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
57 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); | 58 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
58 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 59 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
59 | } | 60 | } |
60 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 61 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
61 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 62 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
62 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 63 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
63 | sha1_to_hex(commit->object.sha1), NULL, | 64 | sha1_to_hex(commit->object.sha1), |
64 | 0, NULL, NULL, ctx.qry.showmsg); | 65 | ctx.qry.vpath, 0, NULL, NULL, |
66 | ctx.qry.showmsg); | ||
65 | } | 67 | } |
66 | else { | 68 | else { |
67 | strncpy(buf, deco->name, sizeof(buf) - 1); | 69 | strncpy(buf, deco->name, sizeof(buf) - 1); |
68 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 70 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
69 | sha1_to_hex(commit->object.sha1), NULL, 0); | 71 | sha1_to_hex(commit->object.sha1), |
72 | ctx.qry.vpath, 0); | ||
70 | } | 73 | } |
71 | deco = deco->next; | 74 | deco = deco->next; |
72 | } | 75 | } |
73 | } | 76 | } |
74 | 77 | ||
75 | void print_commit(struct commit *commit) | 78 | void print_commit(struct commit *commit) |
76 | { | 79 | { |
77 | struct commitinfo *info; | 80 | struct commitinfo *info; |
78 | char *tmp; | 81 | char *tmp; |
79 | int cols = 2; | 82 | int cols = 2; |
80 | 83 | ||
81 | info = cgit_parse_commit(commit); | 84 | info = cgit_parse_commit(commit); |
82 | htmlf("<tr%s><td>", | 85 | htmlf("<tr%s><td>", |
83 | ctx.qry.showmsg ? " class='logheader'" : ""); | 86 | ctx.qry.showmsg ? " class='logheader'" : ""); |
84 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 87 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
85 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); | 88 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
86 | html_link_open(tmp, NULL, NULL); | 89 | html_link_open(tmp, NULL, NULL); |
87 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 90 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
88 | html_link_close(); | 91 | html_link_close(); |
89 | htmlf("</td><td%s>", | 92 | htmlf("</td><td%s>", |
90 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 93 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
91 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 94 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
92 | sha1_to_hex(commit->object.sha1), NULL, 0); | 95 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
93 | show_commit_decorations(commit); | 96 | show_commit_decorations(commit); |
94 | html("</td><td>"); | 97 | html("</td><td>"); |
95 | html_txt(info->author); | 98 | html_txt(info->author); |
96 | if (ctx.repo->enable_log_filecount) { | 99 | if (ctx.repo->enable_log_filecount) { |
97 | files = 0; | 100 | files = 0; |
98 | add_lines = 0; | 101 | add_lines = 0; |
99 | rem_lines = 0; | 102 | rem_lines = 0; |
100 | cgit_diff_commit(commit, inspect_files); | 103 | cgit_diff_commit(commit, inspect_files); |
101 | html("</td><td>"); | 104 | html("</td><td>"); |
102 | htmlf("%d", files); | 105 | htmlf("%d", files); |
103 | if (ctx.repo->enable_log_linecount) { | 106 | if (ctx.repo->enable_log_linecount) { |
104 | html("</td><td>"); | 107 | html("</td><td>"); |
105 | htmlf("-%d/+%d", rem_lines, add_lines); | 108 | htmlf("-%d/+%d", rem_lines, add_lines); |
106 | } | 109 | } |
107 | } | 110 | } |
108 | html("</td></tr>\n"); | 111 | html("</td></tr>\n"); |
109 | if (ctx.qry.showmsg) { | 112 | if (ctx.qry.showmsg) { |
110 | if (ctx.repo->enable_log_filecount) { | 113 | if (ctx.repo->enable_log_filecount) { |
111 | cols++; | 114 | cols++; |
112 | if (ctx.repo->enable_log_linecount) | 115 | if (ctx.repo->enable_log_linecount) |
113 | cols++; | 116 | cols++; |
114 | } | 117 | } |
115 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", | 118 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
116 | cols); | 119 | cols); |
117 | html_txt(info->msg); | 120 | html_txt(info->msg); |
118 | html("</td></tr>\n"); | 121 | html("</td></tr>\n"); |
119 | } | 122 | } |
120 | cgit_free_commitinfo(info); | 123 | cgit_free_commitinfo(info); |
121 | } | 124 | } |
122 | 125 | ||
123 | static const char *disambiguate_ref(const char *ref) | 126 | static const char *disambiguate_ref(const char *ref) |
124 | { | 127 | { |
@@ -147,88 +150,88 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
147 | argv[1] = disambiguate_ref(tip); | 150 | argv[1] = disambiguate_ref(tip); |
148 | 151 | ||
149 | if (grep && pattern && (!strcmp(grep, "grep") || | 152 | if (grep && pattern && (!strcmp(grep, "grep") || |
150 | !strcmp(grep, "author") || | 153 | !strcmp(grep, "author") || |
151 | !strcmp(grep, "committer"))) | 154 | !strcmp(grep, "committer"))) |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 155 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
153 | 156 | ||
154 | if (path) { | 157 | if (path) { |
155 | argv[argc++] = "--"; | 158 | argv[argc++] = "--"; |
156 | argv[argc++] = path; | 159 | argv[argc++] = path; |
157 | } | 160 | } |
158 | init_revisions(&rev, NULL); | 161 | init_revisions(&rev, NULL); |
159 | rev.abbrev = DEFAULT_ABBREV; | 162 | rev.abbrev = DEFAULT_ABBREV; |
160 | rev.commit_format = CMIT_FMT_DEFAULT; | 163 | rev.commit_format = CMIT_FMT_DEFAULT; |
161 | rev.verbose_header = 1; | 164 | rev.verbose_header = 1; |
162 | rev.show_root_diff = 0; | 165 | rev.show_root_diff = 0; |
163 | setup_revisions(argc, argv, &rev, NULL); | 166 | setup_revisions(argc, argv, &rev, NULL); |
164 | load_ref_decorations(DECORATE_FULL_REFS); | 167 | load_ref_decorations(DECORATE_FULL_REFS); |
165 | rev.show_decorations = 1; | 168 | rev.show_decorations = 1; |
166 | rev.grep_filter.regflags |= REG_ICASE; | 169 | rev.grep_filter.regflags |= REG_ICASE; |
167 | compile_grep_patterns(&rev.grep_filter); | 170 | compile_grep_patterns(&rev.grep_filter); |
168 | prepare_revision_walk(&rev); | 171 | prepare_revision_walk(&rev); |
169 | 172 | ||
170 | if (pager) | 173 | if (pager) |
171 | html("<table class='list nowrap'>"); | 174 | html("<table class='list nowrap'>"); |
172 | 175 | ||
173 | html("<tr class='nohover'><th class='left'>Age</th>" | 176 | html("<tr class='nohover'><th class='left'>Age</th>" |
174 | "<th class='left'>Commit message"); | 177 | "<th class='left'>Commit message"); |
175 | if (pager) { | 178 | if (pager) { |
176 | html(" ("); | 179 | html(" ("); |
177 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, | 180 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
178 | NULL, ctx.qry.head, ctx.qry.sha1, | 181 | NULL, ctx.qry.head, ctx.qry.sha1, |
179 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, | 182 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
180 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | 183 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
181 | html(")"); | 184 | html(")"); |
182 | } | 185 | } |
183 | html("</th><th class='left'>Author</th>"); | 186 | html("</th><th class='left'>Author</th>"); |
184 | if (ctx.repo->enable_log_filecount) { | 187 | if (ctx.repo->enable_log_filecount) { |
185 | html("<th class='left'>Files</th>"); | 188 | html("<th class='left'>Files</th>"); |
186 | columns++; | 189 | columns++; |
187 | if (ctx.repo->enable_log_linecount) { | 190 | if (ctx.repo->enable_log_linecount) { |
188 | html("<th class='left'>Lines</th>"); | 191 | html("<th class='left'>Lines</th>"); |
189 | columns++; | 192 | columns++; |
190 | } | 193 | } |
191 | } | 194 | } |
192 | html("</tr>\n"); | 195 | html("</tr>\n"); |
193 | 196 | ||
194 | if (ofs<0) | 197 | if (ofs<0) |
195 | ofs = 0; | 198 | ofs = 0; |
196 | 199 | ||
197 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 200 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
198 | free(commit->buffer); | 201 | free(commit->buffer); |
199 | commit->buffer = NULL; | 202 | commit->buffer = NULL; |
200 | free_commit_list(commit->parents); | 203 | free_commit_list(commit->parents); |
201 | commit->parents = NULL; | 204 | commit->parents = NULL; |
202 | } | 205 | } |
203 | 206 | ||
204 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 207 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
205 | print_commit(commit); | 208 | print_commit(commit); |
206 | free(commit->buffer); | 209 | free(commit->buffer); |
207 | commit->buffer = NULL; | 210 | commit->buffer = NULL; |
208 | free_commit_list(commit->parents); | 211 | free_commit_list(commit->parents); |
209 | commit->parents = NULL; | 212 | commit->parents = NULL; |
210 | } | 213 | } |
211 | if (pager) { | 214 | if (pager) { |
212 | htmlf("</table><div class='pager'>", | 215 | htmlf("</table><div class='pager'>", |
213 | columns); | 216 | columns); |
214 | if (ofs > 0) { | 217 | if (ofs > 0) { |
215 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 218 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
216 | ctx.qry.sha1, ctx.qry.path, | 219 | ctx.qry.sha1, ctx.qry.vpath, |
217 | ofs - cnt, ctx.qry.grep, | 220 | ofs - cnt, ctx.qry.grep, |
218 | ctx.qry.search, ctx.qry.showmsg); | 221 | ctx.qry.search, ctx.qry.showmsg); |
219 | html(" "); | 222 | html(" "); |
220 | } | 223 | } |
221 | if ((commit = get_revision(&rev)) != NULL) { | 224 | if ((commit = get_revision(&rev)) != NULL) { |
222 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 225 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
223 | ctx.qry.sha1, ctx.qry.path, | 226 | ctx.qry.sha1, ctx.qry.vpath, |
224 | ofs + cnt, ctx.qry.grep, | 227 | ofs + cnt, ctx.qry.grep, |
225 | ctx.qry.search, ctx.qry.showmsg); | 228 | ctx.qry.search, ctx.qry.showmsg); |
226 | } | 229 | } |
227 | html("</div>"); | 230 | html("</div>"); |
228 | } else if ((commit = get_revision(&rev)) != NULL) { | 231 | } else if ((commit = get_revision(&rev)) != NULL) { |
229 | html("<tr class='nohover'><td colspan='3'>"); | 232 | html("<tr class='nohover'><td colspan='3'>"); |
230 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, | 233 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, |
231 | NULL, NULL, ctx.qry.showmsg); | 234 | ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); |
232 | html("</td></tr>\n"); | 235 | html("</td></tr>\n"); |
233 | } | 236 | } |
234 | } | 237 | } |