about summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* cache.c: fix header orderJohn Keeping2015-08-13
| | | | | | | | git-compat-util.h may define values that affect how system headers are interpreted, so move sys/sendfile.h after cgit.h (which includes git-compat-util.h). Signed-off-by: John Keeping <john@keeping.me.uk>
* configfile.c: don't include system headers directlyJohn Keeping2015-08-13
| | | | | | | | | git-compat-util.h may define various values that affect the interpretation of system headers. In most places we include cgit.h first, which pulls in git-compat-util.h, but this file does not depend on anything else in CGit, so use git-compat-util.h directly. Signed-off-by: John Keeping <john@keeping.me.uk>
* Remove redundant includesJohn Keeping2015-08-13
| | | | | | | These are all included in git-compat-util.h (when necessary), which we include in cgit.h. Signed-off-by: John Keeping <john@keeping.me.uk>
* Makefile: include Git's config.mak.unameJohn Keeping2015-08-13
| | | | | | | This pulls in the correct value of $(INSTALL) on a wide variety of systems. Signed-off-by: John Keeping <john@keeping.me.uk>
* tests: allow shell to be overriddenJohn Keeping2015-08-13
| | | | | | | | | | | On some systems (e.g. Solaris), /bin/sh is not a POSIX shell. Git already provides suitable overrides in its config.mak.uname file and we provide cgit.conf to allow the user to further change this. The code for this is taken from Git's t/Makefile, meaning that we now invoke the tests in the same way that Git does. Signed-off-by: John Keeping <john@keeping.me.uk>
* redirect: cleanlinessJason A. Donenfeld2015-08-13
|
* redirect: be more careful for different cgi setupsJason A. Donenfeld2015-08-13
|
* ui-log: fix double countingJohn Keeping2015-08-12
| | | | | | | This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <john@keeping.me.uk>
* log: allow users to follow a fileJohn Keeping2015-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <necoro@necoro.eu> Signed-off-by: John Keeping <john@keeping.me.uk>
* shared: make cgit_diff_tree_cb publicJohn Keeping2015-08-12
| | | | | | | 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 <john@keeping.me.uk>
* t0110: Chain together using &&Jason A. Donenfeld2015-08-12
|
* about: always ensure page has a trailing slashJason A. Donenfeld2015-08-12
| | | | | | Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* filters: apply HTML escapingLazaros Koromilas2015-08-12
| | | | http://www.w3.org/International/questions/qa-escapes#use
* git: update to v2.5.0Christian Hesse2015-08-12
| | | | | | | | | | | | | | | 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 <mail@eworm.de>
* Fix processing of repo.hide and repo.ignoreDaniel Reichelt2015-08-12
| | | | | | | | If the global option enable-filter-overrides is set to 1 the repo-specific options repo.hide and repo.ignore never got processed. Signed-off-by: Daniel Reichelt <hacking@nachtgeist.net> Reviewed-by: John Keeping <john@keeping.me.uk>
* contrib/hooks: add sample post-receive hook using agefileJohn Keeping2015-08-12
| | | | | | | | | | | | One of the most frequent questions on the mailing list relates to the idle time in the repository list. The answer to this is to use the "agefile" feature to calculate the time of the last change whenever the repository receives changes. Add a sample post-receive hook in a new "contrib" directory so that we can just point people at the repository in the future. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.4.1Christian Hesse2015-05-14
| | | | | | Update to git version v2.4.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* ui-shared: allow remote refs in branch switcherChristian Hesse2015-03-18
| | | | Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.3.3Christian Hesse2015-03-14
| | | | | | Update to git version v2.3.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* Bump versionJason A. Donenfeld2015-03-13
|
* Remove no-op link from submodule entriesLukas Fleischer2015-03-13
| | | | | | | Instead of linking to the current page ("href='#'"), do not add a link to a submodule entry at all if the module-link setting is not used. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* filters: Add sample gentoo scriptJason A. Donenfeld2015-03-13
|
* cgit: remember to set up env vars before empty clone pathJason A. Donenfeld2015-03-09
|
* ui-shared: currenturl should take into account leading slashJason A. Donenfeld2015-03-09
|
* html: avoid using a plain integer as a NULL pointerJohn Keeping2015-03-09
| | | | | | | | | Sparse complains about this table because we use the integer zero as the NULL pointer. Use this as an opportunity to reformat the table so that it always contains 8 elements per row, making it easier to see which values are being set and which are not. Signed-off-by: John Keeping <john@keeping.me.uk>
* cache: don't use an integer as a NULL pointerJohn Keeping2015-03-09
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: don't use an integer as a NULL pointerJohn Keeping2015-03-09
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: avoid initializing static variable to zeroJohn Keeping2015-03-09
| | | | | | | | | Sparse complains that we are using a plain integer as a NULL pointer here, but in fact we do not have to specify a value for this variable at all since it has static storage duration and thus will be initialized to NULL by the compiler. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-stats: make cgit_period definitions 'static const'John Keeping2015-03-09
| | | | | | | These definitions should not be modified (and never are) so we can move them to .rodata. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: make cgit_doctype 'static'John Keeping2015-03-09
| | | | | | This is not used outside this file and is not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-repolist: make sortcolumn definitions 'static const'John Keeping2015-03-09
| | | | | | | These are not used outside this file and are not declared; they are also never modified. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-log: make some variables 'static'John Keeping2015-03-09
| | | | | | These are not used outside this file and are not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
* shared: make some variables 'static'John Keeping2015-03-09
| | | | | | These are not used outside this file and are not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
* scan-tree: make some variables 'static'John Keeping2015-03-09
| | | | | | These are not used outside this file and are not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
* Avoid signed bitfieldsJohn Keeping2015-03-09
| | | | | | | | Bitfields are only defined for unsigned types. Detected by sparse. Signed-off-by: John Keeping <john@keeping.me.uk>
* Avoid non-ANSI function declarationsJohn Keeping2015-03-09
| | | | | | | | Sparse says things like: warning: non-ANSI function declaration of function 'calc_ttl' Signed-off-by: John Keeping <john@keeping.me.uk>
* Makefile: add a target to run CGit through sparseJohn Keeping2015-03-09
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.3.2Christian Hesse2015-03-07
| | | | | | Update to git version v2.3.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* Bump versionJason A. Donenfeld2015-03-05
|
* Drop return value from parse_user()Lukas Fleischer2015-03-05
| | | | | | | | | In commit 936295c (Simplify commit and tag parsing, 2015-03-03), the commit and tag parsing code was refactored. This broke tag messages in ui-tag since the line after the tagger header was erroneously skipped. Rework parse_user() and skip the line manually outside parse_user(). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* Remove leading newline characters from tag messagesLukas Fleischer2015-03-05
| | | | | | | Fixes a regression introduced in commit 936295c (Simplify commit and tag parsing, 2015-03-03). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* simple-authentication.lua: tie secure cookies to field namesJason A. Donenfeld2015-03-05
|
* cgit: show clone URLs for empty repoJason A. Donenfeld2015-03-05
|
* cache: use F_SETLK to avoid stale lock filesJohn Keeping2015-03-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CGit is killed while it holds a lock on a cache slot (for example because it is taking too long to generate a page), the lock file will be left in place. This prevents any future attempt to use the same slot since it will fail to exclusively create the lock file. Since CGit is the only program that should be manipulating lock files, we can use advisory locking to detect whether another process is actually using the lock file or if it is now stale. I have confirmed that this works on Linux by setting a short TTL in a custom cgitrc and running the following with CGit patched to print a message to stderr if the fcntl(2) fails: $ export CGIT_CONFIG=$PWD/cgitrc $ export QUERY_STRING=url=cgit/tree/ui-shared.c $ ./cgit | grep -v -e '^<div class=.footer.>' \ -e '^Last-Modified: ' \ -e ^'Expires: ' >expect $ seq 50000 | dd bs=8192 | parallel -j200 "diff -u expect <(./cgit | grep -v -e '^<div class=.footer.>' \ -e '^Last-Modified: ' \ -e ^'Expires: ') || echo BAD" This printed the fail message several times without ever printing "BAD". Signed-off-by: John Keeping <john@keeping.me.uk>
* Make root handling sane again.Jason A. Donenfeld2015-03-03
|
* ui-shared: Add current url helper function.Jason A. Donenfeld2015-03-03
|
* ui-shared: keep filter repolist page in paginationJason A. Donenfeld2015-03-03
|
* ui-repolist: use ctx.qry.url instead of rooturl, in case we're filteringJason A. Donenfeld2015-03-03
|
* ui-repolist: use correct owner query linkJason A. Donenfeld2015-03-03
|
* Simplify commit and tag parsingLukas Fleischer2015-03-03
| | | | | | | | * Use skip_prefix to avoid magic numbers in the code. * Use xcalloc() instead of xmalloc(), followed by manual initialization. * Split out line splitting. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>