|
diff --git a/ui-log.c b/ui-log.c index 746f40b..8dd8b89 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -63,68 +63,66 @@ void print_commit(struct commit *commit) |
63 | html("</td></tr>\n"); |
63 | html("</td></tr>\n"); |
64 | cgit_free_commitinfo(info); |
64 | cgit_free_commitinfo(info); |
65 | } |
65 | } |
66 | |
66 | |
67 | |
67 | |
68 | 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, |
69 | char *path, int pager) |
69 | char *path, int pager) |
70 | { |
70 | { |
71 | struct rev_info rev; |
71 | struct rev_info rev; |
72 | struct commit *commit; |
72 | struct commit *commit; |
73 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
73 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
74 | int argc = 2; |
74 | int argc = 2; |
75 | int i, columns = 3; |
75 | int i, columns = 3; |
76 | |
76 | |
77 | if (!tip) |
77 | if (!tip) |
78 | argv[1] = ctx.qry.head; |
78 | argv[1] = ctx.qry.head; |
79 | |
79 | |
80 | if (grep && pattern && (!strcmp(grep, "grep") || |
80 | if (grep && pattern && (!strcmp(grep, "grep") || |
81 | !strcmp(grep, "author") || |
81 | !strcmp(grep, "author") || |
82 | !strcmp(grep, "committer"))) |
82 | !strcmp(grep, "committer"))) |
83 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
83 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
84 | |
84 | |
85 | if (path) { |
85 | if (path) { |
86 | argv[argc++] = "--"; |
86 | argv[argc++] = "--"; |
87 | argv[argc++] = path; |
87 | argv[argc++] = path; |
88 | } |
88 | } |
89 | init_revisions(&rev, NULL); |
89 | init_revisions(&rev, NULL); |
90 | rev.abbrev = DEFAULT_ABBREV; |
90 | rev.abbrev = DEFAULT_ABBREV; |
91 | rev.commit_format = CMIT_FMT_DEFAULT; |
91 | rev.commit_format = CMIT_FMT_DEFAULT; |
92 | rev.verbose_header = 1; |
92 | rev.verbose_header = 1; |
93 | rev.show_root_diff = 0; |
93 | rev.show_root_diff = 0; |
94 | setup_revisions(argc, argv, &rev, NULL); |
94 | setup_revisions(argc, argv, &rev, NULL); |
95 | if (rev.grep_filter) { |
95 | rev.grep_filter.regflags |= REG_ICASE; |
96 | rev.grep_filter->regflags |= REG_ICASE; |
96 | compile_grep_patterns(&rev.grep_filter); |
97 | compile_grep_patterns(rev.grep_filter); |
| |
98 | } |
| |
99 | prepare_revision_walk(&rev); |
97 | prepare_revision_walk(&rev); |
100 | |
98 | |
101 | if (pager) |
99 | if (pager) |
102 | html("<table class='list nowrap'>"); |
100 | html("<table class='list nowrap'>"); |
103 | |
101 | |
104 | html("<tr class='nohover'><th class='left'>Age</th>" |
102 | html("<tr class='nohover'><th class='left'>Age</th>" |
105 | "<th class='left'>Commit message</th>" |
103 | "<th class='left'>Commit message</th>" |
106 | "<th class='left'>Author</th>"); |
104 | "<th class='left'>Author</th>"); |
107 | if (ctx.repo->enable_log_filecount) { |
105 | if (ctx.repo->enable_log_filecount) { |
108 | html("<th class='left'>Files</th>"); |
106 | html("<th class='left'>Files</th>"); |
109 | columns++; |
107 | columns++; |
110 | if (ctx.repo->enable_log_linecount) { |
108 | if (ctx.repo->enable_log_linecount) { |
111 | html("<th class='left'>Lines</th>"); |
109 | html("<th class='left'>Lines</th>"); |
112 | columns++; |
110 | columns++; |
113 | } |
111 | } |
114 | } |
112 | } |
115 | html("</tr>\n"); |
113 | html("</tr>\n"); |
116 | |
114 | |
117 | if (ofs<0) |
115 | if (ofs<0) |
118 | ofs = 0; |
116 | ofs = 0; |
119 | |
117 | |
120 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
118 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
121 | free(commit->buffer); |
119 | free(commit->buffer); |
122 | commit->buffer = NULL; |
120 | commit->buffer = NULL; |
123 | free_commit_list(commit->parents); |
121 | free_commit_list(commit->parents); |
124 | commit->parents = NULL; |
122 | commit->parents = NULL; |
125 | } |
123 | } |
126 | |
124 | |
127 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
125 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
128 | print_commit(commit); |
126 | print_commit(commit); |
129 | free(commit->buffer); |
127 | free(commit->buffer); |
130 | commit->buffer = NULL; |
128 | commit->buffer = NULL; |
|