summaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeLines
...
* ui-shared: use type='search' for the search boxVille Skyttä2017-10-15-2/+2
| | | | Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
* filter: pipe_fh should be localJason A. Donenfeld2017-10-14-7/+7
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* parsing: don't clear existing state with empty inputJohn Keeping2017-10-14-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c699866 (parsing: clear query path before starting, 2017-02-19), we clear the "page" variable simply by calling cgit_parse_url() even if the URL is empty. This breaks a URL like: .../cgit?p=about which is generated when using the "root-readme" configuration option. This happens because "page" is set to "about" when parsing the query string before we handle the path (which is empty, but non-null). It turns out that this is not the only case which is broken, but specifying repository and page via query options has been broken since before the commit mentioned above, for example: .../cgit?r=git&p=log Fix both of these by allowing the previous state to persist if PATH_INFO is empty, falling back to the query parameters if no path has been requested. Reported-by: Tom Ryder <tom@sanctum.geek.nz> Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-tree: link to blame UI if enabledJeff Smith2017-10-03-4/+29
| | | | | | | Create links to the blame page. Signed-off-by: Jeff Smith <whydoubt@gmail.com> Reviewed-by: John Keeping <john@keeping.me.uk>
* ui-blame: add blame UIJeff Smith2017-10-03-1/+265
| | | | | | | | | | Implement a page which provides the blame view of a specified file. This feature is controlled by a new config variable, "enable-blame", which is disabled by default. Signed-off-by: Jeff Smith <whydoubt@gmail.com> Reviewed-by: John Keeping <john@keeping.me.uk>
* ui-shared: make a char* parameter constJeff Smith2017-10-03-12/+9
| | | | | | | | | | | All cgit_xxx_link functions take const char* for the 'name' parameter, except for cgit_commit_link, which takes a char* and subsequently modifies the contents. Avoiding the content changes, and making it const char* will avoid the need to make copies of const char* strings being passed to cgit_commit_link. Signed-off-by: Jeff Smith <whydoubt@gmail.com> Reviewed-by: John Keeping <john@keeping.me.uk>
* ui-tree: move set_title_from_path to ui-sharedJeff Smith2017-10-03-33/+35
| | | | | | | | The ui-blame code will also need to call set_title_from_path, so go ahead and move it to ui-shared. Signed-off-by: Jeff Smith <whydoubt@gmail.com> Reviewed-by: John Keeping <john@keeping.me.uk>
* html: html_ntxt with no ellipsisJeff Smith2017-10-03-23/+14
| | | | | | | | | For implementing a ui-blame page, there is need for a function that outputs a selection from a block of text, transformed for HTML output, but with no further modifications or additions. Signed-off-by: Jeff Smith <whydoubt@gmail.com> Reviewed-by: John Keeping <john@keeping.me.uk>
* cache: flush stdio before restoring FDsJohn Keeping2017-10-03-2/+6
| | | | | | | | | | | | | As described in commit 2efb59e (ui-patch: Flush stdout after outputting data, 2014-06-11), we need to ensure that stdout is flushed before restoring the file descriptor when writing to the cache. It turns out that it's not just ui-patch that is affected by this but also raw diff which writes to stdout internally. Let's avoid risking more places doing this by ensuring that stdout is flushed after writing in fill_slot(). Signed-off-by: John Keeping <john@keeping.me.uk>
* Use https for submoduleDaniel M. Weeks2017-09-22-1/+1
| | | | | | | | | The git protocol provides no transport security. https does provide transport security and should be preferred by default. https is also more likely than git to be permitted by firewalls in restricted environments. Signed-off-by: Daniel M. Weeks <dan@danweeks.net>
* ui-plain: print symlink contentJohn Keeping2017-08-10-1/+1
| | | | | | | | We currently ignore symlinks in ui-plain, leading to a 404. In ui-tree we print the content of the blob (that is, the path to the target of the link), so it makes sense to do the same here. Signed-off-by: John Keeping <john@keeping.me.uk>
* cgit: don't set vpath unless repo is setJohn Keeping2017-08-10-6/+6
| | | | | | | | | After the previous two patches, this can be classified as a tidy up rather than a bug fix, but I think it makes sense to group all of the tests together before setting up the environment for the command to execute. Signed-off-by: John Keeping <john@keeping.me.uk>
* parsing: clear query path before startingJohn Keeping2017-08-10-1/+1
| | | | | | | | | | | | | | | By specifying the "url" query parameter multiple times it is possible to end up with ctx.qry.vpath set while ctx.repo is null, which triggers an invalid code path from cgit_print_pageheader() while printing path crumbs, resulting in a null dereference. The previous patch fixed this segfault, but it makes no sense for us to clear ctx.repo while leaving ctx.qry.path set to the previous value, so let's just clear it here so that the last "url" parameter given takes full effect rather than partially overriding the effect of the previous value. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-shared: don't print path crumbs without a repoJohn Keeping2017-08-10-1/+1
| | | | | | | | | | | | | | | cgit_print_path_crumbs() can call repolink() which assumes that ctx.repo is non-null. Currently we don't have any commands that set want_vpath without also setting want_repo so it shouldn't be possible to fail this test, but the check in cgit.c is in the wrong order so it is possible to specify a query string like "?p=log&path=foo/bar" to end up here without a valid repository. This was found by American fuzzy lop [0]. [0] http://lcamtuf.coredump.cx/afl/ Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-atom: properly escape delimiter in page linkJohn Keeping2017-08-10-1/+1
| | | | | | | | | If the delimiter here is '&' then it needs to be escaped for inclusion in an attribute. Use html_attrf() to ensure that this happens (we know that hex won't need escaping, but this makes it clearer what's happening. Signed-off-by: John Keeping <john@keeping.me.uk>
* git: update to v2.14Jeff Smith2017-08-10-42/+43
| | | | | | | | | | | | | | | | Numerous changes were made to git functions to use an object_id structure rather than sending sha1 hashes as raw unsigned character arrays. The functions that affect cgit are: parse_object, lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect, diff_root_tree_sha1, diff_tree_sha1, and format_display_notes. Commit b2141fc (config: don't include config.h by default) made it necessary to that config.h be explicitly included when needed. Commit 07a3d41 (grep: remove regflags from the public grep_opt API) removed one way of specifying the ignore-case grep option. Signed-off-by: Jeff Smith <whydoubt@gmail.com>
* git: update to v2.13.4Christian Hesse2017-08-10-5/+10
| | | | | | | | | | Update to git version v2.13.4: With commit 8aee769f (pathspec: copy and free owned memory) the definition of struct pathspec_item has changed with the expectation that pathspecs will be managed dynamically. We work around this a bit by setting up a static structure, but let's allocate the match string to avoid needing to cast away const. Updated a patch from John Keeping <john@keeping.me.uk> for git v2.12.1.
* Update .mailmap with my new email addressLukas Fleischer2017-07-27-2/+2
| | | | Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
* Remove unused variable from sort_section()Lukas Fleischer2017-04-05-1/+0
| | | | Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
* ui-repolist: properly sort by ageJason A. Donenfeld2017-03-30-21/+17
| | | | | | | | | | | | | When empty repos exist, comparing them against an existing repo with a good mtime might, with particular qsort implementations, not sort correctly, because of this brokenness: if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t)) However, sorting by the age column works as expected, so anyway, to tidy things up, we simply reuse that function. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* ui-patch: fix crash when using path limitLukas Fleischer2017-01-23-4/+3
| | | | | | | | | The array passed to setup_revisions() must be NULL-terminated. Fixes a regression introduced in 455b598 (ui-patch.c: Use log_tree_commit() to generate diffs, 2013-08-20). Reported-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
* syntax-highlighting: replace invalid unicode with ?Jason A. Donenfeld2017-01-22-2/+2
|
* git: update to v2.11.0Christian Hesse2016-11-30-2/+2
| | | | | Update to git version v2.11.0. Function write_archive() dropped argument (int setup_prefix).
* Link with -ldl on GNU HurdPeter Colberg2016-11-25-1/+1
| | | | | | Debian GNU/Hurd uses the GNU C library. Signed-off-by: Peter Colberg <peter@colberg.org>
* git: update to v2.10.2 againJohn Keeping2016-11-24-0/+0
| | | | | | | The submodule was accidentally downgraded in commit 8e9ddd21 (Bump version, 2016-11-23). Restore v2.10.2 so it matches the makefile again. Signed-off-by: John Keeping <john@keeping.me.uk>
* Bump version.Jason A. Donenfeld2016-11-23-1/+1
|
* css: highlight even table rows and skip empty rowsChristian Hesse2016-11-23-3/+24
| | | | | | This is stolen from kernel.org css [0]. [0] https://git.kernel.org/cgit-korg-0.10.1.css
* git: update to v2.10.2Christian Hesse2016-11-06-1/+1
| | | | Update to git version v2.10.2, no changes required.
* ui-blog: fix oid handlingChristian Hesse2016-10-12-5/+5
| | | | | | | We have to use a pointer for walk_tree_ctx->matched_oid. This fixes faulty commit 6e4b7b6776eb994e795fa38b2619db6c55e10ecc (ui-blob: replace 'unsigned char sha1[20]' with 'struct object_id oid').
* shared: remove unused function strlpart()Christian Hesse2016-10-12-17/+0
|
* shared: remove unused function strrpart()Christian Hesse2016-10-12-16/+0
|
* ui-repolist: fix memory leakChristian Hesse2016-10-12-1/+3
|
* Use skip_prefix() to get rid of magic constantsLukas Fleischer2016-10-12-28/+34
| | | | Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
* patch: reapply path limitJohn Keeping2016-10-12-2/+8
| | | | | | | | | | | | | | This was originally applied added in commit eac1b67 (ui-patch: Apply path limit to generated patch, 2010-06-10) but the ability to limit patches to particular paths was lost in commit 455b598 (ui-patch.c: Use log_tree_commit() to generate diffs, 2013-08-20). The new output is slightly different from the original because Git's diff infrastructure doesn't give us a way to insert an annotation immediately after the "---" separator, so the commit has moved below the diff stat. Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-repolist: fix memory leakChristian Hesse2016-10-07-1/+4
|
* git: update to v2.10.1Christian Hesse2016-10-04-1/+1
| | | | Update to git version v2.10.1, no changes required.
* ui-tree: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-3/+3
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-tag: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-6/+6
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-snapshot: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-9/+9
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-shared: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-5/+5
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-plain: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-3/+3
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-patch: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-11/+11
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-log: replace get_sha1() with get_oid()Christian Hesse2016-10-04-1/+1
| | | | Data structures have been replaced already, so use correct function calls.
* ui-commit: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-4/+4
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* ui-blob: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-22/+22
| | | | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go... In addition replace memmove() with hashcpy().
* cgit: replace 'unsigned char sha1[20]' with 'struct object_id oid'Christian Hesse2016-10-04-4/+5
| | | | | | Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id oid'. We have some code that can be changed independent from upstream. So here we go...
* Makefile: remove extra spaceJason A. Donenfeld2016-10-01-1/+1
| | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
* Simplify http_parse_querystring()Lukas Fleischer2016-10-01-57/+11
| | | | | | | | | | | Instead of reimplementing URL parameter parsing from scratch, use url_decode_parameter_name() and url_decode_parameter_value() which are already provided by Git. Also, change the return type of http_parse_querystring() to void since its only caller already ignores the return value. Signed-off-by: Lukas Fleischer <lfleischer@lfos.de>
* ui-tree: remove a fixed size bufferJohn Keeping2016-10-01-6/+9
| | | | | | | | | As libgit.a moves away from using fixed size buffers, there is no guarantee that PATH_MAX is sufficient for all of the paths in a Git tree, so we should use a dynamically sized buffer here. Coverity-Id: 141884 Signed-off-by: John Keeping <john@keeping.me.uk>
* ui-tag: clean up taginfoJohn Keeping2016-10-01-2/+4
| | | | | | | | | Free the taginfo when we're done with it. Also reduce the scope of a couple of variables so that it's clear that this is the only path that uses the taginfo structure. Coverity-Id: 141883 Signed-off-by: John Keeping <john@keeping.me.uk>
powered by cgit and git | oriole.systems | how to verify signatures