aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Polishing of how the side-by-side diff looks.Gravatar Ragnar Ouchterlony2009-09-17-30/+96
| | | | | | | | | | | Aligned all different files, so that all side-by-side tables look the same. Also made sure that the tables take up the whole browser width. Also various changes to the css to make things easier on the eye. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Add possibility to switch between unidiff and side-by-side-diff.Gravatar Ragnar Ouchterlony2009-09-17-16/+73
| | | | | | | | | | | | | | | | A new config option side-by-side-diffs added, defaulting to 0, meaning unidiff. Also a query option (ss) is used toggle this. In the commit page you can switch between the two diff formats by clicking on the link on the "commit"-row, to the right of (patch). In the diff page you can switch by using the link at the start of the page. All commit-links and diff-links will remember the choice. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* First version of side-by-side diff.Gravatar Ragnar Ouchterlony2009-09-17-2/+325
| | | | | | | | | This constitutes the first prototype of a side-by-side diff. It is not possible to switch between unidiff and side-by-side diff at all at this stage. Signed-off-by: Ragnar Ouchterlony <ragnar@lysator.liu.se> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* CGIT 0.8.3Gravatar Lars Hjemli2009-09-14-1/+1
| | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* Merge branch 'stable'Gravatar Lars Hjemli2009-09-14-1/+1
|\
| * CGIT 0.8.2.2Gravatar Lars Hjemli2009-09-14-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'lh/repo-scan'Gravatar Lars Hjemli2009-09-14-80/+329
|\ \
| * | cgit.c: respect repo-local 'snapshots' option for --scan-pathGravatar Lars Hjemli2009-08-24-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The repo-specific 'snapshots' option is bitwise AND'ed with the global 'snapshots' option during parsing, and since the global cgitrc hasn't been parsed when --scan-path is processed the global 'snapshots' will always be 0 (i.e. no repo-specific 'snapshots' setting will have any effect). This patch fixes the issue by setting the global 'snapshots' mask to 0xFF (hence relying on later parsing of the generated cgitrc repolist to do the right thing). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: only print first line of repo.desc in print_repo()Gravatar Lars Hjemli2009-08-24-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Since repo.desc might have been populated by reading the 'description' file in GIT_DIR, it may contain newlines. And by printing the literal value, we may then generate an invalid cgitrc include-file. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add and use cgit_find_stats_periodname() in print_repo()Gravatar Lars Hjemli2009-08-24-0/+12
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: generate repo.snapshots in print_repo()Gravatar Lars Hjemli2009-08-24-0/+25
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: add missing options to print_repo()Gravatar Lars Hjemli2009-08-24-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Note: print_repo() still ignores repo.max-stats and repo.snapshots, which both requires additional work since these settings are represented internally as an enum and a bitmap. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | shared.c: initialize cgit_repo structs properlyGravatar Lars Hjemli2009-08-24-0/+1
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add config option 'enable-filter-overrides'Gravatar Lars Hjemli2009-08-24-11/+26
| | | | | | | | | | | | | | | | | | | | | This option must be enabled if repo-specific cgitrc files should be allowed to override any of the 'filter' options. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: fix markup errorsGravatar Lars Hjemli2009-08-24-9/+10
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-repolist: handle empty sections similar to NULL sectionsGravatar Lars Hjemli2009-08-24-7/+12
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for repo-local cgitrc fileGravatar Lars Hjemli2009-08-24-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recursively scanning a directory tree looking for git repositories, cgit will now parse cgitrc files found within such repositories. The repo-specific config files can include any repo-specific options except 'repo.url' and 'repo.path'. Also, in such config files the 'repo.' prefix can not be used, i.e. the valid options then becomes: * name * clone-url * desc * ower * defbranch * snapshots * enable-log-filecount * enable-log-linecount * max-stats * module-link * section * about-filter * commit-filter * source-filter * readme Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: refactor repo_config() from config_cb()Gravatar Lars Hjemli2009-08-24-41/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new function repo_config() is used to handle all 'simple' repo options, for the following reasons: * code readability * parser performance * upcoming support for repo-local cgitrc files during scanning Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | ui-repolist.c: sort by section name, repo name as defaultGravatar Lars Hjemli2009-08-24-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | When no sorting is requested by the client, cgit will now sort by section name followed by repo name. This allows repos to be registered/ discovered independently of their display order. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add config option 'repo.section'Gravatar Lars Hjemli2009-08-24-0/+5
| | | | | | | | | | | | | | | | | | | | | This option can be used to specify the section name for the current repository. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Introduce 'section' as canonical spelling for 'repo.group'Gravatar Lars Hjemli2009-08-24-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | The 'repo.' prefix should be reserved for repo-specific options, but the option 'repo.group' must still be honored to stay backwards compatible. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for --scan-path command line optionGravatar Lars Hjemli2009-08-24-1/+2
| | | | | | | | | | | | | | | | | | | | | This is an alias for --scan-tree (which might be deprecated in the future). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Rename 'repo.scan' to 'scan-path'Gravatar Lars Hjemli2009-08-24-10/+10
| | | | | | | | | | | | | | | | | | | | | The 'repo.' prefix will soon be reserved for repo-specific config options. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgitrc.5.txt: document repo.scan and cache-scanrc-ttlGravatar Lars Hjemli2009-08-24-0/+9
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: add support for caching autodetected repositoriesGravatar Lars Hjemli2009-08-24-1/+75
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: make print_repolist() and print_repo() reusable for cachingGravatar Lars Hjemli2009-08-24-12/+12
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cache.h: export hash_str()Gravatar Lars Hjemli2009-08-24-0/+2
| | | | | | | | | | | | | | | | | | This function will be reused to cache the result of tree scanning. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: add support for cgitrc option 'repo.scan'Gravatar Lars Hjemli2009-08-24-0/+2
| | | | | | | | | | | | | | | | | | When specified, the specified path will be scanned for repositories. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | scan-tree: detect non-bare repository and stop scanning earlyGravatar Lars Hjemli2009-08-24-0/+4
| | | | | | | | | | | | | | | | | | | | | We don't want to descend into every subdirectory of a git repository with a workdir. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'fp/linenumbers'Gravatar Lars Hjemli2009-09-14-17/+32
|\ \ \
| * | | cgit.css: make the blob display in tree view a bit prettierGravatar Lars Hjemli2009-08-21-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding some padding to the linenumbers while right-aligning them and removing the background color makes the page more readable. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Rename "linenumbers" to "enable-tree-linenumbers", change default to "1"Gravatar Lars Hjemli2009-08-21-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the name of the cgitrc option more descriptive and at the same time changes the default from "0" to "1" in an attempt to stay backwards compatible - prior to the introduction of "source-filter" and "linenumbers", cgit always generated linenumber links in the tree view, but now this feature can be turned off (one might want to do this if the source-filter performs line-wrapping etc). While at it, the documentation is updated to match the surrounding descriptions. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | Add 'linenumbers' config optionGravatar Florian Pritz2009-08-21-11/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Florian Pritz <bluewind@xssn.at> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-tree.c: show line numbers when highlightingGravatar Florian Pritz2009-08-21-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When source-filter is enabled, cgit currently will not display linenumbers in the tree view. This patch restores the linenumber function. Signed-off-by: Florian Pritz <bluewind@xssn.at> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Use GIT-1.6.4.3Gravatar Lars Hjemli2009-09-14-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <larsh@slackbox.hjemli.net>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2009-09-07-1/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | ui-plain.c: only return the blob with the specified pathGravatar Lars Hjemli2009-09-07-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a path to a directory was specified for the 'plain' view, each blob in the directory used to be returned to the client. This patch fixes the issue by matching the path of each blob against the requested path. Noticed-by: Lars Stoltenow <penma@penma.de> Signed-off-by: Lars Hjemli <larsh@slackbox.hjemli.net>
* | | cgitrc.5.txt: fix description and markup for 'snapshots' optionGravatar Lars Hjemli2009-08-24-8/+3
| |/ |/| | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | scan-tree: split the pw_gecos field at the ',' to get the real nameGravatar Stefan Naewe2009-08-20-0/+3
| | | | | | | | | | Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | cgit.c: fix caching keyed on PATH_INFO with no QUERY_STRINGGravatar Lars Hjemli2009-08-20-1/+1
| | | | | | | | | | | | | | | | When generating a hash for caching, ctx.qry.raw is used as key. And since cgit_parse_url() zero-terminates it's argument (after the repo path), ctx.qry.raw must xstrdup(ctx.qry.url). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Add and use a common readfile() functionGravatar Lars Hjemli2009-08-19-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | This function is used to read the full content of a textfile into a newly allocated buffer (with zerotermination). It replaces the earlier readfile() in scan-tree.c (which was rather error-prone[1]), and is reused by read_agefile() in ui-repolist.c. 1: No checks for EINTR and EAGAIN, fixed-size buffer Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2009-08-19-0/+2
|\ \ | |/
| * truncate buffer before reading empty filesGravatar Simon Arlott2009-08-18-0/+2
| | | | | | | | | | | | | | | | | | | | If readfile() reads an empty file, fgets() won't truncate the buffer and it'll still contain the contents of the previously read file. [lh: fixed similar issue in ui-repolist.c] Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2009-08-18-8/+11
|\ \ | |/
| * ui-shared: don't print header <img/> if there isn't a logo definedGravatar Matthew Metnetsky2009-08-18-8/+11
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'stable'Gravatar Lars Hjemli2009-08-17-1/+7
|\ \ | |/
| * cgit.c: do not segfault on unexpected query-string formatGravatar Lars Hjemli2009-08-17-0/+3
| | | | | | | | | | | | | | | | The querystring_cb() function will be invoked with a NULL value when the querystring contains a name not followed by a '='. Such a value used to cause a segfault, which this patch fixes. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-tag.c: do not segfault when id is missing from query-stringGravatar Lars Hjemli2009-08-17-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of the tag page is to print info about a specific tag, but if no tag was specified on the query-string cgit used to segfault. With this patch, cgit will fallback to the value of the 'h' parameter instead (which is never NULL due to prepare_repo_cmd() in cgit.c). It will now also verify that the specified tagname is in fact a valid ref in the 'refs/tags/' namespace, i.e. specifying 'id=master' will trigger a 'Bad tag reference' error. Noticed-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | ui-log.c: handle lightweight tags when printing commit decorationsGravatar Lars Hjemli2009-08-17-0/+4
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | ui-refs.c: improve handling of lightweight tagsGravatar Stefan Bühler2009-08-17-1/+18
| | | | | | | | | | | | | | | | | | | | When a lightweight tag is referencing a commit object, cgit now uses the commit date when comparing tag age. Also, the commitdate and author info is printed in the refs view, making lightweight tags appear similar to annotated tags. Signed-off-by: Stefan Bühler <lighttpd@stbuehler.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
generated by cgit v0.10.1 at 2024-11-25 01:30:32 (JST)