aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'stable'Lars Hjemli2009-01-11
|\
| * Avoid SEGFAULT on invalid requestsLars Hjemli2009-01-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an unknown page is requested, either on the querystring or via PATH_INFO, we end up with a null-referencing cgit_cmd. This null- pointer is then used as argument to the hc() function (which decides what tab to render as 'active'), but this function failed to check if a valid cmd was specified and a SEGFAULT would occur. This patch fixes the issue by introducing a 'fallback-cmd' which specifies what tab to render as 'active' when no valid cmd is requested. While at it, we now also keep track of the active repository even if an invalid cmd was requested since we want to show the error message about the invalid request in the correct context. Noticed-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Make all tags viewableRobin Redeker2009-01-11
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2009-01-11
|\|
| * ui-tag: escape tagnames properlyLars Hjemli2009-01-11
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Change toggle to more meaningful termJustin Waters2009-01-11
| | | | | | | | | | | | | | | | In the log interface, there is a toggle link at the top, but it isn't clear what's being toggled. I've changed it to "Expand" and "Collapse" to make it clear that you are getting more and less information, respectively. Signed-off-by: Justin Waters <justin.waters@timesys.com>
* | Merge branch 'snapshot-fixes'Lars Hjemli2009-01-11
|\ \
| * | tests/t0107-snapshot.sh: make testscript match updated snapshot behaviorLars Hjemli2008-12-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since cgit now returns a 404 error when the snapshot filename cannot be resolved to a commit object, the testscript needs to request a valid snapshot name. Also, the script assumed that the toplevel directory in the snapshot would get the name of the repository but it's now named similar to the requested snapshot. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | return 404 if snapshot is not foundNatanael Copa2008-12-28
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'lh/mimetypes'Lars Hjemli2009-01-11
|\ \ \
| * | | ui-snapshot.c: change mime-type for tar.gz and tar.bz2Lars Hjemli2008-12-26
| |/ / | | | | | | | | | | | | | | | | | | The updated mime-types seems to work better than the old ones with both safari and firefox. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'lh/virtual-root'Lars Hjemli2009-01-11
|\ \ \
| * | | Untie logic for SCRIPT_NAME and PATH_INFOLars Hjemli2008-12-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SCRIPT_NAME is used as fallback for virtual-root when virtual-root is unspecified in cgitrc and PATH_INFO is used as fallback for the query- string parameter 'url' when the latter is unspecified. But until now, the use of PATH_INFO depended on virtual-root also being unspecified, i.e. it was impossible to use PATH_INFO when virtual-root was specified. This commit makes the fallback on SCRIPT_NAME and PATH_INFO independent code paths, i.e. it is now possible to specify virtual-root in cgitrc while still using PATH_INFO (instead of rewrite rules) to get 'pretty urls'. Noticed-by: Jack Moffitt <jack@chesspark.com> Noticed-by: LiKai Liu <liulk@cs.bu.edu> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Lars Hjemli2009-01-11
|\ \ \ \ | | |_|/ | |/| |
| * | | Makefile: avoid libcurl when building gitLars Hjemli2009-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need support for fetching/pushing in libgit.a, hence we don't need to link with libcurl. Noticed-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | ui-log: show name-decorations in log outputLars Hjemli2009-01-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits are now decorated with a clickable 'label' for each ref pointing at it, similar to how gitweb and gitk displays commit decorations. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | ui-refs: avoid SEGFAULT on lightweight tagsRobin Redeker2009-01-10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Lars Hjemli2009-01-06
|\| | |
| * | | ui-tree.c: do not add blank line when displaying blobsLars Hjemli2009-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, fix a related bug in the test-suite. Noticed-by: Jim Meyering <jim@meyering.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Lars Hjemli2008-12-30
|\| | | | |_|/ |/| |
| * | ui-patch: whitespace changes in the patch generation codeTomas Carnecky2008-12-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a space between the committer name and email, and remove superfluous spaces in the date header. This makes cgit-generated patches match the output from git-format-patch almost exactly, at least as far as the email headers go. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Use GIT-1.6.1Lars Hjemli2008-12-26
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | shared.c: future-proof usage of git diff-structuresLars Hjemli2008-12-26
| |/ |/| | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2008-12-06
|\|
| * tests/setup.sh: allow testsuite to fail properly with POSIX standard shellsLars Hjemli2008-12-06
| | | | | | | | | | | | | | The "((expr))" construct is not implemented by e.g. dash, so this commit replaces the construct with a more portable one. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * tests/t0010-validate-html.sh: skip tests if 'tidy' is not availableLars Hjemli2008-12-06
| | | | | | | | | | Noticed-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'full-log'Lars Hjemli2008-12-06
|\ \ | | | | | | | | | | | | | | | Conflicts: cgit.c cgit.h
| * | ui-log: use css to make full-log prettierLars Hjemli2008-11-30
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-log: (ab)use extra columns for commit message when showmsg=1Lars Hjemli2008-11-29
| | | | | | | | | | | | | | | | | | | | | | | | If the commit message has extra long lines it's better to use the author/ files/lines columns to show those lines than to push the columns of screen and force the users to hscroll. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-log: add support for showing the full commit messageLars Hjemli2008-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some users prefer to see the full message, so to make these users happy the new querystring parameter "showmsg" can be used to print the full commit message per log entry. A link is provided in the log heading to make this function accessible, and all links and forms tries to preserve the users preference. Note: the new link is not displayed on the summary page since the point of the summary page is to be a summary, but it is still obeyed if specified manually. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'lh/sort-repolist'Lars Hjemli2008-12-06
|\ \ \
| * | | ui-repolist: implement lazy caching of repo->mtimeLars Hjemli2008-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sorting the list of repositories by their last modification time, cgit would (in the worst case) invoke fstat(3) four times and open(3) twice for each callback from qsort(3). This obviously scales very badly. Now, the calculated modtime for each repo is saved in repo->mtime, thus keeping the number of stat/open invocations identical for sorted and unsorted repo-listings. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-repolist: sort null values lastLars Hjemli2008-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When sorting on e.g. owner, it's not interesting to get all repos without owner at the top of the list. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-repolist: add support for sorting any columnLars Hjemli2008-11-29
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-repolist: extract get_repo_modtime() from print_modtime()Lars Hjemli2008-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new function is then used by both print_modtime() and cgit_reposort_modtime(). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add support for sorting by Age in the repolistBenjamin Close2008-11-29
| |/ / | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'snapshot-fixes'Lars Hjemli2008-12-06
|\ \ \
| * | | ui-shared: shorten the sha1 printed by cgit_object_linkLars Hjemli2008-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such links was printed as the object type followed by the objects complete sha1. We still use the complete sha1 in the link but we no longer show it in all its glory; only the first 10 hex chars are printed. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-refs.c: show download links for all tags referring to commit objectsLars Hjemli2008-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The snapshot function has only been linked to from the commit page while users often would want to download a certain release. With this patch, direct download links will now be printed for each tagged release on the repo summary page. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-shared: exploit snapshot dwimmery in cgit_print_snapshot_linksLars Hjemli2008-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we know that ui-snapshot.c is able to extract the revision from the filename, there's no longer necessary to specify the revision with a 'id' querystring argument. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-snapshot: improve extraction of revision from snapshot nameLars Hjemli2008-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modified get_ref_from_filename() supports the following snapshot formats: * $REV.$EXT * $REPO[-_]*v?$REV.$EXT This implies that the following urls will retrieve the expected revision: * http://hjemli.net/git/cgit/snapshot/v0.8.1.tar.gz * http://hjemli.net/git/cgit/snapshot/0.8.1.tar.gz * http://hjemli.net/git/cgit/snapshot/cgit-0.8.1.tar.gz * http://hjemli.net/git/cgit/snapshot/cgit-140012d7a8.tar.gz Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Set prefix in snapshots when using dwimmeryNatanael Copa2008-11-30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sets the directory prefix in archives to be the filename, excluding the suffix (.tar.gz, .tar.bz2 etc). The patch also removes the prefix parameter in cgit_print_snapshot() as the prefix might differ. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Lars Hjemli2008-12-06
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'rj/buildtweaks' into stableLars Hjemli2008-12-05
| |\
| | * parsing.c: enable builds with NO_ICONV definedLars Hjemli2008-12-05
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| | * ui-repolist: avoid build warning for strcasestr(3)Lars Hjemli2008-12-05
| | | | | | | | | | | | | | | | | | | | | The non-standard function strcasestr is only defined if _GNU_SOURCE has also been defined. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| | * Makefile: allow cgit.conf to override platform-specific tweaksLars Hjemli2008-12-05
| | | | | | | | | | | | | | | | | | | | | If the makefile doesn't automatically define the correct build variables it is nice to be able to define them explicitly. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| | * Extra cygwin-specific changesRamsay Jones2008-12-03
| | | | | | | | | | | | | | | Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-log: try to disambiguate ref namesLars Hjemli2008-12-03
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The 'h' querystring parameter in cgit is normally used to specify a branch (i.e. a ref below refs/heads/), but if a repository contains a tag with the same name as a branch the output from ui-log would use the tag as start-revision. This patch tries to fix the issue by checking if the specified ref is valid as a branch name; if so, the full refname is used in the call to setup_revisions(). Noticed-by: Takamori Yamaguchi <akschar@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Lars Hjemli2008-11-14
|\|