summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-14ui-patch: make sure to send http headersChristian Hesse
Requesting a text/plain patch with bad commit id made cgit send text without proper http headers. This results in "500 Internal Server Error" with "Premature end of script headers" in server logs. So print http headers before error message and return. Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
2015-08-13Makefile: make "git/config.mak.uname" inclusion optionalJohn Keeping
If we haven't got a "git" directory, it should still be possible to run "make get-git", so we cannot include this file unconditionally. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13ui-shared: show full date in tooltip if longer ago than max_relativeJohn Keeping
Commit caed6cb (ui-shared: show absolute time in tooltip for relative dates, 2014-12-20) added a toolip when we show a relative time. However, in some cases we show a short date (that is, the date but not the time) if an event was sufficiently far in the past and that commit did not update that case to add the same tooltip. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13ui-shared: use common function in print_rel_date()John Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13ui-shared: extract date formatting to a functionJohn Keeping
This will allow this code to be common with print_rel_date. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13filter: don't use dlsym unnecessarilyJohn Keeping
We only need to hook write() if Lua filter's are in use. If support has been disabled, remove the dependency on dlsym(). Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13ui-tree: use "sane" isgraph()John Keeping
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 <john@keeping.me.uk>
2015-08-13cgit.h: move stdbool.h from ui-shared.hJohn Keeping
Follow the Git policy of including system headers in only one place. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13cache.c: fix header orderJohn Keeping
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>
2015-08-13configfile.c: don't include system headers directlyJohn Keeping
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>
2015-08-13Remove redundant includesJohn Keeping
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>
2015-08-13Makefile: include Git's config.mak.unameJohn Keeping
This pulls in the correct value of $(INSTALL) on a wide variety of systems. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13tests: allow shell to be overriddenJohn Keeping
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>
2015-08-13redirect: cleanlinessJason A. Donenfeld
2015-08-13redirect: be more careful for different cgi setupsJason A. Donenfeld
2015-08-12ui-log: fix double countingJohn Keeping
This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-12log: allow users to follow a fileJohn Keeping
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>
2015-08-12shared: make cgit_diff_tree_cb publicJohn Keeping
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>
2015-08-12t0110: Chain together using &&Jason A. Donenfeld
2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld
Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2015-08-12filters: apply HTML escapingLazaros Koromilas
http://www.w3.org/International/questions/qa-escapes#use
2015-08-12git: update to v2.5.0Christian Hesse
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>
2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt
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>
2015-08-12contrib/hooks: add sample post-receive hook using agefileJohn Keeping
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>
2015-05-14git: update to v2.4.1Christian Hesse
Update to git version v2.4.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-18ui-shared: allow remote refs in branch switcherChristian Hesse
Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-14git: update to v2.3.3Christian Hesse
Update to git version v2.3.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-13Bump versionv0.11.2Jason A. Donenfeld
2015-03-13Remove no-op link from submodule entriesLukas Fleischer
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>
2015-03-13filters: Add sample gentoo scriptJason A. Donenfeld
2015-03-09cgit: remember to set up env vars before empty clone pathJason A. Donenfeld
2015-03-09ui-shared: currenturl should take into account leading slashJason A. Donenfeld
2015-03-09html: avoid using a plain integer as a NULL pointerJohn Keeping
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>
2015-03-09cache: don't use an integer as a NULL pointerJohn Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09ui-shared: don't use an integer as a NULL pointerJohn Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09ui-shared: avoid initializing static variable to zeroJohn Keeping
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>
2015-03-09ui-stats: make cgit_period definitions 'static const'John Keeping
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>
2015-03-09ui-shared: make cgit_doctype 'static'John Keeping
This is not used outside this file and is not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09ui-repolist: make sortcolumn definitions 'static const'John Keeping
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>
2015-03-09ui-log: make some variables 'static'John Keeping
These are not used outside this file and are not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09shared: make some variables 'static'John Keeping
These are not used outside this file and are not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09scan-tree: make some variables 'static'John Keeping
These are not used outside this file and are not declared. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09Avoid signed bitfieldsJohn Keeping
Bitfields are only defined for unsigned types. Detected by sparse. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09Avoid non-ANSI function declarationsJohn Keeping
Sparse says things like: warning: non-ANSI function declaration of function 'calc_ttl' Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09Makefile: add a target to run CGit through sparseJohn Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-07git: update to v2.3.2Christian Hesse
Update to git version v2.3.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-05Bump versionv0.11.1Jason A. Donenfeld
2015-03-05Drop return value from parse_user()Lukas Fleischer
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>
2015-03-05Remove leading newline characters from tag messagesLukas Fleischer
Fixes a regression introduced in commit 936295c (Simplify commit and tag parsing, 2015-03-03). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-03-05simple-authentication.lua: tie secure cookies to field namesJason A. Donenfeld