|
diff --git a/ui-log.c b/ui-log.c index 95cb453..d38e40a 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -52,79 +52,77 @@ void print_commit(struct commit *commit) |
52 | |
52 | |
53 | |
53 | |
54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
55 | { |
55 | { |
56 | struct rev_info rev; |
56 | struct rev_info rev; |
57 | struct commit *commit; |
57 | struct commit *commit; |
58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
59 | int argc = 2; |
59 | int argc = 2; |
60 | int i; |
60 | int i; |
61 | |
61 | |
62 | if (!tip) |
62 | if (!tip) |
63 | argv[1] = cgit_query_head; |
63 | argv[1] = cgit_query_head; |
64 | |
64 | |
65 | if (grep) |
65 | if (grep) |
66 | argv[argc++] = fmt("--grep=%s", grep); |
66 | argv[argc++] = fmt("--grep=%s", grep); |
67 | if (path) { |
67 | if (path) { |
68 | argv[argc++] = "--"; |
68 | argv[argc++] = "--"; |
69 | argv[argc++] = path; |
69 | argv[argc++] = path; |
70 | } |
70 | } |
71 | init_revisions(&rev, NULL); |
71 | init_revisions(&rev, NULL); |
72 | rev.abbrev = DEFAULT_ABBREV; |
72 | rev.abbrev = DEFAULT_ABBREV; |
73 | rev.commit_format = CMIT_FMT_DEFAULT; |
73 | rev.commit_format = CMIT_FMT_DEFAULT; |
74 | rev.verbose_header = 1; |
74 | rev.verbose_header = 1; |
75 | rev.show_root_diff = 0; |
75 | rev.show_root_diff = 0; |
76 | setup_revisions(argc, argv, &rev, NULL); |
76 | setup_revisions(argc, argv, &rev, NULL); |
77 | if (rev.grep_filter) { |
77 | if (rev.grep_filter) { |
78 | rev.grep_filter->regflags |= REG_ICASE; |
78 | rev.grep_filter->regflags |= REG_ICASE; |
79 | compile_grep_patterns(rev.grep_filter); |
79 | compile_grep_patterns(rev.grep_filter); |
80 | } |
80 | } |
81 | prepare_revision_walk(&rev); |
81 | prepare_revision_walk(&rev); |
82 | |
82 | |
83 | html("<table class='list nowrap'>"); |
83 | html("<table class='list nowrap'>"); |
84 | html("<tr class='nohover'><th class='left'>Age</th>" |
84 | html("<tr class='nohover'><th class='left'>Age</th>" |
85 | "<th class='left'>Message</th>"); |
85 | "<th class='left'>Message</th>"); |
86 | |
86 | |
87 | if (cgit_repo->enable_log_filecount) { |
87 | if (cgit_repo->enable_log_filecount) { |
88 | html("<th class='left'>Files</th>"); |
88 | html("<th class='left'>Files</th>"); |
89 | if (cgit_repo->enable_log_linecount) |
89 | if (cgit_repo->enable_log_linecount) |
90 | html("<th class='left'>Lines</th>"); |
90 | html("<th class='left'>Lines</th>"); |
91 | } |
91 | } |
92 | html("<th class='left'>Author</th></tr>\n"); |
92 | html("<th class='left'>Author</th></tr>\n"); |
93 | |
93 | |
94 | if (ofs<0) |
94 | if (ofs<0) |
95 | ofs = 0; |
95 | ofs = 0; |
96 | |
96 | |
97 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
97 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
98 | free(commit->buffer); |
98 | free(commit->buffer); |
99 | commit->buffer = NULL; |
99 | commit->buffer = NULL; |
100 | free_commit_list(commit->parents); |
100 | free_commit_list(commit->parents); |
101 | commit->parents = NULL; |
101 | commit->parents = NULL; |
102 | } |
102 | } |
103 | |
103 | |
104 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
104 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
105 | print_commit(commit); |
105 | print_commit(commit); |
106 | free(commit->buffer); |
106 | free(commit->buffer); |
107 | commit->buffer = NULL; |
107 | commit->buffer = NULL; |
108 | free_commit_list(commit->parents); |
108 | free_commit_list(commit->parents); |
109 | commit->parents = NULL; |
109 | commit->parents = NULL; |
110 | } |
110 | } |
111 | html("</table>\n"); |
111 | html("</table>\n"); |
112 | |
112 | |
113 | if (pager) { |
113 | if (pager) { |
114 | html("<div class='pager'>"); |
114 | html("<div class='pager'>"); |
115 | if (ofs > 0) { |
115 | if (ofs > 0) { |
116 | html(" <a href='"); |
116 | cgit_log_link("[prev]", NULL, NULL, cgit_query_head, |
117 | html(cgit_pageurl(cgit_query_repo, cgit_query_page, |
117 | cgit_query_sha1, cgit_query_path, |
118 | fmt("h=%s&ofs=%d", tip, ofs-cnt))); |
118 | ofs - cnt); |
119 | html("'>[prev]</a> "); |
119 | html(" "); |
120 | } |
120 | } |
121 | |
| |
122 | if ((commit = get_revision(&rev)) != NULL) { |
121 | if ((commit = get_revision(&rev)) != NULL) { |
123 | html(" <a href='"); |
122 | cgit_log_link("[next]", NULL, NULL, cgit_query_head, |
124 | html(cgit_pageurl(cgit_query_repo, "log", |
123 | cgit_query_sha1, cgit_query_path, |
125 | fmt("h=%s&ofs=%d", tip, ofs+cnt))); |
124 | ofs + cnt); |
126 | html("'>[next]</a> "); |
| |
127 | } |
125 | } |
128 | html("</div>"); |
126 | html("</div>"); |
129 | } |
127 | } |
130 | } |
128 | } |
|