author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:27:46 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:42:40 (UTC) |
commit | 48dc00342effe3ba530ff6cbb79e5d0d5fc740fd (patch) (unidiff) | |
tree | d3823aa78ad253edca87c3b459f37f85a1c305ab | |
parent | ae4c1ee11379e353f2a94201181a3a9dab75b646 (diff) | |
download | cgit-48dc00342effe3ba530ff6cbb79e5d0d5fc740fd.zip cgit-48dc00342effe3ba530ff6cbb79e5d0d5fc740fd.tar.gz cgit-48dc00342effe3ba530ff6cbb79e5d0d5fc740fd.tar.bz2 |
Show number of changed files in log view
This uses the new tree-diff functions to calculate number of files
changed per commit.
Also fix some whitespace issues.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 17 |
1 files changed, 15 insertions, 2 deletions
@@ -1,97 +1,110 @@ | |||
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 | 10 | ||
11 | int files, lines; | ||
12 | |||
13 | void inspect_files(struct diff_filepair *pair) | ||
14 | { | ||
15 | files++; | ||
16 | } | ||
17 | |||
11 | void print_commit(struct commit *commit) | 18 | void print_commit(struct commit *commit) |
12 | { | 19 | { |
13 | char buf[32]; | 20 | char buf[32]; |
14 | struct commitinfo *info; | 21 | struct commitinfo *info; |
15 | struct tm *time; | 22 | struct tm *time; |
16 | 23 | ||
17 | info = cgit_parse_commit(commit); | 24 | info = cgit_parse_commit(commit); |
18 | time = gmtime(&commit->date); | 25 | time = gmtime(&commit->date); |
19 | html("<tr><td>"); | 26 | html("<tr><td>"); |
20 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); | 27 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time); |
21 | html_txt(buf); | 28 | html_txt(buf); |
22 | html("</td><td>"); | 29 | html("</td><td>"); |
23 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 30 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
24 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); | 31 | char *url = cgit_pageurl(cgit_query_repo, "commit", qry); |
25 | html_link_open(url, NULL, NULL); | 32 | html_link_open(url, NULL, NULL); |
26 | html_ntxt(cgit_max_msg_len, info->subject); | 33 | html_ntxt(cgit_max_msg_len, info->subject); |
27 | html_link_close(); | 34 | html_link_close(); |
35 | html("</td><td class='right'>"); | ||
36 | files = 0; | ||
37 | lines = 0; | ||
38 | cgit_diff_commit(commit, inspect_files); | ||
39 | htmlf("%d", files); | ||
28 | html("</td><td>"); | 40 | html("</td><td>"); |
29 | html_txt(info->author); | 41 | html_txt(info->author); |
30 | html("</td></tr>\n"); | 42 | html("</td></tr>\n"); |
31 | cgit_free_commitinfo(info); | 43 | cgit_free_commitinfo(info); |
32 | } | 44 | } |
33 | 45 | ||
34 | 46 | ||
35 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) | 47 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep) |
36 | { | 48 | { |
37 | struct rev_info rev; | 49 | struct rev_info rev; |
38 | struct commit *commit; | 50 | struct commit *commit; |
39 | const char *argv[3] = {NULL, tip, NULL}; | 51 | const char *argv[3] = {NULL, tip, NULL}; |
40 | int argc = 2; | 52 | int argc = 2; |
41 | int i; | 53 | int i; |
42 | 54 | ||
43 | if (grep) | 55 | if (grep) |
44 | argv[argc++] = fmt("--grep=%s", grep); | 56 | argv[argc++] = fmt("--grep=%s", grep); |
45 | init_revisions(&rev, NULL); | 57 | init_revisions(&rev, NULL); |
46 | rev.abbrev = DEFAULT_ABBREV; | 58 | rev.abbrev = DEFAULT_ABBREV; |
47 | rev.commit_format = CMIT_FMT_DEFAULT; | 59 | rev.commit_format = CMIT_FMT_DEFAULT; |
48 | rev.verbose_header = 1; | 60 | rev.verbose_header = 1; |
49 | rev.show_root_diff = 0; | 61 | rev.show_root_diff = 0; |
50 | setup_revisions(argc, argv, &rev, NULL); | 62 | setup_revisions(argc, argv, &rev, NULL); |
51 | if (rev.grep_filter) { | 63 | if (rev.grep_filter) { |
52 | rev.grep_filter->regflags |= REG_ICASE; | 64 | rev.grep_filter->regflags |= REG_ICASE; |
53 | compile_grep_patterns(rev.grep_filter); | 65 | compile_grep_patterns(rev.grep_filter); |
54 | } | 66 | } |
55 | prepare_revision_walk(&rev); | 67 | prepare_revision_walk(&rev); |
56 | 68 | ||
57 | html("<table class='list nowrap'>"); | 69 | html("<table class='list nowrap'>"); |
58 | html("<tr class='nohover'><th class='left'>Date</th>" | 70 | html("<tr class='nohover'><th class='left'>Date</th>" |
59 | "<th class='left'>Message</th>" | 71 | "<th class='left'>Message</th>" |
72 | "<th class='left'>Files</th>" | ||
60 | "<th class='left'>Author</th></tr>\n"); | 73 | "<th class='left'>Author</th></tr>\n"); |
61 | 74 | ||
62 | if (ofs<0) | 75 | if (ofs<0) |
63 | ofs = 0; | 76 | ofs = 0; |
64 | 77 | ||
65 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { | 78 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
66 | free(commit->buffer); | 79 | free(commit->buffer); |
67 | commit->buffer = NULL; | 80 | commit->buffer = NULL; |
68 | free_commit_list(commit->parents); | 81 | free_commit_list(commit->parents); |
69 | commit->parents = NULL; | 82 | commit->parents = NULL; |
70 | } | 83 | } |
71 | 84 | ||
72 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 85 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
73 | print_commit(commit); | 86 | print_commit(commit); |
74 | free(commit->buffer); | 87 | free(commit->buffer); |
75 | commit->buffer = NULL; | 88 | commit->buffer = NULL; |
76 | free_commit_list(commit->parents); | 89 | free_commit_list(commit->parents); |
77 | commit->parents = NULL; | 90 | commit->parents = NULL; |
78 | } | 91 | } |
79 | html("</table>\n"); | 92 | html("</table>\n"); |
80 | 93 | ||
81 | html("<div class='pager'>"); | 94 | html("<div class='pager'>"); |
82 | if (ofs > 0) { | 95 | if (ofs > 0) { |
83 | html(" <a href='"); | 96 | html(" <a href='"); |
84 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, | 97 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, |
85 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); | 98 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); |
86 | html("'>[prev]</a> "); | 99 | html("'>[prev]</a> "); |
87 | } | 100 | } |
88 | 101 | ||
89 | if ((commit = get_revision(&rev)) != NULL) { | 102 | if ((commit = get_revision(&rev)) != NULL) { |
90 | html(" <a href='"); | 103 | html(" <a href='"); |
91 | html(cgit_pageurl(cgit_query_repo, "log", | 104 | html(cgit_pageurl(cgit_query_repo, "log", |
92 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); | 105 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); |
93 | html("'>[next]</a> "); | 106 | html("'>[next]</a> "); |
94 | } | 107 | } |
95 | html("</div>"); | 108 | html("</div>"); |
96 | } | 109 | } |
97 | 110 | ||