summaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeLines
* ui-patch: match git-format-patch(1) outputJohn Keeping2014-12-28-3/+4
| | | | | | | | | | | | | Using (DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH) causes Git to emit a "---" line between the commit message and the body of the patch, which fixes a regression introduced in commit 455b598 (ui-patch.c: Use log_tree_commit() to generate diffs, 2013-08-20), prior to which we inserted the "---" line ourselves. DIFF_FORMAT_SUMMARY is added so that we match the output of git-format-patch(1) without the "-p" option. Signed-off-by: John Keeping <john@keeping.me.uk>
* t0108: modernize styleJohn Keeping2014-12-28-10/+10
| | | | | | | | * &&-chaining * use test_cmp instead of cmp * use strip_headers instead of knowing how many lines there will be Signed-off-by: John Keeping <john@keeping.me.uk>
* Revert "git: use xz compressed archive for download"Jason A. Donenfeld2014-12-24-2/+2
| | | | | | This reverts commit a87c9d8a9779eab0499efd3c44e090a28c7d1cdf. We want to make OpenBSD people happy.
* Use split_ident_line() in parse_user()Lukas Fleischer2014-12-24-28/+17
| | | | | | | | Use Git's built-in ident line splitting algorithm instead of reimplementing it. This does not only simplify the code but also makes sure that cgit is consistent with Git when it comes to author parsing. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* footer: link back to cgit home pageJason A. Donenfeld2014-12-23-1/+8
| | | | | The footer has always been overrideable using the footer= in cgitrc, so this won't anger anybody who cares about their footer.
* ui-shared: show absolute time in tooltip for relative datesJohn Keeping2014-12-23-12/+23
| | | | Signed-off-by: John Keeping <john@keeping.me.uk>
* git: use xz compressed archive for downloadChristian Hesse2014-12-23-2/+2
|
* match other common markdown file extensionsChris Burroughs2014-12-23-1/+1
|
* repolist: add owner-filterChris Burroughs2014-12-23-8/+64
| | | | | | This allows custom links to be used for repository owners by configuring a filter to be applied in the "Owner" column in the repository list.
* ui-shared: add rel-vcs microformat links to HTML headerJohn Keeping2014-12-23-0/+11
| | | | | | As described at https://joeyh.name/rfc/rel-vcs/. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-summary: add "rel='vcs-git'" to clone URL linksJohn Keeping2014-12-23-2/+4
| | | | | | | | This is described in the rel-vcs microformat[1]. [1] https://joeyh.name/rfc/rel-vcs/ Signed-off-by: John Keeping <john@keeping.me.uk>
* Extract clone URL printing to ui-shared.cJohn Keeping2014-12-23-46/+51
| | | | | | | | This will allow us to reuse the same logic to add clone URL <link/> elements to the header of all repo-specific pages in order to support the rel-vcs microformat. Signed-off-by: John Keeping <john@keeping.me.uk>
* Remove trailing slash after remove-suffixLukas Fleischer2014-12-23-3/+6
| | | | | | | When removing the ".git" suffix of a non-bare repository, also remove the trailing slash for compatibility with cgit_repobasename(). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* git: update to v2.2.1Christian Hesse2014-12-23-7/+8
| | | | | | Update to git version v2.2.1, including API changes. Signed-off-by: Christian Hesse <mail@eworm.de>
* filter: fix libravatar email-filter https issueChristian Hesse2014-12-13-1/+2
| | | | | | Serving cgit via https and getting avatar via http gives error messages about untrusted content. This decides whether or not to use https link by looking at the environment variable HTTPS, which is set in CGI.
* ui-diff: add "stat only" diff typeJohn Keeping2014-12-13-1/+5
| | | | | | | | | | | This prints the diffstat but stops before printing (or generating) any of the body of the diff. No cgitrc option is added here so that we can wait to see how useful this is before letting people set it as the default. Suggested-by: Konstantin Ryabitsev <mricon@kernel.org> Signed-off-by: John Keeping <john@keeping.me.uk>
* Change "ss" diff flag to an enumJohn Keeping2014-12-13-14/+24
| | | | | | | | | | | This will allow us to introduce a new "stat only" diff mode without needing an explosion of mutually incompatible flags. The old "ss" query parameter is still accepted in order to avoid breaking saved links, but we no longer generate any URIs using it; instead the new "dt" (diff type) parameter is used. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: remove toggle_ssdiff arg to cgit_diff_link()John Keeping2014-12-13-8/+8
| | | | | | | This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: remove toggle_ssdiff arg to cgit_commit_link()John Keeping2014-12-13-13/+11
| | | | | | | This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.0.4John Keeping2014-08-07-1/+1
| | | | | | No CGit changes required. Signed-off-by: John Keeping <john@keeping.me.uk>
* Always check if README exists in choose_readme()Lukas Fleischer2014-08-07-6/+0
| | | | | | | | | | | | | Specifying a nonexistent README file via the readme option is sometimes useful, e.g. when using scan-path and setting a global default. Currently, we check whether there is only one option in the readme option and, if so, we choose that file without checking whether it exists. As a consequence, all repositories are equipped with an about link in the aforementioned scenario, even if there is no about file. Remove the early check for the number of keys and always check whether the file exists instead. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* cgitrc.5: we mean a cgi response, not requestJason A. Donenfeld2014-08-01-1/+1
|
* ui-stats.c: set parent pointer to NULL after freeing itJohn Keeping2014-07-28-0/+1
| | | | | | We do this everywhere else, so we should be doing it here as well. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.0.3John Keeping2014-07-28-9/+7
| | | | | | | | | | This is slightly more involved than just bumping the version number because it pulls in a change to convert the commit buffer to a slab, removing the "buffer" field from "struct commit". All sites that access "commit->buffer" have been changed to use the new functions provided for this purpose. Signed-off-by: John Keeping <john@keeping.me.uk>
* parsing.c: make commit buffer constJohn Keeping2014-07-28-4/+4
| | | | | | | This will be required in order to incorporate the changes to commit buffer handling in Git 2.0.2. Signed-off-by: John Keeping <john@keeping.me.uk>
* Bump version.Jason A. Donenfeld2014-06-30-1/+1
|
* remove debug fprinf() calls that sneaked in with commit 79c985Christian Hesse2014-06-29-4/+0
|
* git: update to 2.0.1Christian Hesse2014-06-28-1/+1
| | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
* ui-patch: Flush stdout after outputting dataJohn Keeping2014-06-28-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like cached patches are truncated to the nearest 1024-byte boundary in the patch body. E.g.: > mricon@nikko:[/tmp]$ wget -O no-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6e1b4fdad5157bb9e88777d525704aba24389bee" ... > 2014-06-11 15:34:51 (80.4 MB/s) - ‘no-cache’ saved [4767] Patch is complete, without truncation. Next hit, with cache in place: > mricon@nikko:[/tmp]$ wget -O yes-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6e1b4 > fdad5157bb9e88777d525704aba24389bee" ... > 2014-06-11 15:35:01 (17.0 MB/s) - ‘yes-cache’ saved [4096/4096] Length truncated to 4096. The cache on disk looks truncated as well, so the bug must me during the process of saving cache. The same is true for larger patches: > mricon@nikko:[/tmp]$ wget -O no-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2840c566e95599cd60c7143762ca8b49d9395050" ... > 2014-06-11 15:41:33 (1.07 MB/s) - ‘no-cache’ saved [979644] 979644 bytes with a cache-miss > mricon@nikko:[/tmp]$ wget -O yes-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2840c > 566e95599cd60c7143762ca8b49d9395050" ... > 2014-06-11 15:41:46 (1.05 MB/s) - ‘yes-cache’ saved [978944] 978944 (956KB exactly) with a cache-hit Since the "html" functions use raw write(2) to STDIO_FILENO, we don't notice problems with most pages, but raw patches write using printf(3). This is fine if we're outputting straight to stdout since the buffers are flushed on exit, but we close the cache output before this, so the cached output ends up being truncated. Make sure the buffers are flushed when we finish outputting a patch so that we avoid this. No other UIs use printf(3) so we do not need to worry about them. Actually, it's slightly more interesting than this... since we don't set GIT_FLUSH, Git decides whether or not it will flush stdout after writing each commit based on whether or not stdout points to a regular file (in maybe_flush_or_die()). Which means that when writing directly to the webserver, Git flushes stdout for us, but when we redirect stdout to the cache it points to a regular file so Git no longer flushes the output for us. The patch is still correct, but perhaps the full explanation is interesting! Reported-by: Konstantin Ryabitsev <mricon@kernel.org>
* ui-log: ignore unhandled argumentsJohn Keeping2014-06-28-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you search for a bogus range string here: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/ Using something like "range" and "qwerty123456", it returns an "Internal Server Error" and the following in the logs: > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] fatal: > ambiguous argument 'qwerty123456': unknown revision or path not in the > working tree., referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Use '--' to > separate paths from revisions, like this:, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] 'git <command> > [<revision>...] -- [<file>...]', referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Premature end > of script headers: cgit, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ The cache will kick in, so if you search for the same string again, it'll show an empty range, so you have to change the bogus strings each time. This is because we just pass the arguments straight to Git's revision parsing machinery which die()s if it cannot parse an argument, printing the above to stderr and exiting. The patch below makes it a bit friendlier by just ignoring unhandled arguments, but I can't see an easy way to report errors when we can't parse revision arguments without losing the flexibility of supporting all of the revision specifiers supported by Git. Reported-by: Konstantin Ryabitsev <mricon@kernel.org>
* git: update for git 2.0Christian Hesse2014-06-28-36/+40
| | | | | | | prefixcmp() and suffixcmp() have been remove, functionality is now provided by starts_with() and ends_with(). Retrurn values have been changed, so instead of just renaming we have to fix logic. Everything else looks just fine.
* remove trailing whitespaces from source filesChristian Hesse2014-04-17-24/+24
|
* git: update to 1.9.2Christian Hesse2014-04-12-1/+1
| | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
* Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice2014-04-05-9/+14
| | | | | | | | | For example, if I have two repos (remove-suffix is enabled): /foo /foo/bar http://cgit/foo/bar/ is interpreted as "repository 'foo', command 'bar'" instead of "repository 'foo/bar'"
* Makefile: use more reliable git tarball mirrorJason A. Donenfeld2014-03-20-1/+1
|
* git: update to 1.9.1Christian Hesse2014-03-20-1/+1
| | | | | Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
* filter: add libravatar email-filter lua scriptChristian Hesse2014-03-13-0/+26
|
* Bump version.Jason A. Donenfeld2014-02-28-1/+1
|
* ui-refs: simplify cmp_age logicJason A. Donenfeld2014-02-26-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check in parse_user that eventually makes it into committer_date and tagger_date is: else if (mode == 3 && isdigit(*p)) { *date = atol(p); mode++; } Since isdigit('-') is always false, date will never be negative. Thus the sign of this function: static int cmp_age(int age1, int age2) { if (age1 != 0 && age2 != 0) return age2 - age1; if (age1 == 0 && age2 == 0) return 0; if (age1 == 0) return +1; return -1; } Will always be the same as the sign of this function: static inline int cmp_age(int age1, int age2) { return age2 - age1; } Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Idea-by: Lukas Fleischer <cgit@cryptocrack.de>
* Remove unused parameter from cgit_print_snapshot()Lukas Fleischer2014-02-21-3/+3
|
* print download link for reference string length == 1Christian Hesse2014-02-21-1/+1
| | | | | | I have a number of repositories that start tagging with just '1' and count up. Actually references with sting length of one are skipped, this patch changes that.
* Clean up cache documentation.Jason A. Donenfeld2014-02-21-22/+25
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* Skip cache slot when time-to-live is zeroLukas Fleischer2014-02-21-9/+15
| | | | | | | | | | If time-to-live is set to zero, we don't need to regenerate the cache slots on every request. Instead, just skip the caching process and immediately provide the dynamically generated version of the page. Setting time-to-live to zero is useful when you want to disable caching for certain pages. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* git: Update to 1.9.0Lukas Fleischer2014-02-21-1/+1
| | | | | | No code changes required, just bump the submodule and Makefile versions. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* Makefile: suppress pkg-config errorJason A. Donenfeld2014-02-20-1/+1
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* Add a cache-snapshot-ttl configuration variableLukas Fleischer2014-02-20-0/+12
| | | | | | | | | | | | | This can be used to specify the TTL for snapshots. Snapshots are usually static and do not ever change. On the other hand, tarball generation is CPU intensive. One use case of this setting (apart from increasing the lifetime of snapshot cache slots) is caching of snapshots while disabling the cache for static/dynamic HTML pages (by setting TTL to zero for everything except for snapshot requests). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* diffstat: do not rely on uninitialized dataJason A. Donenfeld2014-02-20-0/+1
| | | | | | | | | | | Right now if you visit: <http://git.zx2c4.com/systemd/diff/src/udev/udev-builtin-input_id.c?id=bcfce235> you'll see that if you reload the page a few times, a bunch of times the diffstat comes out with no lines being shown or changed. I'm not currently sure what the cause of this is, but I suspect it might have to do with this uninitialized data. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* gen-version.sh: check if git is available before trying to call itFabien C2014-02-05-1/+1
| | | | | | | | Some people may clone the cgit repository and compile within a sandbox or on another machine where git is not necessarily installed. When it happens, cgit is getting compiled with an empty version number. This commit fixes this.
* simple-authentication: styleJason A. Donenfeld2014-01-23-1/+1
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* makefile: use LUA_PKGCONFIG to set Lua implementationNatanael Copa2014-01-22-31/+16
| | | | | | | | This breaks compat with the previous LUA_IMPLEMENTATION but gives more flexibility in that user can specify the pkg-config package name directly. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>