author | Lars Hjemli <hjemli@gmail.com> | 2008-04-14 20:23:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-14 20:23:48 (UTC) |
commit | e9a7042b5b44c6af2c7dc91eabed732d92278218 (patch) (unidiff) | |
tree | ca0de7f4de19156b144ada5e9f3a2b46101fee90 /ui-log.c | |
parent | 5764fe95469f65fdee285467f0f87d188fc1a780 (diff) | |
download | cgit-e9a7042b5b44c6af2c7dc91eabed732d92278218.zip cgit-e9a7042b5b44c6af2c7dc91eabed732d92278218.tar.gz cgit-e9a7042b5b44c6af2c7dc91eabed732d92278218.tar.bz2 |
Make a few more columns in repolist and log view clickable
Less mouse movement is nice.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,152 +1,157 @@ | |||
1 | /* ui-log.c: functions for log output | 1 | /* ui-log.c: functions for log output |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
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 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | int files, add_lines, rem_lines; | 13 | int files, add_lines, rem_lines; |
14 | 14 | ||
15 | void count_lines(char *line, int size) | 15 | void count_lines(char *line, int size) |
16 | { | 16 | { |
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 | files++; | 29 | files++; |
30 | if (ctx.repo->enable_log_linecount) | 30 | if (ctx.repo->enable_log_linecount) |
31 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 31 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
32 | } | 32 | } |
33 | 33 | ||
34 | void print_commit(struct commit *commit) | 34 | void print_commit(struct commit *commit) |
35 | { | 35 | { |
36 | struct commitinfo *info; | 36 | struct commitinfo *info; |
37 | char *tmp; | ||
37 | 38 | ||
38 | info = cgit_parse_commit(commit); | 39 | info = cgit_parse_commit(commit); |
39 | html("<tr><td>"); | 40 | html("<tr><td>"); |
41 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | ||
42 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); | ||
43 | html_link_open(tmp, NULL, NULL); | ||
40 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 44 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
45 | html_link_close(); | ||
41 | html("</td><td>"); | 46 | html("</td><td>"); |
42 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 47 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
43 | sha1_to_hex(commit->object.sha1)); | 48 | sha1_to_hex(commit->object.sha1)); |
44 | html("</td><td>"); | 49 | html("</td><td>"); |
45 | html_txt(info->author); | 50 | html_txt(info->author); |
46 | if (ctx.repo->enable_log_filecount) { | 51 | if (ctx.repo->enable_log_filecount) { |
47 | files = 0; | 52 | files = 0; |
48 | add_lines = 0; | 53 | add_lines = 0; |
49 | rem_lines = 0; | 54 | rem_lines = 0; |
50 | cgit_diff_commit(commit, inspect_files); | 55 | cgit_diff_commit(commit, inspect_files); |
51 | html("</td><td>"); | 56 | html("</td><td>"); |
52 | htmlf("%d", files); | 57 | htmlf("%d", files); |
53 | if (ctx.repo->enable_log_linecount) { | 58 | if (ctx.repo->enable_log_linecount) { |
54 | html("</td><td>"); | 59 | html("</td><td>"); |
55 | htmlf("-%d/+%d", rem_lines, add_lines); | 60 | htmlf("-%d/+%d", rem_lines, add_lines); |
56 | } | 61 | } |
57 | } | 62 | } |
58 | html("</td></tr>\n"); | 63 | html("</td></tr>\n"); |
59 | cgit_free_commitinfo(info); | 64 | cgit_free_commitinfo(info); |
60 | } | 65 | } |
61 | 66 | ||
62 | 67 | ||
63 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 68 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
64 | char *path, int pager) | 69 | char *path, int pager) |
65 | { | 70 | { |
66 | struct rev_info rev; | 71 | struct rev_info rev; |
67 | struct commit *commit; | 72 | struct commit *commit; |
68 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; | 73 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
69 | int argc = 2; | 74 | int argc = 2; |
70 | int i, columns = 3; | 75 | int i, columns = 3; |
71 | 76 | ||
72 | if (!tip) | 77 | if (!tip) |
73 | argv[1] = ctx.qry.head; | 78 | argv[1] = ctx.qry.head; |
74 | 79 | ||
75 | if (grep && pattern && (!strcmp(grep, "grep") || | 80 | if (grep && pattern && (!strcmp(grep, "grep") || |
76 | !strcmp(grep, "author") || | 81 | !strcmp(grep, "author") || |
77 | !strcmp(grep, "committer"))) | 82 | !strcmp(grep, "committer"))) |
78 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 83 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
79 | 84 | ||
80 | if (path) { | 85 | if (path) { |
81 | argv[argc++] = "--"; | 86 | argv[argc++] = "--"; |
82 | argv[argc++] = path; | 87 | argv[argc++] = path; |
83 | } | 88 | } |
84 | init_revisions(&rev, NULL); | 89 | init_revisions(&rev, NULL); |
85 | rev.abbrev = DEFAULT_ABBREV; | 90 | rev.abbrev = DEFAULT_ABBREV; |
86 | rev.commit_format = CMIT_FMT_DEFAULT; | 91 | rev.commit_format = CMIT_FMT_DEFAULT; |
87 | rev.verbose_header = 1; | 92 | rev.verbose_header = 1; |
88 | rev.show_root_diff = 0; | 93 | rev.show_root_diff = 0; |
89 | setup_revisions(argc, argv, &rev, NULL); | 94 | setup_revisions(argc, argv, &rev, NULL); |
90 | if (rev.grep_filter) { | 95 | if (rev.grep_filter) { |
91 | rev.grep_filter->regflags |= REG_ICASE; | 96 | rev.grep_filter->regflags |= REG_ICASE; |
92 | compile_grep_patterns(rev.grep_filter); | 97 | compile_grep_patterns(rev.grep_filter); |
93 | } | 98 | } |
94 | prepare_revision_walk(&rev); | 99 | prepare_revision_walk(&rev); |
95 | 100 | ||
96 | if (pager) | 101 | if (pager) |
97 | html("<table class='list nowrap'>"); | 102 | html("<table class='list nowrap'>"); |
98 | 103 | ||
99 | html("<tr class='nohover'><th class='left'>Age</th>" | 104 | html("<tr class='nohover'><th class='left'>Age</th>" |
100 | "<th class='left'>Commit message</th>" | 105 | "<th class='left'>Commit message</th>" |
101 | "<th class='left'>Author</th>"); | 106 | "<th class='left'>Author</th>"); |
102 | if (ctx.repo->enable_log_filecount) { | 107 | if (ctx.repo->enable_log_filecount) { |
103 | html("<th class='left'>Files</th>"); | 108 | html("<th class='left'>Files</th>"); |
104 | columns++; | 109 | columns++; |
105 | if (ctx.repo->enable_log_linecount) { | 110 | if (ctx.repo->enable_log_linecount) { |
106 | html("<th class='left'>Lines</th>"); | 111 | html("<th class='left'>Lines</th>"); |
107 | columns++; | 112 | columns++; |
108 | } | 113 | } |
109 | } | 114 | } |
110 | html("</tr>\n"); | 115 | html("</tr>\n"); |
111 | 116 | ||
112 | if (ofs<0) | 117 | if (ofs<0) |
113 | ofs = 0; | 118 | ofs = 0; |
114 | 119 | ||
115 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 120 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
116 | free(commit->buffer); | 121 | free(commit->buffer); |
117 | commit->buffer = NULL; | 122 | commit->buffer = NULL; |
118 | free_commit_list(commit->parents); | 123 | free_commit_list(commit->parents); |
119 | commit->parents = NULL; | 124 | commit->parents = NULL; |
120 | } | 125 | } |
121 | 126 | ||
122 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 127 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
123 | print_commit(commit); | 128 | print_commit(commit); |
124 | free(commit->buffer); | 129 | free(commit->buffer); |
125 | commit->buffer = NULL; | 130 | commit->buffer = NULL; |
126 | free_commit_list(commit->parents); | 131 | free_commit_list(commit->parents); |
127 | commit->parents = NULL; | 132 | commit->parents = NULL; |
128 | } | 133 | } |
129 | if (pager) { | 134 | if (pager) { |
130 | htmlf("</table><div class='pager'>", | 135 | htmlf("</table><div class='pager'>", |
131 | columns); | 136 | columns); |
132 | if (ofs > 0) { | 137 | if (ofs > 0) { |
133 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 138 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
134 | ctx.qry.sha1, ctx.qry.path, | 139 | ctx.qry.sha1, ctx.qry.path, |
135 | ofs - cnt, ctx.qry.grep, | 140 | ofs - cnt, ctx.qry.grep, |
136 | ctx.qry.search); | 141 | ctx.qry.search); |
137 | html(" "); | 142 | html(" "); |
138 | } | 143 | } |
139 | if ((commit = get_revision(&rev)) != NULL) { | 144 | if ((commit = get_revision(&rev)) != NULL) { |
140 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 145 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
141 | ctx.qry.sha1, ctx.qry.path, | 146 | ctx.qry.sha1, ctx.qry.path, |
142 | ofs + cnt, ctx.qry.grep, | 147 | ofs + cnt, ctx.qry.grep, |
143 | ctx.qry.search); | 148 | ctx.qry.search); |
144 | } | 149 | } |
145 | html("</div>"); | 150 | html("</div>"); |
146 | } else if ((commit = get_revision(&rev)) != NULL) { | 151 | } else if ((commit = get_revision(&rev)) != NULL) { |
147 | html("<tr class='nohover'><td colspan='3'>"); | 152 | html("<tr class='nohover'><td colspan='3'>"); |
148 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, | 153 | cgit_log_link("[...]", NULL, NULL, ctx.qry.head, NULL, NULL, 0, |
149 | NULL, NULL); | 154 | NULL, NULL); |
150 | html("</td></tr>\n"); | 155 | html("</td></tr>\n"); |
151 | } | 156 | } |
152 | } | 157 | } |