author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:50:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:50:57 (UTC) |
commit | a4d1ca1dc6ff8171694d9e2280b6075a1beced0c (patch) (unidiff) | |
tree | 8ccfdd78b7fe61a54bf09c11a130cfbfa8ed50c8 /ui-log.c | |
parent | c5984a9896b39748e61daf6e620483749654b102 (diff) | |
download | cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.zip cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.tar.gz cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.tar.bz2 |
Add ui-shared.h
This is finally a proper headerfile for the shared ui-functions which
used to reside in cgit.h
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,138 +1,139 @@ | |||
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 | 12 | ||
12 | int files, add_lines, rem_lines; | 13 | int files, add_lines, rem_lines; |
13 | 14 | ||
14 | void count_lines(char *line, int size) | 15 | void count_lines(char *line, int size) |
15 | { | 16 | { |
16 | if (size <= 0) | 17 | if (size <= 0) |
17 | return; | 18 | return; |
18 | 19 | ||
19 | if (line[0] == '+') | 20 | if (line[0] == '+') |
20 | add_lines++; | 21 | add_lines++; |
21 | 22 | ||
22 | else if (line[0] == '-') | 23 | else if (line[0] == '-') |
23 | rem_lines++; | 24 | rem_lines++; |
24 | } | 25 | } |
25 | 26 | ||
26 | void inspect_files(struct diff_filepair *pair) | 27 | void inspect_files(struct diff_filepair *pair) |
27 | { | 28 | { |
28 | files++; | 29 | files++; |
29 | if (ctx.repo->enable_log_linecount) | 30 | if (ctx.repo->enable_log_linecount) |
30 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); | 31 | cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); |
31 | } | 32 | } |
32 | 33 | ||
33 | void print_commit(struct commit *commit) | 34 | void print_commit(struct commit *commit) |
34 | { | 35 | { |
35 | struct commitinfo *info; | 36 | struct commitinfo *info; |
36 | 37 | ||
37 | info = cgit_parse_commit(commit); | 38 | info = cgit_parse_commit(commit); |
38 | html("<tr><td>"); | 39 | html("<tr><td>"); |
39 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 40 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
40 | html("</td><td>"); | 41 | html("</td><td>"); |
41 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 42 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
42 | sha1_to_hex(commit->object.sha1)); | 43 | sha1_to_hex(commit->object.sha1)); |
43 | if (ctx.repo->enable_log_filecount) { | 44 | if (ctx.repo->enable_log_filecount) { |
44 | files = 0; | 45 | files = 0; |
45 | add_lines = 0; | 46 | add_lines = 0; |
46 | rem_lines = 0; | 47 | rem_lines = 0; |
47 | cgit_diff_commit(commit, inspect_files); | 48 | cgit_diff_commit(commit, inspect_files); |
48 | html("</td><td class='right'>"); | 49 | html("</td><td class='right'>"); |
49 | htmlf("%d", files); | 50 | htmlf("%d", files); |
50 | if (ctx.repo->enable_log_linecount) { | 51 | if (ctx.repo->enable_log_linecount) { |
51 | html("</td><td class='right'>"); | 52 | html("</td><td class='right'>"); |
52 | htmlf("-%d/+%d", rem_lines, add_lines); | 53 | htmlf("-%d/+%d", rem_lines, add_lines); |
53 | } | 54 | } |
54 | } | 55 | } |
55 | html("</td><td>"); | 56 | html("</td><td>"); |
56 | html_txt(info->author); | 57 | html_txt(info->author); |
57 | html("</td></tr>\n"); | 58 | html("</td></tr>\n"); |
58 | cgit_free_commitinfo(info); | 59 | cgit_free_commitinfo(info); |
59 | } | 60 | } |
60 | 61 | ||
61 | 62 | ||
62 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) | 63 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) |
63 | { | 64 | { |
64 | struct rev_info rev; | 65 | struct rev_info rev; |
65 | struct commit *commit; | 66 | struct commit *commit; |
66 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; | 67 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
67 | int argc = 2; | 68 | int argc = 2; |
68 | int i; | 69 | int i; |
69 | 70 | ||
70 | if (!tip) | 71 | if (!tip) |
71 | argv[1] = ctx.qry.head; | 72 | argv[1] = ctx.qry.head; |
72 | 73 | ||
73 | if (grep && pattern && (!strcmp(grep, "grep") || | 74 | if (grep && pattern && (!strcmp(grep, "grep") || |
74 | !strcmp(grep, "author") || | 75 | !strcmp(grep, "author") || |
75 | !strcmp(grep, "committer"))) | 76 | !strcmp(grep, "committer"))) |
76 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 77 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
77 | 78 | ||
78 | if (path) { | 79 | if (path) { |
79 | argv[argc++] = "--"; | 80 | argv[argc++] = "--"; |
80 | argv[argc++] = path; | 81 | argv[argc++] = path; |
81 | } | 82 | } |
82 | init_revisions(&rev, NULL); | 83 | init_revisions(&rev, NULL); |
83 | rev.abbrev = DEFAULT_ABBREV; | 84 | rev.abbrev = DEFAULT_ABBREV; |
84 | rev.commit_format = CMIT_FMT_DEFAULT; | 85 | rev.commit_format = CMIT_FMT_DEFAULT; |
85 | rev.verbose_header = 1; | 86 | rev.verbose_header = 1; |
86 | rev.show_root_diff = 0; | 87 | rev.show_root_diff = 0; |
87 | setup_revisions(argc, argv, &rev, NULL); | 88 | setup_revisions(argc, argv, &rev, NULL); |
88 | if (rev.grep_filter) { | 89 | if (rev.grep_filter) { |
89 | rev.grep_filter->regflags |= REG_ICASE; | 90 | rev.grep_filter->regflags |= REG_ICASE; |
90 | compile_grep_patterns(rev.grep_filter); | 91 | compile_grep_patterns(rev.grep_filter); |
91 | } | 92 | } |
92 | prepare_revision_walk(&rev); | 93 | prepare_revision_walk(&rev); |
93 | 94 | ||
94 | html("<table summary='log' class='list nowrap'>"); | 95 | html("<table summary='log' class='list nowrap'>"); |
95 | html("<tr class='nohover'><th class='left'>Age</th>" | 96 | html("<tr class='nohover'><th class='left'>Age</th>" |
96 | "<th class='left'>Message</th>"); | 97 | "<th class='left'>Message</th>"); |
97 | 98 | ||
98 | if (ctx.repo->enable_log_filecount) { | 99 | if (ctx.repo->enable_log_filecount) { |
99 | html("<th class='right'>Files</th>"); | 100 | html("<th class='right'>Files</th>"); |
100 | if (ctx.repo->enable_log_linecount) | 101 | if (ctx.repo->enable_log_linecount) |
101 | html("<th class='right'>Lines</th>"); | 102 | html("<th class='right'>Lines</th>"); |
102 | } | 103 | } |
103 | html("<th class='left'>Author</th></tr>\n"); | 104 | html("<th class='left'>Author</th></tr>\n"); |
104 | 105 | ||
105 | if (ofs<0) | 106 | if (ofs<0) |
106 | ofs = 0; | 107 | ofs = 0; |
107 | 108 | ||
108 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 109 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
109 | free(commit->buffer); | 110 | free(commit->buffer); |
110 | commit->buffer = NULL; | 111 | commit->buffer = NULL; |
111 | free_commit_list(commit->parents); | 112 | free_commit_list(commit->parents); |
112 | commit->parents = NULL; | 113 | commit->parents = NULL; |
113 | } | 114 | } |
114 | 115 | ||
115 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 116 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
116 | print_commit(commit); | 117 | print_commit(commit); |
117 | free(commit->buffer); | 118 | free(commit->buffer); |
118 | commit->buffer = NULL; | 119 | commit->buffer = NULL; |
119 | free_commit_list(commit->parents); | 120 | free_commit_list(commit->parents); |
120 | commit->parents = NULL; | 121 | commit->parents = NULL; |
121 | } | 122 | } |
122 | html("</table>\n"); | 123 | html("</table>\n"); |
123 | 124 | ||
124 | if (pager) { | 125 | if (pager) { |
125 | html("<div class='pager'>"); | 126 | html("<div class='pager'>"); |
126 | if (ofs > 0) { | 127 | if (ofs > 0) { |
127 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, | 128 | cgit_log_link("[prev]", NULL, NULL, ctx.qry.head, |
128 | ctx.qry.sha1, ctx.qry.path, | 129 | ctx.qry.sha1, ctx.qry.path, |
129 | ofs - cnt, ctx.qry.grep, | 130 | ofs - cnt, ctx.qry.grep, |
130 | ctx.qry.search); | 131 | ctx.qry.search); |
131 | html(" "); | 132 | html(" "); |
132 | } | 133 | } |
133 | if ((commit = get_revision(&rev)) != NULL) { | 134 | if ((commit = get_revision(&rev)) != NULL) { |
134 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, | 135 | cgit_log_link("[next]", NULL, NULL, ctx.qry.head, |
135 | ctx.qry.sha1, ctx.qry.path, | 136 | ctx.qry.sha1, ctx.qry.path, |
136 | ofs + cnt, ctx.qry.grep, | 137 | ofs + cnt, ctx.qry.grep, |
137 | ctx.qry.search); | 138 | ctx.qry.search); |
138 | } | 139 | } |