summaryrefslogtreecommitdiffabout
path: root/cgit.h
authorJohan Herland <johan@herland.net>2010-09-30 18:15:14 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-11-09 15:37:39 (UTC)
commit1415f3f3e017d0123e850707c55cb7e5e5887406 (patch) (unidiff)
tree9036ea6ce534e40ff35394359332a9a628276c0f /cgit.h
parente0c6f23789e4893781bcd5af2281d468991ccf3a (diff)
downloadcgit-1415f3f3e017d0123e850707c55cb7e5e5887406.zip
cgit-1415f3f3e017d0123e850707c55cb7e5e5887406.tar.gz
cgit-1415f3f3e017d0123e850707c55cb7e5e5887406.tar.bz2
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>
Diffstat (limited to 'cgit.h') (more/less context) (show whitespace changes)
-rw-r--r--cgit.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cgit.h b/cgit.h
index a9896cf..f5f68ac 100644
--- a/cgit.h
+++ b/cgit.h
@@ -281,33 +281,34 @@ extern char *strrpart(char *txt, int maxlen);
281extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); 281extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
282extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, 282extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
283 int flags, void *cb_data); 283 int flags, void *cb_data);
284 284
285extern void *cgit_free_commitinfo(struct commitinfo *info); 285extern void *cgit_free_commitinfo(struct commitinfo *info);
286 286
287extern int cgit_diff_files(const unsigned char *old_sha1, 287extern int cgit_diff_files(const unsigned char *old_sha1,
288 const unsigned char *new_sha1, 288 const unsigned char *new_sha1,
289 unsigned long *old_size, unsigned long *new_size, 289 unsigned long *old_size, unsigned long *new_size,
290 int *binary, int context, int ignorews, 290 int *binary, int context, int ignorews,
291 linediff_fn fn); 291 linediff_fn fn);
292 292
293extern void cgit_diff_tree(const unsigned char *old_sha1, 293extern void cgit_diff_tree(const unsigned char *old_sha1,
294 const unsigned char *new_sha1, 294 const unsigned char *new_sha1,
295 filepair_fn fn, const char *prefix, int ignorews); 295 filepair_fn fn, const char *prefix, int ignorews);
296 296
297extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 297extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
298 const char *prefix);
298 299
299__attribute__((format (printf,1,2))) 300__attribute__((format (printf,1,2)))
300extern char *fmt(const char *format,...); 301extern char *fmt(const char *format,...);
301 302
302extern struct commitinfo *cgit_parse_commit(struct commit *commit); 303extern struct commitinfo *cgit_parse_commit(struct commit *commit);
303extern struct taginfo *cgit_parse_tag(struct tag *tag); 304extern struct taginfo *cgit_parse_tag(struct tag *tag);
304extern void cgit_parse_url(const char *url); 305extern void cgit_parse_url(const char *url);
305 306
306extern const char *cgit_repobasename(const char *reponame); 307extern const char *cgit_repobasename(const char *reponame);
307 308
308extern int cgit_parse_snapshots_mask(const char *str); 309extern int cgit_parse_snapshots_mask(const char *str);
309 310
310extern int cgit_open_filter(struct cgit_filter *filter); 311extern int cgit_open_filter(struct cgit_filter *filter);
311extern int cgit_close_filter(struct cgit_filter *filter); 312extern int cgit_close_filter(struct cgit_filter *filter);
312 313
313extern int readfile(const char *path, char **buf, size_t *size); 314extern int readfile(const char *path, char **buf, size_t *size);