X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9d8d9b61238df3a855504825e5f735d00289f12b..426032f767763b46f462de51d1ebded34f671d79:/ui-log.c?ds=inline
diff --git a/ui-log.c b/ui-log.c
index f3b16e7..bb17e1d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,23 +8,45 @@
#include "cgit.h"
+int files, lines;
+
+void count_lines(char *line, int size)
+{
+ if (size>0 && (line[0] == '+' || line[0] == '-'))
+ lines++;
+}
+
+void inspect_files(struct diff_filepair *pair)
+{
+ files++;
+ if (cgit_repo->enable_log_linecount)
+ cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+}
+
void print_commit(struct commit *commit)
{
- char buf[32];
struct commitinfo *info;
- struct tm *time;
info = cgit_parse_commit(commit);
- time = gmtime(&commit->date);
html("
| ");
- strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
- html_txt(buf);
+ cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
html(" | ");
- char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+ char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
html_link_open(url, NULL, NULL);
- html_ntxt(80, info->subject);
+ html_ntxt(cgit_max_msg_len, info->subject);
html_link_close();
+ if (cgit_repo->enable_log_filecount) {
+ files = 0;
+ lines = 0;
+ cgit_diff_commit(commit, inspect_files);
+ html(" | ");
+ htmlf("%d", files);
+ if (cgit_repo->enable_log_linecount) {
+ html(" | ");
+ htmlf("%d", lines);
+ }
+ }
html(" | ");
html_txt(info->author);
html(" |
\n");
@@ -32,26 +54,42 @@ void print_commit(struct commit *commit)
}
-void cgit_print_log(const char *tip, int ofs, int cnt)
+void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager)
{
struct rev_info rev;
struct commit *commit;
- const char *argv[2] = {NULL, tip};
+ const char *argv[] = {NULL, tip, NULL, NULL, NULL};
+ int argc = 2;
int i;
-
+
+ if (grep)
+ argv[argc++] = fmt("--grep=%s", grep);
+ if (path) {
+ argv[argc++] = "--";
+ argv[argc++] = path;
+ }
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
rev.verbose_header = 1;
rev.show_root_diff = 0;
- setup_revisions(2, argv, &rev, NULL);
+ setup_revisions(argc, argv, &rev, NULL);
+ if (rev.grep_filter) {
+ rev.grep_filter->regflags |= REG_ICASE;
+ compile_grep_patterns(rev.grep_filter);
+ }
prepare_revision_walk(&rev);
- html("Log
");
html("");
- html("| Date | "
- "Message | "
- "Author |
\n");
+ html("| Age | "
+ "Message | ");
+
+ if (cgit_repo->enable_log_filecount) {
+ html("Files | ");
+ if (cgit_repo->enable_log_linecount)
+ html("Lines | ");
+ }
+ html("Author |
\n");
if (ofs<0)
ofs = 0;
@@ -72,20 +110,21 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
}
html("
\n");
- html("");
}
-