ui-log: Fix filecount/linecount when path limit is in effect

When using ui-log with path limits, the listing of commits enables parent
rewriting in Git's internal log machinery. This did not work well together
with cgit_diff_commit() which is used to generate the filecount and
linecount numbers for each commit in the log view. cgit_diff_commit() would
operate without any path limits, and would therefore process the full diff
between the commits shown (which, because of parent rewriting, is not the
same as processing the diff for the commit itself). Additionally, the bottom
commit in the log view would (again, because of parent rewriting) have zero
parents, causing us to process the entire diff between the empty tree and
that commit. Since path limits were not in effect, this would (in large
projects) reports thousands of files and millions of lines changed in that
bottom commit.

This patch fixes the issue by applying the same path limit to
cgit_diff_commit() as is applied to the rest of the log view. The result is
that the filecount/linecount now only reflects the diff as it pertains to
the given path limit.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

3 files changed, 5 insertions, 4 deletions

diff --git a/cgit.h b/cgit.h
index a9896cf..f5f68ac 100644
--- a/cgit.h
+++ b/cgit.h
@@ -295,5 +295,6 @@ extern void cgit_diff_tree(const unsigned char *old_sha1,
                            filepair_fn fn, const char *prefix, int ignorews);
 
-extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
+extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
+                             const char *prefix);
 
 __attribute__((format (printf,1,2)))
diff --git a/shared.c b/shared.c
index 72ac140..765cd27 100644
--- a/shared.c
+++ b/shared.c
@@ -339,5 +339,5 @@ void cgit_diff_tree(const unsigned char *old_sha1,
 }
 
-void cgit_diff_commit(struct commit *commit, filepair_fn fn)
+void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 {
         unsigned char *old_sha1 = NULL;
@@ -345,5 +345,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
         if (commit->parents)
                 old_sha1 = commit->parents->item->object.sha1;
-        cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL,
+        cgit_diff_tree(old_sha1, commit->object.sha1, fn, prefix,
                        ctx.qry.ignorews);
 }
diff --git a/ui-log.c b/ui-log.c
index 41b5225..bc0c02c 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -102,5 +102,5 @@ void print_commit(struct commit *commit)
                 add_lines = 0;
                 rem_lines = 0;
-                cgit_diff_commit(commit, inspect_files);
+                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
                 htmlf("%d", files);