cgit/cgit.h, branch v0.12

ui-plain: add enable-html-serving flag

2016-01-14T14:42:56Z

Unrestricts plain/ to contents likely to be executed by browser.

ui-blob: Do not accept mimetype from user

2016-01-14T13:31:13Z

refactor get_mimetype_from_file() to get_mimetype_for_filename()

2015-08-17T12:25:08Z

* handle mimetype within a single function * return allocated memory on success Signed-off-by: Christian Hesse

move get_mimetype_from_file() to shared

2015-08-17T12:25:08Z

Signed-off-by: Christian Hesse

ui-tree: use "sane" isgraph()

2015-08-13T13:38:35Z

Git's git-compat-util.h defines a "sane ctype" that does not use locale information and works with signed chars, but it does not include isgraph() so we have included ctype.h ourselves. However, this means we have to include a system header before git-compat-util.h which may lead to the system defining some macros (e.g. _FILE_OFFSET_BITS on Solaris) before git-compat-util.h redefines them with a different value. We cannot include ctype.h after git-compat-util.h because we have defined many of its functions as macros which causes a stream of compilation errors. Defining our own "sane" isgraph() using Git's sane isprint() and isspace() avoids all of these problems. Signed-off-by: John Keeping

cgit.h: move stdbool.h from ui-shared.h

2015-08-13T13:38:03Z

Follow the Git policy of including system headers in only one place. Signed-off-by: John Keeping

log: allow users to follow a file

2015-08-12T14:57:46Z

Teach the "log" UI to behave in the same way as "git log --follow", when given a suitable instruction by the user. The default behaviour remains to show the log without following renames, but the follow behaviour can be activated by following a link in the page header. Follow is not the default because outputting merges in follow mode is tricky ("git log --follow" will not show merges). We also disable the graph in follow mode because the commit graph is not simplified so we end up with frequent gaps in the graph and many lines that do not connect with any commits we're actually showing. We also teach the "diff" and "commit" UIs to respect the follow flag on URLs, causing the single-file version of these UIs to detect renames. This feature is needed only for commits that rename the path we're interested in. For commits before the file has been renamed (i.e. that appear later in the log list) we change the file path in the links from the log to point to the old name; this means that links to commits always limit by the path known to that commit. If we didn't do this we would need to walk down the log diff'ing every commit whenever we want to show a commit. The drawback is that the "Log" link in the top bar of such a page links to the log limited by the old name, so it will only show pre-rename commits. I consider this a reasonable trade-off since the "Back" button still works and the log matches the path displayed in the top bar. Since following renames requires running diff on every commit we consider, I've added a knob to the configuration file to globally enable/disable this feature. Note that we may consider a large number of commits the revision walking machinery no longer performs any path limitation so we have to examine every commit until we find a page full of commits that affect the target path or something related to it. Suggested-by: René Neumann Signed-off-by: John Keeping

shared: make cgit_diff_tree_cb public

2015-08-12T14:57:30Z

This will allow us to use this nice wrapper function elsewhere, avoiding dealing with the diff queue when we only need to inspect a filepair. Signed-off-by: John Keeping

git: update to v2.5.0

2015-08-12T12:09:05Z

Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse

Add repo.hide and repo.ignore

2015-01-29T15:41:14Z

These options can be used to hide a repository from the index or completely ignore a repository, respectively. They are particularly useful when used in combination with scan-path. Signed-off-by: Lukas Fleischer