Commit Graph

482 Commitit

Tekijä SHA1 Viesti Päivämäärä
Lars Hjemli
ba75f6613e CGIT 0.8.1.1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-27 20:35:49 +01:00
Todd Zullinger
d529c6fbdc Makefile: install cgit.{css,png} in CGIT_DATA_PATH
CGIT_DATA_PATH defaults to CGIT_SCRIPT_PATH, but allows users to
install the cgi and the data files in different locations.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12 08:56:54 +01:00
Todd Zullinger
4ac89ec8b4 Makefile: add INSTALL var to set install command
This also explicitly sets the modes for installed files (755 for the
.cgi, 644 for the .css and .png).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12 08:22:24 +01:00
Todd Zullinger
3796c2d8d2 Fix tar.bz2 snapshot example
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-12 08:21:58 +01:00
Lars Hjemli
eb14609dc4 Avoid SEGFAULT on invalid requests
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>
2009-01-11 21:23:04 +01:00
Lars Hjemli
720b6ece90 ui-tag: escape tagnames properly
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-11 16:37:47 +01:00
Lars Hjemli
c63aaff2ad Makefile: avoid libcurl when building git
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>
2009-01-10 15:18:18 +01:00
Lars Hjemli
f3c99cf1ce ui-tree.c: do not add blank line when displaying blobs
Also, fix a related bug in the test-suite.

Noticed-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2009-01-06 21:37:23 +01:00
Tomas Carnecky
03afc5fe1f ui-patch: whitespace changes in the patch generation code
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>
2008-12-30 11:16:25 +01:00
Lars Hjemli
b6faa78091 tests/setup.sh: allow testsuite to fail properly with POSIX standard shells
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>
2008-12-06 12:03:54 +01:00
Lars Hjemli
2755af6e29 tests/t0010-validate-html.sh: skip tests if 'tidy' is not available
Noticed-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-06 11:53:59 +01:00
Lars Hjemli
d2592a2cb5 Merge branch 'rj/buildtweaks' into stable 2008-12-05 19:13:32 +01:00
Lars Hjemli
14b4e108a7 parsing.c: enable builds with NO_ICONV defined
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-05 19:10:28 +01:00
Lars Hjemli
7115f7d257 ui-repolist: avoid build warning for strcasestr(3)
The non-standard function strcasestr is only defined if _GNU_SOURCE has
also been defined.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-05 19:04:17 +01:00
Lars Hjemli
a5e899e4c7 Makefile: allow cgit.conf to override platform-specific tweaks
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>
2008-12-05 18:47:16 +01:00
Ramsay Jones
97fdac1608 Extra cygwin-specific changes
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-12-03 23:39:30 +01:00
Lars Hjemli
a1b01b2513 ui-log: try to disambiguate ref names
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>
2008-12-03 17:34:23 +01:00
Lars Hjemli
c7d1402b17 ui-repolist: handle empty agefiles
When the agefile was empty the old code would happily reuse the static
buffer filled by a previous call to read_agefile().

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-14 09:29:22 +01:00
Karl Chen
5b27248301 Use mode 0644 for non-executable files
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-06 20:46:44 +01:00
Ramsay Jones
e4d2f2b042 Fix tests to work on Ubuntu (dash)
The system shell (/bin/sh) on Ubuntu is dash, which aims to be a
POSIX standard shell.  In particular, dash does not implement any
of the common extensions to the standard that, say, bash and ksh
do.

Replace some non-POSIX constructs in setup.sh with more portable
and mundane code.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-06 19:18:09 +01:00
Ramsay Jones
bdd4a56ad5 Fix some warnings to allow -Werror
The type used to declare the st_size field of a 'struct stat' can
be a 32- or 64-bit sized type, which can vary from one platform to
another, or even from one compilation to another.  In particular,
on linux, if you include the following define:

    #define _FILE_OFFSET_BITS 64

prior to including certain system header files, then the type used
for the st_size field will be __off64_t, otherwise it will be an
__off_t.  Note that the above define is included at the top of
git-compat-util.h.

In cache.c, the "%zd" format specifier expects a "signed size_t",
another type which can vary, when an __off64_t or a __off_t is
provided.  To supress the warning, use the PRIuMAX format specifier
and cast the st_size field to uintmax_t.  This should work an any
platform for which git currently compiles.

In ui-plain.c, the size parameter of sha1_object_info() and
read_sha1_file() is defined to be "unsigned long *" not "size_t *".
So, to supress the warning, simply declare size with the correct type.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-06 19:18:07 +01:00
Lars Hjemli
a918c068a6 Use GIT-1.6.0.3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-11-06 19:17:57 +01:00
Lars Hjemli
140012d7a8 CGIT 0.8.1 2008-10-11 20:22:57 +02:00
Lars Hjemli
8011587ef3 Merge branch 'stable'
* stable:
  Makefile: enable compilation on uclibc
2008-10-11 20:21:17 +02:00
Lars Hjemli
efaccb3d6a Makefile: enable compilation on uclibc
Original-patch-by: Natanael Copa <natanael.copa@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-11 20:21:06 +02:00
Lars Hjemli
ed7ff095ca ui-snapshot: add dwimmery
When downloading a snapshot, the snapshot name will often contain the repo
name combined with a tag. This patch tries to exploit this so that the
correct revision is downloaded even if no specific revision is specified.

PS: this only occurs if neither 'h' nor 'id' is specified in the query-
string.

PPS: this also fixes a bug which occurs when trying to download a filename
with an unsupported suffix: it used to try to print an error message to
the user but failed since it didn't prepare the output properly.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-11 20:09:42 +02:00
Lars Hjemli
5632ba35d1 Add cgit_query.nohead flag
This flag is set when no HEAD is specified in the querystring. Currently
it has no users, but it will be used by ui-snapshot to invoke a DWIM-mode
where the revision is extracted from the snapshot name.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-11 19:05:50 +02:00
Lars Hjemli
cb1cc0d82d ui-shared: specify correct css class for summary tab
When introducing cgit_summary_link() in 49ecbbdd I forgot to specify the
css class. This fixes it.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-06 16:00:42 +02:00
Lars Hjemli
ae83752b41 CGIT 0.8 2008-10-05 21:23:39 +02:00
Lars Hjemli
0071aa8612 ui-summary: use html_url_path()
This makes the clone urls be properly escaped.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 21:21:42 +02:00
Lars Hjemli
24d4bb3058 ui-refs: use cgit_tag_link()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 21:19:05 +02:00
Lars Hjemli
cf61ad411c ui-shared: add cgit_tag_link()
This function can be used to generate properly escaped links to the tag
page.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 21:18:45 +02:00
Lars Hjemli
8b5fc6de03 ui-shared: generate proper links in cgit_object_link()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 21:12:08 +02:00
Lars Hjemli
2e884f3162 ui-shared: use html_url_path() to get properly escaped url in form action
When a repo uses an url with e.g. '#' or '?' characters this needs to be
properly escaped when used as action in a form tag.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 19:25:47 +02:00
Lars Hjemli
b7f33786ef Use GIT-1.6.0.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 19:19:59 +02:00
Lars Hjemli
b9aabf0b8f ui-shared: reword the standard page footer
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 19:09:58 +02:00
Lars Hjemli
23ffba78b4 ui-shared: do not print repo name on the "summary" tab
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 19:00:32 +02:00
Lars Hjemli
df46123b0e Replace cgitrc with cgitrc.5.txt
The new file describes all cgitrc options in a more structured manner then
the cgitrc example file and it might also work as the source for a cgitrc
man page.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 18:55:49 +02:00
Lars Hjemli
c6bea0375a Merge branch 'lh/escape-urls'
* lh/escape-urls:
  ui-repolist + ui-shared: Use cgit_summary_link()
  ui-shared.c: add cgit_summary_link()
  ui-shared.c: use html_url_path() in repolink()
  html.c: add html_url_path
2008-10-05 17:16:48 +02:00
Lars Hjemli
49ecbbddf0 ui-repolist + ui-shared: Use cgit_summary_link()
This makes is possible to use cgit with repository urls containing special
url characters like '#' and '?'.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 17:16:36 +02:00
Lars Hjemli
e9d3bd544f ui-shared.c: add cgit_summary_link()
This function can be used to generate a link to the summary page for the
currently active repo.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 16:55:50 +02:00
Lars Hjemli
44b208aa44 ui-shared.c: use html_url_path() in repolink()
This makes sure that reponames and paths are properly escaped when used
as urls.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 16:54:44 +02:00
Lars Hjemli
22a597e56d html.c: add html_url_path
This function can be used to generate properly escaped path-components
for links.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 16:52:57 +02:00
Lars Hjemli
20c895f688 Merge branch 'lh/escape-urls'
* lh/escape-urls:
  ui-shared.c: use html_url_arg()
  html.c: add html_url_arg
2008-10-05 13:13:33 +02:00
Lars Hjemli
204669ff4a ui-snapshot.c: specify archiver_args.baselen
The struct member was introduces in git commit d53fe8187c38, but the cgit
testsuite failed to detect that cgit always generated archives without
prefixes, i.e. the result from cgit_repobasename was ignored.

This fixes the bug and the testsuite.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 13:13:03 +02:00
Lars Hjemli
b575115d9d ui-shared.c: use html_url_arg()
The link-generating functions are updated to use the new html_url_arg
function, thereby fixing links to strange repos, branches and files.

Also, the test-suite is updated to verify some cases of strange urls.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 12:52:25 +02:00
Lars Hjemli
a36a0d9dec html.c: add html_url_arg
This function can be used to properly escape querystring parameter values.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-10-05 12:49:46 +02:00
Lars Hjemli
f82b19407d ui-diff: make diffstat header a link to the full diff
When printing a path-filtered diff it wasn't obvious how to get back to
the full diff (clicking the 'diff' tab would do this). Making the diffstat
heading into a link seems to improve the usability.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-09-23 17:54:45 +02:00
Lars Hjemli
04619c9b85 ui-diff: fix links from diffstat
The links in the diffstat is supposed to work as a filter for the diff,
but this only worked when a single rev was supplied, i.e. the filtered
diff was always against the parent of the specified rev.

With this patch it is now possible to use the diffstat as a 'filter menu'
for urls like http://hjemli.net/git/cgit/diff/?id=v0.7.2&id2=v0.7.1

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-09-23 17:47:26 +02:00
Harley Laue
06e14dc61c Add LDFLAGS to makefile.
This will allow for creating static builds which is useful for chrooted
environments.

Signed-off-by: Harley Laue <losinggeneration@gmail.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
2008-09-20 13:47:58 +02:00