ui-log.c: allow commit range as search expression

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 32028484b7a531898aa4c3a00e51ebad4ec53da6..4441d1d55025405e47d69f07ee79176c510fa111 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -26,9 +26,14 @@ void count_lines(char *line, int size)
 
 void inspect_files(struct diff_filepair *pair)
 {
 
 void inspect_files(struct diff_filepair *pair)
 {

+       unsigned long old_size = 0;
+       unsigned long new_size = 0;
+       int binary = 0;
+

        files++;
        if (ctx.repo->enable_log_linecount)
        files++;
        if (ctx.repo->enable_log_linecount)

-               cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
+               cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+                               &new_size, &binary, count_lines);

 }
 
 void show_commit_decorations(struct commit *commit)
 }
 
 void show_commit_decorations(struct commit *commit)


@@ -48,6 +53,10 @@ void show_commit_decorations(struct commit *commit)
                        strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }
                        strncpy(buf, deco->name + 15, sizeof(buf) - 1);
                        cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
                }

+               else if (!prefixcmp(deco->name, "refs/tags/")) {
+                       strncpy(buf, deco->name + 10, sizeof(buf) - 1);
+                       cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf);
+               }

                else if (!prefixcmp(deco->name, "refs/remotes/")) {
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,
                else if (!prefixcmp(deco->name, "refs/remotes/")) {
                        strncpy(buf, deco->name + 13, sizeof(buf) - 1);
                        cgit_log_link(buf, NULL, "remote-deco", NULL,


@@ -57,7 +66,7 @@ void show_commit_decorations(struct commit *commit)
                else {
                        strncpy(buf, deco->name, sizeof(buf) - 1);
                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
                else {
                        strncpy(buf, deco->name, sizeof(buf) - 1);
                        cgit_commit_link(buf, NULL, "deco", ctx.qry.head,

-                               sha1_to_hex(commit->object.sha1));
+                               sha1_to_hex(commit->object.sha1), 0);

                }
                deco = deco->next;
        }
                }
                deco = deco->next;
        }


@@ -80,7 +89,7 @@ void print_commit(struct commit *commit)
        htmlf("</td><td%s>",
                ctx.qry.showmsg ? " class='logsubject'" : "");
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
        htmlf("</td><td%s>",
                ctx.qry.showmsg ? " class='logsubject'" : "");
        cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,

-                        sha1_to_hex(commit->object.sha1));
+                        sha1_to_hex(commit->object.sha1), 0);

        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);


@@ -137,10 +146,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
        argv[1] = disambiguate_ref(tip);
 
 
        argv[1] = disambiguate_ref(tip);
 

-       if (grep && pattern && (!strcmp(grep, "grep") ||
-                               !strcmp(grep, "author") ||
-                               !strcmp(grep, "committer")))
-               argv[argc++] = fmt("--%s=%s", grep, pattern);
+       if (grep && pattern) {
+               if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
+                   !strcmp(grep, "committer"))
+                       argv[argc++] = fmt("--%s=%s", grep, pattern);
+               if (!strcmp(grep, "range"))
+                       argv[1] = pattern;
+       }

 
        if (path) {
                argv[argc++] = "--";
 
        if (path) {
                argv[argc++] = "--";


@@ -152,7 +164,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);
        rev.verbose_header = 1;
        rev.show_root_diff = 0;
        setup_revisions(argc, argv, &rev, NULL);

-       load_ref_decorations();
+       load_ref_decorations(DECORATE_FULL_REFS);

        rev.show_decorations = 1;
        rev.grep_filter.regflags |= REG_ICASE;
        compile_grep_patterns(&rev.grep_filter);
        rev.show_decorations = 1;
        rev.grep_filter.regflags |= REG_ICASE;
        compile_grep_patterns(&rev.grep_filter);