cgit/cgit.h, branch v0.9

Merge branch 'br/misc'

2011-02-19T13:51:00Z

* br/misc: Use transparent background for the cgit logo ssdiff: anchors for ssdiff implement repo.logo and repo.logo-link

implement repo.logo and repo.logo-link

2011-02-19T13:41:39Z

Allow for per repo logo and logo-link; Use global logo and logo-link per default. Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Lars Hjemli

Merge branch 'jh/scan-path'

2011-02-19T13:25:55Z

* jh/scan-path: scan_path(): Do not recurse into hidden directories by default scan_path(): Improve handling of inaccessible directories

scan_path(): Do not recurse into hidden directories by default

2011-02-19T13:25:14Z

Paths that start with a period ('.') are considered hidden in the Unix world. scan_path() should arguably not recurse into these directories by default. This patch makes it so, and introduces the "scan-hidden-path" config variable for overriding the new default and revert to the old behaviour (scanning _all_ directories, including hidden .directories). Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

ui-log: Implement support for commit graphs

2010-11-16T07:18:36Z

Teach CGit to print an ASCII art commit graph to the left of the commit message, similar to 'git log --graph'. The graph adds extra lines (table rows) to the log when needed to add/remove/shuffle edges in the graph. When 'showmsg' is enabled, the graph is automatically padded to account for the extra lines added by the commit message/notes. This feature is controlled by a new config variable: "enable-commit-graph" (disabled by default), and individual repos can control it by setting "repo.enable-commit-graph". Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

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

2010-11-09T15:37:39Z

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 Signed-off-by: Lars Hjemli

Add `strict-export` option

2010-11-08T18:41:13Z

This option is used to specify a filename which needs to be present in the repositories found during `scan-path` processing. By setting this option to 'git-daemon-export-ok', only repositories explicitly marked for git daemon export will be included in the cgit configuration. Signed-off-by: Felix Hanley Signed-off-by: Lars Hjemli

Merge branch 'ml/bugfix'

2010-09-19T17:00:05Z

Merge branch 'lh/section-from-path'

2010-09-19T16:46:17Z

Conflicts: scan-tree.c

use attribute to catch printf format mistakes

2010-09-04T15:11:40Z

Use "__attribute__((format (printf,N,M)))", as is done in git, do catch mistakes in printf-style format strings. Signed-off-by: Mark Lodato