summaryrefslogtreecommitdiffabout
path: root/ui-log.c
authorLars Hjemli <hjemli@gmail.com>2007-05-15 22:26:23 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-15 22:26:23 (UTC)
commita2ddc10479ec463708e422ca5ce7ec02c22a7d02 (patch) (unidiff)
treee099ad98a79d61eb6e368a7e7972700f0e65b9ae /ui-log.c
parentb28b105ec172b258ae5d629381a5890697c2f938 (diff)
downloadcgit-a2ddc10479ec463708e422ca5ce7ec02c22a7d02.zip
cgit-a2ddc10479ec463708e422ca5ce7ec02c22a7d02.tar.gz
cgit-a2ddc10479ec463708e422ca5ce7ec02c22a7d02.tar.bz2
Change commit-view to expect h parameter, not id
The change makes the commit-page benefit from repo.defbranch. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-log.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui-log.c b/ui-log.c
index 6d5509b..9d0ec02 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,124 +1,123 @@
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
11int files, lines; 11int files, lines;
12 12
13void count_lines(char *line, int size) 13void count_lines(char *line, int size)
14{ 14{
15 if (size>0 && (line[0] == '+' || line[0] == '-')) 15 if (size>0 && (line[0] == '+' || line[0] == '-'))
16 lines++; 16 lines++;
17} 17}
18 18
19void inspect_files(struct diff_filepair *pair) 19void inspect_files(struct diff_filepair *pair)
20{ 20{
21 files++; 21 files++;
22 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 22 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
23} 23}
24 24
25void print_commit(struct commit *commit) 25void print_commit(struct commit *commit)
26{ 26{
27 char buf[32]; 27 char buf[32];
28 struct commitinfo *info; 28 struct commitinfo *info;
29 struct tm *time; 29 struct tm *time;
30 30
31 info = cgit_parse_commit(commit); 31 info = cgit_parse_commit(commit);
32 time = gmtime(&commit->date); 32 time = gmtime(&commit->date);
33 html("<tr><td>"); 33 html("<tr><td>");
34 strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time); 34 strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time);
35 html_txt(buf); 35 html_txt(buf);
36 html("</td><td>"); 36 html("</td><td>");
37 char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 37 char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
38 char *url = cgit_pageurl(cgit_query_repo, "commit", qry); 38 char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
39 html_link_open(url, NULL, NULL); 39 html_link_open(url, NULL, NULL);
40 html_ntxt(cgit_max_msg_len, info->subject); 40 html_ntxt(cgit_max_msg_len, info->subject);
41 html_link_close(); 41 html_link_close();
42 files = 0; 42 files = 0;
43 lines = 0; 43 lines = 0;
44 cgit_diff_commit(commit, inspect_files); 44 cgit_diff_commit(commit, inspect_files);
45 html("</td><td class='right'>"); 45 html("</td><td class='right'>");
46 htmlf("%d", files); 46 htmlf("%d", files);
47 html("</td><td class='right'>"); 47 html("</td><td class='right'>");
48 htmlf("%d", lines); 48 htmlf("%d", lines);
49 html("</td><td>"); 49 html("</td><td>");
50 html_txt(info->author); 50 html_txt(info->author);
51 html("</td></tr>\n"); 51 html("</td></tr>\n");
52 cgit_free_commitinfo(info); 52 cgit_free_commitinfo(info);
53} 53}
54 54
55 55
56void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) 56void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
57{ 57{
58 struct rev_info rev; 58 struct rev_info rev;
59 struct commit *commit; 59 struct commit *commit;
60 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 60 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
61 int argc = 2; 61 int argc = 2;
62 int i; 62 int i;
63 63
64 if (grep) 64 if (grep)
65 argv[argc++] = fmt("--grep=%s", grep); 65 argv[argc++] = fmt("--grep=%s", grep);
66 if (path) { 66 if (path) {
67 argv[argc++] = "--"; 67 argv[argc++] = "--";
68 argv[argc++] = path; 68 argv[argc++] = path;
69 } 69 }
70 init_revisions(&rev, NULL); 70 init_revisions(&rev, NULL);
71 rev.abbrev = DEFAULT_ABBREV; 71 rev.abbrev = DEFAULT_ABBREV;
72 rev.commit_format = CMIT_FMT_DEFAULT; 72 rev.commit_format = CMIT_FMT_DEFAULT;
73 rev.verbose_header = 1; 73 rev.verbose_header = 1;
74 rev.show_root_diff = 0; 74 rev.show_root_diff = 0;
75 setup_revisions(argc, argv, &rev, NULL); 75 setup_revisions(argc, argv, &rev, NULL);
76 if (rev.grep_filter) { 76 if (rev.grep_filter) {
77 rev.grep_filter->regflags |= REG_ICASE; 77 rev.grep_filter->regflags |= REG_ICASE;
78 compile_grep_patterns(rev.grep_filter); 78 compile_grep_patterns(rev.grep_filter);
79 } 79 }
80 prepare_revision_walk(&rev); 80 prepare_revision_walk(&rev);
81 81
82 html("<table class='list nowrap'>"); 82 html("<table class='list nowrap'>");
83 html("<tr class='nohover'><th class='left'>Date</th>" 83 html("<tr class='nohover'><th class='left'>Date</th>"
84 "<th class='left'>Message</th>" 84 "<th class='left'>Message</th>"
85 "<th class='left'>Files</th>" 85 "<th class='left'>Files</th>"
86 "<th class='left'>Lines</th>" 86 "<th class='left'>Lines</th>"
87 "<th class='left'>Author</th></tr>\n"); 87 "<th class='left'>Author</th></tr>\n");
88 88
89 if (ofs<0) 89 if (ofs<0)
90 ofs = 0; 90 ofs = 0;
91 91
92 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 92 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
93 free(commit->buffer); 93 free(commit->buffer);
94 commit->buffer = NULL; 94 commit->buffer = NULL;
95 free_commit_list(commit->parents); 95 free_commit_list(commit->parents);
96 commit->parents = NULL; 96 commit->parents = NULL;
97 } 97 }
98 98
99 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 99 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
100 print_commit(commit); 100 print_commit(commit);
101 free(commit->buffer); 101 free(commit->buffer);
102 commit->buffer = NULL; 102 commit->buffer = NULL;
103 free_commit_list(commit->parents); 103 free_commit_list(commit->parents);
104 commit->parents = NULL; 104 commit->parents = NULL;
105 } 105 }
106 html("</table>\n"); 106 html("</table>\n");
107 107
108 html("<div class='pager'>"); 108 html("<div class='pager'>");
109 if (ofs > 0) { 109 if (ofs > 0) {
110 html("&nbsp;<a href='"); 110 html("&nbsp;<a href='");
111 html(cgit_pageurl(cgit_query_repo, cgit_query_page, 111 html(cgit_pageurl(cgit_query_repo, cgit_query_page,
112 fmt("h=%s&ofs=%d", tip, ofs-cnt))); 112 fmt("h=%s&ofs=%d", tip, ofs-cnt)));
113 html("'>[prev]</a>&nbsp;"); 113 html("'>[prev]</a>&nbsp;");
114 } 114 }
115 115
116 if ((commit = get_revision(&rev)) != NULL) { 116 if ((commit = get_revision(&rev)) != NULL) {
117 html("&nbsp;<a href='"); 117 html("&nbsp;<a href='");
118 html(cgit_pageurl(cgit_query_repo, "log", 118 html(cgit_pageurl(cgit_query_repo, "log",
119 fmt("h=%s&ofs=%d", tip, ofs+cnt))); 119 fmt("h=%s&ofs=%d", tip, ofs+cnt)));
120 html("'>[next]</a>&nbsp;"); 120 html("'>[next]</a>&nbsp;");
121 } 121 }
122 html("</div>"); 122 html("</div>");
123} 123}
124